add generic.h (how did i miss that...)

[toc] / src / toc.h

diff --git a/src/toc.h b/src/toc.h
index c0c73f155d5c86f75accb2549fa0b9c95c21ec57..e95ab3eca27872b427846614e33c7ba0fd2d93e5 100644 (file)
--- a/src/toc.h
+++ b/src/toc.h
@@ -4,6 +4,7 @@
 #include <sstream>\r
 \r
 #include "repr.h"\r
 #include <sstream>\r
 \r
 #include "repr.h"\r

+#include "generic.h"\r

 #include "typeInfo.h"\r
 \r
 template<typename T>\r
 #include "typeInfo.h"\r
 \r
 template<typename T>\r


@@ -53,15 +54,46 @@ static std::string namespacePrefix() {
   return sstr.str();\r
 }\r
 \r
   return sstr.str();\r
 }\r
 \r

+static std::map<std::string, Type> currentInstantiation;\r
+\r

 static Program globalPrg;\r
 static std::shared_ptr<Context> globalCtx;\r
 \r
 static Program globalPrg;\r
 static std::shared_ptr<Context> globalCtx;\r
 \r

+\r
+\r
+// std::string getPrefix(std::shared_ptr<Context> ctx)\r
+// {\r
+//   std::string result;\r
+//   for (auto it = ctx; it != nullptr; it = it->parent)\r
+//   {\r
+//     if (it->name.has_value())\r
+//     {\r
+//       result = it->name.value() + "_" + result;\r
+//     }\r
+//   }\r
+//   return result;\r
+// }\r
+\r

 std::ostream & operator<< (std::ostream & out, const Type & t)\r
 {\r
 std::ostream & operator<< (std::ostream & out, const Type & t)\r
 {\r

-  TypeInfo ti = typeType(globalPrg, t);\r
+  for (auto kv : currentInstantiation)\r
+  {\r
+    if (t.name == kv.first)\r
+    {\r
+      out << kv.second;\r
+      return out;\r
+    }\r
+  }\r
+  TypeInfo ti = typeType(globalCtx, t);\r

   if (ti.isStruct)\r
     out << "struct ";\r
   if (ti.isStruct)\r
     out << "struct ";\r

-  out << vectorStr(t.namespacePrefixes, "_", true) << t.name;\r
+  auto s = findStruct(t.name, t.namespacePrefixes, globalCtx);\r
+  if (s.has_value())\r
+    out << vectorStr(std::get<1>(*s), "_", true) << t.name; \r
+  else\r
+    out << vectorStr(t.namespacePrefixes, "_", true) << t.name;\r
+  if (!t.genericInstantiation.empty())\r
+    out << genericAppendix(t.genericInstantiation);\r

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


@@ -71,6 +103,10 @@ std::ostream & operator<< (std::ostream & out, const Variable & v)
 \r
   std::stringstream sstr;\r
   std::string s = v.name;\r
 \r
   std::stringstream sstr;\r
   std::string s = v.name;\r

+  \r
+  auto var = findVariable(v.name, namespaces, globalCtx);\r
+  if (var.has_value())\r
+    s = vectorStr(std::get<1>(*var), "_", true) + s;\r

 \r
   for (auto m = v.type.modifiers.rbegin(); m != v.type.modifiers.rend(); m++)\r
   {\r
 \r
   for (auto m = v.type.modifiers.rbegin(); m != v.type.modifiers.rend(); m++)\r
   {\r


@@ -130,21 +166,29 @@ std::ostream & operator<< (std::ostream & out, const Expr & e)
   {\r
   case ExprType::Func:\r
   {\r
   {\r
   case ExprType::Func:\r
   {\r

-    if (e._func.namespacePrefixes.empty())\r
-    {\r
-      TypeInfo ti = typeExpr(globalPrg, namespaces, globalCtx, e);\r
-      \r
-    }\r
-    out << vectorStr(e._func.namespacePrefixes, "_", true) << e._func.functionName << "(" << vectorStr(e._func.arguments, ", ") << ")"; break;\r
+    auto f = findFunction(e._func.functionName, e._func.namespacePrefixes, globalCtx);\r
+\r
+    if (std::get<0>(*f).defined)\r
+      out << vectorStr(std::get<1>(*f), "_", true);\r
+\r
+    out << e._func.functionName;\r
+    if (!e._func.genericInstantiation.empty())\r
+      out << genericAppendix(e._func.genericInstantiation);\r
+    out <<"(" << vectorStr(e._func.arguments, ", ") << ")"; break;\r

   }\r
   case ExprType::Method:\r
   {\r
   }\r
   case ExprType::Method:\r
   {\r

-    TypeInfo ti = typeExpr(globalPrg, namespaces, globalCtx, *e._method.expr);\r
+    TypeInfo ti = typeExpr(globalCtx, *e._method.expr);\r

     out <<\r
       vectorStr(ti.type.namespacePrefixes, "_", true) <<\r
     out <<\r
       vectorStr(ti.type.namespacePrefixes, "_", true) <<\r

-      ti.type.name << "_" << e._method.methodName <<\r
-      "(&" << *e._method.expr << (e._method.arguments.empty() ? "" : ", ") <<\r
-      vectorStr(e._method.arguments, ", ") << ")"; break;\r
+      ti.type.name << genericAppendix(ti.type.genericInstantiation) << "_" << e._method.methodName;\r
+    if (!e._method.genericInstantiation.empty())\r
+      out << genericAppendix(e._method.genericInstantiation);\r
+    out << "(";\r
+    if (e._method.expr->type == ExprType::Identifier)\r
+      out << "&";\r
+    out << *e._method.expr << (e._method.arguments.empty() ? "" : ", ") <<\r
+    vectorStr(e._method.arguments, ", ") << ")"; break;\r

   }\r
   case ExprType::Lit:\r
     /**/ if (e._lit.type == LitType::Int) out << e._lit._int;\r
   }\r
   case ExprType::Lit:\r
     /**/ if (e._lit.type == LitType::Int) out << e._lit._int;\r


@@ -153,9 +197,9 @@ std::ostream & operator<< (std::ostream & out, const Expr & e)
     else if (e._lit.type == LitType::Bool) out << e._lit._bool;\r
     break;\r
   case ExprType::Paren:\r
     else if (e._lit.type == LitType::Bool) out << e._lit._bool;\r
     break;\r
   case ExprType::Paren:\r

-    out << "(" << e._paren.expr << ")"; break;\r
+    out << "(" << *e._paren.expr << ")"; break;\r

   case ExprType::Dot:\r
   case ExprType::Dot:\r

-    out << *e._dot.expr << "." << e._dot.identifier; break;\r
+    out << *e._dot.expr << (e._dot.isPointer ? "->" : ".") << e._dot.identifier; break;\r

   case ExprType::PrefixOp:\r
     out << PrefixOperatorTypeStrings[(int)e._prefixOp.type] << *e._prefixOp.expr; break;\r
   case ExprType::PostfixOp:\r
   case ExprType::PrefixOp:\r
     out << PrefixOperatorTypeStrings[(int)e._prefixOp.type] << *e._prefixOp.expr; break;\r
   case ExprType::PostfixOp:\r


@@ -171,7 +215,13 @@ std::ostream & operator<< (std::ostream & out, const Expr & e)
   case ExprType::Bracket:\r
     out << *e._brackets.lexpr << "[" << *e._brackets.rexpr << "]"; break;\r
   case ExprType::Identifier:\r
   case ExprType::Bracket:\r
     out << *e._brackets.lexpr << "[" << *e._brackets.rexpr << "]"; break;\r
   case ExprType::Identifier:\r

-    out << vectorStr(e._identifier.namespacePrefixes, "_", true) << e._identifier.identifier; break;\r
+    auto v = findVariable(e._identifier.identifier, e._identifier.namespacePrefixes, globalCtx);\r
+    if (v.has_value())\r
+      out << vectorStr(std::get<1>(*v), "_", true);\r
+    else\r
+      out << vectorStr(e._identifier.namespacePrefixes, "_", true);\r
+\r
+    out << e._identifier.identifier; break;\r

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


@@ -216,71 +266,166 @@ void tocFunction (std::ostream & out, const Function & f, bool stub)
 {\r
   if (!stub && !f.defined) return;\r
 \r
 {\r
   if (!stub && !f.defined) return;\r
 \r

-  out << f.returnType << " " << namespacePrefix() << f.name << " (" << vectorStr(f.parameters, ", ") << ")";\r
-\r
-  if (stub)\r
+  if (f.genericTypeNames.empty())\r

   {\r
   {\r

-    out << ";\n";\r
+    out << f.returnType << " " << namespacePrefix() << f.name << " (" << vectorStr(f.parameters, ", ") << ")";\r
+\r
+    if (stub)\r
+    {\r
+      out << ";\n";\r
+    }\r
+    else\r
+    {\r
+      out << "\n" << f.body;\r
+    }\r

   }\r
   else\r
   {\r
   }\r
   else\r
   {\r

-    out << "\n" << f.body;\r
+    for (auto instantiation : f.genericInstantiations)\r
+    {\r
+      for (int i = 0; i < f.genericTypeNames.size(); i++)\r
+      {\r
+        currentInstantiation[f.genericTypeNames[i]] = instantiation[i];\r
+      }\r
+\r
+      out << f.returnType << " " << namespacePrefix() << f.name << genericAppendix(instantiation) << " (" << vectorStr(f.parameters, ", ") << ")";\r
+\r
+      if (stub)\r
+      {\r
+        out << ";\n";\r
+      }\r
+      else\r
+      {\r
+        out << "\n" << f.body;\r
+      }\r
+\r
+      currentInstantiation.clear();\r
+    }\r

   }\r
 }\r
 void tocStruct (std::ostream & out, const Struct & s, bool stub)\r
 {\r
   }\r
 }\r
 void tocStruct (std::ostream & out, const Struct & s, bool stub)\r
 {\r

-  out << "struct " << namespacePrefix() << s.name;\r
-  if (stub)\r
+  if (s.genericTypeNames.empty())\r

   {\r
   {\r

-    out << ";\n";\r
+    out << "struct " << namespacePrefix() << s.name;\r
+    if (stub)\r
+    {\r
+      out << ";\n";\r
+      for (auto m : s.methods)\r
+      {\r
+        Function f = m;\r
+\r
+        f.parameters.insert(f.parameters.begin(),\r
+        {"this",\r
+          {\r
+            namespaces,\r
+            s.name,\r
+            {\r
+              {TypeModifierType::Pointer, false, -1}\r
+            }\r
+          }\r
+        });\r
+        out << f.returnType << " " <<\r
+          namespacePrefix() << s.name << "_" << f.name <<\r
+          " (" << vectorStr(f.parameters, ", ") << ");\n";\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
+    indent(out, -2);\r
+    out << "};\n";\r
+    \r

     for (auto m : s.methods)\r
     {\r
       Function f = m;\r
     for (auto m : s.methods)\r
     {\r
       Function f = m;\r

-\r

       f.parameters.insert(f.parameters.begin(),\r
       f.parameters.insert(f.parameters.begin(),\r

-      {"this",\r
-        {\r
-          namespaces,\r
-          s.name,\r
+        {"this",\r

           {\r
           {\r

-            {TypeModifierType::Pointer, false, -1}\r
+            namespaces,\r
+            s.name,\r
+            {\r
+              {TypeModifierType::Pointer, false, -1}\r
+            }\r

           }\r
           }\r

-        }\r
-      });\r
+        });\r

       out << f.returnType << " " <<\r
       out << f.returnType << " " <<\r

-        namespacePrefix() << s.name << "_" << f.name <<\r
-        " (" << vectorStr(f.parameters, ", ") << ");\n";\r
+      namespacePrefix() << s.name << "_" << f.name <<\r
+      " (" << vectorStr(f.parameters, ", ") << ")\n" << f.body;\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
-  indent(out, -2);\r
-  out << "};\n";\r
-  \r
-  for (auto m : s.methods)\r
+  else\r

   {\r
   {\r

-    Function f = m;\r
-    f.parameters.insert(f.parameters.begin(),\r
-      {"this",\r
+    for (auto instantiation : s.genericInstantiations)\r
+    {\r
+      for (int i = 0; i < s.genericTypeNames.size(); i++)\r
+      {\r
+        currentInstantiation[s.genericTypeNames[i]] = instantiation[i];\r
+      }\r
+\r
+      out << "struct " << namespacePrefix() << s.name << genericAppendix(instantiation);\r
+      if (stub)\r
+      {\r
+        out << ";\n";\r
+        for (auto m : s.methods)\r

         {\r
         {\r

-          namespaces,\r
-          s.name,\r
-          {\r
-            {TypeModifierType::Pointer, false, -1}\r
-          }\r
+          Function f = m;\r
+\r
+          f.parameters.insert(f.parameters.begin(),\r
+          {"this",\r
+            {\r
+              namespaces,\r
+              s.name + genericAppendix(instantiation),\r
+              {\r
+                {TypeModifierType::Pointer, false, -1}\r
+              }\r
+            }\r
+          });\r
+          out << f.returnType << " " <<\r
+            namespacePrefix() << s.name << genericAppendix(instantiation) << "_" << f.name <<\r
+            " (" << vectorStr(f.parameters, ", ") << ");\n";\r

         }\r
         }\r

-      });\r
-    out << f.returnType << " " <<\r
-    namespacePrefix() << s.name << "_" << f.name <<\r
-    " (" << vectorStr(f.parameters, ", ") << ")\n" << f.body;\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
+      indent(out, -2);\r
+      out << "};\n";\r
+      \r
+      for (auto m : s.methods)\r
+      {\r
+        Function f = m;\r
+        f.parameters.insert(f.parameters.begin(),\r
+          {"this",\r
+            {\r
+              namespaces,\r
+              s.name + genericAppendix(instantiation),\r
+              {\r
+                {TypeModifierType::Pointer, false, -1}\r
+              }\r
+            }\r
+          });\r
+        out << f.returnType << " " <<\r
+        namespacePrefix() << s.name << genericAppendix(instantiation) << "_" << f.name <<\r
+        " (" << vectorStr(f.parameters, ", ") << ")\n" << f.body;\r
+      }\r
+\r
+      currentInstantiation.clear();\r
+    }\r

   }\r
 }\r
 void tocProgram (std::ostream & out, const Program & p)\r
   }\r
 }\r
 void tocProgram (std::ostream & out, const Program & p)\r


@@ -288,17 +433,17 @@ void tocProgram (std::ostream & out, const Program & p)
   globalCtx = p.ctx;\r
 \r
   globalPrg = p;\r
   globalCtx = p.ctx;\r
 \r
   globalPrg = p;\r

-  for (auto n : p.namespaces)\r
+  for (auto n : p.ctx->namespaces)\r

   {\r
     tocNamespace(out, n, true);\r
   }\r
   out << "\n\n";\r
   {\r
     tocNamespace(out, n, true);\r
   }\r
   out << "\n\n";\r

-  for (auto s : p.structs)\r
+  for (auto s : p.ctx->structs)\r

   {\r
     tocStruct(out, s, true);\r
   }\r
   out << "\n\n";\r
   {\r
     tocStruct(out, s, true);\r
   }\r
   out << "\n\n";\r

-  for (auto f : p.functions)\r
+  for (auto f : p.ctx->functions)\r

   {\r
     tocFunction(out, f, true);\r
   }\r
   {\r
     tocFunction(out, f, true);\r
   }\r


@@ -309,17 +454,17 @@ void tocProgram (std::ostream & out, const Program & p)
     out << v << ";\n";\r
   }\r
   out << "\n\n";\r
     out << v << ";\n";\r
   }\r
   out << "\n\n";\r

-  for (auto n : p.namespaces)\r
+  for (auto n : p.ctx->namespaces)\r

   {\r
     tocNamespace(out, n, false);\r
   }\r
   out << "\n\n";\r
   {\r
     tocNamespace(out, n, false);\r
   }\r
   out << "\n\n";\r

-  for (auto s : p.structs)\r
+  for (auto s : p.ctx->structs)\r

   {\r
     tocStruct(out, s, false);\r
   }\r
   out << "\n\n";\r
   {\r
     tocStruct(out, s, false);\r
   }\r
   out << "\n\n";\r

-  for (auto f : p.functions)\r
+  for (auto f : p.ctx->functions)\r

   {\r
     tocFunction(out, f, false);\r
   }\r
   {\r
     tocFunction(out, f, false);\r
   }\r


@@ -341,17 +486,17 @@ void tocNamespace  (std::ostream & out, const Namespace & n, bool stub)
     }\r
     out << "\n\n";\r
   }\r
     }\r
     out << "\n\n";\r
   }\r

-  for (auto n : n.namespaces)\r
+  for (auto n : n.ctx->namespaces)\r

   {\r
     tocNamespace(out, n, stub);\r
     out << "\n\n";\r
   }\r
   {\r
     tocNamespace(out, n, stub);\r
     out << "\n\n";\r
   }\r

-  for (auto s : n.structs)\r
+  for (auto s : n.ctx->structs)\r

   {\r
     tocStruct(out, s, stub);\r
     out << "\n\n";\r
   }\r
   {\r
     tocStruct(out, s, stub);\r
     out << "\n\n";\r
   }\r

-  for (auto f : n.functions)\r
+  for (auto f : n.ctx->functions)\r

   {\r
     tocFunction(out, f, stub);\r
     out << "\n\n";\r
   {\r
     tocFunction(out, f, stub);\r
     out << "\n\n";\r