Changeset fe9ee1 in git

Timestamp:

Feb 23, 2012, 4:29:38 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

f2d314f4a0cdb2af36b90c37a45c9c938310b60c

Parents:

b311aa82c685773a7295a82de2a309194f00f7c0

Message:

chg: allow pacakges only within Top (basePack) (from master)

Location:

Singular

Files:

• ipid.cc (modified) (4 diffs)
• ipshell.cc (modified) (8 diffs)

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
-
 /*
 * ABSTRACT: identfier handling
@@ -238 +236 @@
   idhdl h;
   s=omStrDup(s);
+  idhdl *save_root=root;
+  if (t==PACKAGE_CMD) root=&(basePack->idroot);
   // is it already defined in root ?
   if ((h=(*root)->get(s,lev))!=NULL)
@@ -301 +301 @@
   checkall();
 #endif
+  if (t==PACKAGE_CMD) root=save_root;
   return *root;
 
@@ -308 +309 @@
     //listall();
     omFree((ADDRESS)s);
+    if (t==PACKAGE_CMD) root=save_root;
     return NULL;
 }

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT:
@@ -169 +168 @@
                     PrintS(")");
                     break;
-    case PROC_CMD: if(strlen(IDPROC(h)->libname)>0)
+    case PROC_CMD: if((IDPROC(h)->libname!=NULL)
+                   && (strlen(IDPROC(h)->libname)>0))
                      Print(" from %s",IDPROC(h)->libname);
                    if(IDPROC(h)->is_static)
@@ -1769 +1769 @@
     if ( rField_is_Extension(r) )// nCoeff_is_algExt(r->cf))
     {
-      assume( r->cf != NULL );    
+      assume( r->cf != NULL );
       assume( r->cf->extRing != NULL );
-      
+
       rDecomposeCF(&(L->m[0]), r->cf->extRing, r);
     }
@@ -1777 +1777 @@
     {
       assume( nCoeff_is_GF(r->cf) );
-       
+
       lists Lc=(lists)omAlloc0Bin(slists_bin);
       Lc->Init(4);
@@ -1783 +1783 @@
       Lc->m[0].rtyp=INT_CMD;
       Lc->m[0].data=(void*)r->cf->m_nfCharQ;
-      // var:      
+      // var:
       lists Lv=(lists)omAlloc0Bin(slists_bin);
       Lv->Init(1);
       Lv->m[0].rtyp=STRING_CMD;
-      Lv->m[0].data=(void *)omStrDup(*rParameter(r));     
+      Lv->m[0].data=(void *)omStrDup(*rParameter(r));
       Lc->m[1].rtyp=LIST_CMD;
       Lc->m[1].data=(void*)Lv;
@@ -1797 +1797 @@
       Loo->m[0].rtyp=STRING_CMD;
       Loo->m[0].data=(void *)omStrDup(rSimpleOrdStr(ringorder_lp));
-       
+
       intvec *iv=new intvec(1); (*iv)[0]=1;
       Loo->m[1].rtyp=INTVEC_CMD;
       Loo->m[1].data=(void *)iv;
-       
+
       Lo->m[0].rtyp=LIST_CMD;
       Lo->m[0].data=(void*)Loo;
@@ -5039 +5039 @@
     }
     assume( float_len <= float_len2 );
-     
+
     if( !complex_flag && (float_len2 <= (short)SHORT_REAL_LENGTH) )
        cf=nInitChar(n_R, NULL);
     else // longR or longC?
-    { 
+    {
        LongComplexInfo param;
-       
+
        param.float_len = float_len;
        param.float_len2 = float_len2;
-       
+
        // set the parameter name
        if (complex_flag)
@@ -5059 +5059 @@
 
        cf = nInitChar(complex_flag ? n_long_C: n_long_R, (void*)&param);
-    }   
+    }
     assume( cf != NULL );
   }