X-Git-Url: https://gitweb.ps.run/toc/blobdiff_plain/c2ba7425955ae538e220cec79d9124756d1b4c8b..c4231c6faf4e1b4650b075c641b0bb8c053739e4:/src/toc.h?ds=sidebyside

diff --git a/src/toc.h b/src/toc.h
index c0c73f1..e95ab3e 100644
--- a/src/toc.h
+++ b/src/toc.h
@@ -4,6 +4,7 @@
 #include <sstream>
 
 #include "repr.h"
+#include "generic.h"
 #include "typeInfo.h"
 
 template<typename T>
@@ -53,15 +54,46 @@ static std::string namespacePrefix() {
   return sstr.str();
 }
 
+static std::map<std::string, Type> currentInstantiation;
+
 static Program globalPrg;
 static std::shared_ptr<Context> globalCtx;
 
+
+
+// std::string getPrefix(std::shared_ptr<Context> ctx)
+// {
+//   std::string result;
+//   for (auto it = ctx; it != nullptr; it = it->parent)
+//   {
+//     if (it->name.has_value())
+//     {
+//       result = it->name.value() + "_" + result;
+//     }
+//   }
+//   return result;
+// }
+
 std::ostream & operator<< (std::ostream & out, const Type & t)
 {
-  TypeInfo ti = typeType(globalPrg, t);
+  for (auto kv : currentInstantiation)
+  {
+    if (t.name == kv.first)
+    {
+      out << kv.second;
+      return out;
+    }
+  }
+  TypeInfo ti = typeType(globalCtx, t);
   if (ti.isStruct)
     out << "struct ";
-  out << vectorStr(t.namespacePrefixes, "_", true) << t.name;
+  auto s = findStruct(t.name, t.namespacePrefixes, globalCtx);
+  if (s.has_value())
+    out << vectorStr(std::get<1>(*s), "_", true) << t.name; 
+  else
+    out << vectorStr(t.namespacePrefixes, "_", true) << t.name;
+  if (!t.genericInstantiation.empty())
+    out << genericAppendix(t.genericInstantiation);
 
   return out;
 }
@@ -71,6 +103,10 @@ std::ostream & operator<< (std::ostream & out, const Variable & v)
 
   std::stringstream sstr;
   std::string s = v.name;
