Changeset e2202ee in git
- Timestamp:
- Oct 30, 2013, 6:06:10 PM (10 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 6bf3eb6562daca62390dcfae2e79a0bbe6b0bb5f
- Parents:
- 17bdb2dc9f70b60fd8d6e0b982bce9729a6f2792
- git-author:
- Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-10-30 18:06:10+01:00
- git-committer:
- Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-10-31 10:34:28+01:00
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/extra.cc
r17bdb2 re2202ee 3496 3496 lV=(int)((long)(h->Data())); 3497 3497 res->rtyp = INT_CMD; 3498 res->data = (void*) pLastVblock(p, lV);3498 res->data = (void*)(long)pLastVblock(p, lV); 3499 3499 } 3500 3500 else return TRUE; … … 3737 3737 int irred= probIrredTest (F, error); 3738 3738 res->rtyp= INT_CMD; 3739 res->data= (void*) irred;3739 res->data= (void*)(long)irred; 3740 3740 return FALSE; 3741 3741 } … … 3808 3808 if ((h->next->next!=NULL)&& (h->next->next->Typ()==INT_CMD)) 3809 3809 v=(int)(long)h->next->next->Data(); 3810 res->data=(char *) simpleipc_cmd((char *)h->Data(),(int)(long)h->next->Data(),v);3810 res->data=(char *)(long)simpleipc_cmd((char *)h->Data(),(int)(long)h->next->Data(),v); 3811 3811 res->rtyp=INT_CMD; 3812 3812 return FALSE; -
Singular/iparith.cc
r17bdb2 re2202ee 5258 5258 } 5259 5259 5260 BOOLEAN jjLOAD(c har *s, BOOLEAN autoexport)5260 BOOLEAN jjLOAD(const char *s, BOOLEAN autoexport) 5261 5261 { 5262 5262 char libnamebuf[256]; … … 5264 5264 5265 5265 #ifdef HAVE_DYNAMIC_LOADING 5266 extern BOOLEAN load_modules(c har *newlib, char *fullpath, BOOLEAN autoexport);5266 extern BOOLEAN load_modules(const char *newlib, char *fullpath, BOOLEAN autoexport); 5267 5267 #endif /* HAVE_DYNAMIC_LOADING */ 5268 5268 switch(LT) … … 5303 5303 } 5304 5304 case LT_BUILTIN: 5305 SModulFunc_t iiGetBuiltinModInit(c har*);5305 SModulFunc_t iiGetBuiltinModInit(const char*); 5306 5306 return load_builtin(s,autoexport, iiGetBuiltinModInit(s)); 5307 5307 case LT_MACH_O: -
Singular/ipassign.cc
r17bdb2 re2202ee 1066 1066 while ((i<iv->length())&&(l!=NULL)) 1067 1067 { 1068 t.data=(char *)( *iv)[i];1068 t.data=(char *)(long)(*iv)[i]; 1069 1069 h=l->next; 1070 1070 l->next=NULL; -
Singular/ipid.h
r17bdb2 re2202ee 83 83 /* module support */ 84 84 typedef int (*SModulFunc_t)(SModulFunctions*); 85 BOOLEAN load_builtin(c har *newlib, BOOLEAN autoexport, SModulFunc_t init);85 BOOLEAN load_builtin(const char *newlib, BOOLEAN autoexport, SModulFunc_t init); 86 86 void module_help_main(const char *newlib,const char *help); 87 87 void module_help_proc(const char *newlib,const char *p, const char *help); -
Singular/iplib.cc
r17bdb2 re2202ee 49 49 50 50 #ifdef HAVE_DYNAMIC_LOADING 51 BOOLEAN load_modules(c har *newlib, char *fullname, BOOLEAN autoexport);51 BOOLEAN load_modules(const char *newlib, char *fullname, BOOLEAN autoexport); 52 52 #endif 53 53 … … 741 741 742 742 SModulFunc_t 743 iiGetBuiltinModInit(c har* libname)743 iiGetBuiltinModInit(const char* libname) 744 744 { 745 745 SI_FOREACH_BUILTIN(SI_GET_BUILTIN_MOD_INIT) … … 919 919 } 920 920 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ 921 BOOLEAN iiLoadLIB(FILE *fp, const char *libnamebuf, c har*newlib,921 BOOLEAN iiLoadLIB(FILE *fp, const char *libnamebuf, const char*newlib, 922 922 idhdl pl, BOOLEAN autoexport, BOOLEAN tellerror) 923 923 { … … 1103 1103 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ 1104 1104 #ifdef HAVE_DYNAMIC_LOADING 1105 BOOLEAN load_modules(c har *newlib, char *fullname, BOOLEAN autoexport)1105 BOOLEAN load_modules(const char *newlib, char *fullname, BOOLEAN autoexport) 1106 1106 { 1107 1107 #ifdef HAVE_STATIC … … 1186 1186 #endif /* HAVE_DYNAMIC_LOADING */ 1187 1187 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ 1188 BOOLEAN load_builtin(c har *newlib, BOOLEAN autoexport, SModulFunc_t init)1188 BOOLEAN load_builtin(const char *newlib, BOOLEAN autoexport, SModulFunc_t init) 1189 1189 { 1190 1190 int iiAddCproc(const char *libname, const char *procname, BOOLEAN pstatic, … … 1386 1386 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ 1387 1387 #ifdef HAVE_LIBPARSER 1388 void libstack::push(c har */*p*/, char *libn)1388 void libstack::push(const char */*p*/, char *libn) 1389 1389 { 1390 1390 libstackv lp; … … 1407 1407 } 1408 1408 1409 libstackv libstack::pop(c har */*p*/)1409 libstackv libstack::pop(const char */*p*/) 1410 1410 { 1411 1411 libstackv ls = this; -
Singular/ipshell.h
r17bdb2 re2202ee 69 69 */ 70 70 /// load lib/module given in v 71 BOOLEAN jjLOAD(c har *s, BOOLEAN autoexport = FALSE);71 BOOLEAN jjLOAD(const char *s, BOOLEAN autoexport = FALSE); 72 72 BOOLEAN iiLocateLib(const char* lib, char* where); 73 73 leftv iiMap(map theMap, const char * what); … … 91 91 poly iiHighCorner(ideal i, int ak); 92 92 char * iiConvName(const char *libname); 93 BOOLEAN iiLoadLIB(FILE *fp, const char *libnamebuf, c har *newlib,93 BOOLEAN iiLoadLIB(FILE *fp, const char *libnamebuf, const char *newlib, 94 94 idhdl pl, BOOLEAN autoexport, BOOLEAN tellerror); 95 95 -
Singular/libparse.cc
r17bdb2 re2202ee 1205 1205 1206 1206 #undef YY_DECL 1207 #define YY_DECL int yylex(c har *newlib, const char *libfile, \1207 #define YY_DECL int yylex(const char *newlib, const char *libfile, \ 1208 1208 lib_style_types *lib_style, \ 1209 1209 idhdl pl, BOOLEAN autoexport, lp_modes mode) -
Singular/libparse.h
r17bdb2 re2202ee 78 78 const char *procname, int line, long pos, BOOLEAN pstatic=FALSE); 79 79 80 int yylplex(c har *libname, const char *libfile, lib_style_types *lib_style,80 int yylplex(const char *libname, const char *libfile, lib_style_types *lib_style, 81 81 idhdl pl, BOOLEAN autoexport=FALSE, lp_modes=LOAD_LIB); 82 82 -
Singular/libparse.ll
r17bdb2 re2202ee 155 155 156 156 #undef YY_DECL 157 #define YY_DECL int yylex(c har *newlib, const char *libfile, \157 #define YY_DECL int yylex(const char *newlib, const char *libfile, \ 158 158 lib_style_types *lib_style, \ 159 159 idhdl pl, BOOLEAN autoexport, lp_modes mode) -
Singular/linearAlgebra_ip.cc
r17bdb2 re2202ee 90 90 eigenvalues->m[i].data = (void*)nCopy(distinctEVs[i]); 91 91 multiplicities->m[i].rtyp = INT_CMD; 92 multiplicities->m[i].data = (void*) mults[i];92 multiplicities->m[i].data = (void*)(long)mults[i]; 93 93 nDelete(&distinctEVs[i]); 94 94 } -
Singular/misc_ip.cc
r17bdb2 re2202ee 360 360 { 361 361 multiplicitiesL->m[i].rtyp = INT_CMD; 362 multiplicitiesL->m[i].data = (void*) multiplicities[i];362 multiplicitiesL->m[i].data = (void*)(long)multiplicities[i]; 363 363 } 364 364 omFree(multiplicities); -
Singular/mod_lib.cc
r17bdb2 re2202ee 25 25 #define BYTES_TO_CHECK 7 26 26 27 lib_types type_of_LIB(c har *newlib, char *libnamebuf)27 lib_types type_of_LIB(const char *newlib, char *libnamebuf) 28 28 { 29 29 const unsigned char mach_o[]={0xfe,0xed,0xfa,0xce,0}; -
Singular/mod_lib.h
r17bdb2 re2202ee 7 7 #include <polys/mod_raw.h> /* for lib_types */ 8 8 9 lib_types type_of_LIB(c har *newlib, char *fullname);9 lib_types type_of_LIB(const char *newlib, char *fullname); 10 10 11 11 #ifdef EMBED_PYTHON -
Singular/subexpr.h
r17bdb2 re2202ee 120 120 BOOLEAN to_be_done; 121 121 int cnt; 122 void push(c har *p, char * libname);123 libstackv pop(c har *p);122 void push(const char *p, char * libname); 123 libstackv pop(const char *p); 124 124 inline char *get() { return(libname); } 125 125 }; -
Singular/table.h
r17bdb2 re2202ee 1122 1122 // input type output type convert procedure 1123 1123 // int -> bigint 1124 { INT_CMD, BIGINT_CMD, D(iiI2BI) , NULL },1124 { INT_CMD, BIGINT_CMD, D(iiI2BI) , NULL_VAL }, 1125 1125 // int -> number 1126 { INT_CMD, NUMBER_CMD, D(iiI2N) , NULL },1127 { BIGINT_CMD, NUMBER_CMD, D(iiBI2N) , NULL },1126 { INT_CMD, NUMBER_CMD, D(iiI2N) , NULL_VAL }, 1127 { BIGINT_CMD, NUMBER_CMD, D(iiBI2N) , NULL_VAL }, 1128 1128 // int -> poly 1129 { INT_CMD, POLY_CMD, D(iiI2P) , NULL },1130 { BIGINT_CMD, POLY_CMD, D(iiBI2P) , NULL },1129 { INT_CMD, POLY_CMD, D(iiI2P) , NULL_VAL }, 1130 { BIGINT_CMD, POLY_CMD, D(iiBI2P) , NULL_VAL }, 1131 1131 // int -> vector 1132 { INT_CMD, VECTOR_CMD, D(iiI2V) , NULL },1133 { BIGINT_CMD, VECTOR_CMD, D(iiBI2V) , NULL },1132 { INT_CMD, VECTOR_CMD, D(iiI2V) , NULL_VAL }, 1133 { BIGINT_CMD, VECTOR_CMD, D(iiBI2V) , NULL_VAL }, 1134 1134 // int -> ideal 1135 { INT_CMD, IDEAL_CMD, D(iiI2Id) , NULL },1136 { BIGINT_CMD, IDEAL_CMD, D(iiBI2Id) , NULL },1135 { INT_CMD, IDEAL_CMD, D(iiI2Id) , NULL_VAL }, 1136 { BIGINT_CMD, IDEAL_CMD, D(iiBI2Id) , NULL_VAL }, 1137 1137 // int -> matrix 1138 { INT_CMD, MATRIX_CMD, D(iiI2Id) , NULL },1139 { BIGINT_CMD, MATRIX_CMD, D(iiBI2Id) , NULL },1138 { INT_CMD, MATRIX_CMD, D(iiI2Id) , NULL_VAL }, 1139 { BIGINT_CMD, MATRIX_CMD, D(iiBI2Id) , NULL_VAL }, 1140 1140 // int -> intvec 1141 { INT_CMD, INTVEC_CMD, D(iiI2Iv) , NULL },1141 { INT_CMD, INTVEC_CMD, D(iiI2Iv) , NULL_VAL }, 1142 1142 // intvec -> intmat 1143 { INTVEC_CMD, INTMAT_CMD, D(iiDummy), NULL },1143 { INTVEC_CMD, INTMAT_CMD, D(iiDummy), NULL_VAL }, 1144 1144 // intvec -> matrix 1145 { INTVEC_CMD, MATRIX_CMD, D(iiIm2Ma) , NULL },1145 { INTVEC_CMD, MATRIX_CMD, D(iiIm2Ma) , NULL_VAL }, 1146 1146 // intmat -> bigintmat 1147 { INTMAT_CMD, BIGINTMAT_CMD, D(iiIm2Bim) , NULL },1147 { INTMAT_CMD, BIGINTMAT_CMD, D(iiIm2Bim) , NULL_VAL }, 1148 1148 // bigintmat -> intmat 1149 { BIGINTMAT_CMD, INTMAT_CMD, D(iiBim2Im) , NULL },1149 { BIGINTMAT_CMD, INTMAT_CMD, D(iiBim2Im) , NULL_VAL }, 1150 1150 // intmat -> matrix 1151 { INTMAT_CMD, MATRIX_CMD, D(iiIm2Ma) , NULL },1151 { INTMAT_CMD, MATRIX_CMD, D(iiIm2Ma) , NULL_VAL }, 1152 1152 // number -> poly 1153 { NUMBER_CMD, POLY_CMD, D(iiN2P) , NULL },1153 { NUMBER_CMD, POLY_CMD, D(iiN2P) , NULL_VAL }, 1154 1154 // number -> matrix 1155 { NUMBER_CMD, MATRIX_CMD, D(iiN2Ma) , NULL },1155 { NUMBER_CMD, MATRIX_CMD, D(iiN2Ma) , NULL_VAL }, 1156 1156 // number -> ideal 1157 1157 // number -> vector … … 1159 1159 // poly -> number 1160 1160 // poly -> ideal 1161 { POLY_CMD, IDEAL_CMD, D(iiP2Id) , NULL },1161 { POLY_CMD, IDEAL_CMD, D(iiP2Id) , NULL_VAL }, 1162 1162 // poly -> vector 1163 { POLY_CMD, VECTOR_CMD, D(iiP2V) , NULL },1163 { POLY_CMD, VECTOR_CMD, D(iiP2V) , NULL_VAL }, 1164 1164 // poly -> matrix 1165 { POLY_CMD, MATRIX_CMD, D(iiP2Id) , NULL },1165 { POLY_CMD, MATRIX_CMD, D(iiP2Id) , NULL_VAL }, 1166 1166 // vector -> module 1167 { VECTOR_CMD, MODUL_CMD, D(iiP2Id) , NULL },1167 { VECTOR_CMD, MODUL_CMD, D(iiP2Id) , NULL_VAL }, 1168 1168 // vector -> matrix 1169 { VECTOR_CMD, MATRIX_CMD, D(iiV2Ma) , NULL },1169 { VECTOR_CMD, MATRIX_CMD, D(iiV2Ma) , NULL_VAL }, 1170 1170 // ideal -> module 1171 { IDEAL_CMD, MODUL_CMD, D(iiMa2Mo) , NULL },1171 { IDEAL_CMD, MODUL_CMD, D(iiMa2Mo) , NULL_VAL }, 1172 1172 // ideal -> matrix 1173 { IDEAL_CMD, MATRIX_CMD, D(iiDummy) , NULL },1173 { IDEAL_CMD, MATRIX_CMD, D(iiDummy) , NULL_VAL }, 1174 1174 // module -> matrix 1175 { MODUL_CMD, MATRIX_CMD, D(iiMo2Ma) , NULL },1175 { MODUL_CMD, MATRIX_CMD, D(iiMo2Ma) , NULL_VAL }, 1176 1176 // matrix -> ideal 1177 1177 // matrix -> module 1178 { MATRIX_CMD, MODUL_CMD, D(iiMa2Mo) , NULL },1178 { MATRIX_CMD, MODUL_CMD, D(iiMa2Mo) , NULL_VAL }, 1179 1179 // intvec 1180 1180 // link 1181 { STRING_CMD, LINK_CMD, D(iiS2Link) , NULL },1181 { STRING_CMD, LINK_CMD, D(iiS2Link) , NULL_VAL }, 1182 1182 // resolution -> list 1183 { RESOLUTION_CMD, LIST_CMD, NULL /*iiR2L*/ , D(iiR2L_l) },1183 { RESOLUTION_CMD, LIST_CMD, NULL_VAL /*iiR2L*/ , D(iiR2L_l) }, 1184 1184 // list -> resolution 1185 { LIST_CMD, RESOLUTION_CMD, D(iiL2R) , NULL 1185 { LIST_CMD, RESOLUTION_CMD, D(iiL2R) , NULL_VAL}, 1186 1186 // end of list 1187 { 0, 0, NULL , NULL }1187 { 0, 0, NULL_VAL , NULL_VAL } 1188 1188 }; 1189 1189 #endif -
libpolys/coeffs/modulop.cc
r17bdb2 re2202ee 364 364 } 365 365 if (n == 1) 366 *a = (number) z;366 *a = (number)(long)z; 367 367 else 368 368 { … … 372 372 #ifdef NV_OPS 373 373 if (r->ch>NV_MAX_PRIME) 374 *a = nvDiv((number) z,(number)n,r);374 *a = nvDiv((number)(long)z,(number)(long)n,r); 375 375 else 376 376 #endif 377 *a = npDiv((number) z,(number)n,r);377 *a = npDiv((number)(long)z,(number)(long)n,r); 378 378 } 379 379 } … … 617 617 dest = res->z; 618 618 619 intin=0;619 long in=0; 620 620 if (e<0) 621 621 { -
libpolys/coeffs/rmodulo2m.cc
r17bdb2 re2202ee 710 710 } 711 711 if (n == 1) 712 *a = (number) z;713 else 714 *a = nr2mDiv((number) z,(number)n,r);712 *a = (number)(long)z; 713 else 714 *a = nr2mDiv((number)(long)z,(number)(long)n,r); 715 715 return s; 716 716 }
Note: See TracChangeset
for help on using the changeset viewer.