Changeset aa4d31 in git for ppcc/src/parser.cc

Timestamp:

Feb 7, 2019, 1:18:27 PM (5 years ago)

Author:

Reimer Behrends <behrends@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

098784114c00a08a4d18cf392c0f2411aa0d007ed669f7b103e531e130535f2141dd1d77cfa31a81

Parents:

54b24c79febc0e79ee3f9c6a86b7c4d505c69a43

Message:

parallel preprocessor-related fixes.

File:

• ppcc/src/parser.cc (modified) (9 diffs)

ppcc/src/parser.cc

@@ -1 +1 @@
 #include "adlib/lib.h"
 #include "adlib/map.h"
+#include "adlib/set.h"
 #include "pplex.h"
 
@@ -18 +19 @@
 static Dict *class_vars;
 static Dict *class_types;
+static StrSet *type_prefix_set;
+static Dict *namespaced;
 
 enum DeclType {
@@ -37 +40 @@
   GCVar(class_vars, new Dict());
   GCVar(class_types, new Dict());
+  GCVar(type_prefix_set, new StrSet());
+  type_prefix_set->add(S("class"));
+  type_prefix_set->add(S("struct"));
+  type_prefix_set->add(S("typedef"));
+  // special treatment for some gfanlib variables for now.
+  GCVar(namespaced, new Dict());
+  namespaced->add(S("MVMachineIntegerOverflow"), S("gfan"));
+  namespaced->add(S("lpSolver"), S("gfan"));
 });
 
@@ -244 +255 @@
   }
   if ((is_class && !is_extern) || init_start >= 0) {
-    if (is_toplevel)
+    if (is_toplevel) {
       init_list->add(var_name);
+    }
     Token var_init = Token(SymGen, var_name->clone()->add("__INIT__"));
     parser->emit(static_token);
@@ -262 +274 @@
       parser->init_count++;
       parser->emit(Token(SymGen, S(
-        "static pSingular_register_init_var(void *, void *, long);"
+        "void pSingular_register_init_var(void *, void *, long);"
         "class %s__CONSTR__ {\n"
-        "  %s__CONSTR__() {\n"
+        "  public: %s__CONSTR__() {\n"
         "    pSingular_register_init_var(&%s, &%s__INIT__, sizeof(%s));\n"
         "  }\n"
@@ -281 +293 @@
     Token &token = output->at(i);
     if (token.sym == SymIdent && class_vars->contains(token.str)) {
-      token.str = class_vars->at(token.str);
+      Int j = i-1;
+      while (j >= 0 && TEST(SymsWS | BIT(SymAst), output->at(j).sym))
+        j--;
+      if (j < 0 || !type_prefix_set->contains(output->at(j).str))
+        token.str = class_vars->at(token.str);
     }
   }
@@ -318 +334 @@
     if (class_vars->contains(var_name)) {
       Str *type = class_types->at(var_name);
+      if (namespaced->contains(var_name)) {
+        type = namespaced->at(var_name)->clone()->add("::")->add(type);
+        var_name = namespaced->at(var_name)->clone()->add("::")->add(var_name);
+      }
       init_part->add(S(
         "  %s = (%c *)pSingular_alloc_var((long)sizeof(%c));\n"
@@ -374 +394 @@
     Int var_pos = -1, var_start = -1, var_end = -1;
     var_start = parser->current_pos();
-    parser->skip_while(SymsTypePrefix | BIT(SymWS));
+    parser->skip_while(SymsTypePrefix | BIT(SymWS) | BIT(SymClass));
     if (TEST(SymsEndDecl | BIT(SymLBrkt), parser->current_sym())) {
       // We are one symbol past the initial variable identifier.
@@ -481 +501 @@
         if (toplevel->len() > 0)
           toplevel->pop();
+        tl = 0;
         parser->advance();
         break;