Changeset bcd557 in git
- Timestamp:
- Jun 18, 1998, 7:32:13 PM (26 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 300a346b7aab2a310ad9542b7b9ed1e68c1a8be2
- Parents:
- 0a53a908f6c1a64a4e1f1b05085604516b79f95d
- Location:
- Singular
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/ChangeLog
r0a53a9 rbcd557 1 Thu Jun 18 19:27:27 MET DST 1998 hannes 2 * error handling (grammar.y iparith.cc iplib.cc) 3 (leaving of levels, local vars, messages,..) 4 The reason: 5 proc p { intvec w; w[0]; } 6 proc p2 {int i;p();"huhu";} 7 p2(); int i; listvar(); 8 1 9 1998-06-13 Olaf Bachmann <obachman@mathematik.uni-kl.de> 2 10 3 11 * feread.cc: explicit declaration of stuff we need from readline.h 4 12 5 13 1998-06-12 Olaf Bachmann <obachman@mathematik.uni-kl.de> 6 14 7 8 9 10 15 * polys.cc: pComp for simple orderings based on only three 16 routines (no variation for # of variables) 17 18 * spolys0.cc (spGSpolyLoop): globally replaced by spSpolyLoop_General 11 19 12 20 Fri Jun 12 12:11:06 MET DST 1998 hannes 13 14 15 21 * minor optimizations in polys.cc, kutil.* kstd1.cc: 22 pass pointers, not structures to posIn[LT], 23 do not check for NULL in pDeg (as pFDeg does not check) 16 24 17 25 Wed Jun 3 16:20:22 1998 Jens Schmidt <schmidt@mathematik.uni-kl.de> 18 26 19 20 21 27 * Makefile.in (DOCS): target removed 28 (DISTFILES): reference to `$(DOC)' removed 29 (distclean): reference to `$(docdir)' removed 22 30 23 31 Wed Jun 03 16:46:06 1998 <pohl@FUECHSE> 24 32 25 26 33 * claptmpl.cc: instantiation for operator == (CFFactor, CFFactor) 34 added 27 35 28 36 Tue Jun 2 17:28:48 MET DST 1998 hannes 29 30 37 * introduced /* */ comments 38 * some code cleanups 31 39 Fri May 29 17:00:27 MET DST 1998 hannes 32 33 40 * change res to nres (cmd), resu to res(standard.lib) 41 including changes to libs, docs (partially) 34 42 Wed May 27 19:13:10 MET DST 1998 hannes 35 43 * removed #define HAVE_GMP and non-gmp-parts 36 44 Wed May 20 15:03:28 1998 Jens Schmidt <schmidt@mathematik.uni-kl.de> 37 45 38 46 * LIB/primdec.lib (info): info string reformated 39 47 40 48 1998-05-19 Olaf Bachmann <obachman@mathematik.uni-kl.de> 41 49 42 43 44 45 46 47 48 50 * find_exec.c (find_executable): add "." top path, if under WINNT 51 and MSDOS display 52 53 * mmutil.c (mmCheckDBMCB): use _end only #ifdef unix 54 55 * ideals.cc (idDelLmEquals): added idDelLmEqual == simplify(16), 56 and idDelDiv == simplify(32); improved pComparePolys 49 57 50 58 1998-05-18 Olaf Bachmann <obachman@mathematik.uni-kl.de> 51 59 52 53 60 * extra.cc (jjSYSTEM): changed "whoami" --> "Singular", added 61 "nblocks" 54 62 55 63 Sat May 16 14:14:20 MET DST 1998 hannes … … 65 73 without gftables (ring.cc) 66 74 Wed May 13 16:52:09 MET DST 1998 hannes 67 75 * changed syntax of NOT (does not require () any more) 68 76 Tue May 12 16:58:13 MET DST 1998 hannes 69 77 * changed return type of option(): none -> string 70 78 Tue May 12 11:57:50 MET DST 1998 hannes 71 79 * added "lres" 72 80 1998-05-08 Olaf Bachmann <obachman@mathematik.uni-kl.de> 73 81 74 75 76 77 78 82 * extra.cc (jjSYSTEM): put all undocumented system calls into 83 #ifdef HAVE_EXTENDED_SYSTEM which is _not_ defined by default 84 85 * exteded system("random") to always return the seed of the random 86 generator 79 87 80 88 Thu May 7 19:49:34 MET DST 1998 hannes 81 89 * added syntax rule "proc <name> <arglist> <string> <body>" 82 90 * speedup for feReadLine 83 91 84 92 Wed May 6 19:10:59 1998 Jens Schmidt <schmidt@mathematik.uni-kl.de> 85 93 86 87 94 * find_exec.c (find_executable): bug fix. Recognizes 95 `../Singular' properly. 88 96 89 97 Tue May 5 14:06:12 1998 Jens/Kai 90 98 91 99 * libparse.l: message fix 92 100 93 101 Thu Apr 30 19:16:45 MET DST 1998 hannes 94 102 * fixed "missing e-o-buffer" for long lines in febase.inc 95 103 96 104 Wed Apr 29 18:26:19 MET DST 1998 hannes 97 98 105 * added filed list_length tossyStrategy 106 ( for conversion list <-> resolution): syz.h, syz1.cc, iparith.cc 99 107 1998-04-29 Olaf Bachmann <obachman@mathematik.uni-kl.de> 100 108 101 102 109 * mmutil.c (mmGetIndex): new implementation: Use generated lookup 110 table (mmutil.inc) instead of "binary" search on size 103 111 104 112 Tue Apr 28 19:56:46 MET DST 1998 hannes … … 106 114 1998-04-28 Olaf Bachmann <obachman@mathematik.uni-kl.de> 107 115 108 109 110 111 116 * kstd2.cc (redHomog): Some more ouput for KDEBUG && TEST_OPT_DEBUG 117 118 * mminit.cc: introduced memory(2) which measures physical memory 119 consumption using the system call sbrk (this never lies!) 112 120 113 121 Mon Apr 27 18:07:21 MET DST 1998 hannes 114 122 * use ReAlloc for enlargeT, enlargeL (kutil.cc) 115 123 Mon Apr 27 16:45:41 MET DST 1998 hannes 116 124 * fixed conversion of factory 0 to poly NULL (clapconv.cc) … … 118 126 1998-04-27 Olaf Bachmann <obachman@mathematik.uni-kl.de> 119 127 120 121 128 * febase.cc (myfread): introduced myfread and myfopen which assure 129 that newlines in text files are always \n 122 130 123 131 Fri Apr 24 19:14:42 1998 Jens Schmidt <schmidt@mathematik.uni-kl.de> 124 132 125 126 127 128 129 130 131 132 133 134 135 133 * clapsing.cc (FACTORY_GCD_STAT, singclap_divide_content): 134 dependency on FACTORY_GCD_TEST removed. Statistics are now done 135 using `FACTORY_GCDSTAT' and `FCATORY_CONTSTAT' which are defined 136 to expand to nothing if `FACTORY_GCD_TIMING' is off. 137 138 * extra.cc (FACTORY_GCD_STAT): dependency on `FACTORY_GCD_TEST' 139 removed. Includes `gcd_stat.h' in dependency on 140 `FACTORY_CGD_STAT'. 141 142 * extra.cc (jjSYSTEM): new command `gcdstat' in dependency on 143 `FACTORY_GCD_STAT' 136 144 137 145 Fri Apr 24 18:25:23 MET DST 1998 hannes … … 146 154 Thu Apr 23 11:12:48 1998 Jens Schmidt <schmidt@mathematik.uni-kl.de> 147 155 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 156 * clapsing.cc (FACTORY_CFTROUT, FACTORY_CFAOUT): stuipd bug fix 157 158 * clapsing.cc (FACTORY_ALGOUT, FACTORY_CFTROUT, FACTORY_CFAOUT): 159 new macros for debugging data transfer to Factory 160 (singclap_divide_content, singclap_alglcm, 161 singclap_algdividecontent): use the new macros 162 163 * clapsing.cc (FACTORY_GCD_TIMING, singclap_divide_content, 164 singclap_alglcm, singclap_algdividecontent): dependency on 165 FACTORY_GCD_TEST removed. Timings are now done directly using 166 `TIMING_START' and `TIMING_END' which are defined to expand to 167 nothing if `FACTORY_GCD_TIMING' is off. 168 169 * extra.cc (FACTORY_GCD_TIMING): dependency on FACTORY_GCD_TEST 170 removed 171 172 * longalg.cc (naNormalize): gcd calculation depends on #define 173 `FACTORY_GCD_TEST' 166 174 167 175 Wed Apr 22 09:42:35 MET DST 1998 hannes … … 174 182 Tue Apr 21 12:30:44 1998 Jens Schmidt <schmidt@mathematik.uni-kl.de> 175 183 176 177 178 179 180 181 182 183 184 185 186 184 * clapsing.cc (singclap_gcd): checks for `NULL' removed 185 186 * clapsing.cc, extra.cc (FACTORY_GCD_TEST, FACTORY_GCD_STAT, 187 FACTORY_GCD_DEBOUT, FACTORY_GCD_TIMING): new #defines for gcd 188 testing 189 * clapsing.cc (singclap_divide_content, singclap_alglcm, 190 singclap_algdividecontent): code added for factory testing. 191 Wrapped by #defines `FACTORY_GCD_TEST', `FACTORY_GCD_STAT', 192 `FACTORY_GCD_DEBOUT', and `FACTORY_GCD_TIMING'. 193 * extra.cc (jjSYSTEM): code added for factory testing. Wrapped 194 by #defines `FACTORY_GCD_TEST' and `FACTORY_GCD_TIMING'. 187 195 188 196 Fri Apr 17 09:53:53 MET DST 1998 hannes … … 192 200 1998-04-21 Olaf Bachmann <obachman@mathematik.uni-kl.de> 193 201 194 195 196 197 202 * mmprivat.h: Got rid off mmheap.cc, "inlined" mmPutMemory 203 204 * longalg.h: Exponents in parameter (polys) are typedef'ed to 205 EXPONENT_TYPE 198 206 199 207 1998-04-20 Olaf Bachmann <obachman@mathematik.uni-kl.de> 200 208 201 209 * mmallocb.c: Merged with mmheap.c. 202 210 203 211 1998-04-16 Olaf Bachmann <obachman@mathematik.uni-kl.de> 204 212 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 213 * mpsr_PutPoly.cc: Took out normalization of rational numbers 214 before they are put -- might have side effects 215 216 * extra.cc: added system("--option") which returns value of 217 option; in debug mode: system("OptionValues") lists all option 218 values 219 220 * sing_mp.cc: use long option names for MP link options 221 * MPtcp:launch: Uses find_exec as default application 222 223 * tesths.cc: New (handling of) command line options (long 224 options, usage of getopt_long): Parse more than one argument 225 script, etc .. 226 * added getopt.[c,h]for parsing of command lines 227 228 * mod2.h.in, configure.in: Got rid off str* tests 221 229 222 230 1998-04-07 Olaf Bachmann <obachman@mathematik.uni-kl.de> 223 231 224 225 226 227 232 * mpsr_Put.cc (mpsr_PutDump): dump does not dump LIB string any more 233 234 * extra.cc (jjSYSTEM): added System("whoami") to return full 235 executable pathname of running Singular 228 236 229 237 Tue Apr 7 10:27:50 MET DST 1998 hannes … … 232 240 1998-04-06 Olaf Bachmann <obachman@mathematik.uni-kl.de> 233 241 234 235 236 237 238 239 240 241 242 242 * spSpolyLoop.h: neww calling interface for spGetSpolyLoop 243 244 * kstd1.cc (kNF): moved strat->ak field initailization out of 245 initBuchMora into single routines 246 247 * febase.cc (feGetSearchPath): added feGetSearchPath; changed 248 algorithm for searching files: $SINGULARPATH -> relative to 249 executable -> burnt-in locations 250 * added find_exec.c to get absolute pathname of executable 243 251 244 252 Mon Apr 6 14:23:52 1998 Jens Schmidt <schmidt@mathematik.uni-kl.de> 245 253 246 254 * claptmpl.cc: instantiation for `tabs()' added 247 255 248 256 Sat Apr 4 00:52:58 MET DST 1998 Kai Krueger <krueger@mathematik.uni-kl.de> 249 250 251 257 * iplib.cc libparse.cc libparse.h libparse.l misc.cc LIB/*.lib 258 Changed help for libraries. 259 252 260 Wed Apr 1 20:55:15 MET DST 1998 hannes 253 254 255 256 257 261 * mpsr_Tok.cc,tok.h: minor fix, removed VERBOSE_CMD 262 * iparith.cc ipconv.cc: added conversion list <-> resolution 263 * lists.cc, syz1.cc : fixed bug in conversion (list<->res.): 264 handling "empty" case 265 * scanner.l: added option: %option always-interactive 258 266 259 267 Tue Mar 31 10:47:06 MET DST 1998 hannes 260 268 * feread.cc: fixed handling of empty history 261 262 263 264 265 269 * clapsing.cc: fixed gcd(0,..) and gcd(..,0) -> pOne() 270 * febase.h/febase.inc: renaming of scanner variables 271 ( yy_blocklineno, yy_noeof) 272 * febase.inc: increased speed in feReadLine 273 * minor changes in scanner/grammar/iparith.cc (example) 266 274 267 275 1998-03-27 Olaf Bachmann <obachman@mathematik.uni-kl.de> 268 276 269 270 271 272 273 277 * longalg.cc (naDBTest): fixed lines for number tests 278 279 * added spSpolyLoop.inc to repository 280 281 * algmap.cc (maAlgpolyMap): fixed bug which changed preimage 274 282 275 283 1998-03-23 Olaf Bachmann <obachman@mathematik.uni-kl.de> 276 284 277 278 279 280 281 282 283 284 285 * taged version 1.1.7 -- unconditional fast version 286 287 * polys-impl.cc, polys.cc: No COMP_FAST any more 288 289 * Makefile.in: Introduced variable PERL, set by configure 290 291 * kstdfac.cc (kStratCopy): kModW iv is not copied, but just the 292 pointer is set 285 293 286 294 1998-03-18 Olaf Bachmann <obachman@mathematik.uni-kl.de> 287 295 288 289 290 291 296 * Makefile.in: added Singularb target for bprof 297 298 * polys-impl.h, polys-comp.h: Cleaned up COMP_FAST and related 299 #defines 292 300 293 301 1998-03-16 Olaf Bachmann <obachman@mathematik.uni-kl.de> 294 302 295 296 297 298 303 * polys-impl.h: no #define COMP_FAST 304 305 * configure.in,Makefile.in: check for flex -P; increased version 306 number to 1.1.7 299 307 300 308 Fri Mar 13 16:16:27 MET 1998 hannes … … 303 311 304 312 Fri Mar 6 13:27:45 MET 1998 Kai Krueger <krueger@mathematik.uni-kl.de> 305 306 307 308 309 310 311 312 313 314 315 316 313 * new: libparse.l,libparse.cc,utils.cc,ytils.h 314 scanner for a quick check of singular-libraries. 315 * Makefile.in,mod2.h.in,iplib.cc,structs.h,subexpr.h 316 use a scanner when loading libraries. 317 * grammar.y,ipassign.cc,subexpr.h 318 procinfo: added position of end of proc-definition 319 added flag for 'static'-proc (proc that can only be used 320 in the library they are defined). 321 * LIB: deform.lib,finvar.lib,hnoether.lib,normal.lib,presolve.lib 322 primdec.lib,tex.lib 323 made fixes requested by libparse (s.a. brackets, ....) 324 317 325 1998-03-04 Olaf Bachmann <obachman@mathematik.uni-kl.de> 318 326 319 320 321 322 323 324 325 326 327 * febase.h: added macro assume() 328 329 * spSpolyLoop.cc: Automatic generation of SpolyLoops using 330 spSpolyLoop.pl 331 332 * kstd*.cc: New calling interface to get SpolyLoop 333 334 * ring.h: Introduced rOrderType_t 327 335 328 336 Mon Mar 2 16:18:25 MET 1998 hannes … … 335 343 336 344 Tue Feb 17 18:43:11 MET 1998 hannes 337 338 345 * added additional factorization check after redTail 346 (kstdfac.cc) 339 347 340 348 1998-02-17 Olaf Bachmann <obachman@mathematik.uni-kl.de> 341 349 342 343 344 345 346 347 350 * longalg.cc (napWrite): made it globally available to support 351 FACTORY_DEBUG_OUT 352 353 * clapsing.cc (singclap_algdividecontent): inserted 354 FACTORY_DEBUG_OUT 355 348 356 Mon Feb 16 10:43:38 MET 1998 hannes 349 357 * added HAVE_TCL to ring.cc -
Singular/LIB/standard.lib
r0a53a9 rbcd557 1 // $Id: standard.lib,v 1.2 0 1998-06-18 15:45:12 siebertExp $1 // $Id: standard.lib,v 1.21 1998-06-18 17:32:13 Singular Exp $ 2 2 ////////////////////////////////////////////////////////////////////////////// 3 3 4 version="$Id: standard.lib,v 1.2 0 1998-06-18 15:45:12 siebertExp $";4 version="$Id: standard.lib,v 1.21 1998-06-18 17:32:13 Singular Exp $"; 5 5 info=" 6 6 LIBRARY: standard.lib PROCEDURES WHICH ARE ALWAYS LOADED AT START-UP … … 283 283 int add_vars = 0; 284 284 string ri = "ring Phelp ="; 285 285 286 286 // more than one parameters are converted to ring variables 287 287 if (npars_P > 1) … … 341 341 // additional variables were introduced 342 342 // need another intermediate ring 343 ri = "ring Phelp1 = (" + charstr(Phelp) 343 ri = "ring Phelp1 = (" + charstr(Phelp) 344 344 + "),(" + varstr(Phelp) + "),(" + ordstr_P; 345 345 … … 716 716 } 717 717 } 718 718 719 719 if (typeof(#[1]) == "resolution") 720 720 { … … 725 725 return minimizeres(#); 726 726 } 727 727 728 728 } 729 729 -
Singular/grammar.y
r0a53a9 rbcd557 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: grammar.y,v 1. 39 1998-06-13 12:44:37 krueger Exp $ */4 /* $Id: grammar.y,v 1.40 1998-06-18 17:32:11 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT: SINGULAR shell grammatik … … 74 74 void yyerror(char * fmt) 75 75 { 76 int oldInError=inerror; 77 78 inerror = 1; 76 79 77 BOOLEAN old_errorreported=errorreported; 80 78 errorreported = TRUE; … … 84 82 currid = NULL; 85 83 } 86 if( !oldInError)84 if(inerror==0) 87 85 { 88 86 Werror( "error occurred in %s line %d: `%s`" … … 104 102 Werror("last reserved name was `%s`",lastreserved); 105 103 } 104 inerror=1; 106 105 } 107 else108 inerror=oldInError;109 106 if ((currentVoice!=NULL) 110 107 && (currentVoice->prev!=NULL) 111 && (myynest>0))108 && (myynest>0)) 112 109 { 113 110 Werror("leaving %s",VoiceName()); 114 exitBuffer(BT_proc);115 111 } 116 112 } … … 307 303 #endif 308 304 prompt_char = '>'; 309 currid = NULL;310 305 if(siCntrlc) 311 306 { … … 319 314 if (inerror==2) PrintLn(); 320 315 errorreported = inerror = cmdtok = 0; 321 lastreserved=NULL; 322 expected_parms=FALSE; 323 noringvars = FALSE; 324 siCntrlc = FALSE; 316 lastreserved = currid = NULL; 317 expected_parms = noringvars = siCntrlc = FALSE; 325 318 } 326 319 ; … … 345 338 | error ';' 346 339 { 347 feBufferTypes t=currentVoice->Typ();348 340 #ifdef SIQ 349 341 siq=0; 350 342 #endif 351 343 currentVoice->ifsw=0; 352 if (inerror&&($1.i<UMINUS) && ($1.i>' ')) 353 { 354 // 1: yyerror called 355 // 2: scanner put actual string 356 // 3: error rule put token+\n 357 inerror=3; 358 Print(" error at token `%s`\n",iiTwoOps($1.i)); 344 if (inerror) 345 { 346 if ((inerror!=3) && ($1.i<UMINUS) && ($1.i>' ')) 347 { 348 // 1: yyerror called 349 // 2: scanner put actual string 350 // 3: error rule put token+\n 351 inerror=3; 352 Print(" error at token `%s`\n",iiTwoOps($1.i)); 353 } 359 354 } 360 355 if (!errorreported) WerrorS("...parse error"); … … 363 358 if (myynest>0) 364 359 { 360 feBufferTypes t=currentVoice->Typ(); 365 361 //PrintS("leaving yyparse\n"); 362 exitBuffer(BT_proc); 366 363 if (t==BT_example) 367 {368 errorreported = inerror = cmdtok = 0;369 lastreserved=NULL;370 expected_parms=FALSE;371 inerror = 0;372 yyerrok;373 364 YYACCEPT; 374 }375 365 else 376 366 YYABORT; … … 380 370 exitVoice(); 381 371 } 382 //errorreported = FALSE;383 //lastreserved=NULL;384 372 } 385 373 ; … … 1344 1332 $1.Print(&sLastPrinted); 1345 1333 $1.CleanUp(); 1334 if (errorreported) YYERROR; 1346 1335 } 1347 1336 ; -
Singular/iplib.cc
r0a53a9 rbcd557 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: iplib.cc,v 1.3 0 1998-06-13 12:44:42 krueger Exp $ */4 /* $Id: iplib.cc,v 1.31 1998-06-18 17:32:12 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT: interpreter: LIB and help … … 130 130 char buf[256], *s = NULL, *p; 131 131 long procbuflen; 132 132 133 133 FILE * fp = feFopen( pi->libname, "rb", NULL, TRUE ); 134 134 if (fp==NULL) … … 320 320 idhdl ns = namespaceroot->get(plib,0, TRUE); 321 321 FreeL(plib); 322 if(ns != NULL) { 322 if(ns != NULL) 323 { 323 324 namespaceroot->push(IDPACKAGE(ns), IDID(ns)); 324 325 //printf("iiMake_proc: namespace found.\n"); 325 } else { 326 } 327 else 328 { 326 329 namespaceroot->push(namespaceroot->root->pack, "toplevel"); 327 330 //printf("iiMake_proc: staying in TOP-LEVEL\n"); 328 331 } 329 332 #else /* HAVE_NAMESPACES */ 330 if(pi->is_static && myynest==0) { 333 if(pi->is_static && myynest==0) 334 { 331 335 Werror("'%s::%s()' is a local procedure and cannot be accessed by an user.", 332 336 pi->libname, pi->procname); … … 346 350 #endif 347 351 #if 1 348 if(pi->language == LANG_SINGULAR) err=iiPStart(pn,sl); 349 if(pi->language == LANG_C) 352 if(pi->language == LANG_SINGULAR) 353 { 354 err=iiPStart(pn,sl); 355 } 356 else if(pi->language == LANG_C) 350 357 { 351 358 leftv res = (leftv)Alloc0(sizeof(sleftv)); … … 408 415 if (iiCurrArgs!=NULL) 409 416 { 410 Warn("too many arguments for %s",IDID(pn));417 if (!err) Warn("too many arguments for %s",IDID(pn)); 411 418 iiCurrArgs->CleanUp(); 412 419 Free((ADDRESS)iiCurrArgs,sizeof(sleftv)); … … 416 423 namespaceroot->pop(); 417 424 #endif /* HAVE_NAMESPACES */ 418 if (err) return NULL; 425 if (err) 426 return NULL; 419 427 return &iiRETURNEXPR[myynest+1]; 420 428 }
Note: See TracChangeset
for help on using the changeset viewer.