add generic.h (how did i miss that...)

[toc] / src / check.h

diff --git a/src/check.h b/src/check.h
index d85bd81e27b01f5a7cf7ea03c02a44a3b464dbd6..091b646edc5953bf0ff9b345dc19bf0823295d8f 100644 (file)
--- a/src/check.h
+++ b/src/check.h
@@ -4,8 +4,7 @@
 \r
 bool checkStmt(\r
   const Stmt & s,\r
 \r
 bool checkStmt(\r
   const Stmt & s,\r

-  std::vector<Struct> structs,\r
-  std::vector<Function> funcs,\r
+  std::vector<Namespace> namespaces,\r

   std::vector<Variable> vars)\r
 {\r
   return true;\r
   std::vector<Variable> vars)\r
 {\r
   return true;\r


@@ -13,15 +12,14 @@ bool checkStmt(
 \r
 bool checkFunction(\r
   const Function & f,\r
 \r
 bool checkFunction(\r
   const Function & f,\r

-  std::vector<Struct> structs,\r
-  std::vector<Function> funcs,\r
+  std::vector<Namespace> namespaces,\r

   std::vector<Variable> vars)\r
 {\r
   vars.insert(vars.end(), f.parameters.begin(), f.parameters.end());\r
   vars.insert(vars.end(), f.body.variables.begin(), f.body.variables.end());\r
   for (auto s : f.body.statements)\r
   {\r
   std::vector<Variable> vars)\r
 {\r
   vars.insert(vars.end(), f.parameters.begin(), f.parameters.end());\r
   vars.insert(vars.end(), f.body.variables.begin(), f.body.variables.end());\r
   for (auto s : f.body.statements)\r
   {\r

-    if (!checkStmt(s, structs, funcs, vars))\r
+    if (!checkStmt(s, namespaces, vars))\r

       return false;\r
   }\r
   return true;\r
       return false;\r
   }\r
   return true;\r


@@ -31,7 +29,7 @@ bool checkProgram(const Program & p)
 {\r
   for (auto f : p.functions)\r
   {\r
 {\r
   for (auto f : p.functions)\r
   {\r

-    if (!checkFunction(f, p.structs, p.functions, p.variables))\r
+    if (!checkFunction(f, p.namespaces, p.variables))\r

       return false;\r
   }\r
   for (auto s : p.structs)\r
       return false;\r
   }\r
   for (auto s : p.structs)\r


@@ -41,7 +39,7 @@ bool checkProgram(const Program & p)
       vars.push_back(v);\r
     for (auto f : s.methods)\r
     {\r
       vars.push_back(v);\r
     for (auto f : s.methods)\r
     {\r

-      if (!checkFunction(f, p.structs, p.functions, vars))\r
+      if (!checkFunction(f, p.namespaces, vars))\r

         return false;\r
     }\r
   }\r
         return false;\r
     }\r
   }\r