type modifiers, parenthesized expressions, chained access expressions

[toc] / src / toc.h

diff --git a/src/toc.h b/src/toc.h
index 6dd611dd3035d9a9f67c5d87a1b7c797a2cc24b5..0c5546641dae37c1ed65f203a9c0877db73857ca 100644 (file)
--- a/src/toc.h
+++ b/src/toc.h
@@ -1,6 +1,7 @@
 #pragma once\r
 \r
 #include <iostream>\r
 #pragma once\r
 \r
 #include <iostream>\r

+#include <sstream>\r

 \r
 #include "repr.h"\r
 \r
 \r
 #include "repr.h"\r
 \r


@@ -41,7 +42,27 @@ std::ostream & operator<< (std::ostream & out, const Type & t) {
   return out;\r
 }\r
 std::ostream & operator<< (std::ostream & out, const Variable & v) {\r
   return out;\r
 }\r
 std::ostream & operator<< (std::ostream & out, const Variable & v) {\r

-  out << v.type << " " << v.name;\r
+  out << v.type << " ";\r
+\r
+  std::stringstream sstr;\r
+  std::string s = v.name;\r
+\r
+  for (auto m = v.type.modifiers.rbegin(); m != v.type.modifiers.rend(); m++) {\r
+    if (m->type == TypeModifierType::Pointer) {\r
+      sstr.str(std::string());\r
+      sstr << "*(" << s << ")";\r
+      s = sstr.str();\r
+    }\r
+    else {\r
+      sstr.str(std::string());\r
+      sstr << "(" << s << ")[";\r
+      if (m->_staticArray)\r
+        sstr << m->_arraySize;\r
+      sstr << "]";\r
+      s = sstr.str();\r
+    }\r
+  }\r
+  out << s;\r

 \r
   return out;\r
 }\r
 \r
   return out;\r
 }\r


@@ -88,6 +109,9 @@ std::ostream & operator<< (std::ostream & out, const TernaryOperatorExpr & o) {
   return out;\r
 }\r
 std::ostream & operator<< (std::ostream & out, const Expr & e) {\r
   return out;\r
 }\r
 std::ostream & operator<< (std::ostream & out, const Expr & e) {\r

+  if (e.parenthesized)\r
+    out << "(";\r
+\r

   switch (e.type) {\r
   case ExprType::Func:\r
     out << e._func.functionName << "(" << e._func.arguments << ")"; break;\r
   switch (e.type) {\r
   case ExprType::Func:\r
     out << e._func.functionName << "(" << e._func.arguments << ")"; break;\r


@@ -110,6 +134,9 @@ std::ostream & operator<< (std::ostream & out, const Expr & e) {
   case ExprType::TernaryOperator:\r
     out << e._ternaryOperator; break;\r
   }\r
   case ExprType::TernaryOperator:\r
     out << e._ternaryOperator; break;\r
   }\r

+  \r
+  if (e.parenthesized)\r
+    out << ")";\r

 \r
   return out;\r
 }\r
 \r
   return out;\r
 }\r


