add comments, fix struct/function lookup

[toc] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 7d8d5c7f8467db121a9d55f20d2e9eb9122cc6ec..6792e832b692413aa6a6c916690d0707a19d9222 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,12 +7,15 @@
 #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
 \r
 \r
-int main(int argc, const char * argv[]) {\r
-  std::ifstream ifs("test.toc");\r
+int main(int argc, const char * argv[])\r
+{\r
+  std::ifstream ifs("test/test2.toc");\r
 \r
   ANTLRInputStream input(ifs);\r
 \r
@@ -23,28 +26,30 @@ int main(int argc, const char * argv[]) {
   TocParser::ProgContext * prog = parser.prog();\r
   tree::ParseTree * tree = prog;\r
 \r
-  if (parser.getNumberOfSyntaxErrors() > 0) {\r
+  if (parser.getNumberOfSyntaxErrors() > 0)\r
+  {\r
     std::cerr << "Parsing error" << std::endl;\r
     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);\r
-  std::cout << "Variables:\n";\r
-  for (auto v : prg.variables)\r
-    std::cout << " " << v.name << endl;\r
-  std::cout << "Functions:\n";\r
-  for (auto f : prg.functions)\r
-    std::cout << " " << f.name << endl;\r
+  Program prg = getProgram(prog, nullptr);\r
+  instantiateGenerics(prg);\r
 \r
-  tocProgram(std::cout, prg);\r
+  try\r
+  {\r
+    tocProgram(std::cout, prg);\r
 \r
-  //std::ofstream ofs("output.c");\r
-  //tocProg(ofs, prg);\r
-  //ofs.close();\r
+    std::ofstream ofs("output.c");\r
+    tocProgram(ofs, prg);\r
+    ofs.close();\r
+  }\r
+  catch (const char * e)\r
+  {\r
+    std::cerr << "Error: " << e << std::endl;\r
+  }\r
 \r
   return 0;\r
 }
\ No newline at end of file