generic functions and structs

[toc] / src / toc.h

diff --git a/src/toc.h b/src/toc.h
index c0c73f155d5c86f75accb2549fa0b9c95c21ec57..659c9f32f4157cf832128ec3d828105c1827db2c 100644 (file)
--- a/src/toc.h
+++ b/src/toc.h
@@ -4,6 +4,7 @@
 #include <sstream>\r
 \r
 #include "repr.h"\r
+#include "generic.h"\r
 #include "typeInfo.h"\r
 \r
 template<typename T>\r
@@ -53,15 +54,27 @@ static std::string namespacePrefix() {
   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
 std::ostream & operator<< (std::ostream & out, const Type & t)\r
 {\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(globalPrg, t);\r
   if (ti.isStruct)\r
     out << "struct ";\r
   out << vectorStr(t.namespacePrefixes, "_", true) << t.name;\r
+  if (!t.genericInstantiation.empty())\r
+    out << genericAppendix(t.genericInstantiation);\r
 \r
   return out;\r
 }\r
@@ -135,16 +148,21 @@ std::ostream & operator<< (std::ostream & out, const Expr & e)
       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
+    out << vectorStr(e._func.namespacePrefixes, "_", true) << 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
     TypeInfo ti = typeExpr(globalPrg, namespaces, globalCtx, *e._method.expr);\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 << "(&" << *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
@@ -155,7 +173,7 @@ std::ostream & operator<< (std::ostream & out, const Expr & e)
   case ExprType::Paren:\r
     out << "(" << e._paren.expr << ")"; break;\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
@@ -216,75 +234,172 @@ void tocFunction (std::ostream & out, const Function & f, bool stub)
 {\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
-    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
-    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
-  out << "struct " << namespacePrefix() << s.name;\r
-  if (stub)\r
+  if (s.genericTypeNames.empty())\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
-\r
       f.parameters.insert(f.parameters.begin(),\r
-      {"this",\r
-        {\r
-          namespaces,\r
-          s.name,\r
+        {"this",\r
           {\r
-            {TypeModifierType::Pointer, false, -1}\r
+            namespaces,\r
+            s.name,\r
+            {\r
+              {TypeModifierType::Pointer, false, -1}\r
+            }\r
           }\r
-        }\r
-      });\r
+        });\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
-    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
+  else\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
-          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
-    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
+void tocProgram (std::ostream & out, const Program & _p)\r
 {\r
+  Program p = instantiateGenerics(_p);\r
+\r
   globalCtx = p.ctx;\r
 \r
   globalPrg = p;\r