From 4139b7c3d7b6439dc86a72e2aabf07d762cda729 Mon Sep 17 00:00:00 2001 From: student Date: Wed, 12 Apr 2017 11:40:16 -0400 Subject: Minor cleanup --- .../bjc/pratt/examples/lang/PrattParserTest.java | 31 ++++++++-------------- 1 file changed, 11 insertions(+), 20 deletions(-) (limited to 'JPratt/src/examples/java/bjc/pratt') diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java index 34623c6..a4def27 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java @@ -52,7 +52,7 @@ public class PrattParserTest { * Main method. * * @param args - * Unused CLI arguments. + * Unused CLI arguments. */ public static void main(final String[] args) { /* @@ -88,9 +88,6 @@ public class PrattParserTest { reserved.addAll(Arrays.asList("try", "catch", "finally")); reserved.add("var"); - final ChainTokenSplitter nsplit = new ChainTokenSplitter(); - - final ConfigurableTokenSplitter hi = new ConfigurableTokenSplitter(true); final ConfigurableTokenSplitter lo = new ConfigurableTokenSplitter(true); lo.addSimpleDelimiters("->"); @@ -109,11 +106,8 @@ public class PrattParserTest { lo.addMultiDelimiters("[", "]"); lo.addMultiDelimiters("{", "}"); - //hi.compile(); lo.compile(); - nsplit.appendSplitters(hi, lo); - final ExcludingTokenSplitter excluder = new ExcludingTokenSplitter(lo); excluder.addLiteralExclusions(reserved.toArray(new String[0])); @@ -130,8 +124,7 @@ public class PrattParserTest { String ln = scn.nextLine(); while (!ln.trim().equals("")) { - final Iterator> tokens = preprocessInput(ops, filtered, ln, reserved, - ctx); + final Iterator> tokens = preprocessInput(ops, filtered, ln, reserved, ctx); try { final StringTokenStream tokenStream = new StringTokenStream(tokens); @@ -141,8 +134,7 @@ public class PrattParserTest { */ tokenStream.next(); - final ITree> tree = parser.parseExpression(0, tokenStream, ctx, - true); + final ITree> tree = parser.parseExpression(0, tokenStream, ctx, true); if (!tokenStream.headIs("(end)")) { System.out.println("\nMultiple expressions on line"); @@ -170,7 +162,8 @@ public class PrattParserTest { final List splitTokens = new LinkedList<>(); for (final String raw : rawTokens) { - if (raw.equals("")) continue; + if (raw.equals("")) + continue; boolean doSplit = false; @@ -229,8 +222,7 @@ public class PrattParserTest { parser.addNonInitialCommand("catch", infixLeft(5)); - final NonInitialCommand ifElse = ternary(6, 0, "else", litToken("cond"), - false); + final NonInitialCommand ifElse = ternary(6, 0, "else", litToken("cond"), false); parser.addNonInitialCommand("if", ifElse); parser.addNonInitialCommand(":=", new AssignCommand(10)); @@ -272,8 +264,7 @@ public class PrattParserTest { parser.addNonInitialCommand(".", infixLeft(60)); - final NonInitialCommand arrayIdx = postCircumfix(60, 0, "]", - litToken("idx")); + final NonInitialCommand arrayIdx = postCircumfix(60, 0, "]", litToken("idx")); parser.addNonInitialCommand("[", arrayIdx); final InitialCommand ifThenElse = preTernary(0, 0, 0, "then", "else", @@ -287,12 +278,12 @@ public class PrattParserTest { new BlockEnter(), idfun, new BlockExit(), true); parser.addInitialCommand("begin", scoper); - final InitialCommand arrayLiteral = delimited(0, ",", "]", - litToken("array"), idfun, idfun, idfun, false); + final InitialCommand arrayLiteral = delimited(0, ",", "]", litToken("array"), + idfun, idfun, idfun, false); parser.addInitialCommand("[", arrayLiteral); - final InitialCommand jsonLiteral = delimited(0, ",", "}", litToken("json"), - idfun, idfun, idfun, false); + final InitialCommand jsonLiteral = delimited(0, ",", "}", litToken("json"), idfun, + idfun, idfun, false); parser.addInitialCommand("{", jsonLiteral); parser.addInitialCommand("try", unary(3)); -- cgit v1.2.3