add namespace, private struct member grammar, change bracket style

[toc] / src / toc.h

diff --git a/src/toc.h b/src/toc.h
index b36d878cc580c33d673e1ed0410b4b13de83664c..e4f36e521365e71b944d2fe6b1db35d5b363a58d 100644 (file)
--- a/src/toc.h
+++ b/src/toc.h
@@ -1,274 +1,272 @@
 #pragma once\r
 \r
 #include <iostream>\r
 #pragma once\r
 \r
 #include <iostream>\r

+#include <sstream>\r

 \r
 \r

-#include "TocParser.h"\r
+#include "repr.h"\r

 \r
 \r

-void toc(std::ostream & o, TocParser::ProgContext * ctx);\r
-void toc(std::ostream & o, TocParser::VarDeclContext * ctx);\r
-void toc(std::ostream & o, TocParser::FuncContext * ctx);\r
-void toc(std::ostream & o, TocParser::StructDeclContext * ctx);\r
-void toc(std::ostream & o, TocParser::BodyContext * ctx);\r
-void toc(std::ostream & o, TocParser::StmtContext * ctx);\r
-void toc(std::ostream & o, TocParser::IfCondContext * ctx);\r
-void toc(std::ostream & o, TocParser::WhileLoopContext * ctx);\r
-void toc(std::ostream & o, TocParser::AssignmentContext * ctx);\r
-void toc(std::ostream & o, TocParser::ReturnStmtContext * ctx);\r
-void toc(std::ostream & o, TocParser::ExprContext * ctx);\r
-void toc(std::ostream & o, TocParser::NonOpExprContext * ctx);\r
-void toc(std::ostream & o, TocParser::NonSubscriptExprContext * ctx);\r
-void toc(std::ostream & o, TocParser::FuncCallContext * ctx);\r
-void toc(std::ostream & o, TocParser::IdentifierContext * ctx);\r
-void toc(std::ostream & o, TocParser::LiteralContext * ctx);\r
-void toc(std::ostream & o, TocParser::SubscriptContext * ctx);\r
-void toc(std::ostream & o, TocParser::MemberAccessContext * ctx);\r
-void toc(std::ostream & o, TocParser::ParenExprContext * ctx);\r
-void toc(std::ostream & o, TocParser::BinaryOperatorContext * ctx);\r
-\r
-void toc_stub(std::ostream & o, TocParser::FuncContext * ctx);\r
-void toc_stub(std::ostream & o, TocParser::StructDeclContext * ctx);\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
-      o << ";\n";\r
-    }\r
-    else if (decl->structDecl() != nullptr) toc(o, decl->structDecl());\r
-    else if (decl->funcDecl()   != nullptr) toc(o, decl->funcDecl()->func());\r
+template<typename T>\r
+std::ostream & operator<< (std::ostream & out, const std::vector<T> & v)\r
+{\r
+  bool comma = false;\r
+  for (auto t : v)\r
+  {\r
+    if (comma) out << ", ";\r
+    else comma = true;\r
+    out << t;\r

   }\r
   }\r

+  return out;\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
-    o << " = ";\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
 \r

-  if (ctx->parameter()->firstParameter() != nullptr) {\r
-    o\r
-      << ctx->parameter()->firstParameter()->var()->type()->getText()\r
-      << " "\r
-      << ctx->parameter()->firstParameter()->var()->varName()->getText();\r
+std::ostream & operator<< (std::ostream & out, const Type & t);\r
+std::ostream & operator<< (std::ostream & out, const Variable & v);\r
+std::ostream & operator<< (std::ostream & out, const Body & b);\r
+std::ostream & operator<< (std::ostream & out, const UnaryOperatorExpr & o);\r
+std::ostream & operator<< (std::ostream & out, const BinaryOperatorExpr & o);\r
+std::ostream & operator<< (std::ostream & out, const TernaryOperatorExpr & o);\r
+std::ostream & operator<< (std::ostream & out, const Expr & e);\r
+std::ostream & operator<< (std::ostream & out, const Stmt & s);\r

 \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
+void tocFunction (std::ostream & out, const Function & f, bool stub);\r
+void tocStruct   (std::ostream & out, const Struct & s, bool stub);\r
+void tocProgram  (std::ostream & out, const Program & p);\r

 \r
 \r

-  o << ")\n{\n";\r
+static const int TAB_WIDTH = 2;\r
+static int indentation = 0;\r
+static void indent(std::ostream & out, int change = 0)\r
+{\r
+  indentation += change;\r
+  out << std::string(indentation, ' ');\r
+}\r

 \r
 \r

-  toc(o, ctx->body());\r
+std::ostream & operator<< (std::ostream & out, const Type & t)\r
+{\r
+  out << t.name;\r

 \r
 \r

-  o << "}\n";\r
+  return out;\r

 }\r
 }\r

