minor refactors

esaulpaugh · Aug 19, 2024 · 9604408 · 9604408
1 parent c107e09
commit 9604408
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/main/java/com/esaulpaugh/headlong/rlp/Notation.java b/src/main/java/com/esaulpaugh/headlong/rlp/Notation.java
@@ -207,38 +207,34 @@ public String toString() {
      */
     public static List<Object> parse(String notation) {
         List<Object> topLevelObjects = new ArrayList<>(); // a sequence (as in RLPEncoder.sequence)
-        parse(notation, 0, notation.length(), topLevelObjects, 0);
+        parse(notation, 0, topLevelObjects, 0);
         return topLevelObjects;
     }
 
     private static final int MAX_DEPTH = 768;
 
-    private static int parse(final String notation, int i, final int end, final List<Object> parent, int depth) {
-        while (i < end) {
-            switch (notation.charAt(i)) {
+    private static int parse(final String notation, int i, final List<Object> parent, final int depth) {
+        do {
+            switch (notation.charAt(i++)) {
             case BEGIN_STRING:
-                final int datumStart = i + 1;
-                final int datumEnd = notation.indexOf(END_STRING, datumStart);
+                final int datumEnd = notation.indexOf(END_STRING, i);
                 if (datumEnd < 0) {
-                    throw new IllegalArgumentException("unterminated string @ " + datumStart);
+                    throw new IllegalArgumentException("unterminated string @ " + i);
                 }
-                parent.add(FastHex.decode(notation, datumStart, datumEnd - datumStart));
+                parent.add(FastHex.decode(notation, i, datumEnd - i));
                 i = datumEnd + 1;
                 continue;
             case BEGIN_LIST:
                 if (depth >= MAX_DEPTH) {
                     throw new IllegalArgumentException("exceeds max depth of " + MAX_DEPTH);
                 }
                 List<Object> childList = new ArrayList<>();
-                i = parse(notation, i + 1, end, childList, depth + 1);
+                i = parse(notation, i, childList, depth + 1);
                 parent.add(childList);
                 continue;
-            case END_LIST:
-                return i + 1;
-            default:
-                i++;
+            case END_LIST: return i;
             }
-        }
+        } while (i < notation.length());
         return Integer.MAX_VALUE;
     }
 }
diff --git a/src/test/java/com/esaulpaugh/headlong/abi/AdvancedABICasesTest.java b/src/test/java/com/esaulpaugh/headlong/abi/AdvancedABICasesTest.java
@@ -78,7 +78,7 @@ boolean test(boolean function) {
                         System.out.println(r + " " + e + (r.equals(e) ? "" : " ****"));
                     }
                     for (; i < encodingTokens.length; i++) {
-                        System.out.println("----------------------------------------------------------------" + " " + encodingTokens[i]);
+                        System.out.println("---------------------------------------------------------------- " + encodingTokens[i]);
                     }
                 }
                 // return false;