Changeset 16dfe8e in git


Ignore:
Timestamp:
Feb 14, 2019, 10:51:41 AM (5 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
11f1b1fdb1df5098e25ace2cbe91a3e47ae52328
Parents:
5c308a04175b4dba05979a7000554c8cdaf451cdc09d612528cd4d66776d205047e0389a69feb35d
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-02-14 10:51:41+01:00
git-committer:
GitHub <noreply@github.com>2019-02-14 10:51:41+01:00
Message:
Merge pull request #916 from kabouzeid/reduce

Allow more reduce variants in Letterplace
Files:
2 added
9 edited

Legend:

Unmodified
Added
Removed

  • Singular/dyn_modules/interval/interval.cc

    rc09d61 r16dfe8e  
    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

  • Singular/iparith.cc

    r5c308a r16dfe8e  
    51655165}
    51665166#endif
    5167 #ifdef HAVE_SHIFTBBA // do not place above jjSTD in this file because we need to reference it
     5167#if defined(HAVE_SHIFTBBA) || defined(HAVE_PLURAL)// do not place above jjSTD in this file because we need to reference it
    51685168static BOOLEAN jjRIGHTSTD(leftv res, leftv v)
    51695169{

  • Singular/table.h

    r5c308a r16dfe8e  
    245245,{D(jjDUMMY),      RESOLUTION_CMD,  RESOLUTION_CMD, RESOLUTION_CMD, ALLOW_PLURAL |ALLOW_RING}
    246246,{D(jjRESTART),    RESTART_CMD,     NONE,           INT_CMD,        ALLOW_NC |ALLOW_RING}
    247 #ifdef HAVE_SHIFTBBA
     247#if defined(HAVE_SHIFTBBA) || defined(HAVE_PLURAL)
    248248,{D(jjRIGHTSTD),   RIGHTSTD_CMD,    IDEAL_CMD,      IDEAL_CMD     , ALLOW_NC |NO_RING}
    249249#endif
    … …  
    282282,{D(jjENVELOPE),   ENVELOPE_CMD,    RING_CMD,       RING_CMD      , ALLOW_PLURAL |NO_RING}
    283283,{D(jjOPPOSITE),   OPPOSITE_CMD,    RING_CMD,       RING_CMD      , ALLOW_PLURAL |NO_RING}
     284#endif
     285#if defined(HAVE_PLURAL) || defined(HAVE_SHIFTBBA)
    284286,{D(jjTWOSTD),     TWOSTD_CMD,      IDEAL_CMD,      IDEAL_CMD     , ALLOW_NC |NO_RING}
    285287#endif
    … …  
    731733,{D(jjREAD2),     READ_CMD,       STRING_CMD,     LINK_CMD,   STRING_CMD, ALLOW_NC |ALLOW_RING}
    732734,{D(jjREDUCE_P),  REDUCE_CMD,     POLY_CMD,       POLY_CMD,   IDEAL_CMD, ALLOW_NC |ALLOW_RING}
    733 ,{D(jjREDUCE_P),  REDUCE_CMD,     VECTOR_CMD,     VECTOR_CMD, IDEAL_CMD, ALLOW_PLURAL |ALLOW_RING}
    734 ,{D(jjREDUCE_P),  REDUCE_CMD,     VECTOR_CMD,     VECTOR_CMD, MODUL_CMD, ALLOW_PLURAL |ALLOW_RING}
     735,{D(jjREDUCE_P),  REDUCE_CMD,     VECTOR_CMD,     VECTOR_CMD, IDEAL_CMD, ALLOW_NC |ALLOW_RING}
     736,{D(jjREDUCE_P),  REDUCE_CMD,     VECTOR_CMD,     VECTOR_CMD, MODUL_CMD, ALLOW_NC |ALLOW_RING}
    735737,{D(jjREDUCE_ID), REDUCE_CMD,     IDEAL_CMD,      IDEAL_CMD,  IDEAL_CMD, ALLOW_NC |ALLOW_RING}
    736 ,{D(jjREDUCE_ID), REDUCE_CMD,     MODUL_CMD,      MODUL_CMD,  IDEAL_CMD, ALLOW_PLURAL |ALLOW_RING}
    737 ,{D(jjREDUCE_ID), REDUCE_CMD,     MODUL_CMD,      MODUL_CMD,  MODUL_CMD, ALLOW_PLURAL |ALLOW_RING}
     738,{D(jjREDUCE_ID), REDUCE_CMD,     MODUL_CMD,      MODUL_CMD,  IDEAL_CMD, ALLOW_NC |ALLOW_RING}
     739,{D(jjREDUCE_ID), REDUCE_CMD,     MODUL_CMD,      MODUL_CMD,  MODUL_CMD, ALLOW_NC |ALLOW_RING}
    738740,{D(jjRES),       RES_CMD,        RESOLUTION_CMD, IDEAL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    739741,{D(jjRES),       RES_CMD,        RESOLUTION_CMD, MODUL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    … …  
    855857,{D(jjRANDOM_CF),      RANDOM_CMD, CNUMBER_CMD, CNUMBER_CMD, CNUMBER_CMD, CRING_CMD, ALLOW_NC |ALLOW_RING}
    856858#endif
    857 ,{D(jjREDUCE3_P),      REDUCE_CMD, POLY_CMD,   POLY_CMD,   IDEAL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    858 ,{D(jjREDUCE3_P),      REDUCE_CMD, VECTOR_CMD, VECTOR_CMD, IDEAL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    859 ,{D(jjREDUCE3_P),      REDUCE_CMD, VECTOR_CMD, VECTOR_CMD, MODUL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    860 ,{D(jjREDUCE3_ID),     REDUCE_CMD, IDEAL_CMD,  IDEAL_CMD,  IDEAL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    861 ,{D(jjREDUCE3_ID),     REDUCE_CMD, MODUL_CMD,  MODUL_CMD,  MODUL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    862 ,{D(jjREDUCE3_ID),     REDUCE_CMD, MODUL_CMD,  MODUL_CMD,  IDEAL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
     859,{D(jjREDUCE3_P),      REDUCE_CMD, POLY_CMD,   POLY_CMD,   IDEAL_CMD,  INT_CMD, ALLOW_NC |ALLOW_RING}
     860,{D(jjREDUCE3_P),      REDUCE_CMD, VECTOR_CMD, VECTOR_CMD, IDEAL_CMD,  INT_CMD, ALLOW_NC |ALLOW_RING}
     861,{D(jjREDUCE3_P),      REDUCE_CMD, VECTOR_CMD, VECTOR_CMD, MODUL_CMD,  INT_CMD, ALLOW_NC |ALLOW_RING}
     862,{D(jjREDUCE3_ID),     REDUCE_CMD, IDEAL_CMD,  IDEAL_CMD,  IDEAL_CMD,  INT_CMD, ALLOW_NC |ALLOW_RING}
     863,{D(jjREDUCE3_ID),     REDUCE_CMD, MODUL_CMD,  MODUL_CMD,  MODUL_CMD,  INT_CMD, ALLOW_NC |ALLOW_RING}
     864,{D(jjREDUCE3_ID),     REDUCE_CMD, MODUL_CMD,  MODUL_CMD,  IDEAL_CMD,  INT_CMD, ALLOW_NC |ALLOW_RING}
    863865,{D(jjREDUCE3_CP),     REDUCE_CMD, POLY_CMD,   POLY_CMD,   POLY_CMD,   IDEAL_CMD, ALLOW_PLURAL |ALLOW_RING}
    864866,{D(jjREDUCE3_CP),     REDUCE_CMD, VECTOR_CMD, VECTOR_CMD, POLY_CMD,   MODUL_CMD, ALLOW_PLURAL |ALLOW_RING}
    … …  
    946948,{D(jjOPTION_PL), OPTION_CMD,      STRING_CMD/*or set by p*/,-1, ALLOW_NC |ALLOW_RING}
    947949,{D(jjCALL2ARG),  REDUCE_CMD,      IDEAL_CMD/*or set by p*/,  2, ALLOW_NC |ALLOW_RING}
    948 ,{D(jjCALL3ARG),  REDUCE_CMD,      IDEAL_CMD/*or set by p*/,  3, ALLOW_PLURAL |ALLOW_RING}
     950,{D(jjCALL3ARG),  REDUCE_CMD,      IDEAL_CMD/*or set by p*/,  3, ALLOW_NC |ALLOW_RING}
    949951,{D(jjREDUCE4),   REDUCE_CMD,      IDEAL_CMD/*or set by p*/,  4, ALLOW_PLURAL |ALLOW_RING}
    950952,{D(jjREDUCE5),   REDUCE_CMD,      IDEAL_CMD/*or set by p*/,  5, ALLOW_PLURAL |ALLOW_RING}
    … …  
    11741176  { "return",      0, RETURN ,            RETURN},
    11751177  { "RETURN",      0, END_GRAMMAR ,       RETURN},
    1176 #ifdef HAVE_SHIFTBBA
     1178#if defined(HAVE_SHIFTBBA) || defined(HAVE_PLURAL)
    11771179  { "rightstd",    0, RIGHTSTD_CMD ,      CMD_1},
    11781180#endif /* HAVE_PLURAL */
    … …  
    12051207  { "trace",       0, TRACE_CMD ,         CMD_1},
    12061208  { "transpose",   0, TRANSPOSE_CMD ,     CMD_1},
    1207 #ifdef HAVE_PLURAL
     1209#if defined(HAVE_PLURAL) || defined(HAVE_SHIFTBBA)
    12081210  { "twostd",      0, TWOSTD_CMD ,        CMD_1},
    12091211#endif /* HAVE_PLURAL */

  • Singular/walk.cc

    rc09d61 r16dfe8e  
    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

  • misc/intset.cc

    rc09d61 r16dfe8e  
    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

    rc09d61 r16dfe8e  
    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

    rc09d61 r16dfe8e  
    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

    rc09d61 r16dfe8e  
    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

    rc09d61 r16dfe8e  
    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.