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

diff --git a/src/repr.h b/src/repr.h
index f196427..959e74d 100644
--- a/src/repr.h
+++ b/src/repr.h
@@ -37,6 +37,16 @@ struct AssignStmt;
 struct ReturnStmt;
 struct Stmt;
 
+struct Context
+{
+  std::optional<std::string> name;
+  std::shared_ptr<Context> parent;
+  std::vector<Variable> variables;
+  std::vector<Function> functions;
+  std::vector<Struct> structs;
+  std::vector<Namespace> namespaces;
+};
+
 enum class TypeModifierType
 {
   Pointer, Array
@@ -55,6 +65,22 @@ struct Type
   std::vector<std::string> namespacePrefixes;
   std::string name;
   std::vector<TypeModifier> modifiers;
+  std::vector<Type> genericInstantiation;
+  
+  bool operator!=(const Type & that)
+  {
+    if (this->name != that.name)
+      return true;
+
+    for (int i = 0; i < this->modifiers.size(); i++)
+      if (this->modifiers[i].type != that.modifiers[i].type)
+        return true;
+
+    for (int i = 0; i < this->namespacePrefixes.size(); i++)
+      if (this->namespacePrefixes[i] != that.namespacePrefixes[i])
+        return true;
+    return false;
+  }
 };
 
 struct Variable
@@ -65,15 +91,20 @@ struct Variable
 
 struct Body
 {
-  std::vector<Variable> variables;
+  std::shared_ptr<Context> ctx;
   std::vector<Stmt> statements;
 };
 
 struct Function
 {
-  Type returnType;
   std::string name;
+  Type returnType;
   std::vector<Variable> parameters;
+  bool defined;
+
+  std::vector<std::string> genericTypeNames;
+  std::vector<std::vector<Type>> genericInstantiations;
+
   Body body;
 };
 
@@ -88,6 +119,8 @@ struct StructMember
 struct Struct
 {
   std::string name;
+  std::vector<std::string> genericTypeNames;
+  std::vector<std::vector<Type>> genericInstantiations;
   std::vector<StructMember<Variable>> members;
   std::vector<StructMember<Function>> methods;
 };
@@ -95,18 +128,12 @@ struct Struct
 struct Namespace
 {
   std::string name;
-  std::vector<Variable> variables;
-  std::vector<Struct> structs;
-  std::vector<Function> functions;
-  std::vector<Namespace> namespaces;
+  std::shared_ptr<Context> ctx;
 };
 
 struct Program
 {
-  std::vector<Variable> variables;
-  std::vector<Struct> structs;
-  std::vector<Function> functions;
-  std::vector<Namespace> namespaces;
+  std::shared_ptr<Context> ctx;
 };
 
 enum class ExprType
@@ -119,6 +146,7 @@ struct FuncExpr
   std::vector<std::string> namespacePrefixes;
   std::string functionName;
   std::vector<Expr> arguments;
+  std::vector<Type> genericInstantiation;
 };
 
 struct MethodExpr
@@ -126,6 +154,7 @@ struct MethodExpr
   std::shared_ptr<Expr> expr;
   std::string methodName;
   std::vector<Expr> arguments;
+  std::vector<Type> genericInstantiation;
 };
 
 enum class LitType
@@ -150,6 +179,7 @@ struct ParenExpr
 
 struct DotExpr
 {
+  bool isPointer;
   std::shared_ptr<Expr> expr;
   std::string identifier;
 };