+  
+  auto var = findVariable(v.name, namespaces, globalCtx);
+  if (var.has_value())
+    s = vectorStr(std::get<1>(*var), "_", true) + s;
 
   for (auto m = v.type.modifiers.rbegin(); m != v.type.modifiers.rend(); m++)
   {
@@ -130,21 +166,29 @@ std::ostream & operator<< (std::ostream & out, const Expr & e)
   {
   case ExprType::Func:
   {
-    if (e._func.namespacePrefixes.empty())
-    {
-      TypeInfo ti = typeExpr(globalPrg, namespaces, globalCtx, e);
-      
-    }
-    out << vectorStr(e._func.namespacePrefixes, "_", true) << e._func.functionName << "(" << vectorStr(e._func.arguments, ", ") << ")"; break;
+    auto f = findFunction(e._func.functionName, e._func.namespacePrefixes, globalCtx);
+
+    if (std::get<0>(*f).defined)
+      out << vectorStr(std::get<1>(*f), "_", true);
+
+    out << e._func.functionName;
+    if (!e._func.genericInstantiation.empty())
+      out << genericAppendix(e._func.genericInstantiation);
+    out <<"(" << vectorStr(e._func.arguments, ", ") << ")"; break;
   }
   case ExprType::Method:
   {
-    TypeInfo ti = typeExpr(globalPrg, namespaces, globalCtx, *e._method.expr);
+    TypeInfo ti = typeExpr(globalCtx, *e._method.expr);
     out <<
       vectorStr(ti.type.namespacePrefixes, "_", true) <<
-      ti.type.name << "_" << e._method.methodName <<
-      "(&" << *e._method.expr << (e._method.arguments.empty() ? "" : ", ") <<
-      vectorStr(e._method.arguments, ", ") << ")"; break;
+      ti.type.name << genericAppendix(ti.type.genericInstantiation) << "_" << e._method.methodName;
+    if (!e._method.genericInstantiation.empty())
+      out << genericAppendix(e._method.genericInstantiation);
+    out << "(";
+    if (e._method.expr->type == ExprType::Identifier)
+      out << "&";
+    out << *e._method.expr << (e._method.arguments.empty() ? "" : ", ") <<
+    vectorStr(e._method.arguments, ", ") << ")"; break;
   }
   case ExprType::Lit:
     /**/ if (e._lit.type == LitType::Int) out << e._lit._int;
@@ -153,9 +197,9 @@ std::ostream & operator<< (std::ostream & out, const Expr & e)
     else if (e._lit.type == LitType::Bool) out << e._lit._bool;
     break;
   case ExprType::Paren:
-    out << "(" << e._paren.expr << ")"; break;
+    out << "(" << *e._paren.expr << ")"; break;
   case ExprType::Dot:
-    out << *e._dot.expr << "." << e._dot.identifier; break;
+    out << *e._dot.expr << (e._dot.isPointer ? "->" : ".") << e._dot.identifier; break;
   case ExprType::PrefixOp:
     out << PrefixOperatorTypeStrings[(int)e._prefixOp.type] << *e._prefixOp.expr; break;
   case ExprType::PostfixOp:
@@ -171,7 +215,13 @@ std::ostream & operator<< (std::ostream & out, const Expr & e)
   case ExprType::Bracket:
     out << *e._brackets.lexpr << "[" << *e._brackets.rexpr << "]"; break;
   case ExprType::Identifier:
-    out << vectorStr(e._identifier.namespacePrefixes, "_", true) << e._identifier.identifier; break;
+    auto v = findVariable(e._identifier.identifier, e._identifier.namespacePrefixes, globalCtx);
+    if (v.has_value())
+      out << vectorStr(std::get<1>(*v), "_", true);
+    else
+      out << vectorStr(e._identifier.namespacePrefixes, "_", true);
+
+    out << e._identifier.identifier; break;
   }
 
   return out;
@@ -216,71 +266,166 @@ void tocFunction (std::ostream & out, const Function & f, bool stub)
 {
   if (!stub && !f.defined) return;
 
-  out << f.returnType << " " << namespacePrefix() << f.name << " (" << vectorStr(f.parameters, ", ") << ")";
-
-  if (stub)
+  if (f.genericTypeNames.empty())
   {
-    out << ";\n";
+    out << f.returnType << " " << namespacePrefix() << f.name << " (" << vectorStr(f.parameters, ", ") << ")";
+
+    if (stub)
+    {
+      out << ";\n";
+    }
+    else
+    {
+      out << "\n" << f.body;
+    }
   }
   else
   {
-    out << "\n" << f.body;
+    for (auto instantiation : f.genericInstantiations)
+    {
+      for (int i = 0; i < f.genericTypeNames.size(); i++)
+      {
+        currentInstantiation[f.genericTypeNames[i]] = instantiation[i];
+      }
+
+      out << f.returnType << " " << namespacePrefix() << f.name << genericAppendix(instantiation) << " (" << vectorStr(f.parameters, ", ") << ")";
+
+      if (stub)
+      {
+        out << ";\n";
+      }
+      else
+      {
+        out << "\n" << f.body;
+      }
+
+      currentInstantiation.clear();
+    }
   }
 }
 void tocStruct (std::ostream & out, const Struct & s, bool stub)
 {
-  out << "struct " << namespacePrefix() << s.name;
-  if (stub)
+  if (s.genericTypeNames.empty())
   {
-    out << ";\n";
+    out << "struct " << namespacePrefix() << s.name;
+    if (stub)
+    {
+      out << ";\n";
+      for (auto m : s.methods)
+      {
+        Function f = m;
+
+        f.parameters.insert(f.parameters.begin(),
+        {"this",
+          {
+            namespaces,
+            s.name,
+            {
+              {TypeModifierType::Pointer, false, -1}
+            }
+          }
+        });
+        out << f.returnType << " " <<
+          namespacePrefix() << s.name << "_" << f.name <<
+          " (" << vectorStr(f.parameters, ", ") << ");\n";
+      }
+      return;
+    }
+    out << "\n{\n";
+    indentation += 2;
+
+    for (auto m : s.members)
+    {
+      indent(out);
+      out << m << ";\n";
+    }
+
+    indent(out, -2);
+    out << "};\n";
+    
     for (auto m : s.methods)
     {
       Function f = m;
-
       f.parameters.insert(f.parameters.begin(),
-      {"this",
-        {
-          namespaces,
-          s.name,
+        {"this",
           {
-            {TypeModifierType::Pointer, false, -1}
+            namespaces,
+            s.name,
+            {
+              {TypeModifierType::Pointer, false, -1}
+            }
           }
-        }
-      });
+        });
       out << f.returnType << " " <<
-        namespacePrefix() << s.name << "_" << f.name <<
-        " (" << vectorStr(f.parameters, ", ") << ");\n";
+      namespacePrefix() << s.name << "_" << f.name <<
+      " (" << vectorStr(f.parameters, ", ") << ")\n" << f.body;
     }
-    return;
-  }
-  out << "\n{\n";
-  indentation += 2;
-
-  for (auto m : s.members)
-  {
-    indent(out);
-    out << m << ";\n";
   }
-
-  indent(out, -2);
-  out << "};\n";
-  
-  for (auto m : s.methods)
+  else
   {
-    Function f = m;
-    f.parameters.insert(f.parameters.begin(),
-      {"this",
+    for (auto instantiation : s.genericInstantiations)
+    {
+      for (int i = 0; i < s.genericTypeNames.size(); i++)
+      {
+        currentInstantiation[s.genericTypeNames[i]] = instantiation[i];
+      }
+
+      out << "struct " << namespacePrefix() << s.name << genericAppendix(instantiation);
+      if (stub)
+      {
+        out << ";\n";
+        for (auto m : s.methods)
         {
-          namespaces,
-          s.name,
-          {
-            {TypeModifierType::Pointer, false, -1}
-          }
+          Function f = m;
+
+          f.parameters.insert(f.parameters.begin(),
+          {"this",
+            {
+              namespaces,
+              s.name + genericAppendix(instantiation),
+              {
+                {TypeModifierType::Pointer, false, -1}
+              }
+            }
+          });
+          out << f.returnType << " " <<
+            namespacePrefix() << s.name << genericAppendix(instantiation) << "_" << f.name <<
+            " (" << vectorStr(f.parameters, ", ") << ");\n";
         }
-      });
-    out << f.returnType << " " <<
-    namespacePrefix() << s.name << "_" << f.name <<
-    " (" << vectorStr(f.parameters, ", ") << ")\n" << f.body;
+        return;
+      }
+      out << "\n{\n";
+      indentation += 2;
+
+      for (auto m : s.members)
+      {
+        indent(out);
+        out << m << ";\n";
+      }
+
+      indent(out, -2);
+      out << "};\n";
+      
+      for (auto m : s.methods)
+      {
+        Function f = m;
+        f.parameters.insert(f.parameters.begin(),
+          {"this",
+            {
+              namespaces,
+              s.name + genericAppendix(instantiation),
+              {
+                {TypeModifierType::Pointer, false, -1}
+              }
+            }
+          });
+        out << f.returnType << " " <<
+        namespacePrefix() << s.name << genericAppendix(instantiation) << "_" << f.name <<
+        " (" << vectorStr(f.parameters, ", ") << ")\n" << f.body;
+      }
+
+      currentInstantiation.clear();
+    }
   }
 }
 void tocProgram (std::ostream & out, const Program & p)
