X-Git-Url: https://gitweb.ps.run/toc/blobdiff_plain/9f5457a18f551d261e4bd380ea16a52dc5b04cf9..8aeae09e74b46ca52866f22b48f55fecdf27b849:/src/toc.h?ds=sidebyside

diff --git a/src/toc.h b/src/toc.h
index 6dd611d..0c55466 100644
--- a/src/toc.h
+++ b/src/toc.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <iostream>
+#include <sstream>
 
 #include "repr.h"
 
@@ -41,7 +42,27 @@ std::ostream & operator<< (std::ostream & out, const Type & t) {
   return out;
 }
 std::ostream & operator<< (std::ostream & out, const Variable & v) {
-  out << v.type << " " << v.name;
+  out << v.type << " ";
+
+  std::stringstream sstr;
+  std::string s = v.name;
+
+  for (auto m = v.type.modifiers.rbegin(); m != v.type.modifiers.rend(); m++) {
+    if (m->type == TypeModifierType::Pointer) {
+      sstr.str(std::string());
+      sstr << "*(" << s << ")";
+      s = sstr.str();
+    }
+    else {
+      sstr.str(std::string());
+      sstr << "(" << s << ")[";
+      if (m->_staticArray)
+        sstr << m->_arraySize;
+      sstr << "]";
+      s = sstr.str();
+    }
+  }
+  out << s;
 
   return out;
 }
