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

Timestamp:

Feb 13, 2019, 5:39:27 PM (5 years ago)

Author:

Reimer Behrends <behrends@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e26df3f314b9946ffef7f945cbe5c66517600b92

Parents:

d669f7b103e531e130535f2141dd1d77cfa31a81

Message:

Final ppcc fixes (part 2).

File:

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

ppcc/src/parser.cc

@@ -56 +56 @@
 class Parser : public GC {
 public:
-  TokenList *input, *output;
+  TokenList *input, *output, *prologue;
   SourceFile *source;
   Int pos, marker;
@@ -66 +66 @@
       input->add(eof);
     output = new TokenList();
+    prologue = new TokenList();
     pos = 0;
     marker = 0;
@@ -274 +275 @@
       parser->init_count++;
       parser->emit(Token(SymGen, S(
-        "void pSingular_register_init_var(void *, void *, long);"
         "class %s__CONSTR__ {\n"
         "  public: %s__CONSTR__() {\n"
-        "    pSingular_register_init_var(&%s, &%s__INIT__, sizeof(%s));\n"
+        "    pSingular_register_init_var((void *)&%s, (void *)&%s__INIT__, sizeof(%s));\n"
         "  }\n"
         "} %s__AUX__;\n"
@@ -286 +286 @@
 
 void EmitEpilogue(Parser *parser) {
-  if (init_list->len() == 0 && class_vars->count() == 0)
+  if (parser->init_count == 0 && init_list->len() == 0 && class_vars->count() == 0)
     return;
   Str *modulename = parser->source->modulename;
@@ -300 +300 @@
     }
   }
-  if (init_list->len() == 0)
+  if (parser->init_count == 0 && init_list->len() == 0)
     return;
   Str *init_part;
@@ -350 +350 @@
   }
   init_part->add("}\n");
+  if (parser->init_count) {
+    parser->prologue->add(Token(SymGen,
+      S("static void pSingular_register_init_var(void *, void *, long);\n")));
+  }
   init_part = init_part->replace_all(S("%n"), S(parser->init_count+1));
   parser->emit(Token(SymGen, init_part));
@@ -512 +516 @@
   }
   EmitEpilogue(parser);
-  return parser->output;
+  return parser->prologue->clone()->add(parser->output);
 }
 
@@ -531 +535 @@
   SourceFile *source = ReadSource(filename, filedata);
   TokenList *tokens = Transform(source);
-  Str *result = new Str();  for (Int i = 0; i < tokens->len(); i++) {
+  Str *result = new Str();
+  for (Int i = 0; i < tokens->len(); i++) {
     result->add(tokens->at(i).str);
   }