-void toc(std::ostream & o, TocParser::StructDeclContext * ctx) {\r
-  o\r
-    << "typedef struct "\r
-    << ctx->structName()->getText()\r
-    << "\n{\n";\r
+std::ostream & operator<< (std::ostream & out, const Variable & v)\r
+{\r
+  out << v.type << " ";\r
+\r
+  std::stringstream sstr;\r
+  std::string s = v.name;\r

 \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
+  for (auto m = v.type.modifiers.rbegin(); m != v.type.modifiers.rend(); m++)\r
+  {\r
+    if (m->type == TypeModifierType::Pointer)\r
+    {\r
+      sstr.str(std::string());\r
+      sstr << "*(" << s << ")";\r
+      s = sstr.str();\r
+    }\r
+    else\r
+    {\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
     }\r
   }\r

-  o << "} "\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
+  out << s;\r

 \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
+  return out;\r
+}\r
+std::ostream & operator<< (std::ostream & out, const Body & b)\r
+{\r
+  indent(out);\r
+  out << "{\n";\r
+  indentation += 2;\r

 \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
+  for (auto v : b.variables)\r
+  {\r
+    indent(out);\r
+    out << v << ";\n";\r
+  }\r

 \r
 \r

-      o << ")\n{\n";\r
+  out << "\n";\r
+  \r
+  for (auto s : b.statements)\r
+  {\r
+    indent(out);\r
+    out << s << "\n";\r
+  }\r

 \r
 \r

-      toc(o, member->structMethod()->func()->body());\r
+  indent(out, -2);\r
+  out << "}\n";\r

 \r
 \r

-      o << "}\n";\r
-    }\r
-  }\r
+  return out;\r

 }\r
 }\r

-void toc(std::ostream & o, TocParser::BodyContext * ctx) {\r
-  for (auto * stmt : ctx->stmt()) {\r
-    toc(o, stmt);\r
-    o << "\n";\r
+std::ostream & operator<< (std::ostream & out, const UnaryOperatorExpr & o)\r
+{\r
+  if (o.type == UnaryOperatorType::IncrementPost || o.type == UnaryOperatorType::DecrementPost)\r
+  {\r
+    out << UnaryOperatorTypeStrings[(int)o.type] << *o.expr;\r
+  }\r
+  else\r
+  {\r
+    out << *o.expr << UnaryOperatorTypeStrings[(int)o.type];\r

   }\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
 \r

-  if (ctx->conditional() == nullptr && ctx->loop() == nullptr)\r
-    o << ";";\r
-}\r
-void toc(std::ostream & o, TocParser::IfCondContext * ctx) {\r
-  o << "if (";\r
-  toc(o, ctx->expr());\r
-  o << ")\n{\n";\r
-  toc(o, ctx->body());\r
-  o << "}\n";\r
-}\r
-void toc(std::ostream & o, TocParser::WhileLoopContext * ctx) {\r
-  o << "while (";\r
-  toc(o, ctx->expr());\r
-  o << ")\n{\n";\r
-  toc(o, ctx->body());\r
-  o << "}\n";\r
-}\r
-void toc(std::ostream & o, TocParser::AssignmentContext * ctx) {\r
-  toc(o, ctx->identifier());\r
-  o << " = ";\r
-  toc(o, ctx->expr());\r
-}\r
-void toc(std::ostream & o, TocParser::ReturnStmtContext * ctx) {\r
-  o << "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
+  return out;\r

 }\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
+std::ostream & operator<< (std::ostream & out, const BinaryOperatorExpr & o)\r
+{\r
+  out << *o.lexpr << " " << BinaryOperatorTypeStrings[(int)o.type] << " " << *o.rexpr;\r
+\r
+  return out;\r

 }\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
+std::ostream & operator<< (std::ostream & out, const TernaryOperatorExpr & o)\r
+{\r
+  out << *o.lexpr << " ? " << *o.rexprTrue << " : " << *o.rexprFalse;\r
+\r
+  return out;\r

 }\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) o << ", ";\r
-    toc(o, ctx->expr(i));\r
+std::ostream & operator<< (std::ostream & out, const Expr & e)\r
+{\r
+  if (e.parenthesized)\r
+    out << "(";\r
+\r
+  switch (e.type)\r
+  {\r
+  case ExprType::Func:\r
+    out << e._func.functionName << "(" << e._func.arguments << ")"; break;\r
+  case ExprType::Lit:\r
+    /**/ if (e._lit.type == LitType::Int) out << e._lit._int;\r
+    else if (e._lit.type == LitType::Decimal) out << e._lit._decimal;\r
+    else if (e._lit.type == LitType::String) out << e._lit._string;\r
+    else if (e._lit.type == LitType::Bool) out << e._lit._bool;\r
+    break;\r
+  case ExprType::Identifier:\r
+    out << e._identifier.name; break;\r
+  case ExprType::Brackets:\r
+    out << *e._brackets.lexpr << "[" << *e._brackets.rexpr << "]"; break;\r
+  case ExprType::Dot:\r
+    out << *e._dot.expr << "." << e._dot.ident.name; break;\r
+  case ExprType::UnaryOperator:\r
+    out << e._unaryOperator; break;\r
+  case ExprType::BinaryOperator:\r
+    out << e._binaryOperator; break;\r
+  case ExprType::TernaryOperator:\r
+    out << e._ternaryOperator; break;\r

   }\r
   }\r

-  o << ")";\r
-}\r
-void toc(std::ostream & o, TocParser::IdentifierContext * ctx) {\r
-  o << ctx->getText();\r
-}\r
-void toc(std::ostream & o, TocParser::LiteralContext * ctx) {\r
-  if (ctx->INTLIT() != nullptr) o << ctx->INTLIT()->getText();\r
-}\r
-void toc(std::ostream & o, TocParser::SubscriptContext * ctx) {\r
-  toc(o, ctx->nonSubscriptExpr());\r
-  o << "[";\r
-  toc(o, ctx->expr());\r
-  o << "]";\r
-}\r
-void toc(std::ostream & o, TocParser::MemberAccessContext * ctx) {\r
-  toc(o, ctx->identifier(0));\r
-  o << ".";\r
-  toc(o, ctx->identifier(1));\r
-}\r
-void toc(std::ostream & o, TocParser::ParenExprContext * ctx) {\r
-  o << "(";\r
-  toc(o, ctx->expr());\r
-  o << ")";\r
+  \r
+  if (e.parenthesized)\r
+    out << ")";\r
+\r
+  return out;\r

 }\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