@@ -135,7 +162,7 @@ std::ostream & operator<< (std::ostream & out, const Stmt & s) {
   case StmtType::While:\r
     out << "while (" << s._while.condition << ")\n" << s._while.body; break;\r
   case StmtType::Assign:\r
   case StmtType::While:\r
     out << "while (" << s._while.condition << ")\n" << s._while.body; break;\r
   case StmtType::Assign:\r

-    out << s._assign.name << "=" << s._assign.expr << ";"; break;\r
+    out << s._assign.name << " = " << s._assign.expr << ";"; break;\r

   case StmtType::Return:\r
     out << "return " << s._return.expr << ";"; break;\r
   case StmtType::Expr:\r
   case StmtType::Return:\r
     out << "return " << s._return.expr << ";"; break;\r
   case StmtType::Expr:\r


@@ -161,7 +188,10 @@ void tocStruct (std::ostream & out, const Struct & s, bool stub) {
   if (stub) {\r
     out << ";\n";\r
     for (auto m : s.methods) {\r
   if (stub) {\r
     out << ";\n";\r
     for (auto m : s.methods) {\r

-      out << m.returnType << " " << s.name << "_" << m.name << " (" << m.parameters << ");\n";\r
+      m.parameters.insert(m.parameters.begin(), {"this", {s.name, {{TypeModifierType::Pointer, false, -1}}}});\r
+      out << m.returnType << " " <<\r
+        s.name << "_" << m.name <<\r
+        " (" << m.parameters << ");\n";\r

     }\r
     return;\r
   }\r
     }\r
     return;\r
   }\r


@@ -177,6 +207,7 @@ void tocStruct (std::ostream & out, const Struct & s, bool stub) {
   out << "};\n";\r
   \r
   for (auto m : s.methods) {\r
   out << "};\n";\r
   \r
   for (auto m : s.methods) {\r

+    m.parameters.insert(m.parameters.begin(), {"this", {s.name, {{TypeModifierType::Pointer, false, -1}}}});  \r

     out << m.returnType << " " << s.name << "_" << m.name << " (" << m.parameters << ")\n" << m.body;\r
   }\r
 }\r
     out << m.returnType << " " << s.name << "_" << m.name << " (" << m.parameters << ")\n" << m.body;\r
   }\r
 }\r


@@ -184,265 +215,17 @@ void tocProgram (std::ostream & out, const Program & p) {
   for (auto s : p.structs) {\r
     tocStruct(out, s, true);\r
   }\r
   for (auto s : p.structs) {\r
     tocStruct(out, s, true);\r
   }\r

-  for (auto s : p.structs) {\r
-    tocStruct(out, s, false);\r
+  for (auto f : p.functions) {\r
+    tocFunction(out, f, true);\r

   }\r
 \r
   for (auto v : p.variables) {\r
     out << v << ";\n";\r
   }\r
   }\r
 \r
   for (auto v : p.variables) {\r
     out << v << ";\n";\r
   }\r

-\r
-  for (auto f : p.functions) {\r
-    tocFunction(out, f, true);\r
+  for (auto s : p.structs) {\r
+    tocStruct(out, s, false);\r

   }\r
   for (auto f : p.functions) {\r
     tocFunction(out, f, false);\r
   }\r
 }\r
   }\r
   for (auto f : p.functions) {\r
     tocFunction(out, f, false);\r
   }\r
 }\r

