Changeset d775e5 in git
- Timestamp:
- Jun 13, 2013, 5:23:32 PM (11 years ago)
- Branches:
- (u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')
- Children:
- e681f379bf042bd7052640aadef90dd176998b63
- Parents:
- e7cb20744d26d5cc5f5669542c1ef76088ea5c9f05cefcd1a3fc75f18390961692cf2f129bd68c11
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.am
re7cb20 rd775e5 11 11 TESTDIRS=$(PACKAGES) 12 12 13 14 13 emacsdir=$(datadir)/singular/emacs 15 14 … … 47 46 redhat/singular.spec 48 47 49 DESKTOP = desktop/Singular.png 48 iconsdir = $(datadir)/icons 49 icons_DATA = desktop/Singular.png 50 50 51 EXTRA_DIST = autogen.sh $(EMACS) $(DEBIAN) $(REDHAT) $(DESKTOP) 51 desktopdir = $(datadir)/applications 52 desktop_DATA = desktop/Singular.desktop desktop/Singular-manual.desktop 53 54 substvars = sed \ 55 -e 's|@docdir[@]|$(docdir)|g' \ 56 -e 's|@datadir[@]|$(datadir)|g' \ 57 -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' 58 desktop/Singular.desktop: desktop/Singular.desktop.in 59 $(AM_V_GEN) $(substvars) $< > $@ 60 desktop/Singular-manual.desktop: desktop/Singular-manual.desktop.in 61 $(AM_V_GEN) $(substvars) $< > $@ 62 desktop_in = desktop/Singular.desktop.in desktop/Singular-manual.desktop.in 63 64 EXTRA_DIST = autogen.sh $(EMACS) \ 65 $(DEBIAN) $(REDHAT) \ 66 $(icons_DATA) $(desktop_in) 52 67 53 68 bin_SCRIPTS = libsingular-config -
Singular/iparith.cc
r05cefc rd775e5 128 128 #define NO_ZERODIVISOR 8 129 129 #define ALLOW_ZERODIVISOR 0 130 131 // bit 4 for warning, if used at toplevel 132 #define WARN_RING 16 130 133 131 134 static BOOLEAN check_valid(const int p, const int op); … … 8882 8885 } 8883 8886 /* else ALLOW_ZERODIVISOR */ 8887 else if(((p & WARN_RING)==WARN_RING)&&(myynest==0)) 8888 { 8889 WarnS("considering the image in Q[...]"); 8890 } 8884 8891 } 8885 8892 #endif -
Singular/iplib.cc
r05cefc rd775e5 730 730 } 731 731 732 int huhu_mod_init(SModulFunctions*){ return 0; }732 void staticdemo_mod_init(SModulFunctions*){ PrintS("init of staticdemo\n"); } 733 733 734 734 #define SI_GET_BUILTIN_MOD_INIT(name) \ -
Singular/table.h
r05cefc rd775e5 47 47 ,{D(jjCHAR), CHARACTERISTIC_CMD, INT_CMD, RING_CMD , ALLOW_PLURAL |ALLOW_RING} 48 48 ,{D(jjCHAR), CHARACTERISTIC_CMD, INT_CMD, QRING_CMD , ALLOW_PLURAL |ALLOW_RING} 49 #ifdef HAVE_FACTORY 49 50 ,{D(jjCHARSERIES), CHAR_SERIES_CMD, MATRIX_CMD, IDEAL_CMD , NO_PLURAL |NO_RING} 51 #else 52 ,{ jjWRONG , CHAR_SERIES_CMD, MATRIX_CMD, IDEAL_CMD , NO_PLURAL |NO_RING} 53 #endif 50 54 ,{D(jjrCharStr), CHARSTR_CMD, XS(STRING_CMD), RING_CMD , ALLOW_PLURAL |ALLOW_RING} 51 55 ,{D(jjrCharStr), CHARSTR_CMD, XS(STRING_CMD), QRING_CMD , ALLOW_PLURAL |ALLOW_RING} … … 147 151 ,{D(jjJACOB_M), JACOB_CMD, MODUL_CMD, MODUL_CMD , ALLOW_PLURAL |ALLOW_RING} 148 152 ,{D(jjJanetBasis), JANET_CMD, IDEAL_CMD, IDEAL_CMD , ALLOW_PLURAL |NO_RING} 149 ,{D(jjKBASE), KBASE_CMD, IDEAL_CMD, IDEAL_CMD , ALLOW_PLURAL | NO_RING}150 ,{D(jjKBASE), KBASE_CMD, MODUL_CMD, MODUL_CMD , ALLOW_PLURAL | NO_RING}153 ,{D(jjKBASE), KBASE_CMD, IDEAL_CMD, IDEAL_CMD , ALLOW_PLURAL |ALLOW_RING|WARN_RING} /*ring-cf: warning at top level*/ 154 ,{D(jjKBASE), KBASE_CMD, MODUL_CMD, MODUL_CMD , ALLOW_PLURAL |ALLOW_RING|WARN_RING} /*ring-cf: warning at top level*/ 151 155 ,{D(jjLU_DECOMP), LU_CMD, LIST_CMD, MATRIX_CMD , NO_PLURAL |NO_RING} 152 156 ,{D(jjPFAC1), PFAC_CMD, LIST_CMD, BIGINT_CMD , ALLOW_PLURAL |ALLOW_RING} … … 201 205 ,{D(jjNVARS), NVARS_CMD, INT_CMD, QRING_CMD , ALLOW_PLURAL |ALLOW_RING} 202 206 ,{D(jjOpenClose), OPEN_CMD, NONE, LINK_CMD , ALLOW_PLURAL |ALLOW_RING} 207 ,{D(jjCALL1MANY), OPTION_CMD, NONE, DEF_CMD , ALLOW_PLURAL |ALLOW_RING} /*libsing*/ 203 208 ,{D(jjORD), ORD_CMD, INT_CMD, POLY_CMD , ALLOW_PLURAL |ALLOW_RING} 204 209 ,{D(jjORD), ORD_CMD, INT_CMD, VECTOR_CMD , ALLOW_PLURAL |ALLOW_RING} … … 277 282 ,{D(jjVARIABLES_ID),VARIABLES_CMD, IDEAL_CMD, MATRIX_CMD , ALLOW_PLURAL |ALLOW_RING} 278 283 ,{D(jjDUMMY), VECTOR_CMD, VECTOR_CMD, VECTOR_CMD , ALLOW_PLURAL |ALLOW_RING} 279 ,{D(jjVDIM), VDIM_CMD, INT_CMD, IDEAL_CMD , ALLOW_PLURAL | NO_RING}280 ,{D(jjVDIM), VDIM_CMD, INT_CMD, MODUL_CMD , ALLOW_PLURAL | NO_RING}284 ,{D(jjVDIM), VDIM_CMD, INT_CMD, IDEAL_CMD , ALLOW_PLURAL |ALLOW_RING |WARN_RING} /*ring-cf: warning at top level*/ 285 ,{D(jjVDIM), VDIM_CMD, INT_CMD, MODUL_CMD , ALLOW_PLURAL |ALLOW_RING |WARN_RING} /*ring-cf: warning at top level*/ 281 286 ,{D(jjVAR1), VAR_CMD, POLY_CMD, INT_CMD , ALLOW_PLURAL |ALLOW_RING} 282 287 ,{D(jjVARSTR1), VARSTR_CMD, STRING_CMD, INT_CMD , ALLOW_PLURAL |ALLOW_RING} … … 585 590 ,{D(jjJET_ID), JET_CMD, MODUL_CMD, MODUL_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING} 586 591 ,{D(jjJET_ID), JET_CMD, MATRIX_CMD, MATRIX_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING} 587 ,{D(jjKBASE2), KBASE_CMD, IDEAL_CMD, IDEAL_CMD, INT_CMD, ALLOW_PLURAL | NO_RING}588 ,{D(jjKBASE2), KBASE_CMD, MODUL_CMD, MODUL_CMD, INT_CMD, ALLOW_PLURAL | NO_RING}592 ,{D(jjKBASE2), KBASE_CMD, IDEAL_CMD, IDEAL_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING |WARN_RING} /*ring-cf: warning at top level*/ 593 ,{D(jjKBASE2), KBASE_CMD, MODUL_CMD, MODUL_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING |WARN_RING} /*ring-cf: warning at top level*/ 589 594 ,{D(jjKERNEL), KERNEL_CMD, IDEAL_CMD, RING_CMD, ANY_TYPE, ALLOW_PLURAL |ALLOW_RING} 590 595 ,{D(jjKERNEL), KERNEL_CMD, IDEAL_CMD, QRING_CMD, ANY_TYPE, ALLOW_PLURAL |ALLOW_RING} … … 832 837 ,{D(loSimplex), SIMPLEX_CMD, LIST_CMD, 6 , NO_PLURAL |NO_RING} 833 838 ,{D(nuUResSolve), URSOLVE_CMD, LIST_CMD, 4 , NO_PLURAL |NO_RING} 834 ,{D(jjCALL1ARG), SBA_CMD, IDEAL_CMD, 1 , ALLOW_PLURAL |ALLOW_RING}835 ,{D(jjCALL2ARG), SBA_CMD, IDEAL_CMD, 2 , ALLOW_PLURAL |ALLOW_RING}836 ,{D(jjCALL3ARG), SBA_CMD, IDEAL_CMD, 3 , NO_PLURAL |ALLOW_RING}837 839 ,{D(jjCALL1ARG), STD_CMD, IDEAL_CMD, 1 , ALLOW_PLURAL |ALLOW_RING} 838 840 ,{D(jjCALL2ARG), STD_CMD, IDEAL_CMD, 2 , ALLOW_PLURAL |ALLOW_RING} … … 1035 1037 { "ringlist", 0, RINGLIST_CMD , CMD_1}, 1036 1038 { "rvar", 0, IS_RINGVAR , CMD_1}, 1037 { "sba", 0, SBA_CMD , CMD_ M},1039 { "sba", 0, SBA_CMD , CMD_123}, 1038 1040 { "setring", 0, SETRING_CMD , SETRING_CMD}, 1039 1041 { "simplex", 0, SIMPLEX_CMD, CMD_M}, … … 1141 1143 // intvec -> matrix 1142 1144 { INTVEC_CMD, MATRIX_CMD, D(iiIm2Ma) , NULL }, 1143 // intmat -> matrix1144 { INTMAT_CMD, MATRIX_CMD, D(iiIm2Ma) , NULL },1145 1145 // intmat -> bigintmat 1146 1146 { INTMAT_CMD, BIGINTMAT_CMD, D(iiIm2Bim) , NULL }, 1147 1147 // bigintmat -> intmat 1148 1148 { BIGINTMAT_CMD, INTMAT_CMD, D(iiBim2Im) , NULL }, 1149 // intmat -> matrix 1150 { INTMAT_CMD, MATRIX_CMD, D(iiIm2Ma) , NULL }, 1149 1151 // number -> poly 1150 1152 { NUMBER_CMD, POLY_CMD, D(iiN2P) , NULL }, -
configure.ac
re7cb20 rd775e5 171 171 AC_CONFIG_FILES([IntegerProgramming/Makefile]) 172 172 AC_CONFIG_FILES([libsingular-config]) 173 173 174 AC_CONFIG_SUBDIRS([gfanlib]) 174 175 175 176 AC_CONFIG_FILES([redhat/singular.spec]) 176 AC_CONFIG_FILES([desktop/Singular.desktop])177 AC_CONFIG_FILES([desktop/Singular-manual.desktop])178 177 179 178 AC_OUTPUT -
desktop/Singular-manual.desktop.in
re7cb20 rd775e5 9 9 Comment[ru]= 10 10 Type=Link 11 URL=file:// /usr/share/doc/Singular/html/index.htm12 Icon= /usr/share/icons/Singular.png11 URL=file://@docdir@/html/index.htm 12 Icon=@datadir@/icons/Singular.png 13 13 Categories=Math;Science;Development;Education;Documentation; 14 14 Encoding=UTF-8 -
desktop/Singular.desktop.in
re7cb20 rd775e5 11 11 Terminal=true 12 12 Categories=Math;Science;Education; 13 Icon= /usr/share/icons/Singular.png13 Icon=@datadir@/icons/Singular.png 14 14 Encoding=UTF-8 15 15 -
libpolys/polys/mod_raw.h
r05cefc rd775e5 53 53 /// use @c add(name) to add built-in library to macro 54 54 #define SI_FOREACH_BUILTIN(add)\ 55 add( huhu)\55 add(staticdemo)\ 56 56 SI_BUILTIN_PYOBJECT(add) 57 57 58 #define SI_MOD_INIT(name) name##_mod_init 58 59 59 60 #endif /* MOD_RAW_H */
Note: See TracChangeset
for help on using the changeset viewer.