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

diff --git a/src/repr_get.h b/src/repr_get.h
index 396c71a..a1f496a 100644
--- a/src/repr_get.h
+++ b/src/repr_get.h
@@ -43,6 +43,13 @@ Type getType(TocParser::TypeContext * ctx)
       isStaticArray ? atoi(m->INT_LIT()->toString().c_str()) : -1
     );
   }
+  if (ctx->genericInstantiation() != nullptr)
+  {
+    for (auto g : ctx->genericInstantiation()->type())
+    {
+      result.genericInstantiation.push_back(getType(g));
+    }
+  }
   return result;
 }
 Variable getVariable(TocParser::VarContext * ctx)
@@ -77,18 +84,43 @@ Function getFunction(TocParser::FuncContext * ctx, std::shared_ptr<Context> pare
   Function result;
   result.name = ctx->funcName()->NAME()->toString();
   result.returnType = getType(ctx->type());
+  if (ctx->genericDecl() != nullptr)
+  {
+    for (auto t : ctx->genericDecl()->typeName())
+    {
+      result.genericTypeNames.push_back(t->getText());
+    }
+  }
+
   if (!ctx->parameter()->var().empty())
   {
     for (auto p : ctx->parameter()->var())
       result.parameters.push_back(getVariable(p));
   }
-  result.body = getBody(ctx->body(), parent);
+
+  if (ctx->body() != nullptr)
+  {
+    result.body = getBody(ctx->body(), parent);
+    result.defined = true;
+  }
+  else
+  {
+    result.defined = false;
+  }
   return result;
 }
 Struct getStruct(TocParser::StructDeclContext * ctx, std::shared_ptr<Context> parent)
 {
   Struct result;
   result.name = ctx->structName()->NAME()->toString();
+  if (ctx->genericDecl() != nullptr)
+  {
+    for (auto t : ctx->genericDecl()->typeName())
+    {
+      result.genericTypeNames.push_back(t->getText());
+    }
+  }
+
   for (auto m : ctx->structMember())
   {
     if (m->structVar() != nullptr)
@@ -113,6 +145,7 @@ Namespace getNamespace(TocParser::NamespaceDeclContext * ctx, std::shared_ptr<Co
   Namespace result;
   result.ctx = std::make_unique<Context>();
   result.name = ctx->typeName()->getText();
+  result.ctx->name = result.name;
   for (auto d : ctx->decl())
   {
     if (d->varDecl() != nullptr)
@@ -121,15 +154,15 @@ Namespace getNamespace(TocParser::NamespaceDeclContext * ctx, std::shared_ptr<Co
     }
     if (d->funcDecl() != nullptr)
     {
-      result.functions.push_back(getFunction(d->funcDecl()->func(), result.ctx));
+      result.ctx->functions.push_back(getFunction(d->funcDecl()->func(), result.ctx));
     }
     if (d->structDecl() != nullptr)
     {
-      result.structs.push_back(getStruct(d->structDecl(), result.ctx));
+      result.ctx->structs.push_back(getStruct(d->structDecl(), result.ctx));
     }
     if (d->namespaceDecl() != nullptr)
     {
-      result.namespaces.push_back(getNamespace(d->namespaceDecl(), result.ctx));
+      result.ctx->namespaces.push_back(getNamespace(d->namespaceDecl(), result.ctx));
     }
   }
   return result;
@@ -146,15 +179,15 @@ Program getProgram(TocParser::ProgContext * ctx, std::shared_ptr<Context> parent
     }
     if (d->funcDecl() != nullptr)
     {
-      result.functions.push_back(getFunction(d->funcDecl()->func(), result.ctx));
+      result.ctx->functions.push_back(getFunction(d->funcDecl()->func(), result.ctx));
     }
     if (d->structDecl() != nullptr)
     {
-      result.structs.push_back(getStruct(d->structDecl(), result.ctx));
+      result.ctx->structs.push_back(getStruct(d->structDecl(), result.ctx));
     }
     if (d->namespaceDecl() != nullptr)
     {
-      result.namespaces.push_back(getNamespace(d->namespaceDecl(), result.ctx));
+      result.ctx->namespaces.push_back(getNamespace(d->namespaceDecl(), result.ctx));
     }
   }
   return result;
@@ -191,6 +224,13 @@ Expr getExpr(TocParser::FuncExprContext * ctx)
   for (auto n : ctx->namespaceSpecifier())
     result._func.namespacePrefixes.push_back(n->typeName()->getText());
   result._func.functionName = ctx->funcName()->NAME()->toString();
+  if (ctx->genericInstantiation() != nullptr)
+  {
+    for (auto g : ctx->genericInstantiation()->type())
+    {
+      result._func.genericInstantiation.push_back(getType(g));
+    }
+  }
   for (auto e : ctx->expr())
     result._func.arguments.push_back(getExpr(e));
   return result;
@@ -201,6 +241,13 @@ Expr getExpr(TocParser::MethodExprContext * ctx)
   result.type = ExprType::Method;
   result._method.expr = std::make_unique<Expr>(getExpr(ctx->expr(0)));
   result._method.methodName = ctx->funcName()->NAME()->toString();
+  if (ctx->genericInstantiation() != nullptr)
+  {
+    for (auto g : ctx->genericInstantiation()->type())
+    {
+      result._method.genericInstantiation.push_back(getType(g));
+    }
+  }
   for (int i = 1; i < ctx->expr().size(); i++)
     result._method.arguments.push_back(getExpr(ctx->expr(i)));
   return result;
@@ -219,10 +266,10 @@ Expr getExpr(TocParser::LitExprContext * ctx)
     result._lit.type = LitType::Decimal;
     result._lit._decimal = atof(ctx->literal()->DECIMAL_LIT()->toString().c_str());
   }
-  else if (ctx->literal()->STRING_LIT() != nullptr)
+  else if (ctx->literal()->StringLit() != nullptr)
   {
     result._lit.type = LitType::String;
-    result._lit._string = ctx->literal()->STRING_LIT()->toString();
+    result._lit._string = ctx->literal()->StringLit()->toString();
   }
   else if (ctx->literal()->BOOL_LIT() != nullptr)
   {
@@ -244,6 +291,7 @@ Expr getExpr(TocParser::DotExprContext * ctx)
   result.type = ExprType::Dot;
   result._dot.expr = std::make_unique<Expr>(getExpr(ctx->expr()));
   result._dot.identifier = ctx->varName()->getText();
+  result._dot.isPointer = ctx->arrow() != nullptr;
   return result;
 }
 Expr getExpr(TocParser::PrefixOpExprContext * ctx)