Changeset 81fb5ae in git
- Timestamp:
- Oct 14, 2016, 2:24:06 PM (8 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 90cf60ed7f7213e1344c3ca3b2f843d7460f55c3
- Parents:
- 7ffb4bcdad71af1ab7691d1c8544911a9b902128
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/dyn_modules/Order/singular.cc
r7ffb4b r81fb5ae 12 12 #include <coeffs/bigintmat.h> 13 13 14 #ifdef SINGULAR_4_ 114 #ifdef SINGULAR_4_2 15 15 static int nforder_type_id=0; 16 16 n_coeffType nforder_type =n_unknown; -
Singular/iparith.cc
r7ffb4b r81fb5ae 3850 3850 return FALSE; 3851 3851 } 3852 #ifdef SINGULAR_4_ 13852 #ifdef SINGULAR_4_2 3853 3853 static BOOLEAN jjDET_N2(leftv res, leftv v) 3854 3854 { … … 5075 5075 case BIGINTMAT_CMD: 5076 5076 case NUMBER_CMD: 5077 #ifdef SINGULAR_4_ 15077 #ifdef SINGULAR_4_2 5078 5078 case CNUMBER_CMD: 5079 5079 #endif … … 6223 6223 return FALSE; 6224 6224 } 6225 #ifdef SINGULAR_4_ 16225 #ifdef SINGULAR_4_2 6226 6226 static BOOLEAN jjRANDOM_CF(leftv res, leftv u, leftv v, leftv w) 6227 6227 // <coeff>, par1, par2 -> number2 … … 7884 7884 static BOOLEAN jjRING_PL(leftv res, leftv a) 7885 7885 { 7886 Print("construct ring\n");7886 //Print("construct ring\n"); 7887 7887 if (a->Typ()!=CRING_CMD) 7888 7888 { … … 8824 8824 //if (tok==PRINT_EXPR) return "print_expr"; 8825 8825 if (tok==IDHDL) return "identifier"; 8826 #ifdef SINGULAR_4_18827 //if (tok==CRING_CMD) return "Ring";8828 #endif8829 8826 if (tok>MAX_TOK) return getBlackboxName(tok); 8830 8827 unsigned i; -
Singular/ipassign.cc
r7ffb4b r81fb5ae 406 406 return FALSE; 407 407 } 408 #ifdef SINGULAR_4_ 1408 #ifdef SINGULAR_4_2 409 409 static BOOLEAN jiA_NUMBER2(leftv res, leftv a, Subexpr e) 410 410 { -
Singular/ipconv.cc
r7ffb4b r81fb5ae 176 176 } 177 177 178 #ifdef SINGULAR_4_ 1178 #ifdef SINGULAR_4_2 179 179 static void * iiI2NN(void *data) 180 180 { … … 219 219 } 220 220 221 #ifdef SINGULAR_4_ 1221 #ifdef SINGULAR_4_2 222 222 static void * iiBI2NN(void *data) 223 223 { … … 269 269 #endif 270 270 271 #ifdef SINGULAR_4_ 1271 #ifdef SINGULAR_4_2 272 272 static void * iiNN2N(void *data) 273 273 { … … 285 285 #endif 286 286 287 #ifdef SINGULAR_4_ 1287 #ifdef SINGULAR_4_2 288 288 static void * iiNN2P(void *data) 289 289 { -
Singular/ipid.cc
r7ffb4b r81fb5ae 135 135 { 136 136 //the type with init routines: 137 #ifdef SINGULAR_4_ 1137 #ifdef SINGULAR_4_2 138 138 case CNUMBER_CMD: 139 139 return (void*)n2Init(0,NULL); -
Singular/ipshell.cc
r7ffb4b r81fb5ae 74 74 #ifdef SINGULAR_4_1 75 75 #include <Singular/number2.h> 76 #endif 77 #ifdef SINGULAR_4_2 76 78 #include <coeffs/bigintmat.h> 77 79 #endif … … 225 227 #endif 226 228 break; 227 #ifdef SINGULAR_4_ 1229 #ifdef SINGULAR_4_2 228 230 case CNUMBER_CMD: 229 231 { number2 n=(number2)IDDATA(h); -
Singular/misc_ip.cc
r7ffb4b r81fb5ae 1175 1175 } 1176 1176 1177 #ifdef SINGULAR_4_ 11177 #ifdef SINGULAR_4_2 1178 1178 static n_coeffType n_pAE=n_unknown; 1179 1179 static BOOLEAN ii_pAE_init(leftv res,leftv a) … … 1191 1191 } 1192 1192 } 1193 #endif 1194 #ifdef SINGULAR_4_1 1193 1195 #ifdef HAVE_FLINT 1194 1196 static n_coeffType n_FlintZn=n_unknown; … … 1265 1267 { 1266 1268 n_coeffType type; 1267 #ifdef SINGULAR_4_ 11269 #ifdef SINGULAR_4_2 1268 1270 type = nRegister(n_polyExt, n2pInitChar); 1269 1271 assume(type == n_polyExt); … … 1307 1309 feSetOptValue(FE_OPT_CPUS, cpus); 1308 1310 1309 #ifdef SINGULAR_4_11310 1311 // default coeffs 1311 1312 { … … 1319 1320 //h=enterid(omStrDup("CC"),0/*level*/, CRING_CMD,&(basePack->idroot),FALSE /*init*/,FALSE /*search*/); 1320 1321 //IDDATA(h)=(char*)nInitChar(n_long_C,NULL); 1321 n_coeffType t=nRegister(n_unknown,n_AEInitChar); 1322 n_coeffType t; 1323 #ifdef SINGULAR_4_2 1324 t=nRegister(n_unknown,n_AEInitChar); 1322 1325 if (t!=n_unknown) 1323 1326 { … … 1336 1339 iiAddCproc("kernel","pAE",FALSE,ii_pAE_init); 1337 1340 } 1341 #endif 1342 #ifdef SINGULAR_4_1 1338 1343 #ifdef HAVE_FLINT 1339 1344 t=nRegister(n_unknown,flintQ_InitChar); … … 1349 1354 } 1350 1355 #endif 1351 } 1352 #endif 1356 #endif 1357 } 1353 1358 // setting routines for PLURAL QRINGS: 1354 1359 // allowing to use libpolys without libSingular(kStd) -
Singular/number2.cc
r7ffb4b r81fb5ae 1 1 #include "kernel/mod2.h" // general settings/macros 2 3 2 #ifdef SINGULAR_4_1 4 3 #include <reporter/reporter.h> // for Print, WerrorS … … 75 74 } 76 75 76 BOOLEAN jjEQUAL_CR(leftv res, leftv a, leftv b) 77 { 78 coeffs a2=(coeffs)a->Data(); 79 coeffs b2=(coeffs)b->Data(); 80 res->data=(void*)(long)(a2==b2); 81 return FALSE; 82 } 83 84 #ifdef SINGULAR_4_2 77 85 // ----------------------------------------------------------- 78 86 // interpreter stuff for Number/number2 … … 378 386 } 379 387 380 BOOLEAN jjEQUAL_CR(leftv res, leftv a, leftv b)381 {382 coeffs a2=(coeffs)a->Data();383 coeffs b2=(coeffs)b->Data();384 res->data=(void*)(long)(a2==b2);385 return FALSE;386 }387 388 // ----------------------------------------------------------- 388 389 // operations with Number/number2 … … 511 512 512 513 #endif 514 #endif -
Singular/number2.h
r7ffb4b r81fb5ae 4 4 #include <kernel/mod2.h> 5 5 6 #ifdef SINGULAR_4_17 6 #include <omalloc/omalloc.h> 8 7 #include <coeffs/coeffs.h> 9 8 #include <kernel/structs.h> 9 #ifdef SINGULAR_4_2 10 10 struct snumber2; 11 11 struct spoly2; … … 27 27 static inline poly2 p2Init(long i, ring c) 28 28 { poly2 N=(poly2)omAlloc0(sizeof(spoly2)); if (c!=NULL) { N->cf=c; N->n=p_ISet(i,c);} return N;} 29 30 char *crString(coeffs c);31 32 void crPrint(coeffs cf);33 34 BOOLEAN jjCRING_Zp(leftv res, leftv a, leftv b);35 BOOLEAN jjCRING_Zm(leftv res, leftv a, leftv b);36 37 BOOLEAN jjEQUAL_CR(leftv res, leftv a, leftv b); // compare cring38 29 39 30 // type conversion: … … 65 56 BOOLEAN jjCMATRIX_3(leftv, leftv, leftv,leftv); 66 57 #endif 58 #ifdef SINGULAR_4_1 59 char *crString(coeffs c); 60 61 void crPrint(coeffs cf); 62 63 BOOLEAN jjCRING_Zp(leftv res, leftv a, leftv b); 64 BOOLEAN jjCRING_Zm(leftv res, leftv a, leftv b); 65 66 BOOLEAN jjEQUAL_CR(leftv res, leftv a, leftv b); // compare cring 67 67 #endif 68 69 #endif -
Singular/subexpr.cc
r7ffb4b r81fb5ae 110 110 crPrint((coeffs)d); 111 111 break; 112 #endif 113 #ifdef SINGULAR_4_2 112 114 case CNUMBER_CMD: 113 115 n2Print((number2)d); … … 424 426 return (void*)d; 425 427 } 428 #endif 429 #ifdef SINGULAR_4_2 426 430 case CNUMBER_CMD: 427 431 return (void*)n2Copy((number2)d); … … 513 517 break; 514 518 } 519 #endif 520 #ifdef SINGULAR_4_2 515 521 case CNUMBER_CMD: 516 522 { … … 818 824 819 825 #ifdef SINGULAR_4_1 826 case CRING_CMD: 827 return nCoeffString((coeffs)d); 828 #endif 829 #ifdef SINGULAR_4_2 820 830 case CNUMBER_CMD: 821 831 return n2String((number2)d,typed); 822 case CRING_CMD:823 return nCoeffString((coeffs)d);824 832 case CMATRIX_CMD: 825 833 { … … 1039 1047 switch (t) 1040 1048 { 1041 #ifdef SINGULAR_4_ 11049 #ifdef SINGULAR_4_2 1042 1050 case CMATRIX_CMD: 1043 1051 { … … 1133 1141 } 1134 1142 1135 #ifdef SINGULAR_4_ 11143 #ifdef SINGULAR_4_2 1136 1144 static snumber2 iiNumber2Data[4]; 1137 1145 static int iiCmatrix_index=0; … … 1247 1255 break; 1248 1256 } 1249 #ifdef SINGULAR_4_ 11257 #ifdef SINGULAR_4_2 1250 1258 case CMATRIX_CMD: 1251 1259 { -
Singular/table.h
r7ffb4b r81fb5ae 26 26 ,{D(jjUMINUS_BI), '-', BIGINT_CMD, BIGINT_CMD , ALLOW_PLURAL |ALLOW_RING} 27 27 ,{D(jjUMINUS_N), '-', NUMBER_CMD, NUMBER_CMD , ALLOW_PLURAL |ALLOW_RING} 28 #ifdef SINGULAR_4_ 128 #ifdef SINGULAR_4_2 29 29 ,{D(jjNUMBER2_OP1),'-', CNUMBER_CMD, CNUMBER_CMD , ALLOW_PLURAL |ALLOW_RING} 30 30 ,{D(jjPOLY2_OP1), '-', CPOLY_CMD, CPOLY_CMD , ALLOW_PLURAL |ALLOW_RING} … … 36 36 ,{D(jjUMINUS_IV), '-', INTMAT_CMD, INTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 37 37 ,{D(jjUMINUS_BIM), '-', BIGINTMAT_CMD, BIGINTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 38 #ifdef SINGULAR_4_ 138 #ifdef SINGULAR_4_2 39 39 ,{D(jjUMINUS_BIM), '-', CMATRIX_CMD, CMATRIX_CMD , ALLOW_PLURAL |ALLOW_RING} 40 40 #endif … … 56 56 ,{D(jjrCharStr), CHARSTR_CMD, STRING_CMD, RING_CMD , ALLOW_PLURAL |ALLOW_RING} 57 57 ,{D(jjOpenClose), CLOSE_CMD, NONE, LINK_CMD , ALLOW_PLURAL |ALLOW_RING} 58 #ifdef SINGULAR_4_ 158 #ifdef SINGULAR_4_2 59 59 ,{D(jjDUMMY), CMATRIX_CMD, CMATRIX_CMD, CMATRIX_CMD , ALLOW_PLURAL |ALLOW_RING} 60 60 #endif … … 65 65 ,{D(jjCOLS_IV), COLS_CMD, INT_CMD, INTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 66 66 ,{D(jjCOLS_BIM), COLS_CMD, INT_CMD, BIGINTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 67 #ifdef SINGULAR_4_ 167 #ifdef SINGULAR_4_2 68 68 ,{D(jjCOLS_BIM), COLS_CMD, INT_CMD, CMATRIX_CMD , ALLOW_PLURAL |ALLOW_RING} 69 69 #endif … … 84 84 ,{D(jjCOUNT_L), COUNT_CMD, INT_CMD, LIST_CMD , ALLOW_PLURAL |ALLOW_RING} 85 85 ,{D(jjCOUNT_RG), COUNT_CMD, INT_CMD, RING_CMD , ALLOW_PLURAL |ALLOW_RING} 86 #ifdef SINGULAR_4_ 186 #ifdef SINGULAR_4_2 87 87 ,{D(jjR2_CR), CRING_CMD, CRING_CMD, RING_CMD , ALLOW_PLURAL |ALLOW_RING} 88 88 #endif … … 97 97 ,{D(jjDENOMINATOR),DENOMINATOR_CMD, NUMBER_CMD, NUMBER_CMD , ALLOW_PLURAL |ALLOW_RING} 98 98 ,{D(jjNUMERATOR), NUMERATOR_CMD, NUMBER_CMD, NUMBER_CMD , ALLOW_PLURAL |ALLOW_RING} 99 #ifdef SINGULAR_4_ 199 #ifdef SINGULAR_4_2 100 100 ,{D(jjDET_N2), DET_CMD, CNUMBER_CMD, CMATRIX_CMD , ALLOW_PLURAL |ALLOW_RING} 101 101 #endif … … 185 185 ,{D(jjNAMES), NAMES_CMD, LIST_CMD, RING_CMD , ALLOW_PLURAL |ALLOW_RING} 186 186 ,{D(jjNOT), NOT, INT_CMD, INT_CMD , ALLOW_PLURAL |ALLOW_RING} 187 #ifdef SINGULAR_4_ 1187 #ifdef SINGULAR_4_2 188 188 ,{D(jjN2_N), NUMBER_CMD, NUMBER_CMD, CNUMBER_CMD , ALLOW_PLURAL |ALLOW_RING} 189 189 #endif … … 201 201 ,{D(jjPAR1), PAR_CMD, NUMBER_CMD, INT_CMD , ALLOW_PLURAL |ALLOW_RING} 202 202 ,{D(jjPARDEG), PARDEG_CMD, INT_CMD, NUMBER_CMD , ALLOW_PLURAL |ALLOW_RING} 203 #ifdef SINGULAR_4_ 1203 #ifdef SINGULAR_4_2 204 204 ,{D(jjN2_CR), PARENT_CMD, CRING_CMD, CNUMBER_CMD , ALLOW_PLURAL |ALLOW_RING} 205 205 ,{D(jjP2_R), PARENT_CMD, RING_CMD, CPOLY_CMD , ALLOW_PLURAL |ALLOW_RING} … … 228 228 ,{D(jjRINGLIST), RINGLIST_CMD, LIST_CMD, RING_CMD , ALLOW_PLURAL |ALLOW_RING} 229 229 #ifdef SINGULAR_4_1 230 ,{D(jjRING_LIST), RING_LIST_CMD, LIST_CMD, RING_CMD , ALLOW_PLURAL |ALLOW_RING}231 230 ,{D(jjRINGLIST_C), RING_LIST_CMD, LIST_CMD, CRING_CMD , ALLOW_PLURAL |ALLOW_RING} 232 231 #endif … … 239 238 ,{D(jjROWS_IV), ROWS_CMD, INT_CMD, INTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 240 239 ,{D(jjROWS_BIM), ROWS_CMD, INT_CMD, BIGINTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 241 #ifdef SINGULAR_4_ 1240 #ifdef SINGULAR_4_2 242 241 ,{D(jjROWS_BIM), ROWS_CMD, INT_CMD, CMATRIX_CMD , ALLOW_PLURAL |ALLOW_RING} 243 242 #endif … … 267 266 ,{D(jjTRANSP_IV), TRANSPOSE_CMD, INTMAT_CMD, INTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 268 267 ,{D(jjTRANSP_BIM), TRANSPOSE_CMD, BIGINTMAT_CMD, BIGINTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 269 #ifdef SINGULAR_4_ 1268 #ifdef SINGULAR_4_2 270 269 ,{D(jjTRANSP_BIM), TRANSPOSE_CMD, CMATRIX_CMD, CMATRIX_CMD , ALLOW_PLURAL |ALLOW_RING} 271 270 #endif … … 319 318 ,{D(jjPLUS_IV), '+', INTVEC_CMD, INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL | ALLOW_RING} 320 319 ,{D(jjPLUS_IV), '+', INTMAT_CMD, INTMAT_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 321 #ifdef SINGULAR_4_ 1320 #ifdef SINGULAR_4_2 322 321 ,{D(jjNUMBER2_OP2),'+', CNUMBER_CMD, CNUMBER_CMD,CNUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} 323 322 ,{D(jjNUMBER2_OP2),'+', CNUMBER_CMD, DEF_CMD, CNUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} … … 345 344 ,{D(jjMINUS_IV), '-', INTVEC_CMD, INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL | ALLOW_RING} 346 345 ,{D(jjMINUS_IV), '-', INTMAT_CMD, INTMAT_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 347 #ifdef SINGULAR_4_ 1346 #ifdef SINGULAR_4_2 348 347 ,{D(jjNUMBER2_OP2),'-', CNUMBER_CMD, CNUMBER_CMD,CNUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} 349 348 ,{D(jjNUMBER2_OP2),'-', CNUMBER_CMD, INT_CMD, CNUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} … … 394 393 ,{D(jjTIMES_IV), '*', INTMAT_CMD, INTMAT_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 395 394 ,{D(jjTIMES_IV), '*', INTMAT_CMD, INTVEC_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 396 #ifdef SINGULAR_4_ 1395 #ifdef SINGULAR_4_2 397 396 ,{D(jjNUMBER2_OP2),'*', CNUMBER_CMD, CNUMBER_CMD,CNUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} 398 397 ,{D(jjNUMBER2_OP2),'*', CNUMBER_CMD, INT_CMD, CNUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} … … 416 415 ,{D(jjCRING_Zp), '/', CRING_CMD, CRING_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} 417 416 ,{D(jjCRING_Zm), '/', CRING_CMD, CRING_CMD, BIGINT_CMD, ALLOW_PLURAL | ALLOW_RING} 417 #endif 418 #ifdef SINGULAR_4_2 418 419 ,{D(jjNUMBER2_OP2),'/', CNUMBER_CMD, CNUMBER_CMD,CNUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} 419 420 ,{D(jjNUMBER2_OP2),'/', CNUMBER_CMD, INT_CMD, CNUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} … … 431 432 ,{D(jjOP_IV_I), '%', INTMAT_CMD, INTMAT_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} 432 433 ,{D(jjMOD_N), '%', NUMBER_CMD, NUMBER_CMD, NUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} 433 #ifdef SINGULAR_4_ 1434 #ifdef SINGULAR_4_2 434 435 ,{D(jjNUMBER2_OP2),'%', CNUMBER_CMD, CNUMBER_CMD,CNUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} 435 436 ,{D(jjNUMBER2_OP2),'%', CNUMBER_CMD, INT_CMD, CNUMBER_CMD, ALLOW_PLURAL | ALLOW_RING} … … 443 444 ,{D(jjPOWER_P), '^', POLY_CMD, POLY_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} 444 445 ,{D(jjPOWER_ID), '^', IDEAL_CMD, IDEAL_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} 445 #ifdef SINGULAR_4_ 1446 #ifdef SINGULAR_4_2 446 447 ,{D(jjNUMBER2_POW),'^', CNUMBER_CMD, CNUMBER_CMD,INT_CMD, ALLOW_PLURAL | ALLOW_RING} 447 448 ,{D(jjPOLY2_POW), '^', CPOLY_CMD, CPOLY_CMD, INT_CMD, ALLOW_PLURAL | ALLOW_RING} … … 497 498 ,{D(jjCOMPARE_IV),EQUAL_EQUAL, INT_CMD, INTMAT_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 498 499 ,{D(jjCOMPARE_BIM),EQUAL_EQUAL, INT_CMD, BIGINTMAT_CMD, BIGINTMAT_CMD, ALLOW_PLURAL | ALLOW_RING} 500 #ifdef SINGULAR_4_2 501 ,{D(jjCOMPARE_BIM),EQUAL_EQUAL, INT_CMD, CMATRIX_CMD, CMATRIX_CMD, ALLOW_PLURAL | ALLOW_RING} 502 #endif 499 503 #ifdef SINGULAR_4_1 500 ,{D(jjCOMPARE_BIM),EQUAL_EQUAL, INT_CMD, CMATRIX_CMD, CMATRIX_CMD, ALLOW_PLURAL | ALLOW_RING}501 504 ,{D(jjEQUAL_CR), EQUAL_EQUAL, INT_CMD, CRING_CMD, CRING_CMD, ALLOW_PLURAL | ALLOW_RING} 502 505 #endif … … 558 561 ,{D(jjCHINREM_ID),CHINREM_CMD, ANY_TYPE/*set by p*/,LIST_CMD,INTVEC_CMD, ALLOW_PLURAL |NO_RING} 559 562 ,{D(jjCHINREM_ID),CHINREM_CMD, ANY_TYPE/*set by p*/,LIST_CMD,LIST_CMD, ALLOW_PLURAL |NO_RING} 560 #ifdef SINGULAR_4_ 1563 #ifdef SINGULAR_4_2 561 564 ,{D(jjNUMBER2CR), CNUMBER_CMD, CNUMBER_CMD, INT_CMD, CRING_CMD, ALLOW_PLURAL |ALLOW_RING} 562 565 ,{D(jjNUMBER2CR), CNUMBER_CMD, CNUMBER_CMD, BIGINT_CMD, CRING_CMD, ALLOW_PLURAL |ALLOW_RING} … … 653 656 ,{D(jjRES), MRES_CMD, RESOLUTION_CMD, MODUL_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING} 654 657 //,{D(nuMPResMat), MPRES_CMD, MODUL_CMD, IDEAL_CMD, INT_CMD, NO_PLURAL |ALLOW_RING} 655 #ifdef SINGULAR_4_ 1658 #ifdef SINGULAR_4_2 656 659 ,{D(jjNUMBER2CR), CNUMBER_CMD, CNUMBER_CMD, INT_CMD, CRING_CMD, ALLOW_PLURAL |ALLOW_RING} 657 660 ,{D(jjNUMBER2CR), CNUMBER_CMD, CNUMBER_CMD, BIGINT_CMD, CRING_CMD, ALLOW_PLURAL |ALLOW_RING} … … 731 734 ,{D(jjBRACK_Ma_IV_I), '[', POLY_CMD, MATRIX_CMD, INTVEC_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING} 732 735 ,{D(jjBRACK_Ma_IV_IV), '[', POLY_CMD, MATRIX_CMD, INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING} 733 #ifdef SINGULAR_4_ 1736 #ifdef SINGULAR_4_2 734 737 ,{D(jjBRACK_Bim), '[', CNUMBER_CMD, CMATRIX_CMD, INT_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING} 735 738 #endif … … 743 746 ,{D(jjCOEFFS3_KB), COEFFS_CMD, MATRIX_CMD, IDEAL_CMD, IDEAL_CMD, POLY_CMD, ALLOW_PLURAL |ALLOW_RING} 744 747 ,{D(jjCOEFFS3_KB), COEFFS_CMD, MATRIX_CMD, MODUL_CMD, MODUL_CMD, POLY_CMD, ALLOW_PLURAL |ALLOW_RING} 745 #ifdef SINGULAR_4_ 1748 #ifdef SINGULAR_4_2 746 749 ,{D(jjCMATRIX_3), CMATRIX_CMD, CMATRIX_CMD,INT_CMD, INT_CMD, CRING_CMD, ALLOW_PLURAL |ALLOW_RING} 747 750 #endif … … 782 785 ,{D(jjPREIMAGE), PREIMAGE_CMD, IDEAL_CMD, RING_CMD, ANY_TYPE, ANY_TYPE, ALLOW_PLURAL |ALLOW_RING} 783 786 ,{D(jjRANDOM_Im), RANDOM_CMD, INTMAT_CMD, INT_CMD, INT_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING} 784 #ifdef SINGULAR_4_ 1787 #ifdef SINGULAR_4_2 785 788 ,{D(jjRANDOM_CF), RANDOM_CMD, CNUMBER_CMD, CNUMBER_CMD, CNUMBER_CMD, CRING_CMD, ALLOW_PLURAL |ALLOW_RING} 786 789 #endif … … 834 837 ,{D(jjBREAK1), BREAKPOINT_CMD, NONE, -2 , ALLOW_PLURAL |ALLOW_RING} 835 838 ,{D(iiBranchTo), BRANCHTO_CMD, NONE, -2 , ALLOW_PLURAL |ALLOW_RING} 836 #ifdef SINGULAR_4_ 1839 #ifdef SINGULAR_4_2 837 840 ,{D(jjCALL3ARG), CMATRIX_CMD, CMATRIX_CMD, 3 , ALLOW_PLURAL |ALLOW_RING} 838 841 ,{D(jjCALL2ARG), CNUMBER_CMD, CNUMBER_CMD, 2 , ALLOW_PLURAL |ALLOW_RING} … … 923 926 { "cleardenom", 0, CONTENT_CMD , CMD_1}, 924 927 { "close", 0, CLOSE_CMD , CMD_1}, 925 #ifdef SINGULAR_4_ 1928 #ifdef SINGULAR_4_2 926 929 { "Matrix", 0, CMATRIX_CMD , ROOT_DECL_LIST}, 927 930 { "Number", 0, CNUMBER_CMD , ROOT_DECL_LIST}, … … 934 937 { "contract", 0, CONTRACT_CMD , CMD_2}, 935 938 { "convhull", 0, NEWTONPOLY_CMD, CMD_1}, 939 #ifdef SINGULAR_4_1 940 { "cring", 0, CRING_CMD, ROOT_DECL}, 941 #endif 936 942 { "dbprint", 0, DBPRINT_CMD , CMD_M}, 937 943 { "def", 0, DEF_CMD , ROOT_DECL}, … … 1019 1025 { "map", 0, MAP_CMD , RING_DECL}, 1020 1026 { "matrix", 0, MATRIX_CMD , MATRIX_CMD}, 1021 #ifdef SINGULAR_4_11022 { "Matrix", 0, CMATRIX_CMD , ROOT_DECL_LIST},1023 #endif1024 1027 { "maxideal", 0, MAXID_CMD , CMD_1}, 1025 1028 { "memory", 0, MEMORY_CMD , CMD_1}, … … 1057 1060 { "nrows", 0, ROWS_CMD , CMD_1}, 1058 1061 { "number", 0, NUMBER_CMD , RING_DECL}, 1059 #ifdef SINGULAR_4_11060 { "Number", 0, CNUMBER_CMD , ROOT_DECL_LIST},1061 #endif1062 1062 { "numerator", 0, NUMERATOR_CMD , CMD_1}, 1063 1063 { "nvars", 0, NVARS_CMD , CMD_1}, … … 1100 1100 { "RETURN", 0, END_GRAMMAR , RETURN}, 1101 1101 { "ring", 0, RING_CMD , RING_CMD}, 1102 #ifdef SINGULAR_4_11103 { "Ring", 0, CRING_CMD, ROOT_DECL},1104 #endif1105 1102 { "ringlist", 0, RINGLIST_CMD , CMD_1}, 1106 1103 #ifdef SINGULAR_4_1 … … 1252 1249 // list -> resolution 1253 1250 { LIST_CMD, RESOLUTION_CMD, NULL_VAL , D(iiL2R) }, 1254 #ifdef SINGULAR_4_ 11251 #ifdef SINGULAR_4_2 1255 1252 { INT_CMD, CNUMBER_CMD, D(iiI2NN) , NULL_VAL }, 1256 1253 { BIGINT_CMD, CNUMBER_CMD, D(iiBI2NN) , NULL_VAL }, … … 1294 1291 ,{D(jiA_INTVEC), INTMAT_CMD, INTMAT_CMD } 1295 1292 ,{D(jiA_BIGINTMAT),BIGINTMAT_CMD, BIGINTMAT_CMD} 1296 #ifdef SINGULAR_4_ 11293 #ifdef SINGULAR_4_2 1297 1294 ,{D(jiA_BIGINTMAT),CMATRIX_CMD, CMATRIX_CMD} 1298 1295 #endif 1299 1296 ,{D(jiA_NUMBER), NUMBER_CMD, NUMBER_CMD } 1300 #ifdef SINGULAR_4_ 11297 #ifdef SINGULAR_4_2 1301 1298 ,{D(jiA_NUMBER2), CNUMBER_CMD, CNUMBER_CMD } 1302 1299 //,{D(jiA_NUMBER2_I),CNUMBER_CMD, INT_CMD } … … 1312 1309 ,{D(jiA_PACKAGE), PACKAGE_CMD, PACKAGE_CMD } 1313 1310 ,{D(jiA_DEF), DEF_CMD, DEF_CMD } 1314 #ifdef SINGULAR_4_ 11311 #ifdef SINGULAR_4_2 1315 1312 ,{D(jiA_NUMBER2_I),CNUMBER_CMD, INT_CMD } 1316 1313 ,{D(jiA_NUMBER2_N),CNUMBER_CMD, NUMBER_CMD } -
libpolys/misc/auxiliary.h
r7ffb4b r81fb5ae 36 36 #define SI_BIGINT_VARIANT 1 37 37 38 /* preparation for versio 4.1.0: */38 /* preparation for versio 4.1.0: cring (4_1), cpoly, cnumber, cmatrix (4_2) */ 39 39 #undef SINGULAR_4_1 40 #undef SINGULAR_4_2 40 41 41 42 #ifndef SIZEOF_LONG
Note: See TracChangeset
for help on using the changeset viewer.