Changeset 77ff8e in git
- Timestamp:
- Oct 15, 1998, 4:08:43 PM (26 years ago)
- Branches:
- (u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')
- Children:
- db242b128be30aaa1380dfedb4f993424bf7ce50
- Parents:
- 7ae776f0df0c8b0ecce7a1639acf874949740c78
- Location:
- Singular
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/ChangeLog
r7ae776 r77ff8e 1 Thu Oct 15 15:54:05 MEST 1998 <krueger@mathematik.uni-kl.de> 2 * extra.cc,grammar.y,ipid.cc,ipid.h,iplib.cc,ipshell.cc 3 * ipshell.h,ring.cc,structs.h,tesths.cc,mod2.h.in 4 Replaced ring *iiLocalRing[] by a stack (class namerec) 5 To use old method define USE_IILOCALRING in mod2.h 6 Old method incompatible with HAVE_NAMESPACES! 7 1 8 1998-10-14 Olaf Bachmann <obachman@mathematik.uni-kl.de> 2 9 -
Singular/extra.cc
r7ae776 r77ff8e 2 2 * Computer Algebra System SINGULAR * 3 3 *****************************************/ 4 /* $Id: extra.cc,v 1.6 8 1998-10-15 11:45:51 obachmanExp $ */4 /* $Id: extra.cc,v 1.69 1998-10-15 14:08:28 krueger Exp $ */ 5 5 /* 6 6 * ABSTRACT: general interface to internals of Singular ("system" command) … … 779 779 } 780 780 else 781 #endif /* HAVE_NAMESPACES */ 781 782 /*==================== nsstack ===================================*/ 782 783 if(strcmp(sys_cmd,"nsstack")==0) … … 784 785 namehdl nshdl = namespaceroot; 785 786 for( ; nshdl->isroot != TRUE; nshdl = nshdl->next) { 786 Print("NSstack: %s:%d\n", nshdl->name, nshdl->lev); 787 } 788 Print("NSstack: %s:%d\n", nshdl->name, nshdl->lev); 789 return FALSE; 790 } 791 else 792 #endif /* HAVE_NAMESPACES */ 787 Print("NSstack: %s:%d, nesting=%d\n", nshdl->name, nshdl->lev, nshdl->myynest); 788 } 789 Print("NSstack: %s:%d, nesting=%d\n", nshdl->name, nshdl->lev, nshdl->myynest); 790 return FALSE; 791 } 792 else 793 793 /*==================== proclist =================================*/ 794 794 if(strcmp(sys_cmd,"proclist")==0) -
Singular/grammar.y
r7ae776 r77ff8e 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: grammar.y,v 1.4 8 1998-09-14 13:59:28 Singular Exp $ */4 /* $Id: grammar.y,v 1.49 1998-10-15 14:08:29 krueger Exp $ */ 5 5 /* 6 6 * ABSTRACT: SINGULAR shell grammatik … … 1285 1285 //} 1286 1286 } 1287 #ifdef USE_IILOCALRING 1287 1288 iiLocalRing[myynest-1]=IDRING(h); 1289 #else 1290 namespaceroot->next->currRing=IDRING(h); 1291 #endif 1288 1292 } 1289 1293 else -
Singular/ipid.cc
r7ae776 r77ff8e 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: ipid.cc,v 1.1 7 1998-09-24 09:59:44 Singular Exp $ */4 /* $Id: ipid.cc,v 1.18 1998-10-15 14:08:31 krueger Exp $ */ 5 5 6 6 /* … … 27 27 #include "ipid.h" 28 28 29 #ifdef HAVE_NAMESPACES30 29 namehdl namespaceroot = NULL; 31 30 #define TEST 32 # else /* HAVE_NAMESPACES */31 #ifndef HAVE_NAMESPACES 33 32 idhdl idroot = NULL; 34 33 #endif /* HAVE_NAMESPACES */ … … 78 77 IDLEV(h) = lev; 79 78 #ifdef HAVE_NAMESPACES 80 h->ref = 1;79 h->ref = 0; 81 80 #endif /* HAVE_NAMESPACES */ 82 81 IDNEXT(h) = this; … … 287 286 else 288 287 { 288 //if(t==PACKAGE_CMD) printf("Achtung\n"); 289 289 idhdl s=IDROOT; 290 290 while ((s!=h) && (s!=NULL)) s=s->next; … … 315 315 316 316 // any objects defined for this ring ? 317 if (((IDTYP(h)== PACKAGE_CMD) ||(IDRING(h)->ref<=0))317 if (((IDTYP(h)==RING_CMD) && (IDRING(h)->ref<=0)) 318 318 && (IDRING(h)->idroot!=NULL)) 319 319 { … … 650 650 #ifdef HAVE_NAMESPACES 651 651 *h = namespaceroot->get(i, myynest); 652 if(*h == NULL) { *h = namespaceroot->get(i, myynest, TRUE); } 652 653 #else /* HAVE_NAMESPACES */ 653 654 #endif /* HAVE_NAMESPACES */ … … 685 686 } 686 687 687 #ifdef HAVE_NAMESPACES688 688 char *getnamelev() 689 689 { … … 697 697 //printf("PUSH: put entry (%s) on stack\n", name); 698 698 namehdl ns = (namerec *)Alloc0(sizeof(namerec)); 699 extern int myynest; 699 700 ns->next = this; 700 701 if(this==NULL && !init) … … 705 706 if(init) 706 707 { 707 ns->pack = (ip_package *)Alloc0(sizeof(ip_package)); 708 ns->isroot = TRUE; 709 ns->lev = 1; 708 ns->next = NULL; 709 #ifdef HAVE_NAMESPACES 710 ns->pack = (ip_package *)Alloc0(sizeof(ip_package)); 711 #endif /* HAVE_NAMESPACES */ 712 ns->isroot = TRUE; 713 ns->lev = 1; 714 ns->myynest = 0; 710 715 } 711 716 else 712 717 { 718 extern ring currRing; 719 #ifdef HAVE_NAMESPACES 713 720 ns->pack = pack; 721 #endif /* HAVE_NAMESPACES */ 714 722 ns->lev = this->lev+1; 715 } 716 ns->name = mstrdup(name); 717 718 723 ns->myynest = myynest+1; 724 this->currRing = currRing; 725 //printf("Saving Ring %x, %x\n", this->currRing, currRing); 726 } 727 ns->name = mstrdup(name); 728 729 719 730 //if(ns->isroot) Print("PUSH: Add root NameSpace\n"); 731 //ns->currRing = currRing; 732 //ns->currRingHdl = currRingHdl; 733 //printf("Test 1\n"); 720 734 if(ns->isroot) ns->root=ns; else ns->root = this->root; 721 735 namespaceroot = ns; … … 730 744 } 731 745 #endif 746 //Print("NSPUSH: done\n"); 732 747 return(namespaceroot); 733 748 } … … 749 764 } 750 765 766 #ifdef HAVE_NAMESPACES 751 767 idhdl namerec::get(const char * s, int lev, BOOLEAN root) 752 768 { -
Singular/ipid.h
r7ae776 r77ff8e 4 4 * Computer Algebra System SINGULAR * 5 5 ****************************************/ 6 /* $Id: ipid.h,v 1.1 6 1998-09-24 09:59:45 Singular Exp $ */6 /* $Id: ipid.h,v 1.17 1998-10-15 14:08:32 krueger Exp $ */ 7 7 /* 8 8 * ABSTRACT: identfier handling … … 75 75 { 76 76 idhdl idroot; /* local objects */ 77 short ref; 77 78 }; 78 79 … … 138 139 }; 139 140 140 #ifdef HAVE_NAMESPACES141 141 class namerec { 142 142 public: … … 144 144 namehdl root; 145 145 package pack; 146 idhdl currRingHdl;147 146 char * name; 148 147 int lev; … … 151 150 #define NSPACK(a) ((a)->pack) 152 151 152 int myynest; 153 idhdl currRingHdl; 154 ring currRing; 153 155 154 156 namerec() { memset(this,0,sizeof(*this)); } … … 160 162 161 163 extern namehdl namespaceroot; 164 #ifdef HAVE_NAMESPACES 162 165 # define IDROOT (NSROOT(namespaceroot)) 163 166 #else /* HAVE_NAMESPACES */ -
Singular/iplib.cc
r7ae776 r77ff8e 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: iplib.cc,v 1.3 3 1998-08-25 13:33:19krueger Exp $ */4 /* $Id: iplib.cc,v 1.34 1998-10-15 14:08:34 krueger Exp $ */ 5 5 /* 6 6 * ABSTRACT: interpreter: LIB and help … … 28 28 BOOLEAN pstatic = FALSE); 29 29 #endif /* HAVE_LIBPARSER */ 30 #define NS_LRING namespaceroot->next->currRing 30 31 31 32 char *iiConvName(char *p); … … 271 272 } 272 273 274 #ifdef USE_IILOCALRING 273 275 ring *iiLocalRing 274 276 #ifdef TEST … … 276 278 #endif 277 279 ; 280 #endif 278 281 sleftv *iiRETURNEXPR 279 282 #ifdef TEST … … 286 289 static void iiShowLevRings() 287 290 { 291 #ifdef USE_IILOCALRING 288 292 int i; 289 293 for (i=1;i<=myynest;i++) … … 294 298 Print("\n"); 295 299 } 300 #endif 301 { 302 namehdl nshdl; 303 for(nshdl=namespaceroot; nshdl->isroot != TRUE; nshdl = nshdl->next) { 304 Print("%d lev %d:",nshdl->lev, nshdl->myynest); 305 if (nshdl->currRing==NULL) PrintS("NULL"); 306 else Print("%d",nshdl->currRing); 307 Print("\n"); 308 } 309 Print("%d lev %d:",nshdl->lev, nshdl->myynest); 310 if (nshdl->currRing==NULL) PrintS("NULL"); 311 else Print("%d",nshdl->currRing); 312 Print("\n"); 313 } 296 314 if (currRing==NULL) PrintS("curr:NULL\n"); 297 315 else Print ("curr:%d\n",currRing->no); … … 306 324 iiRETURNEXPR_len*sizeof(sleftv), 307 325 (iiRETURNEXPR_len+16)*sizeof(sleftv)); 326 #ifdef IILOCALRING 308 327 iiLocalRing=(ring *)ReAlloc(iiLocalRing, 309 328 iiRETURNEXPR_len*sizeof(ring), 310 329 (iiRETURNEXPR_len+16)*sizeof(ring)); 330 #endif 311 331 iiRETURNEXPR_len+=16; 312 332 } … … 316 336 int err; 317 337 procinfov pi = IDPROC(pn); 318 #ifdef HAVE_NAMESPACES319 338 char *plib = iiConvName(pi->libname); 339 #ifdef HAVE_NAMESPACES 320 340 idhdl ns = namespaceroot->get(plib,0, TRUE); 341 if(pi->is_static) { 342 if(ns==NULL) { 343 Werror("'%s::%s()' 1 is a local procedure and cannot be accessed by an user.", 344 plib, pi->procname); 345 FreeL(plib); 346 return NULL; 347 } 348 if(strcmp(plib, namespaceroot->name)!= 0) { 349 Werror("'%s::%s()' 2 is a local procedure and cannot be accessed by an user.", 350 plib, pi->procname); 351 FreeL(plib); 352 return NULL; 353 } 354 } 321 355 FreeL(plib); 322 356 if(ns != NULL) … … 327 361 else 328 362 { 329 namespaceroot->push(namespaceroot->root->pack, " toplevel");363 namespaceroot->push(namespaceroot->root->pack, "Top"); 330 364 //printf("iiMake_proc: staying in TOP-LEVEL\n"); 331 365 } … … 337 371 return NULL; 338 372 } 373 namespaceroot->push(NULL, plib); 339 374 #endif /* HAVE_NAMESPACES */ 340 375 iiCheckNest(); 376 #ifdef USE_IILOCALRING 341 377 iiLocalRing[myynest]=currRing; 378 #endif 342 379 iiRETURNEXPR[myynest+1].Init(); 343 380 if (traceit&TRACE_SHOW_PROC) … … 349 386 if (traceit&TRACE_SHOW_RINGS) iiShowLevRings(); 350 387 #endif 351 #if 1352 if(pi->language == LANG_SINGULAR)353 {354 err=iiPStart(pn,sl);355 }356 else if(pi->language == LANG_C)357 {358 leftv res = (leftv)Alloc0(sizeof(sleftv));359 res->rtyp=NONE;360 err = (pi->data.o.function)(res, sl);361 iiRETURNEXPR[myynest+1].Copy(res);362 Free((ADDRESS)res, sizeof(sleftv));363 }364 #else365 388 switch (pi->language) 366 389 { 367 case LANG_SINGULAR: err=iiPStart(pn,sl); break; 368 case LANG_C: leftv res = (leftv)Alloc0(sizeof(sleftv)); 369 err = (pi->data.o.function)(res, sl); 370 iiRETURNEXPR[myynest+1].Copy(res); 371 Free((ADDRESS)res, sizeof(sleftv)); 372 break; 373 default: err=TRUE; 374 } 375 #endif 390 case LANG_NONE: 391 err=TRUE; 392 break; 393 394 case LANG_SINGULAR: 395 err=iiPStart(pn,sl); 396 break; 397 case LANG_C: 398 leftv res = (leftv)Alloc0(sizeof(sleftv)); 399 err = (pi->data.o.function)(res, sl); 400 iiRETURNEXPR[myynest+1].Copy(res); 401 Free((ADDRESS)res, sizeof(sleftv)); 402 break; 403 } 376 404 if (traceit&TRACE_SHOW_PROC) 377 405 { … … 387 415 iiRETURNEXPR[myynest+1].Init(); 388 416 } 417 #ifdef HAVE_NAMESPACES 418 if (namespaceroot->next->currRing != currRing) 419 //if (iiLocalRing[myynest] != currRing) 420 { 421 //Print("RING changed?\n"); 422 423 if (((iiRETURNEXPR[myynest+1].Typ()>BEGIN_RING) 424 && (iiRETURNEXPR[myynest+1].Typ()<END_RING)) 425 || ((iiRETURNEXPR[myynest+1].Typ()==LIST_CMD) 426 && (lRingDependend((lists)iiRETURNEXPR[myynest+1].Data())))) 427 { 428 //idhdl hn; 429 char *n; 430 char *o; 431 if (namespaceroot->next->currRing!=NULL) o=rFindHdl(namespaceroot->next->currRing,NULL, NULL)->id; 432 //namespaceroot->currRingHdl->id; 433 else o="none"; 434 if (currRing!=NULL) n=rFindHdl(currRing,NULL, NULL)->id; //currRingHdl->id; 435 else n="none"; 436 Werror("ring change during procedure call: %s -> %s",o,n); 437 iiRETURNEXPR[myynest+1].CleanUp(); 438 err=TRUE; 439 } 440 if (namespaceroot->next->currRing!=NULL) 441 { 442 rSetHdl(rFindHdl(namespaceroot->next->currRing,NULL, NULL),TRUE); 443 iiLocalRing[myynest]=NULL; 444 namespaceroot->next->currRing = NULL; 445 } 446 else 447 { currRingHdl=NULL; currRing=NULL; } 448 } 449 else 450 { 451 if(currRingHdl == NULL) 452 { 453 //printf("iplib.cc: currRingHdl is NULL\n"); 454 //currRingHdl = namespaceroot->currRingHdl; 455 } 456 } 457 #else /* HAVE_NAMESPACES */ 458 #ifdef USE_IILOCALRING 459 if(namespaceroot->next->currRing != iiLocalRing[myynest]) printf("iiMake_proc: 1 ring not saved\n"); 389 460 if (iiLocalRing[myynest] != currRing) 390 461 { … … 409 480 rSetHdl(rFindHdl(iiLocalRing[myynest],NULL, NULL),TRUE); 410 481 iiLocalRing[myynest]=NULL; 482 namespaceroot->next->currRing = NULL; 411 483 } 412 484 else 413 485 { currRingHdl=NULL; currRing=NULL; } 414 486 } 487 #else /* USE_IILOCALRING */ 488 if (NS_LRING != currRing) 489 { 490 if (((iiRETURNEXPR[myynest+1].Typ()>BEGIN_RING) 491 && (iiRETURNEXPR[myynest+1].Typ()<END_RING)) 492 || ((iiRETURNEXPR[myynest+1].Typ()==LIST_CMD) 493 && (lRingDependend((lists)iiRETURNEXPR[myynest+1].Data())))) 494 { 495 //idhdl hn; 496 char *n; 497 char *o; 498 if (NS_LRING!=NULL) o=rFindHdl(NS_LRING,NULL, NULL)->id; 499 else o="none"; 500 if (currRing!=NULL) n=rFindHdl(currRing,NULL, NULL)->id; 501 else n="none"; 502 Werror("ring change during procedure call: %s -> %s",o,n); 503 iiRETURNEXPR[myynest+1].CleanUp(); 504 err=TRUE; 505 } 506 if (NS_LRING!=NULL) 507 { 508 rSetHdl(rFindHdl(NS_LRING,NULL, NULL),TRUE); 509 NS_LRING=NULL; 510 } 511 else 512 { currRingHdl=NULL; currRing=NULL; } 513 } 514 #endif /* USE_IILOCALRING */ 515 #endif /* HAVE_NAMESPACES */ 415 516 if (iiCurrArgs!=NULL) 416 517 { … … 420 521 iiCurrArgs=NULL; 421 522 } 422 #ifdef HAVE_NAMESPACES523 // #ifdef HAVE_NAMESPACES 423 524 namespaceroot->pop(); 424 #endif /* HAVE_NAMESPACES */525 // #endif /* HAVE_NAMESPACES */ 425 526 if (err) 426 527 return NULL; … … 439 540 newBuffer( example, BT_example, pi, pi->data.s.example_lineno ); 440 541 iiCheckNest(); 542 namespaceroot->push(NULL, ""); 543 if(namespaceroot->next->currRing != currRing) printf("iiEStart: ring not saved\n"); 544 #ifdef USE_IILOCALRING 441 545 iiLocalRing[myynest]=currRing; 546 #endif 442 547 if (traceit&TRACE_SHOW_PROC) 443 548 { … … 455 560 printf("leaving -example- (level %d)\n",myynest); 456 561 } 562 #ifdef USE_IILOCALRING 457 563 if (iiLocalRing[myynest] != currRing) 458 564 { … … 468 574 } 469 575 } 576 #else /* USE_IILOCALRING */ 577 if (NS_LRING != currRing) 578 { 579 if (NS_LRING!=NULL) 580 { 581 rSetHdl(rFindHdl(NS_LRING,NULL, NULL),TRUE); 582 NS_LRING=NULL; 583 } 584 else 585 { 586 currRingHdl=NULL; 587 currRing=NULL; 588 } 589 } 590 #endif /* USE_IILOCALRING */ 591 namespaceroot->pop(); 470 592 return err; 471 593 } … … 492 614 } 493 615 #ifdef HAVE_NAMESPACES 616 int token; 617 618 if(IsCmd(plib, &token)) { 619 Werror("'%s' is resered identifier\n", plib); 620 return TRUE; 621 } 494 622 hl = namespaceroot->get("LIB",0, TRUE); 495 623 #else /* HAVE_NAMESPACES */ … … 856 984 857 985 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ 986 char mytoupper(char c) 987 { 988 if(c>=97 && c<=(97+26)) c-=32; 989 return(c); 990 } 991 992 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ 993 #if defined(WINNT) 994 # define FS_SEP '\\' 995 #elif defined(macintosh) 996 # define FS_SEP ',' 997 #else 998 # define FS_SEP '/' 999 #endif 1000 858 1001 char *iiConvName(char *libname) 859 1002 { 860 int l=strlen(libname)+7;861 char *p = (char *)AllocL(l);1003 char *tmpname = mstrdup(libname); 1004 char *p = strrchr(tmpname, FS_SEP); 862 1005 char *r; 863 864 memset(p,0,l);865 //sprintf(p, "%s_init", libname);866 sprintf(p, "%s", libname);867 for(r=p; *r!='\0'; r++)868 {869 if(*r=='.') *r='_';870 if(*r==':') *r='_';871 }872 return( p);1006 if(p==NULL) p = tmpname; 1007 else p++; 1008 r = strchr(p, '.'); 1009 if( r!= NULL) *r = '\0'; 1010 r = mstrdup(p); 1011 *r = mytoupper(*r); 1012 // printf("iiConvName: '%s' '%s' => '%s'\n", libname, tmpname, r); 1013 FreeL(tmpname); 1014 1015 return(r); 873 1016 } 874 1017 -
Singular/ipshell.cc
r7ae776 r77ff8e 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: ipshell.cc,v 1.2 4 1998-09-29 10:36:39krueger Exp $ */4 /* $Id: ipshell.cc,v 1.25 1998-10-15 14:08:35 krueger Exp $ */ 5 5 /* 6 6 * ABSTRACT: … … 800 800 { 801 801 Warn("redefining %s",IDID(h)); 802 #ifdef USE_IILOCALRING 802 803 if (iiLocalRing[0]==IDRING(h)) iiLocalRing[0]=NULL; 804 #else 805 if (namespaceroot->root->currRing==IDRING(h)) 806 namespaceroot->root->currRing=NULL; 807 #endif 803 808 killhdl(h,root); 804 809 } -
Singular/ipshell.h
r7ae776 r77ff8e 4 4 * Computer Algebra System SINGULAR * 5 5 ****************************************/ 6 /* $Id: ipshell.h,v 1.1 2 1998-05-12 14:59:20 Singular Exp $ */6 /* $Id: ipshell.h,v 1.13 1998-10-15 14:08:37 krueger Exp $ */ 7 7 /* 8 8 * ABSTRACT … … 25 25 extern int iiRETURNEXPR_len; 26 26 extern sleftv *iiRETURNEXPR; 27 #ifdef IILOCALRING 27 28 extern ring *iiLocalRing; 29 #endif 28 30 extern cmdnames cmds[]; 29 31 extern char *lastreserved; -
Singular/mod2.h.in
r7ae776 r77ff8e 138 138 #endif 139 139 140 /* Define to use old mechanismen for saving currRing with procedures 141 * Does not work with HAVE_NAMESPACES enabled 142 */ 143 #undef USE_IILOCALRING 144 140 145 /* Define to use new namespaces techniks */ 141 146 #undef HAVE_NAMESPACES … … 321 326 #endif /* not NDEBUG */ 322 327 323 328 #ifdef HAVE_NAMESPACES 329 # undef USE_IILOCALRING 330 #endif 324 331 #endif /* MOD2_H */ -
Singular/ring.cc
r7ae776 r77ff8e 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: ring.cc,v 1.3 1 1998-08-25 13:33:21krueger Exp $ */4 /* $Id: ring.cc,v 1.32 1998-10-15 14:08:39 krueger Exp $ */ 5 5 6 6 /* … … 862 862 int j; 863 863 int *pi=r->order; 864 #ifdef USE_IILOCALRING 864 865 for (j=0;j<iiRETURNEXPR_len;j++) 865 866 { … … 870 871 } 871 872 } 873 #else /* USE_IILOCALRING */ 874 { 875 namehdl nshdl = namespaceroot; 876 877 for(nshdl=namespaceroot; nshdl->isroot != TRUE; nshdl = nshdl->next) { 878 //Print("NSstack: %s:%d, nesting=%d\n", nshdl->name, nshdl->lev, nshdl->myynest); 879 if (nshdl->currRing==r) 880 { 881 if (nshdl->myynest<myynest) 882 // Warn("killing the basering for level %d/%d",nshdl->lev,nshdl->myynest); 883 Warn("killing the basering for level %d",nshdl->myynest); 884 nshdl->currRing=NULL; 885 } 886 } 887 if (nshdl->currRing==r) 888 { 889 //Print("NSstack: %s:%d, nesting=%d\n", nshdl->name, nshdl->lev, nshdl->myynest); 890 if (nshdl->myynest<myynest) 891 // Warn("killing the basering for level %d/%d",nshdl->lev,nshdl->myynest); 892 Warn("killing the basering for level %d",nshdl->myynest); 893 nshdl->currRing=NULL; 894 } 895 } 896 #endif /* USE_IILOCALRING */ 872 897 if (pi!=NULL) 873 898 { -
Singular/structs.h
r7ae776 r77ff8e 4 4 * Computer Algebra System SINGULAR * 5 5 ****************************************/ 6 /* $Id: structs.h,v 1.1 4 1998-09-09 13:08:38 Singular Exp $ */6 /* $Id: structs.h,v 1.15 1998-10-15 14:08:41 krueger Exp $ */ 7 7 /* 8 8 * ABSTRACT … … 46 46 class ssyStrategy; 47 47 class procinfo; 48 #ifdef HAVE_NAMESPACES49 48 class namerec; 50 #endif51 49 #endif 52 50 … … 100 98 typedef ssyStrategy * syStrategy; 101 99 typedef procinfo * procinfov; 102 #ifdef HAVE_NAMESPACES103 100 typedef namerec * namehdl; 104 #endif105 101 #endif 106 102 -
Singular/tesths.cc
r7ae776 r77ff8e 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: tesths.cc,v 1.5 3 1998-10-15 11:46:08 obachmanExp $ */4 /* $Id: tesths.cc,v 1.54 1998-10-15 14:08:43 krueger Exp $ */ 5 5 6 6 /* … … 485 485 } 486 486 /*. say hello */ 487 { 488 idhdl h; 489 namespaceroot->push(NULL, "Top", TRUE); 487 490 #ifdef HAVE_NAMESPACES 488 namespaceroot->push(NULL, "(ROOT)", TRUE); 491 h=enterid(mstrdup("Top"), 0, PACKAGE_CMD, &IDROOT, TRUE); 492 IDPACKAGE(h) = NSPACK(namespaceroot); 489 493 #endif /* HAVE_NAMESPACES */ 494 } 490 495 if (BVERBOSE(0) && !feBatch) 491 496 {
Note: See TracChangeset
for help on using the changeset viewer.