Changeset ef0a94 in git


Ignore:
Timestamp:
Feb 13, 2019, 5:39:27 PM (4 years ago)
Author:
Reimer Behrends <behrends@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')
Children:
e26df3f314b9946ffef7f945cbe5c66517600b92
Parents:
d669f7b103e531e130535f2141dd1d77cfa31a81
Message:
Final ppcc fixes (part 2).
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • Singular/dyn_modules/Order/singular.cc

    rd669f7 ref0a94  
    510510     (currPack->libname? currPack->libname: "NFOrder"),// the library name,
    511511    "nforder: orders in number fields"); // the help string for the module
    512   VAR return MAX_TOK;
     512  return MAX_TOK;
    513513}
    514514#endif
  • Singular/dyn_modules/cohomo/cohomo.cc

    rd669f7 ref0a94  
    53315331{
    53325332  firstorderdef_setup(p);
    5333   VAR return MAX_TOK;
     5333  return MAX_TOK;
    53345334}
    53355335
  • Singular/dyn_modules/interval/interval.cc

    rd669f7 ref0a94  
    12211221extern "C" int SI_MOD_INIT(interval)(SModulFunctions* psModulFunctions)
    12221222{
    1223   VAR blackbox *b_iv = (blackbox*) omAlloc0(sizeof(blackbox)),
     1223  blackbox *b_iv = (blackbox*) omAlloc0(sizeof(blackbox)),
    12241224           *b_bx = (blackbox*) omAlloc0(sizeof(blackbox));
    12251225
     
    12531253    evalPolyAtBox);
    12541254
    1255   VAR return MAX_TOK;
     1255  return MAX_TOK;
    12561256}
    12571257// vim: spell spelllang=en
  • Singular/dyn_modules/python/python_module.cc

    rd669f7 ref0a94  
    8080
    8181  psModulFunctions->iiAddCproc(currPack->libname,"python",FALSE, mod_python);
    82   VAR return MAX_TOK;
     82  return MAX_TOK;
    8383}
    8484#endif
  • Singular/dyn_modules/singmathic/singmathic.cc

    rd669f7 ref0a94  
    597597    prOrderX
    598598  );
    599   VAR return MAX_TOK;
     599  return MAX_TOK;
    600600}
    601601
  • Singular/walk.cc

    rd669f7 ref0a94  
    37313731  mpz_clear(ndeg);
    37323732
    3733   VAR return repr_vector;
     3733  return repr_vector;
    37343734}
    37353735#endif
     
    38273827  mpz_clear(sing_int);
    38283828
    3829   VAR return repr_vector;
     3829  return repr_vector;
    38303830}
    38313831#endif
  • libpolys/misc/options.h

    rd669f7 ref0a94  
    1313extern "C" VAR unsigned si_opt_1; //< NOTE: Original option variable name: test
    1414extern "C" VAR unsigned si_opt_2; //< NOTE: Original option variable name: verbose
    15 extern "C" BOOLEAN siCntrlc;
     15extern "C" VAR BOOLEAN siCntrlc;
    1616#else
    1717EXTERN_VAR unsigned si_opt_1;
  • misc/intset.cc

    rd669f7 ref0a94  
    209209  psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),"insert_set",FALSE,insert_set);
    210210  psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),"equal_set",FALSE,equal_set);
    211   VAR return MAX_TOK;
    212 }
     211  return MAX_TOK;
     212}
  • misc/lt.cc

    rd669f7 ref0a94  
    4040{
    4141  psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),"same_lt",FALSE,same_lt);
    42   VAR return MAX_TOK;
     42  return MAX_TOK;
    4343}
  • misc/lt2.cc

    rd669f7 ref0a94  
    7474  psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),"same_lt2",FALSE,same_lt2);
    7575  psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),"cf_at",FALSE,cf_at);
    76   VAR return MAX_TOK;
     76  return MAX_TOK;
    7777}
  • misc/partition.cc

    rd669f7 ref0a94  
    9090     (currPack->libname? currPack->libname: ""),// the library name,
    9191    "partition"); // the help string for the module
    92   VAR return MAX_TOK;
     92  return MAX_TOK;
    9393}
    9494
  • ppcc/src/parser.cc

    rd669f7 ref0a94  
    5656class Parser : public GC {
    5757public:
    58   TokenList *input, *output;
     58  TokenList *input, *output, *prologue;
    5959  SourceFile *source;
    6060  Int pos, marker;
     
    6666      input->add(eof);
    6767    output = new TokenList();
     68    prologue = new TokenList();
    6869    pos = 0;
    6970    marker = 0;
     
    274275      parser->init_count++;
    275276      parser->emit(Token(SymGen, S(
    276         "void pSingular_register_init_var(void *, void *, long);"
    277277        "class %s__CONSTR__ {\n"
    278278        "  public: %s__CONSTR__() {\n"
    279         "    pSingular_register_init_var(&%s, &%s__INIT__, sizeof(%s));\n"
     279        "    pSingular_register_init_var((void *)&%s, (void *)&%s__INIT__, sizeof(%s));\n"
    280280        "  }\n"
    281281        "} %s__AUX__;\n"
     
    286286
    287287void EmitEpilogue(Parser *parser) {
    288   if (init_list->len() == 0 && class_vars->count() == 0)
     288  if (parser->init_count == 0 && init_list->len() == 0 && class_vars->count() == 0)
    289289    return;
    290290  Str *modulename = parser->source->modulename;
     
    300300    }
    301301  }
    302   if (init_list->len() == 0)
     302  if (parser->init_count == 0 && init_list->len() == 0)
    303303    return;
    304304  Str *init_part;
     
    350350  }
    351351  init_part->add("}\n");
     352  if (parser->init_count) {
     353    parser->prologue->add(Token(SymGen,
     354      S("static void pSingular_register_init_var(void *, void *, long);\n")));
     355  }
    352356  init_part = init_part->replace_all(S("%n"), S(parser->init_count+1));
    353357  parser->emit(Token(SymGen, init_part));
     
    512516  }
    513517  EmitEpilogue(parser);
    514   return parser->output;
     518  return parser->prologue->clone()->add(parser->output);
    515519}
    516520
     
    531535  SourceFile *source = ReadSource(filename, filedata);
    532536  TokenList *tokens = Transform(source);
    533   Str *result = new Str();  for (Int i = 0; i < tokens->len(); i++) {
     537  Str *result = new Str();
     538  for (Int i = 0; i < tokens->len(); i++) {
    534539    result->add(tokens->at(i).str);
    535540  }
Note: See TracChangeset for help on using the changeset viewer.