X-Git-Url: https://gitweb.ps.run/toc/blobdiff_plain/17860defa84c6d8bc0e8bc088a7e09361f17db07..c4231c6faf4e1b4650b075c641b0bb8c053739e4:/src/toc.h

diff --git a/src/toc.h b/src/toc.h
index 8bf0e68..e95ab3e 100644
--- a/src/toc.h
+++ b/src/toc.h
@@ -59,6 +59,21 @@ 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)
 {
   for (auto kv : currentInstantiation)
@@ -69,10 +84,14 @@ std::ostream & operator<< (std::ostream & out, const Type & t)
       return out;
     }
   }
-  TypeInfo ti = typeType(globalPrg, t);
+  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);
 
@@ -84,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++)
   {
@@ -143,25 +166,28 @@ 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;
+    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 << genericAppendix(ti.type.genericInstantiation) << "_" << e._method.methodName;
     if (!e._method.genericInstantiation.empty())
       out << genericAppendix(e._method.genericInstantiation);
-    out << "(&" << *e._method.expr << (e._method.arguments.empty() ? "" : ", ") <<
+    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:
@@ -171,7 +197,7 @@ 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.isPointer ? "->" : ".") << e._dot.identifier; break;
   case ExprType::PrefixOp:
@@ -189,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;
@@ -396,14 +428,12 @@ void tocStruct (std::ostream & out, const Struct & s, bool stub)
     }
   }
 }
-void tocProgram (std::ostream & out, const Program & _p)
+void tocProgram (std::ostream & out, const Program & p)
 {
-  Program p = instantiateGenerics(_p);
-
   globalCtx = p.ctx;
 
   globalPrg = p;
-  for (auto n : p.namespaces)
+  for (auto n : p.ctx->namespaces)
   {
     tocNamespace(out, n, true);
   }
@@ -424,7 +454,7 @@ 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);
   }
@@ -456,7 +486,7 @@ 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";