diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-12-10 12:45:11 -0800 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-12-10 12:45:11 -0800 |
commit | 169c1d9665efbeb678e2a50382d5cdc1da424447 (patch) | |
tree | ef2ba7d0cf3838f99b90448de99ed0aaddd762ed /vespajlib | |
parent | 2462ef3a0dce6fcd4a0b04c0ee76e44531f31395 (diff) |
Minor cleanup
Diffstat (limited to 'vespajlib')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/TensorParser.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorParser.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorParser.java index 3ab7af2ed37..8d07a1ed9a8 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/TensorParser.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorParser.java @@ -189,15 +189,11 @@ class TensorParser { while (indexes.hasNext()) { indexes.next(); - for (int i = 0; i < indexes.rightDimensionsAtStart() && hasInnerStructure; i++) consume('['); - consumeNumber(); - for (int i = 0; i < indexes.rightDimensionsAtEnd() && hasInnerStructure; i++) consume(']'); - if (indexes.hasNext()) consume(','); } @@ -216,7 +212,7 @@ class TensorParser { return firstLeftBracket >= 0 && firstLeftBracket < valueString.indexOf(']'); } - private void consumeNumber() { + protected void consumeNumber() { skipSpace(); int nextNumberEnd = nextStopCharIndex(position, string); @@ -237,14 +233,14 @@ class TensorParser { position = nextNumberEnd; } - private int nextStopCharIndex(int charIndex, String valueString) { - while (charIndex < valueString.length()) { - if (valueString.charAt(charIndex) == ',') return charIndex; - if (valueString.charAt(charIndex) == ']') return charIndex; - charIndex++; + private int nextStopCharIndex(int position, String valueString) { + while (position < valueString.length()) { + if (valueString.charAt(position) == ',') return position; + if (valueString.charAt(position) == ']') return position; + position++; } throw new IllegalArgumentException("Malformed tensor value '" + valueString + - "': Expected a ',' or ']' after position " + charIndex); + "': Expected a ',', ']' or '}' after position " + position); } } |