@@ -88,6 +109,9 @@ std::ostream & operator<< (std::ostream & out, const TernaryOperatorExpr & o) {
   return out;
 }
 std::ostream & operator<< (std::ostream & out, const Expr & e) {
+  if (e.parenthesized)
+    out << "(";
+
   switch (e.type) {
   case ExprType::Func:
     out << e._func.functionName << "(" << e._func.arguments << ")"; break;
@@ -110,6 +134,9 @@ std::ostream & operator<< (std::ostream & out, const Expr & e) {
   case ExprType::TernaryOperator:
     out << e._ternaryOperator; break;
   }
+  
+  if (e.parenthesized)
+    out << ")";
 
   return out;
 }
@@ -135,7 +162,7 @@ std::ostream & operator<< (std::ostream & out, const Stmt & s) {
   case StmtType::While:
     out << "while (" << s._while.condition << ")\n" << s._while.body; break;
   case StmtType::Assign:
-    out << s._assign.name << "=" << s._assign.expr << ";"; break;
+    out << s._assign.name << " = " << s._assign.expr << ";"; break;
   case StmtType::Return:
     out << "return " << s._return.expr << ";"; break;
   case StmtType::Expr:
@@ -161,7 +188,10 @@ void tocStruct (std::ostream & out, const Struct & s, bool stub) {
   if (stub) {
     out << ";\n";
     for (auto m : s.methods) {
-      out << m.returnType << " " << s.name << "_" << m.name << " (" << m.parameters << ");\n";
+      m.parameters.insert(m.parameters.begin(), {"this", {s.name, {{TypeModifierType::Pointer, false, -1}}}});
+      out << m.returnType << " " <<
+        s.name << "_" << m.name <<
+        " (" << m.parameters << ");\n";
     }
     return;
   }
@@ -177,6 +207,7 @@ void tocStruct (std::ostream & out, const Struct & s, bool stub) {
   out << "};\n";
   
   for (auto m : s.methods) {
+    m.parameters.insert(m.parameters.begin(), {"this", {s.name, {{TypeModifierType::Pointer, false, -1}}}});  
     out << m.returnType << " " << s.name << "_" << m.name << " (" << m.parameters << ")\n" << m.body;
   }
 }
@@ -184,265 +215,17 @@ void tocProgram (std::ostream & out, const Program & p) {
   for (auto s : p.structs) {
     tocStruct(out, s, true);
   }
-  for (auto s : p.structs) {
-    tocStruct(out, s, false);
+  for (auto f : p.functions) {
+    tocFunction(out, f, true);
   }
 
   for (auto v : p.variables) {
     out << v << ";\n";
   }
-
-  for (auto f : p.functions) {
-    tocFunction(out, f, true);
+  for (auto s : p.structs) {
+    tocStruct(out, s, false);
   }
   for (auto f : p.functions) {
     tocFunction(out, f, false);
   }
 }
-
-
-
-
-// void toc(std::ostream & o, TocParser::ProgContext * ctx) {
-//   for (auto * decl : ctx->decl()) {
-//     /**/ if (decl->structDecl() != nullptr) toc_stub(o, decl->structDecl());
-//     else if (decl->funcDecl()   != nullptr) toc_stub(o, decl->funcDecl()->func());
-//   }
-//   for (auto * decl : ctx->decl()) {
-//     if (decl->varDecl()    != nullptr) {
-//       toc(o, decl->varDecl());
-//       out << ";\n";
-//     }
-//     else if (decl->structDecl() != nullptr) toc(o, decl->structDecl());
-//     else if (decl->funcDecl()   != nullptr) toc(o, decl->funcDecl()->func());
-//   }
-// }
-// void toc(std::ostream & o, TocParser::VarDeclContext * ctx) {
-//   o
-//     << ctx->var()->type()->getText()
-//     << " "
-//     << ctx->var()->varName()->getText();
-  
-//   if (ctx->var()->expr() != nullptr) {
-//     out << " = ";
-//     toc(o, ctx->var()->expr());
-//   }
-// }
-// void toc(std::ostream & o, TocParser::FuncContext * ctx) {
-//   o
-//     << ctx->type()->getText()
-//     << " "
-//     << ctx->funcName()->getText()
-//     << "(";
-
-//   if (ctx->parameter()->firstParameter() != nullptr) {
-//     o
-//       << ctx->parameter()->firstParameter()->var()->type()->getText()
-//       << " "
-//       << ctx->parameter()->firstParameter()->var()->varName()->getText();
-
-//     for (auto * par : ctx->parameter()->additionalParameter()) {
-//       o
-//         << ", "
-//         << par->var()->type()->getText()
-//         << " "
-//         << par->var()->varName()->getText();
-//     }
-//   }
-
-//   out << ")\n{\n";
-
-//   toc(o, ctx->body());
-
-//   out << "}\n";
-// }
-// void toc(std::ostream & o, TocParser::StructDeclContext * ctx) {
-//   o
-//     << "typedef struct "
-//     << ctx->structName()->getText()
-//     << "\n{\n";
-
-//   for (auto * member : ctx->structMember()) {
-//     if (member->structVar() != nullptr) {
-//       o
-//         << member->structVar()->var()->type()->getText()
-//         << " "
-//         << member->structVar()->var()->varName()->getText()
-//         << ";\n";
-//     }
-//   }
-//   out << "} "
-//     << ctx->structName()->getText()
-//     << ";\n";
-//   for (auto * member : ctx->structMember()) {
-//     if (member->structMethod() != nullptr) {
-//       o
-//         << member->structMethod()->func()->type()->getText()
-//         << " "
-//         << ctx->structName()->getText()
-//         << "_"
-//         << member->structMethod()->func()->funcName()->getText()
-//         << "("
-//         << ctx->structName()->getText()
-//         << " * this";
-
-//       if (member->structMethod()->func()->parameter()->firstParameter() != nullptr) {
-//         o
-//           << ", "
-//           << member->structMethod()->func()->parameter()->firstParameter()->var()->type()->getText()
-//           << " "
-//           << member->structMethod()->func()->parameter()->firstParameter()->var()->varName()->getText();
-
-//         for (auto * par : member->structMethod()->func()->parameter()->additionalParameter()) {
-//           o
-//             << ", "
-//             << par->var()->type()->getText()
-//             << " "
-//             << par->var()->varName()->getText();
-//         }
-//       }
-
-//       out << ")\n{\n";
-
-//       toc(o, member->structMethod()->func()->body());
-
-//       out << "}\n";
-//     }
-//   }
-// }
-// void toc(std::ostream & o, TocParser::BodyContext * ctx) {
-//   for (auto * stmt : ctx->stmt()) {
-//     toc(o, stmt);
-//     out << "\n";
-//   }
-// }
-// void toc(std::ostream & o, TocParser::StmtContext * ctx) {
-//   /**/ if (ctx->varDecl() != nullptr) toc(o, ctx->varDecl());
-//   else if (ctx->conditional() != nullptr) toc(o, ctx->conditional()->ifCond());
-//   else if (ctx->loop() != nullptr) toc(o, ctx->loop()->whileLoop());
-//   else if (ctx->assignment() != nullptr) toc(o, ctx->assignment());
-//   else if (ctx->returnStmt() != nullptr) toc(o, ctx->returnStmt());
-//   else if (ctx->expr() != nullptr) toc(o, ctx->expr());
-
-//   if (ctx->conditional() == nullptr && ctx->loop() == nullptr)
-//     out << ";";
-// }
-// void toc(std::ostream & o, TocParser::IfCondContext * ctx) {
-//   out << "if (";
-//   toc(o, ctx->expr());
-//   out << ")\n{\n";
-//   toc(o, ctx->body());
-//   out << "}\n";
-// }
-// void toc(std::ostream & o, TocParser::WhileLoopContext * ctx) {
-//   out << "while (";
-//   toc(o, ctx->expr());
-//   out << ")\n{\n";
-//   toc(o, ctx->body());
-//   out << "}\n";
-// }
-// void toc(std::ostream & o, TocParser::AssignmentContext * ctx) {
-//   toc(o, ctx->identifier());
-//   out << " = ";
-//   toc(o, ctx->expr());
-// }
-// void toc(std::ostream & o, TocParser::ReturnStmtContext * ctx) {
-//   out << "return ";
-//   toc(o, ctx->expr());
-// }
-// void toc(std::ostream & o, TocParser::ExprContext * ctx) {
-//     /**/ if (ctx->funcCall()     != nullptr) toc(o, ctx->funcCall());
-//     else if (ctx->identifier()   != nullptr) toc(o, ctx->identifier());
-//     else if (ctx->literal()      != nullptr) toc(o, ctx->literal());
-//     else if (ctx->subscript()    != nullptr) toc(o, ctx->subscript());
-//     else if (ctx->memberAccess() != nullptr) toc(o, ctx->memberAccess());
-//     else if (ctx->parenExpr()    != nullptr) toc(o, ctx->parenExpr());
-//     else if (ctx->operatorExpr() != nullptr) toc(o, ctx->operatorExpr()->binaryOperator());
-// }
-// void toc(std::ostream & o, TocParser::NonOpExprContext * ctx) {
-//     /**/ if (ctx->funcCall()     != nullptr) toc(o, ctx->funcCall());
-//     else if (ctx->identifier()   != nullptr) toc(o, ctx->identifier());
-//     else if (ctx->literal()      != nullptr) toc(o, ctx->literal());
-//     else if (ctx->subscript()    != nullptr) toc(o, ctx->subscript());
-//     else if (ctx->memberAccess() != nullptr) toc(o, ctx->memberAccess());
-//     else if (ctx->parenExpr()    != nullptr) toc(o, ctx->parenExpr());
-// }
-// void toc(std::ostream & o, TocParser::NonSubscriptExprContext * ctx) {
-//     /**/ if (ctx->funcCall()     != nullptr) toc(o, ctx->funcCall());
-//     else if (ctx->identifier()   != nullptr) toc(o, ctx->identifier());
-//     else if (ctx->memberAccess() != nullptr) toc(o, ctx->memberAccess());
-//     else if (ctx->parenExpr()    != nullptr) toc(o, ctx->parenExpr());
-// }
-// void toc(std::ostream & o, TocParser::FuncCallContext * ctx) {
-//   o
-//     << ctx->funcName()->getText()
-//     << "(";
-//   for (int i = 0; i < ctx->expr().size(); i++) {
-//     if (i != 0) out << ", ";
-//     toc(o, ctx->expr(i));
-//   }
-//   out << ")";
-// }
-// void toc(std::ostream & o, TocParser::IdentifierContext * ctx) {
-//   out << ctx->getText();
-// }
-// void toc(std::ostream & o, TocParser::LiteralContext * ctx) {
-//   if (ctx->INTLIT() != nullptr) out << ctx->INTLIT()->getText();
-// }
-// void toc(std::ostream & o, TocParser::SubscriptContext * ctx) {
-//   toc(o, ctx->nonSubscriptExpr());
-//   out << "[";
-//   toc(o, ctx->expr());
-//   out << "]";
-// }
-// void toc(std::ostream & o, TocParser::MemberAccessContext * ctx) {
-//   toc(o, ctx->identifier(0));
-//   out << ".";
-//   toc(o, ctx->identifier(1));
-// }
-// void toc(std::ostream & o, TocParser::ParenExprContext * ctx) {
-//   out << "(";
-//   toc(o, ctx->expr());
-//   out << ")";
-// }
-// void toc(std::ostream & o, TocParser::BinaryOperatorContext * ctx) {
-//   for (int i = 0; i < ctx->BINARY_OPERATOR().size(); i++) {
-//     toc(o, ctx->nonOpExpr(i));
-//     o
-//       << " "
-//       << ctx->BINARY_OPERATOR(i)->getText()
-//       << " ";
-//     toc(o, ctx->nonOpExpr(i + 1));
-//   }
-// }
-
-// void toc_stub(std::ostream & o, TocParser::FuncContext * ctx) {
-//   o
-//     << ctx->type()->getText()
-//     << " "
-//     << ctx->funcName()->getText()
-//     << "(";
-
-//   if (ctx->parameter()->firstParameter() != nullptr) {
-//     o
-//       << ctx->parameter()->firstParameter()->var()->type()->getText()
-//       << " "
-//       << ctx->parameter()->firstParameter()->var()->varName()->getText();
-
-//     for (auto * par : ctx->parameter()->additionalParameter()) {
-//       o
-//         << ", "
-//         << par->var()->type()->getText()
-//         << " "
-//         << par->var()->varName()->getText();
-//     }
-//   }
-
-//   out << ");\n";
-// }
-// void toc_stub(std::ostream & o, TocParser::StructDeclContext * ctx) {
-//   o
-//     << "struct "
-//     << ctx->structName()->getText()
-//     << ";\n";
-// }