Dominicsbranch

src/main/Application.java

@@ -32,17 +32,25 @@ public class Application {
         }
 
         //Iterate through every String
-        for (String expression: expressions) {
-            System.out.println("Expression: " + expression);
+        for (String expressionString: expressions) {
+            System.out.println("Expression: " + expressionString);
             //Usage of the lexer, parser & evaluator
             try {
                 //Create a list of tokens with the lexer
-                List<Lexer.Token> tokens = Lexer.lex(expression);
+                List<Lexer.Token> tokens = Lexer.lex(expressionString);
                 System.out.println("Lexer created tokens:");
                 //prints out each token to the console
                 for(Lexer.Token token: tokens) {
                     System.out.println(token.toString());
                 }
+                //Parse all tokens with the parser and saves the result into the variable 'ast'
+                Parser parser = new Parser();
+                Parser.Expression ast = parser.parse(tokens);
+                //Prints the ast out with an ASTPrinter
+                //the result can later be used to show the ast in a function plotter
+                ASTPrinter printer = new ASTPrinter();
+                System.out.println("Printing: '" + printer.visit(ast) + "'");
+                System.out.println();
             }
             catch (Exception e) {
                 e.printStackTrace();
@@ -51,22 +59,10 @@ public class Application {
         }
 
         /*
-        //Iterates through every String and parses them into multiple tokens
-        for (String value: expressions) {
-            Parser parser = new Parser();
-            try {
-                Parser.Expression exp = parser.parse(tokens);
-                ASTPrinter printer = new ASTPrinter();
                 Evaluator evaluator = new Evaluator();
-                System.out.println("Printing: '" + printer.visit(exp) + "'");
                 String s = printer.visit(exp);
                 System.out.println("Evaluating: '" + evaluator.visit(exp) + "'");
                 SwingFunctionPlotter.plotFunction(s);
-            }
-            catch (ParserException e) {
-                System.out.println(e.getMessage());
-            }
-            System.out.println();
         }*/
     }
 }