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

diff --git a/src/repr.h b/src/repr.h
index f196427..709528d 100644
--- a/src/repr.h
+++ b/src/repr.h
@@ -37,6 +37,15 @@ 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;
+};
+
 enum class TypeModifierType
 {
   Pointer, Array
@@ -55,6 +64,7 @@ struct Type
   std::vector<std::string> namespacePrefixes;
   std::string name;
   std::vector<TypeModifier> modifiers;
+  std::vector<Type> genericInstantiation;
 };
 
 struct Variable
@@ -65,15 +75,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 +103,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,17 +112,13 @@ struct Struct
 struct Namespace
 {
   std::string name;
-  std::vector<Variable> variables;
-  std::vector<Struct> structs;
-  std::vector<Function> functions;
+  std::shared_ptr<Context> ctx;
   std::vector<Namespace> namespaces;
 };
 
 struct Program
 {
-  std::vector<Variable> variables;
-  std::vector<Struct> structs;
-  std::vector<Function> functions;
+  std::shared_ptr<Context> ctx;
   std::vector<Namespace> namespaces;
 };
 
@@ -119,6 +132,7 @@ struct FuncExpr
   std::vector<std::string> namespacePrefixes;
   std::string functionName;
   std::vector<Expr> arguments;
+  std::vector<Type> genericInstantiation;
 };
 
 struct MethodExpr
@@ -126,6 +140,7 @@ struct MethodExpr
   std::shared_ptr<Expr> expr;
   std::string methodName;
   std::vector<Expr> arguments;
+  std::vector<Type> genericInstantiation;
 };
 
 enum class LitType
@@ -150,6 +165,7 @@ struct ParenExpr
 
 struct DotExpr
 {
+  bool isPointer;
   std::shared_ptr<Expr> expr;
   std::string identifier;
 };