diff options
| author | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2019-04-22 19:36:38 -0300 |
|---|---|---|
| committer | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2019-04-22 19:38:40 -0300 |
| commit | a31aea09510d1cbea05cbf99d37bf00c58f676a8 (patch) | |
| tree | e0e6bf97a7219ff21a2105ae759d3ceec5b2bc50 /clformat/src/main/java/bjc/utils/ioutils/format | |
| parent | 9020cb3a0c5c8bd89b594c28b73181b69dd40fe3 (diff) | |
Misc. Fixes
Diffstat (limited to 'clformat/src/main/java/bjc/utils/ioutils/format')
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java | 3 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java index 56fc69b..305af3b 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java @@ -57,7 +57,8 @@ public class CLFormatter { builtinDirectives.put("{", new IterationDirective()); builtinDirectives.put("(", new CaseDirective()); - builtinDirectives.put("`(", new InflectDirective()); + + builtinDirectives.put("`[", new InflectDirective()); builtinDirectives.put("T", new TabulateDirective()); } diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java index d6e918e..779ce9d 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java @@ -59,6 +59,8 @@ public class CLParameters { private void refreshAbbrevs() { // @NOTE 9/19/18 // + // @Cleanup @Leak + // // This never clears abbrevWords or nameAbbrevs, which I'm fine // with here, as these objects are fairly temporary. // @@ -276,7 +278,9 @@ public class CLParameters { String actKey = keys[0]; - if (nameIndices.containsKey(actKey)) { + if (namedParams.containsKey(actKey)) { + return namedParams.get(actKey); + } else if (nameIndices.containsKey(actKey)) { int idx = nameIndices.get(actKey); // @NOTE 9/22/18 @@ -284,10 +288,8 @@ public class CLParameters { // Consider whether we should throw an exception here. if (idx < 0 || idx >= params.length) return ""; - return params[nameIndices.get(actKey)]; - } else if (namedParams.containsKey(actKey)) { - return namedParams.get(actKey); - } + return params[idx]; + } return ""; } |