+std::ostream & operator<< (std::ostream & out, const Stmt & s)\r
+{\r
+  switch (s.type)\r
+  {\r
+  case StmtType::If:\r
+    out << "if (" << s._if.condition << ")\n" << s._if.body; break;\r
+  case StmtType::Switch:\r
+    out << "switch (" << s._switch.ident.name << ")\n{\n";\r
+    for (auto c : s._switch.cases)\r
+    {\r
+      indent(out, 2);\r
+      out << "case " << *c.expr << ": " << c.body << "break;";\r
+    }\r
+    indent(out, -2);\r
+    out << "}\n";\r
+    break;\r
+  case StmtType::For:\r
+    out << "for (" <<\r
+      s._for.varName << " = " << *s._for.initValue << "; " <<\r
+      *s._for.condition << "; " <<\r
+      *s._for.action <<\r
+      ")\n" << s._for.body; break;\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
+  case StmtType::Return:\r
+    out << "return " << s._return.expr << ";"; break;\r
+  case StmtType::Expr:\r
+    out << s._expr << ";"; break;\r

   }\r
   }\r

+\r
+  return out;\r

 }\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
 \r

-  if (ctx->parameter()->firstParameter() != nullptr) {\r
-    o\r
-      << ctx->parameter()->firstParameter()->var()->type()->getText()\r
-      << " "\r
-      << ctx->parameter()->firstParameter()->var()->varName()->getText();\r
+void tocFunction (std::ostream & out, const Function & f, bool stub)\r
+{\r
+  out << f.returnType << " " << f.name << " (" << f.parameters << ")";\r

 \r
 \r

-    for (auto * par : ctx->parameter()->additionalParameter()) {\r
-      o\r
-        << ", "\r
-        << par->var()->type()->getText()\r
-        << " "\r
-        << par->var()->varName()->getText();\r
+  if (stub)\r
+  {\r
+    out << ";\n";\r
+  }\r
+  else\r
+  {\r
+    out << "\n" << f.body;\r
+  }\r
+}\r
+void tocStruct (std::ostream & out, const Struct & s, bool stub)\r
+{\r
+  out << "struct " << s.name;\r
+  if (stub)\r
+  {\r
+    out << ";\n";\r
+    for (auto m : s.methods)\r
+    {\r
+      m.parameters.insert(m.parameters.begin(),\r
+      {"this",\r
+      {s.name,\r
+      {{TypeModifierType::Pointer, false, -1}}}});\r
+      out << m.returnType << " " <<\r
+        s.name << "_" << m.name <<\r
+        " (" << m.parameters << ");\n";\r

     }\r
     }\r

+    return;\r
+  }\r
+  out << "\n{\n";\r
+  indentation += 2;\r
+\r
+  for (auto m : s.members)\r
+  {\r
+    indent(out);\r
+    out << m << ";\n";\r

   }\r
 \r
   }\r
 \r

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

 }\r
 }\r

-void toc_stub(std::ostream & o, TocParser::StructDeclContext * ctx) {\r
-  o\r
-    << "struct "\r
-    << ctx->structName()->getText()\r
-    << ";\n";\r
+void tocProgram (std::ostream & out, const Program & p)\r
+{\r
+  for (auto s : p.structs)\r
+  {\r
+    tocStruct(out, s, true);\r
+  }\r
+  for (auto f : p.functions)\r
+  {\r
+    tocFunction(out, f, true);\r
+  }\r
+\r
+  for (auto v : p.variables)\r
+  {\r
+    out << v << ";\n";\r
+  }\r
+  for (auto s : p.structs)\r
+  {\r
+    tocStruct(out, s, false);\r
+  }\r
+  for (auto f : p.functions)\r
+  {\r
+    tocFunction(out, f, false);\r
+  }\r

 }\r
 }\r