-\r
-\r
-\r
-\r
-// void toc(std::ostream & o, TocParser::ProgContext * ctx) {\r
-//   for (auto * decl : ctx->decl()) {\r
-//     /**/ if (decl->structDecl() != nullptr) toc_stub(o, decl->structDecl());\r
-//     else if (decl->funcDecl()   != nullptr) toc_stub(o, decl->funcDecl()->func());\r
-//   }\r
-//   for (auto * decl : ctx->decl()) {\r
-//     if (decl->varDecl()    != nullptr) {\r
-//       toc(o, decl->varDecl());\r
-//       out << ";\n";\r
-//     }\r
-//     else if (decl->structDecl() != nullptr) toc(o, decl->structDecl());\r
-//     else if (decl->funcDecl()   != nullptr) toc(o, decl->funcDecl()->func());\r
-//   }\r
-// }\r
-// void toc(std::ostream & o, TocParser::VarDeclContext * ctx) {\r
-//   o\r
-//     << ctx->var()->type()->getText()\r
-//     << " "\r
-//     << ctx->var()->varName()->getText();\r
-  \r
-//   if (ctx->var()->expr() != nullptr) {\r
-//     out << " = ";\r
-//     toc(o, ctx->var()->expr());\r
-//   }\r
-// }\r
-// void toc(std::ostream & o, TocParser::FuncContext * ctx) {\r
-//   o\r
-//     << ctx->type()->getText()\r
-//     << " "\r
-//     << ctx->funcName()->getText()\r
-//     << "(";\r
-\r
-//   if (ctx->parameter()->firstParameter() != nullptr) {\r
-//     o\r
-//       << ctx->parameter()->firstParameter()->var()->type()->getText()\r
-//       << " "\r
-//       << ctx->parameter()->firstParameter()->var()->varName()->getText();\r
-\r
-//     for (auto * par : ctx->parameter()->additionalParameter()) {\r
-//       o\r
-//         << ", "\r
-//         << par->var()->type()->getText()\r
-//         << " "\r
-//         << par->var()->varName()->getText();\r
-//     }\r
-//   }\r
-\r
-//   out << ")\n{\n";\r
-\r
-//   toc(o, ctx->body());\r
-\r
-//   out << "}\n";\r
-// }\r
-// void toc(std::ostream & o, TocParser::StructDeclContext * ctx) {\r
-//   o\r
-//     << "typedef struct "\r
-//     << ctx->structName()->getText()\r
-//     << "\n{\n";\r
-\r
-//   for (auto * member : ctx->structMember()) {\r
-//     if (member->structVar() != nullptr) {\r
-//       o\r
-//         << member->structVar()->var()->type()->getText()\r
-//         << " "\r
-//         << member->structVar()->var()->varName()->getText()\r
-//         << ";\n";\r
-//     }\r
-//   }\r
-//   out << "} "\r
-//     << ctx->structName()->getText()\r
-//     << ";\n";\r
-//   for (auto * member : ctx->structMember()) {\r
-//     if (member->structMethod() != nullptr) {\r
-//       o\r
-//         << member->structMethod()->func()->type()->getText()\r
-//         << " "\r
-//         << ctx->structName()->getText()\r
-//         << "_"\r
-//         << member->structMethod()->func()->funcName()->getText()\r
-//         << "("\r
-//         << ctx->structName()->getText()\r
-//         << " * this";\r
-\r
-//       if (member->structMethod()->func()->parameter()->firstParameter() != nullptr) {\r
-//         o\r
-//           << ", "\r
-//           << member->structMethod()->func()->parameter()->firstParameter()->var()->type()->getText()\r
-//           << " "\r
-//           << member->structMethod()->func()->parameter()->firstParameter()->var()->varName()->getText();\r
-\r
-//         for (auto * par : member->structMethod()->func()->parameter()->additionalParameter()) {\r
-//           o\r
-//             << ", "\r
-//             << par->var()->type()->getText()\r
-//             << " "\r
-//             << par->var()->varName()->getText();\r
-//         }\r
-//       }\r
-\r
-//       out << ")\n{\n";\r
-\r
-//       toc(o, member->structMethod()->func()->body());\r
-\r
-//       out << "}\n";\r
-//     }\r
-//   }\r
-// }\r
-// void toc(std::ostream & o, TocParser::BodyContext * ctx) {\r
-//   for (auto * stmt : ctx->stmt()) {\r
-//     toc(o, stmt);\r
-//     out << "\n";\r
-//   }\r
-// }\r
-// void toc(std::ostream & o, TocParser::StmtContext * ctx) {\r
-//   /**/ if (ctx->varDecl() != nullptr) toc(o, ctx->varDecl());\r
-//   else if (ctx->conditional() != nullptr) toc(o, ctx->conditional()->ifCond());\r
-//   else if (ctx->loop() != nullptr) toc(o, ctx->loop()->whileLoop());\r
-//   else if (ctx->assignment() != nullptr) toc(o, ctx->assignment());\r
-//   else if (ctx->returnStmt() != nullptr) toc(o, ctx->returnStmt());\r
-//   else if (ctx->expr() != nullptr) toc(o, ctx->expr());\r
-\r
-//   if (ctx->conditional() == nullptr && ctx->loop() == nullptr)\r
-//     out << ";";\r
-// }\r
-// void toc(std::ostream & o, TocParser::IfCondContext * ctx) {\r
-//   out << "if (";\r
-//   toc(o, ctx->expr());\r
-//   out << ")\n{\n";\r
-//   toc(o, ctx->body());\r
-//   out << "}\n";\r
-// }\r
-// void toc(std::ostream & o, TocParser::WhileLoopContext * ctx) {\r
-//   out << "while (";\r
-//   toc(o, ctx->expr());\r
-//   out << ")\n{\n";\r
-//   toc(o, ctx->body());\r
-//   out << "}\n";\r
-// }\r
-// void toc(std::ostream & o, TocParser::AssignmentContext * ctx) {\r
-//   toc(o, ctx->identifier());\r
-//   out << " = ";\r
-//   toc(o, ctx->expr());\r
-// }\r
-// void toc(std::ostream & o, TocParser::ReturnStmtContext * ctx) {\r
-//   out << "return ";\r
-//   toc(o, ctx->expr());\r
-// }\r
-// void toc(std::ostream & o, TocParser::ExprContext * ctx) {\r
-//     /**/ if (ctx->funcCall()     != nullptr) toc(o, ctx->funcCall());\r
-//     else if (ctx->identifier()   != nullptr) toc(o, ctx->identifier());\r
-//     else if (ctx->literal()      != nullptr) toc(o, ctx->literal());\r
-//     else if (ctx->subscript()    != nullptr) toc(o, ctx->subscript());\r
-//     else if (ctx->memberAccess() != nullptr) toc(o, ctx->memberAccess());\r
-//     else if (ctx->parenExpr()    != nullptr) toc(o, ctx->parenExpr());\r
-//     else if (ctx->operatorExpr() != nullptr) toc(o, ctx->operatorExpr()->binaryOperator());\r
-// }\r
-// void toc(std::ostream & o, TocParser::NonOpExprContext * ctx) {\r
-//     /**/ if (ctx->funcCall()     != nullptr) toc(o, ctx->funcCall());\r
-//     else if (ctx->identifier()   != nullptr) toc(o, ctx->identifier());\r
-//     else if (ctx->literal()      != nullptr) toc(o, ctx->literal());\r
-//     else if (ctx->subscript()    != nullptr) toc(o, ctx->subscript());\r
-//     else if (ctx->memberAccess() != nullptr) toc(o, ctx->memberAccess());\r
-//     else if (ctx->parenExpr()    != nullptr) toc(o, ctx->parenExpr());\r
-// }\r
-// void toc(std::ostream & o, TocParser::NonSubscriptExprContext * ctx) {\r
-//     /**/ if (ctx->funcCall()     != nullptr) toc(o, ctx->funcCall());\r
-//     else if (ctx->identifier()   != nullptr) toc(o, ctx->identifier());\r
-//     else if (ctx->memberAccess() != nullptr) toc(o, ctx->memberAccess());\r
-//     else if (ctx->parenExpr()    != nullptr) toc(o, ctx->parenExpr());\r
-// }\r
-// void toc(std::ostream & o, TocParser::FuncCallContext * ctx) {\r
-//   o\r
-//     << ctx->funcName()->getText()\r
-//     << "(";\r
-//   for (int i = 0; i < ctx->expr().size(); i++) {\r
-//     if (i != 0) out << ", ";\r
-//     toc(o, ctx->expr(i));\r
-//   }\r
-//   out << ")";\r
-// }\r
-// void toc(std::ostream & o, TocParser::IdentifierContext * ctx) {\r
-//   out << ctx->getText();\r
-// }\r
-// void toc(std::ostream & o, TocParser::LiteralContext * ctx) {\r
-//   if (ctx->INTLIT() != nullptr) out << ctx->INTLIT()->getText();\r
-// }\r
-// void toc(std::ostream & o, TocParser::SubscriptContext * ctx) {\r
-//   toc(o, ctx->nonSubscriptExpr());\r
-//   out << "[";\r
-//   toc(o, ctx->expr());\r
-//   out << "]";\r
-// }\r
-// void toc(std::ostream & o, TocParser::MemberAccessContext * ctx) {\r
-//   toc(o, ctx->identifier(0));\r
-//   out << ".";\r
-//   toc(o, ctx->identifier(1));\r
-// }\r
-// void toc(std::ostream & o, TocParser::ParenExprContext * ctx) {\r
-//   out << "(";\r
-//   toc(o, ctx->expr());\r
-//   out << ")";\r
-// }\r
-// void toc(std::ostream & o, TocParser::BinaryOperatorContext * ctx) {\r
-//   for (int i = 0; i < ctx->BINARY_OPERATOR().size(); i++) {\r
-//     toc(o, ctx->nonOpExpr(i));\r
-//     o\r
-//       << " "\r
-//       << ctx->BINARY_OPERATOR(i)->getText()\r
-//       << " ";\r
-//     toc(o, ctx->nonOpExpr(i + 1));\r
-//   }\r
-// }\r
-\r
-// void toc_stub(std::ostream & o, TocParser::FuncContext * ctx) {\r
-//   o\r
-//     << ctx->type()->getText()\r
-//     << " "\r
-//     << ctx->funcName()->getText()\r
-//     << "(";\r
-\r
-//   if (ctx->parameter()->firstParameter() != nullptr) {\r
-//     o\r
-//       << ctx->parameter()->firstParameter()->var()->type()->getText()\r
-//       << " "\r
-//       << ctx->parameter()->firstParameter()->var()->varName()->getText();\r
-\r
-//     for (auto * par : ctx->parameter()->additionalParameter()) {\r
-//       o\r
-//         << ", "\r
-//         << par->var()->type()->getText()\r
-//         << " "\r
-//         << par->var()->varName()->getText();\r
-//     }\r
-//   }\r
-\r
-//   out << ");\n";\r
-// }\r
-// void toc_stub(std::ostream & o, TocParser::StructDeclContext * ctx) {\r
-//   o\r
-//     << "struct "\r
-//     << ctx->structName()->getText()\r
-//     << ";\n";\r
-// }\r