Changeset 3b1a83c in git
- Timestamp:
- Oct 23, 2001, 4:04:26 PM (22 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 65248586d85a6b175c2665d87679f2e492ae9fb8
- Parents:
- 7497ef3773fc1afff892546445b1d82b1cf0fb05
- Location:
- Singular
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/grammar.y
r7497ef3 r3b1a83c 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: grammar.y,v 1.9 4 2001-10-09 16:36:01 Singular Exp $ */4 /* $Id: grammar.y,v 1.95 2001-10-23 14:04:21 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT: SINGULAR shell grammatik … … 1364 1364 { 1365 1365 newRingHdl=enterid(ring_name, myynest, RING_CMD, &IDROOT); 1366 $2.CleanUp(); 1366 1367 if (newRingHdl!=NULL) 1367 1368 { … … 1406 1407 #endif /* HAVE_NAMESPACES */ 1407 1408 yyInRingConstruction = FALSE; 1409 $2.CleanUp(); 1408 1410 } 1409 1411 ; … … 1468 1470 p=IDNEXT(p); 1469 1471 } 1470 1472 IDRING(h)->idroot=root; 1471 1473 //} 1472 1474 } … … 1625 1627 procinfov pi; 1626 1628 idhdl h = enterid($2,myynest,PROC_CMD,&IDROOT,TRUE); 1627 if (h==NULL) {omFree((ADDRESS)$ 3); YYERROR;}1629 if (h==NULL) {omFree((ADDRESS)$2);omFree((ADDRESS)$3); YYERROR;} 1628 1630 iiInitSingularProcinfo(IDPROC(h),"", $2, 0, 0); 1629 1631 IDPROC(h)->data.s.body = (char *)omAlloc(strlen($3)+31);; 1630 1632 sprintf(IDPROC(h)->data.s.body,"parameter list #;\n%s;return();\n\n",$3); 1631 1633 omFree((ADDRESS)$3); 1634 omFree((ADDRESS)$2); 1632 1635 } 1633 1636 | PROC_DEF STRINGTOK BLOCKTOK … … 1636 1639 if (h==NULL) 1637 1640 { 1641 omFree((ADDRESS)$1); 1638 1642 omFree((ADDRESS)$2); 1639 1643 omFree((ADDRESS)$3); … … 1648 1652 omFree((ADDRESS)args); 1649 1653 omFree((ADDRESS)$3); 1654 omFree((ADDRESS)$1); 1650 1655 } 1651 1656 | PROC_DEF STRINGTOK STRINGTOK BLOCKTOK … … 1655 1660 if (h==NULL) 1656 1661 { 1662 omFree((ADDRESS)$1); 1657 1663 omFree((ADDRESS)$2); 1658 1664 omFree((ADDRESS)$4); … … 1663 1669 procinfov pi; 1664 1670 iiInitSingularProcinfo(IDPROC(h),"", $1, 0, 0); 1671 omFree((ADDRESS)$1); 1665 1672 IDPROC(h)->data.s.body = (char *)omAlloc(strlen($4)+strlen(args)+14);; 1666 1673 sprintf(IDPROC(h)->data.s.body,"%s\n%s;return();\n\n",args,$4); -
Singular/ipid.cc
r7497ef3 r3b1a83c 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: ipid.cc,v 1.5 4 2001-10-09 16:36:04Singular Exp $ */4 /* $Id: ipid.cc,v 1.55 2001-10-23 14:04:22 Singular Exp $ */ 5 5 6 6 /* … … 332 332 { 333 333 idhdl h; 334 // is it the currRing - id ?335 334 #ifdef HAVE_NAMESPACES 336 335 namehdl topnsroot = namespaceroot->root; 337 336 #endif 338 if ((currRingHdl!=NULL) 339 &&(IDLEV(currRingHdl)!=lev) 340 &&(s==IDID(currRingHdl))) 341 { 342 s=omStrDup(s); 343 } 337 s=omStrDup(s); 344 338 // is it already defined in root ? 345 else if ((h=(*root)->get(s,lev))!=NULL) 346 { 347 if (IDLEV(h)!=lev) 348 { 349 s=omStrDup(s); 350 } 351 else if ((IDTYP(h) == t)||(t==DEF_CMD)) 339 if ((h=(*root)->get(s,lev))!=NULL) 340 { 341 if (IDLEV(h)==lev) 342 { 343 if ((IDTYP(h) == t)||(t==DEF_CMD)) 352 344 { 353 345 if ((IDTYP(h)==PACKAGE_CMD) … … 357 349 } 358 350 if (BVERBOSE(V_REDEFINE)) 359 #ifdef KAI360 Warn("1 redefining %s **",s);361 #else362 351 Warn("redefining %s **",s); 363 #endif364 352 #ifdef HAVE_NAMESPACES 365 353 if(t==PACKAGE_CMD && strcmp(s,"Top")==0) … … 374 362 else 375 363 goto errlabel; 364 } 376 365 } 377 366 // is it already defined in idroot ? … … 380 369 if ((h=IDROOT->get(s,lev))!=NULL) 381 370 { 382 if (IDLEV(h) !=lev)383 s=omStrDup(s);384 elseif ((IDTYP(h) == t)||(t==DEF_CMD))371 if (IDLEV(h)==lev) 372 { 373 if ((IDTYP(h) == t)||(t==DEF_CMD)) 385 374 { 386 375 if (BVERBOSE(V_REDEFINE)) 387 #ifdef KAI388 Warn("2 redefining %s **",s);389 #else390 376 Warn("redefining %s **",s); 391 #endif392 377 if (s==IDID(h)) IDID(h)=NULL; 393 378 killhdl2(h,&IDROOT); … … 395 380 else 396 381 goto errlabel; 382 } 397 383 } 398 384 } … … 403 389 if ((h=topnsroot->get(s,lev))!=NULL) 404 390 { 405 s=omStrDup(s);406 391 } 407 392 } … … 412 397 if ((h=currRing->idroot->get(s,lev))!=NULL) 413 398 { 414 if (IDLEV(h)!=lev) 415 { 416 s=omStrDup(s); 417 } 418 else if ((IDTYP(h) == t)||(t==DEF_CMD)) 399 if (IDLEV(h)==lev) 400 { 401 if ((IDTYP(h) == t)||(t==DEF_CMD)) 419 402 { 420 403 if (BVERBOSE(V_REDEFINE)) 421 #ifdef KAI422 Warn("3 redefining %s **",s);423 #else424 404 Warn("redefining %s **",s); 425 #endif426 405 IDID(h)=NULL; 427 406 killhdl2(h,&currRing->idroot); 428 407 } 429 408 else 430 {431 409 goto errlabel; 432 410 } … … 434 412 } 435 413 *root = (*root)->set(s, lev, t, init); 414 #ifdef HAVE_NS 436 415 checkall(); 416 #endif 437 417 return *root; 438 418 439 419 errlabel: 440 Werror("identifier `%s` in use",s); 420 Werror("identifier `%s` in use(lev h=%d,typ=%d,t=%d, curr=%d)",s,IDLEV(h),IDTYP(h),t,lev); 421 #ifdef HAVE_NS 422 listall(); 423 #endif 424 omFree(s); 441 425 return NULL; 442 426 } … … 527 511 //h->attribute=NULL; 528 512 } 529 // ring / qring --------------------------------------------------------530 513 if ((IDTYP(h) == PACKAGE_CMD) && (strcmp(IDID(h),"Top")==0)) 531 514 { … … 533 516 return; 534 517 } 518 // ring / qring -------------------------------------------------------- 535 519 if ((IDTYP(h) == RING_CMD) || (IDTYP(h) == QRING_CMD)) 536 520 { … … 692 676 slKill(IDLINK(h)); 693 677 } 694 else if((IDTYP(h)==RESOLUTION_CMD)&&(IDDATA(h)!=NULL)) 695 { 696 syKillComputation((syStrategy)IDDATA(h)); 678 else if(IDTYP(h)==RESOLUTION_CMD) 679 { 680 if (IDDATA(h)!=NULL) 681 syKillComputation((syStrategy)IDDATA(h)); 697 682 } 698 683 #ifdef TEST … … 1083 1068 { 1084 1069 //Print("pop %s\n",name); 1085 if (currRing!=::currRing) PrintS("currRing wrong\n");;1086 ::currRing=this->currRing;1070 //if (currRing!=::currRing) PrintS("currRing wrong\n");; 1071 //::currRing=this->currRing; 1087 1072 //if (r==NULL) Print("set ring to NULL at lev %d(%s)\n",myynest,name); 1088 ::currRingHdl=this->currRingHdl;1089 if((::currRingHdl==NULL)||(IDRING(::currRingHdl)!=(::currRing)))1090 ::currRingHdl=rFindHdl(::currRing,NULL,NULL);1073 //::currRingHdl=this->currRingHdl; 1074 //if((::currRingHdl==NULL)||(IDRING(::currRingHdl)!=(::currRing))) 1075 // ::currRingHdl=rFindHdl(::currRing,NULL,NULL); 1091 1076 #ifdef HAVE_NS 1092 1077 //Print("restore pack=%s,1.obj=%s\n",IDID(currPackHdl),IDID(currPack->idroot)); … … 1137 1122 #if 0 1138 1123 if(init && ns->isroot) { 1139 idhdl pl = enterid( omStrDup("Top"),0, PACKAGE_CMD,1124 idhdl pl = enterid( "Top",0, PACKAGE_CMD, 1140 1125 &NSROOT(namespaceroot), TRUE ); 1141 1126 if(pl != NULL) { -
Singular/iplib.cc
r7497ef3 r3b1a83c 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: iplib.cc,v 1.9 2 2001-10-09 16:36:05Singular Exp $ */4 /* $Id: iplib.cc,v 1.93 2001-10-23 14:04:22 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT: interpreter: LIB and help … … 328 328 myynest++; 329 329 err=yyparse(); 330 #ifdef HAVE_NS 330 331 checkall(); 332 #endif 331 333 if (sLastPrinted.rtyp!=0) 332 334 { … … 335 337 //Print("kill locals for %s (level %d)\n",IDID(pn),myynest); 336 338 killlocals(myynest); 339 #ifdef HAVE_NS 337 340 checkall(); 341 #endif 338 342 //Print("end kill locals for %s (%d)\n",IDID(pn),myynest); 339 343 myynest--; … … 363 367 } 364 368 #endif 365 #ifdef HAVE_NS 369 #if 0 370 //#ifdef HAVE_NS 366 371 i=myynest; 367 372 proclevel *p=procstack; … … 504 509 } 505 510 #ifdef USE_IILOCALRING 511 #if 0 506 512 if(procstack->currRing != iiLocalRing[myynest]) Print("iiMake_proc: 1 ring not saved procs:%x, iiLocal:%x\n",procstack->currRing, iiLocalRing[myynest]); 513 #endif 507 514 if (iiLocalRing[myynest] != currRing) 508 515 { … … 523 530 err=TRUE; 524 531 } 525 if (iiLocalRing[myynest]!=NULL) 526 { 527 rSetHdl(rFindHdl(iiLocalRing[myynest],NULL, NULL)); 528 iiLocalRing[myynest]=NULL; 529 } 530 else 531 { currRingHdl=NULL; currRing=NULL; } 532 } 533 if ((currRing!=NULL) && 534 ((currRingHdl==NULL)||(IDRING(currRingHdl)!=currRing))) 535 { 536 rSetHdl(rFindHdl(currRing,NULL, NULL)); 537 iiLocalRing[myynest]=NULL; 532 538 } 533 539 #else /* USE_IILOCALRING */ … … 877 883 if (hl==NULL) 878 884 { 879 hl = enterid( omStrDup("LIB"),0, STRING_CMD, &idroot, FALSE );885 hl = enterid( "LIB",0, STRING_CMD, &idroot, FALSE ); 880 886 IDSTRING(hl) = omStrDup(newlib); 881 887 } … … 936 942 if (pl==NULL) 937 943 { 938 pl = enterid( omStrDup(plib),0, PACKAGE_CMD,944 pl = enterid( plib,0, PACKAGE_CMD, 939 945 &NSROOT(namespaceroot->root), TRUE ); 940 946 IDPACKAGE(pl)->language = LANG_SINGULAR; … … 957 963 if (pl==NULL) 958 964 { 959 pl = enterid( omStrDup(plib),0, PACKAGE_CMD,965 pl = enterid( plib,0, PACKAGE_CMD, 960 966 &(basePack->idroot), TRUE ); 961 967 IDPACKAGE(pl)->language = LANG_SINGULAR; … … 1140 1146 pi->language = LANG_SINGULAR; 1141 1147 pi->ref = 1; 1148 #ifdef HAVE_NS 1142 1149 pi->pack = NULL; 1150 #endif 1143 1151 pi->is_static = pstatic; 1144 1152 pi->data.s.proc_start = pos; … … 1165 1173 idhdl h; 1166 1174 1167 h = enterid( omStrDup(procname),0, PROC_CMD, &IDROOT, TRUE);1175 h = enterid(procname,0, PROC_CMD, &IDROOT, TRUE); 1168 1176 if ( h!= NULL ) 1169 1177 { … … 1217 1225 { 1218 1226 #ifdef HAVE_NAMESPACES 1219 pl = enterid( omStrDup(plib),0, PACKAGE_CMD,1227 pl = enterid( plib,0, PACKAGE_CMD, 1220 1228 &NSROOT(namespaceroot->root), TRUE ); 1221 1229 #else 1222 pl = enterid( omStrDup(plib),0, PACKAGE_CMD, &IDROOT,1230 pl = enterid( plib,0, PACKAGE_CMD, &IDROOT, 1223 1231 TRUE ); 1224 1232 #endif -
Singular/ipshell.cc
r7497ef3 r3b1a83c 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: ipshell.cc,v 1.6 8 2001-10-09 16:36:06Singular Exp $ */4 /* $Id: ipshell.cc,v 1.69 2001-10-23 14:04:23 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT: … … 256 256 } 257 257 } 258 258 #ifndef HAVE_NS 259 259 void killlocals(int v) 260 260 { 261 #ifndef HAVE_NS262 261 killlocals0(v,&IDROOT); 263 #else264 killlocals0(v,&(currPack->idroot));265 if (currPack!=basePack)266 {267 //PrintS("killlocals in Top\n");268 killlocals0(v,&(basePack->idroot));269 }270 #endif271 262 272 263 if ((iiRETURNEXPR_len > myynest) … … 282 273 BOOLEAN changed=FALSE; 283 274 #ifndef HAVE_NAMESPACES 284 #ifdef HAVE_NS285 idhdl h = currPack->idroot;286 #else287 275 idhdl h = IDROOT; 288 #endif289 276 290 277 // Print("killlocals in %s\n",IDID(currPackHdl)); … … 297 284 killlocals0(v,&(IDRING(h)->idroot)); 298 285 } 286 else if (IDTYP(h) == PACKAGE_CMD) 287 { 288 killlocals0(v,&(IDPACKAGE(h)->idroot)); 289 } 299 290 h = IDNEXT(h); 300 291 } 301 #ifdef HAVE_NS302 if (currPack!=basePack)303 {304 //PrintS("killlocals in Top\n");305 h=basePack->idroot;306 while (h!=NULL)307 {308 if (((IDTYP(h)==QRING_CMD) || (IDTYP(h) == RING_CMD))309 && (IDRING(h)->idroot!=NULL))310 {311 //Print("go to %s\n",IDID(h));312 if (IDRING(h)!=currRing) {changed=TRUE;rSetHdl(h);}313 killlocals0(v,&(IDRING(h)->idroot));314 }315 h = IDNEXT(h);316 }317 }318 #endif319 292 #else 320 293 idhdl h = NSROOT(namespaceroot->root); … … 366 339 //listall(); 367 340 } 341 #endif 342 #ifdef HAVE_NS 343 void killlocals_rec(idhdl *root,BOOLEAN &changed,int v) 344 { 345 idhdl h=*root; 346 while (h!=NULL) 347 { 348 if (IDLEV(h)>=v) 349 { 350 // Print("kill %s, lev %d for lev %d\n",IDID(h),IDLEV(h),v); 351 idhdl n=IDNEXT(h); 352 if (((IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD)) 353 && (IDRING(h)==currRing)) 354 changed=TRUE; 355 killhdl2(h,root); 356 h=n; 357 } 358 else if (IDTYP(h)==PACKAGE_CMD) 359 { 360 // Print("into pack %s, lev %d for lev %d\n",IDID(h),IDLEV(h),v); 361 if (IDPACKAGE(h)!=basePack) 362 killlocals_rec(&(IDRING(h)->idroot),changed,v); 363 h=IDNEXT(h); 364 } 365 else if ((IDTYP(h)==RING_CMD) 366 ||(IDTYP(h)==QRING_CMD)) 367 { 368 if (IDRING(h)->idroot!=NULL) 369 { 370 // Print("into ring %s, lev %d for lev %d\n",IDID(h),IDLEV(h),v); 371 if (currRing!=IDRING(h)) 372 { 373 changed=TRUE; 374 ring sr=currRing; 375 rChangeCurrRing(IDRING(h)); 376 killlocals_rec(&(IDRING(h)->idroot),changed,v); 377 rChangeCurrRing(sr); 378 } 379 else 380 { 381 killlocals_rec(&(IDRING(h)->idroot),changed,v); 382 } 383 } 384 h=IDNEXT(h); 385 } 386 else 387 { 388 // Print("skip %s lev %d for lev %d\n",IDID(h),IDLEV(h),v); 389 h=IDNEXT(h); 390 } 391 } 392 } 393 void killlocals(int v) 394 { 395 BOOLEAN changed=FALSE; 396 idhdl sh=currRingHdl; 397 if (sh!=NULL) changed=(IDLEV(sh)>=v); 398 ring sr=currRing; 399 400 killlocals_rec(&(basePack->idroot),changed,v); 401 402 if ((iiRETURNEXPR_len > myynest) 403 && ((iiRETURNEXPR[myynest].Typ()==RING_CMD) 404 || (iiRETURNEXPR[myynest].Typ()==QRING_CMD))) 405 { 406 leftv h=&iiRETURNEXPR[myynest]; 407 killlocals0(v,&(((ring)h->data)->idroot)); 408 } 409 410 if (changed) 411 { 412 currRing=NULL; 413 currRingHdl=NULL; 414 if (sr!=NULL) 415 { 416 sh=rFindHdl(sr,NULL,NULL); 417 rSetHdl(sh); 418 } 419 } 420 421 if (myynest<=1) iiNoKeepRing=TRUE; 422 //Print("end killlocals >= %d\n",v); 423 //listall(); 424 } 425 #endif 368 426 369 427 void list_cmd(int typ, const char* what, char *prefix,BOOLEAN iterate, BOOLEAN fullname) … … 731 789 sprintf(s,"%s(%d)",name,i+1); 732 790 if (i==0) 733 h=enterid( omStrDup(s),myynest,typ0,&(currRing->idroot), FALSE);791 h=enterid(s,myynest,typ0,&(currRing->idroot), FALSE); 734 792 else 735 h=enterid( omStrDup(s),myynest,MODUL_CMD,&(currRing->idroot), FALSE);793 h=enterid(s,myynest,MODUL_CMD,&(currRing->idroot), FALSE); 736 794 if (h!=NULL) 737 795 { … … 932 990 #endif /* HAVE_NAMESPACES */ 933 991 { 934 if (name->rtyp==IDHDL) { id=omStrDup(id); }935 992 sy->data = (char *)enterid(id,lev,t,root,init_b); 936 993 } … … 939 996 sy->rtyp=IDHDL; 940 997 currid=sy->name=IDID((idhdl)sy->data); 941 name->name=NULL; /* used in enterid */998 // name->name=NULL; /* used in enterid */ 942 999 //sy->e = NULL; 943 1000 if (name->next!=NULL) … … 1005 1062 if (iiLocalRing[0]==IDRING(h)) iiLocalRing[0]=NULL; 1006 1063 #else 1007 #endif1008 1064 proclevel *p=procstack; 1009 1065 while (p->next!=NULL) p=p->next; … … 1013 1069 p->currRingHdl=NULL; 1014 1070 } 1015 //#endif1071 #endif 1016 1072 killhdl2(h,root); 1017 1073 } … … 1049 1105 namespaceroot->push(rootpack, IDID(roothdl)); 1050 1106 //namespaceroot->push(NSPACK(namespaceroot->root), "Top"); 1051 idhdl rl=enterid( omStrDup(v->name), toLev, IDTYP(h),1107 idhdl rl=enterid(v->name, toLev, IDTYP(h), 1052 1108 &(rootpack->idroot), FALSE); 1053 1109 namespaceroot->pop(); … … 1141 1197 BOOLEAN iiExport (leftv v, int toLev) 1142 1198 { 1199 #ifdef HAVE_NS 1143 1200 checkall(); 1201 #endif 1144 1202 BOOLEAN nok=FALSE; 1145 1203 leftv r=v; … … 1162 1220 } 1163 1221 r->CleanUp(); 1222 #ifdef HAVE_NS 1164 1223 checkall(); 1224 #endif 1165 1225 return nok; 1166 1226 } -
Singular/kspoly.cc
r7497ef3 r3b1a83c 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: kspoly.cc,v 1.2 5 2001-10-09 16:36:07Singular Exp $ */4 /* $Id: kspoly.cc,v 1.26 2001-10-23 14:04:23 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT - Routines for Spoly creation and reductions -
Singular/libparse.l
r7497ef3 r3b1a83c 3 3 * Computer Algebra System SINGULAR * 4 4 ****************************************/ 5 /* $Id: libparse.l,v 1.4 8 2001-10-09 16:36:08Singular Exp $ */5 /* $Id: libparse.l,v 1.49 2001-10-23 14:04:23 Singular Exp $ */ 6 6 #include <stdio.h> 7 7 #include <string.h> … … 307 307 #else 308 308 //#ifdef HAVE_NAMESPACES 309 //h0 = enterid( omStrDup("version"), myynest, STRING_CMD,309 //h0 = enterid( "version", myynest, STRING_CMD, 310 310 // &IDPACKAGE(pl)->idroot, FALSE ); 311 311 //if (h0!=NULL) … … 351 351 { 352 352 #ifdef HAVE_NAMESPACES 353 h0 = enterid( omStrDup(proc), 0 /*myynest*/, PROC_CMD,353 h0 = enterid( proc, 0 /*myynest*/, PROC_CMD, 354 354 &IDPACKAGE(pl)->idroot, TRUE); 355 355 if(!p_static && autoexport) 356 356 { 357 357 namespaceroot->push( NSPACK(namespaceroot->root) ,""); 358 h_top = enterid( omStrDup(proc), myynest, PROC_CMD,358 h_top = enterid( proc, myynest, PROC_CMD, 359 359 &NSROOT(namespaceroot->root), FALSE ); 360 360 namespaceroot->pop(); … … 362 362 #else /* HAVE_NAMESPACES */ 363 363 #ifdef HAVE_NS 364 h0 = enterid( omStrDup(proc), 0 /*myynest*/, PROC_CMD,364 h0 = enterid( proc, 0 /*myynest*/, PROC_CMD, 365 365 &(IDPACKAGE(pl)->idroot), TRUE); 366 366 if(!p_static && autoexport) 367 367 { 368 h_top = enterid( omStrDup(proc), 0 /*myynest*/, PROC_CMD,368 h_top = enterid( proc, 0 /*myynest*/, PROC_CMD, 369 369 &(basePack->idroot), FALSE ); 370 370 } 371 371 #else 372 h0 = enterid( omStrDup(proc), 0 /*myynest*/, PROC_CMD,372 h0 = enterid( proc, 0 /*myynest*/, PROC_CMD, 373 373 &IDROOT, TRUE ); 374 374 #endif /* HAVE_NS */ … … 394 394 IDPROC(h_top)->ref++; 395 395 } 396 396 IDPROC(h0)->pack=IDPACKAGE(pl); 397 397 #endif /* HAVE_NS */ 398 398 if (BVERBOSE(V_LOAD_PROC)) … … 995 995 #ifdef HAVE_NAMESPACES 996 996 if( mode != GET_INFO ) { 997 h0 = enterid( omStrDup("info"), myynest, STRING_CMD,997 h0 = enterid( "info", myynest, STRING_CMD, 998 998 &IDPACKAGE(pl)->idroot, FALSE ); 999 999 if (h0!=NULL) -
Singular/mpsr_sl.cc
r7497ef3 r3b1a83c 7 7 * Author: obachman (Olaf Bachmann) 8 8 * Created: 12/00 9 * Version: $Id: mpsr_sl.cc,v 1. 4 2001-10-09 16:36:11Singular Exp $9 * Version: $Id: mpsr_sl.cc,v 1.5 2001-10-23 14:04:24 Singular Exp $ 10 10 *******************************************************************/ 11 11 … … 476 476 leftv v = NULL; 477 477 // establish top-level identifier for link 478 idhdl id = enterid( omStrDup("mp_ll"), 0, LINK_CMD, &IDROOT, FALSE);478 idhdl id = enterid("mp_ll", 0, LINK_CMD, &IDROOT, FALSE); 479 479 IDLINK(id) = silink; 480 480 -
Singular/ring.cc
r7497ef3 r3b1a83c 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: ring.cc,v 1.17 0 2001-09-25 16:07:32Singular Exp $ */4 /* $Id: ring.cc,v 1.171 2001-10-23 14:04:25 Singular Exp $ */ 5 5 6 6 /* … … 117 117 if (h!=NULL) 118 118 { 119 // Print(" new ring:%s (l:%d)\n",IDID(h),IDLEV(h)); 119 120 rg = IDRING(h); 120 121 omCheckAddrSize((ADDRESS)h,sizeof(idrec)); … … 903 904 } 904 905 } 905 //#else /* USE_IILOCALRING */906 #endif /* USE_IILOCALRING */906 #else /* USE_IILOCALRING */ 907 //#endif /* USE_IILOCALRING */ 907 908 { 908 909 proclevel * nshdl = procstack; … … 919 920 } 920 921 } 921 //#endif /* USE_IILOCALRING */922 #endif /* USE_IILOCALRING */ 922 923 923 924 rDelete(r); … … 1059 1060 h=IDNEXT(h); 1060 1061 } 1062 #ifdef HAVE_NS 1063 if (IDROOT!=basePack->idroot) h=basePack->idroot; 1064 while (h!=NULL) 1065 { 1066 if (((IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD)) 1067 && (h->data.uring==r) 1068 && (h!=n)) 1069 return h; 1070 h=IDNEXT(h); 1071 } 1072 proclevel *p=procstack; 1073 while(p!=NULL) 1074 { 1075 if ((p->currPack!=basePack) 1076 && (p->currPack!=currPack)) 1077 h=p->currPack->idroot; 1078 while (h!=NULL) 1079 { 1080 if (((IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD)) 1081 && (h->data.uring==r) 1082 && (h!=n)) 1083 return h; 1084 h=IDNEXT(h); 1085 } 1086 p=p->next; 1087 } 1088 #endif 1061 1089 #endif 1062 1090 return NULL; -
Singular/scanner.l
r7497ef3 r3b1a83c 3 3 * Computer Algebra System SINGULAR * 4 4 ****************************************/ 5 /* $Id: scanner.l,v 1.3 0 2001-10-09 16:36:21Singular Exp $ */5 /* $Id: scanner.l,v 1.31 2001-10-23 14:04:26 Singular Exp $ */ 6 6 #include <stdio.h> 7 7 #include <string.h> … … 346 346 . { 347 347 /*if (*yytext == '\n') REJECT;*/ 348 348 register char ch= *yytext; 349 349 lvalp->i = ch; 350 351 352 353 350 switch(ch) 351 { 352 /* case '&': */ 353 case '|': 354 354 return LOGIC_OP; 355 356 357 355 /* case '/': */ 356 case '%': 357 case '*': 358 358 return MULDIV_OP; 359 360 361 362 363 364 359 /* case '<': */ 360 case '>': 361 return COMP_OP; 362 default: 363 break; 364 } 365 365 return ch; 366 366 } -
Singular/tesths.cc
r7497ef3 r3b1a83c 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: tesths.cc,v 1.8 7 2001-10-09 16:36:26 Singular Exp $ */4 /* $Id: tesths.cc,v 1.88 2001-10-23 14:04:26 Singular Exp $ */ 5 5 6 6 /* … … 112 112 namespaceroot->push(NULL, "Top", 0, TRUE); 113 113 idhdl h; 114 h=enterid( omStrDup("Top"), 0, PACKAGE_CMD, &IDROOT, TRUE);114 h=enterid("Top", 0, PACKAGE_CMD, &IDROOT, TRUE); 115 115 IDPACKAGE(h) = NSPACK(namespaceroot); 116 116 IDPACKAGE(h)->language = LANG_TOP; … … 120 120 currPack=basePack; 121 121 idhdl h; 122 h=enterid( omStrDup("Top"), 0, PACKAGE_CMD, &IDROOT, TRUE);122 h=enterid("Top", 0, PACKAGE_CMD, &IDROOT, TRUE); 123 123 IDPACKAGE(h)->language = LANG_TOP; 124 124 IDPACKAGE(h)=basePack;
Note: See TracChangeset
for help on using the changeset viewer.