add comments, fix struct/function lookup

[toc] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 461d0148b05f9b14e3b87d385f9f5493253dfd69..6792e832b692413aa6a6c916690d0707a19d9222 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,7 @@
 #include "toc.h"\r
 #include "repr.h"\r
 #include "repr_get.h"\r
+#include "generic.h"\r
 //#include "check.h"\r
 \r
 using namespace antlr4;\r
@@ -31,24 +32,21 @@ int main(int argc, const char * argv[])
     return 1;\r
   }\r
 \r
-  std::string s = tree->toStringTree(&parser) + "\n";\r
-\r
+  //std::string s = tree->toStringTree(&parser) + "\n";\r
   //std::cout << "Parse Tree: " << s << std::endl;\r
 \r
   Program prg = getProgram(prog, nullptr);\r
+  instantiateGenerics(prg);\r
 \r
   try\r
   {\r
     tocProgram(std::cout, prg);\r
 \r
-    // if (!checkProgram(prg))\r
-    //   std::cerr << "Error" << std::endl;\r
-\r
     std::ofstream ofs("output.c");\r
     tocProgram(ofs, prg);\r
     ofs.close();\r
   }\r
-  catch (const std::string & e)\r
+  catch (const char * e)\r
   {\r
     std::cerr << "Error: " << e << std::endl;\r
   }\r