@@ -288,17 +433,17 @@ void tocProgram (std::ostream & out, const Program & p)
   globalCtx = p.ctx;
 
   globalPrg = p;
-  for (auto n : p.namespaces)
+  for (auto n : p.ctx->namespaces)
   {
     tocNamespace(out, n, true);
   }
   out << "\n\n";
-  for (auto s : p.structs)
+  for (auto s : p.ctx->structs)
   {
     tocStruct(out, s, true);
   }
   out << "\n\n";
-  for (auto f : p.functions)
+  for (auto f : p.ctx->functions)
   {
     tocFunction(out, f, true);
   }
@@ -309,17 +454,17 @@ void tocProgram (std::ostream & out, const Program & p)
     out << v << ";\n";
   }
   out << "\n\n";
-  for (auto n : p.namespaces)
+  for (auto n : p.ctx->namespaces)
   {
     tocNamespace(out, n, false);
   }
   out << "\n\n";
-  for (auto s : p.structs)
+  for (auto s : p.ctx->structs)
   {
     tocStruct(out, s, false);
   }
   out << "\n\n";
-  for (auto f : p.functions)
+  for (auto f : p.ctx->functions)
   {
     tocFunction(out, f, false);
   }
@@ -341,17 +486,17 @@ void tocNamespace  (std::ostream & out, const Namespace & n, bool stub)
     }
     out << "\n\n";
   }
-  for (auto n : n.namespaces)
+  for (auto n : n.ctx->namespaces)
   {
     tocNamespace(out, n, stub);
     out << "\n\n";
   }
-  for (auto s : n.structs)
+  for (auto s : n.ctx->structs)
   {
     tocStruct(out, s, stub);
     out << "\n\n";
   }
-  for (auto f : n.functions)
+  for (auto f : n.ctx->functions)
   {
     tocFunction(out, f, stub);
     out << "\n\n";