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

diff --git a/src/typeInfo.h b/src/typeInfo.h
index 3914847..e813612 100644
--- a/src/typeInfo.h
+++ b/src/typeInfo.h
@@ -10,20 +10,22 @@ struct TypeInfo
 
 #include "find.h"
 
-TypeInfo typeType(const Program & p, Type t)
+TypeInfo typeType(std::shared_ptr<Context> globalCtx, Type t)
 {
   TypeInfo result;
   result.isStruct = true;
   if (t.name == "int" || t.name == "float" || t.name == "double" ||
-      t.name == "char" || t.name == "long" || t.name == "short" || t.name == "bool")
+      t.name == "char" || t.name == "long" || t.name == "short" || t.name == "bool" ||
+      t.name == "void")
   {
     result.isStruct = false;
   }
   result.type = t;
+
   return result;
 }
 
-TypeInfo typeExpr(const Program & p, const std::vector<string> & globalNamespace, Expr e)
+TypeInfo typeExpr(std::shared_ptr<Context> globalCtx, Expr e)
 {
   TypeInfo result;
 
@@ -31,23 +33,24 @@ TypeInfo typeExpr(const Program & p, const std::vector<string> & globalNamespace
   {
   case ExprType::Func:
   {
-    auto namespacePrefixes = globalNamespace;
-    namespacePrefixes.insert(namespacePrefixes.end(),
-      e._func.namespacePrefixes.begin(),
-      e._func.namespacePrefixes.end());
-    auto f = findFunction(p, e._func.functionName, namespacePrefixes);
+    auto f = findFunction(e._func.functionName, e._func.namespacePrefixes, globalCtx);
     if (!f.has_value())
       throw "Unknown function";
-    result = typeType(p, f.value().returnType);
+    result = typeType(globalCtx, std::get<0>(*f).returnType);
     break;
   }
   case ExprType::Method:
   {
-    TypeInfo tiCaller = typeExpr(p, globalNamespace, *e._method.expr);
-    auto m = findStructMethod(p, e._method.methodName, tiCaller);
+    TypeInfo tiCaller = typeExpr(globalCtx, *e._method.expr);
+    if (!tiCaller.isStruct)
+      throw "Calling method on non-struct";
+    auto s = findStruct(tiCaller.type.name, tiCaller.type.namespacePrefixes, globalCtx);
+    if (!s.has_value())
+      throw "Calling method on unknown struct";
+    auto m = findStructMethod(e._method.methodName, std::get<0>(*s));
     if (!m.has_value())
       throw "Unknown method";
-    result = typeType(p, m.value().returnType);
+    result = typeType(globalCtx, m->t.returnType);
     break;
   }
   case ExprType::Lit:
@@ -61,32 +64,37 @@ TypeInfo typeExpr(const Program & p, const std::vector<string> & globalNamespace
     }
     break;
   case ExprType::Paren:
-    result = typeExpr(p, globalNamespace, *e._paren.expr);
+    result = typeExpr(globalCtx, *e._paren.expr);
     break;
   case ExprType::Dot:
   {
-    auto sm = findStructMember(p,
-        typeExpr(p, globalNamespace, *e._dot.expr), e._dot.identifier);
+    auto tiCaller = typeExpr(globalCtx, *e._dot.expr);
+    if (!tiCaller.isStruct)
+      throw "Accessing member of non-struct";
+    auto s = findStruct(tiCaller.type.name, tiCaller.type.namespacePrefixes, globalCtx);
+    if (!s.has_value())
+      throw "Calling method on unknown struct";
+    auto sm = findStructMember(e._dot.identifier, std::get<0>(*s));
     if (!sm.has_value())
       throw "Unknown struct member";
-    result = typeType(p, sm.value().type);
+    result = typeType(globalCtx, sm->t.type);
     break;
   }
   case ExprType::PrefixOp:
-    result = typeExpr(p, globalNamespace, *e._prefixOp.expr);
+    result = typeExpr(globalCtx, *e._prefixOp.expr);
     break;
   case ExprType::PostfixOp:
-    result = typeExpr(p, globalNamespace, *e._postfixOp.expr);
+    result = typeExpr(globalCtx, *e._postfixOp.expr);
     break;
   case ExprType::BinaryOp:
-    result = typeExpr(p, globalNamespace, *e._binaryOp.lexpr);
+    result = typeExpr(globalCtx, *e._binaryOp.lexpr);
     break;
   case ExprType::TernaryOp:
-    result = typeExpr(p, globalNamespace, *e._ternaryOp.rexprTrue);
+    result = typeExpr(globalCtx, *e._ternaryOp.rexprTrue);
     break;
   case ExprType::Bracket:
   {
-    TypeInfo ti = typeExpr(p, globalNamespace, *e._brackets.lexpr);
+    TypeInfo ti = typeExpr(globalCtx, *e._brackets.lexpr);
     if (!ti.type.modifiers.empty())
     {
       result = ti;
@@ -99,14 +107,10 @@ TypeInfo typeExpr(const Program & p, const std::vector<string> & globalNamespace
   }
   case ExprType::Identifier:
   {
-    auto namespacePrefixes = globalNamespace;
-    namespacePrefixes.insert(namespacePrefixes.end(),
-      e._identifier.namespacePrefixes.begin(),
-      e._identifier.namespacePrefixes.end());
-    auto v = findVariable(p, e._identifier.identifier, namespacePrefixes);
+    auto v = findVariable(e._identifier.identifier, e._identifier.namespacePrefixes, globalCtx);
     if (!v.has_value())
       throw "Unknown variable";
-    result = typeType(p, v.value().type);
+    result = typeType(globalCtx, std::get<0>(*v).type);
     break;
   }
   }