Basic Parser2.0 tests

Author: robertDurst

examples/test2.fish

@@ -1,25 +1,17 @@
 import foo : "foo.fish"
 import bar : "bar.fish"
 
-(fun some_function([int] i)(void){
-   i = i + 1
-   return i
-})
+(fun foo (int i, flt f)(void){ return i })
 
 start {
-   dec str s = "Throw youresel"
-   dec [int] i = [1,2,3]
-   f.f = f...foo() + (5 * 11 ** (4  and 6))
-   z = 7
-
    Tree (
-      (|1 == 2| {
-         z = 2
-      })
-
-       (|1 != 2 and (!true)| {
-         z = new Foo { z: 1, f: "hello from the otherside" }
-         --z
-      })
+      (|1 == 2 and (2 < 3)| {})
+      (|!true| {})
    )
+
+   dec flt f = 12.0
+   dec [int] is = [1,2,3]
+   dec Foo f = new Foo {f: i}
+   f.f += f...f() + 1
+   ++f.f
 }

examples/test_uda.fish

@@ -0,0 +1,7 @@
+Uat {
+    flt f 
+}
+
+Ufn {
+    (fun foo(int i)(void){})
+}

src/main/CommandLine.cpp

@@ -164,7 +164,8 @@ handleCommandLine(int argc, char* const* argv)
 
                 Parser2* p = new Parser2(filename);
                 auto n = p->parse();
-                p->postorder(n);
+                p->postorder(
+                    n, [](std::string s) -> void { std::cout << s << '\n'; });
             }
             catch (const std::string msg)
             {

src/parser/Parser2.h

@@ -117,31 +117,36 @@ class Parser2
     Parser2(const std::string& filename);
     std::shared_ptr<NodeLexeme> parse();
 
+    template <typename F>
     void
-    lexemeIt(Lexeme l, int indent)
+    lexemeIt(Lexeme l, F f)
     {
         auto i = l.index();
         if (i == 0)
-            postorder(std::get<std::shared_ptr<NodeLexeme>>(l), indent + 4);
+            postorder(std::get<std::shared_ptr<NodeLexeme>>(l), f);
         else if (i == 1)
-            postorder(std::get<std::shared_ptr<LeafLexeme>>(l), indent + 4);
+            postorder(std::get<std::shared_ptr<LeafLexeme>>(l), f);
     }
+
+    template <typename F>
     void
-    postorder(std::shared_ptr<NodeLexeme> n, int indent = 0)
+    postorder(std::shared_ptr<NodeLexeme> n, F f)
     {
         if (n != nullptr && n->op != OP::NULL_VAL)
         {
             // root
-            std::cout << std::setw(indent) << disp(n->op) << '\n';
+            f(disp(n->op));
             // left
-            lexemeIt(n->left, indent);
+            lexemeIt(n->left, f);
             // right
-            lexemeIt(n->right, indent);
+            lexemeIt(n->right, f);
         }
     }
+
+    template <typename F>
     void
-    postorder(std::shared_ptr<LeafLexeme> n, int indent = 0)
+    postorder(std::shared_ptr<LeafLexeme> n, F f)
     {
-        std::cout << std::setw(indent) << n->value << '\n';
+        f(n->value);
     }
 };

test/CMakeLists.txt

@@ -1,16 +1,21 @@
 cmake_minimum_required(VERSION 2.6)
 
+set(CMAKE_CXX_STANDARD 17)
+
 # Add sailfishc libs. TODO: write this more eloquently
 ADD_LIBRARY(SailfishcLibs 
     ../src/lexar/Lexar.cpp
     ../src/lexar/Lexar2.cpp
     ../src/lexar/Token2.cpp
     ../src/parser/Parser.cpp
+    ../src/parser/Parser2.cpp
+    ../src/parser/Lexeme.cpp
     visitors/InOrderTraversal.cpp
     ../src/visitor/Visitor.cpp
     ../src/semantics/SymbolTable.cpp 
     ../src/semantics/TypeChecker.cpp 
     ../src/errorhandler/SemanticErrorHandler.cpp 
+    ../src/errorhandler/Parser2ErrorHandler.cpp 
     ../src/errorhandler/SymbolTableErrorHandler.cpp 
     ../src/errorhandler/ParserErrorHandler.cpp
     ../src/common/ReservedWords.cpp

test/examples/parser2_script.fish

@@ -0,0 +1,17 @@
+import foo : "foo.fish"
+import bar : "bar.fish"
+
+(fun foo (int i, flt f)(void){ return i })
+
+start {
+   Tree (
+      (|1 == 2 and (2 < 3)| {})
+      (|!true| {})
+   )
+
+   dec flt f = 12.0
+   dec [int] is = [1,2,3]
+   dec Foo f = new Foo {f: i}
+   f.f += f...f() + 1
+   ++f.f
+}

test/examples/parser2_udt.fish

@@ -0,0 +1,7 @@
+Uat {
+    flt f 
+}
+
+Ufn {
+    (fun foo(int i)(void){})
+}