Changeset c94cbe in git

Timestamp:

Feb 14, 2019, 10:42:52 AM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5c308a04175b4dba05979a7000554c8cdaf451cd

Parents:

4063070e6e1a1e17016b69b4af52ab449f9bde45e26df3f314b9946ffef7f945cbe5c66517600b92

Message:

Merge branch 'threadsupport' into spielwiese

Files:

• Singular/dyn_modules/interval/interval.cc (modified) (1 diff)
• Singular/walk.cc (modified) (2 diffs)
• misc/intset.cc (modified) (1 diff)
• misc/lt.cc (modified) (1 diff)
• misc/lt2.cc (modified) (1 diff)
• misc/partition.cc (modified) (1 diff)
• ppcc/src/parser.cc (modified) (8 diffs)
• ppcc/src/pplex.cc (added)
• ppcc/src/pplex.h (added)

Singular/dyn_modules/interval/interval.cc

@@ -1221 +1221 @@
 extern "C" int SI_MOD_INIT(interval)(SModulFunctions* psModulFunctions)
 {
-  VAR blackbox *b_iv = (blackbox*) omAlloc0(sizeof(blackbox)),
+  blackbox *b_iv = (blackbox*) omAlloc0(sizeof(blackbox)),
            *b_bx = (blackbox*) omAlloc0(sizeof(blackbox));
 

Singular/walk.cc

@@ -3731 +3731 @@
   mpz_clear(ndeg);
 
-  VAR return repr_vector;
+  return repr_vector;
 }
 #endif
@@ -3827 +3827 @@
   mpz_clear(sing_int);
 
-  VAR return repr_vector;
+  return repr_vector;
 }
 #endif

misc/intset.cc

@@ -209 +209 @@
   psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),"insert_set",FALSE,insert_set);
   psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),"equal_set",FALSE,equal_set);
-  VAR return MAX_TOK;
-}
+  return MAX_TOK;
+}

misc/lt.cc

@@ -40 +40 @@
 {
   psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),"same_lt",FALSE,same_lt);
-  VAR return MAX_TOK;
+  return MAX_TOK;
 }

misc/lt2.cc

@@ -74 +74 @@
   psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),"same_lt2",FALSE,same_lt2);
   psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),"cf_at",FALSE,cf_at);
-  VAR return MAX_TOK;
+  return MAX_TOK;
 }

misc/partition.cc

@@ -90 +90 @@
      (currPack->libname? currPack->libname: ""),// the library name,
     "partition"); // the help string for the module
-  VAR return MAX_TOK;
+  return MAX_TOK;
 }
 

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);
   }