Changeset 5b32a1 in git for Singular

Timestamp:

Jan 18, 2013, 6:45:36 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1f1fb0ae2d0228deb0e78489ca037165df05672b

Parents:

95c8260b23a2326800f3f5fa9092330787e39d7a271d25946dbb409d16650bb1ecdffccf0c03594e

Message:

Merge branch 'spielwiese' into sw_fix

* spielwiese:
  fix: warning for option changes does not work for libsingular

Conflicts:
	Singular/iplib.cc

Location:

Singular

Files:

• LIB/dmod.lib (modified) (2 diffs)
• LIB/finvar.lib (modified) (1 diff)
• iparith.cc (modified) (1 diff)
• ipid.cc (modified) (2 diffs)
• ipid.h (modified) (2 diffs)
• iplib.cc (modified) (4 diffs)
• ipshell.cc (modified) (2 diffs)
• table.h (modified) (1 diff)

Singular/LIB/dmod.lib

@@ -1721 +1721 @@
   dbprint(ppl-1, @R4);
   ideal K4 = imap(@R2,K2);
+  intvec saveopt=option(get);
   option(redSB);
   dbprint(ppl,"// -3-2- the final cosmetic std");
@@ -1731 +1732 @@
   ideal LD = K4;
   export LD;
+  option(set,saveopt);
   return(@R4);
 }

Singular/LIB/finvar.lib

@@ -6462 +6462 @@
   int dgb=degBound;
   degBound = 0;
+  intvec saveopt=option(get);
   option(redSB);
   ideal sP = groebner(ideal(P));

Singular/iparith.cc

@@ -4542 +4542 @@
 {
   res->data=ipNameList(((ring)v->Data())->idroot);
+  return FALSE;
+}
+static BOOLEAN jjNAMES_I(leftv res, leftv v)
+{
+  res->data=ipNameListLev((IDROOT),(int)(long)v->Data());
   return FALSE;
 }

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
+
 /*
 * ABSTRACT: identfier handling
@@ -519 +520 @@
 }
 
+lists ipNameListLev(idhdl root, int lev)
+{
+  idhdl h=root;
+  /* compute the length */
+  int l=0;
+  while (h!=NULL) { if (IDLEV(h)==lev) l++; h=IDNEXT(h); }
+  /* allocate list */
+  lists L=(lists)omAllocBin(slists_bin);
+  L->Init(l);
+  /* copy names */
+  h=root;
+  l=0;
+  while (h!=NULL)
+  {
+    if (IDLEV(h)==lev)
+    {
+      /* list is initialized with 0 => no need to clear anything */
+      L->m[l].rtyp=STRING_CMD;
+      L->m[l].data=omStrDup(IDID(h));
+      l++;
+    }
+    h=IDNEXT(h);
+  }
+  return L;
+}
+
 /*
 * move 'tomove' from root1 list to root2 list

Singular/ipid.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
+
 /*
 * ABSTRACT: identfier handling
@@ -98 +99 @@
 void  killhdl2(idhdl h, idhdl * ih, ring r);
 lists ipNameList(idhdl root);
+lists ipNameListLev(idhdl root, int lev);
 void  ipMoveId(idhdl h);
 BOOLEAN checkPackage(package pack);

Singular/iplib.cc

@@ -311 +311 @@
   #ifndef LIBSINGULAR
   // see below:
-  int save1=(si_opt_1 & ~TEST_RINGDEP_OPTS);
-  int save2=si_opt_2;
+  BITSET save1=(test & ~TEST_RINGDEP_OPTS);
+  BITSET save2=verbose;
   #endif
   BOOLEAN err=yyparse();
@@ -322 +322 @@
   // the access to optionStruct and verboseStruct do not work
   // on x86_64-Linux for pic-code
-  int save11= ( si_opt_1 & ~TEST_RINGDEP_OPTS);
+  BITSET save11= ( test & ~TEST_RINGDEP_OPTS);
   if ((TEST_V_ALLWARN) &&
   (t==BT_proc) &&
-  ((save1!=save11)||(save2!=si_opt_2)) &&
+  ((save1!=save11)||(save2!=verbose)) &&
   (pi->libname!=NULL) && (pi->libname[0]!='\0'))
   {
@@ -345 +345 @@
     for (i=0; verboseStruct[i].setval!=0; i++)
     {
-      if ((verboseStruct[i].setval & si_opt_2)
+      if ((verboseStruct[i].setval & verbose)
       && (!(verboseStruct[i].setval & save2)))
       {
           Print(" +%s",verboseStruct[i].name);
       }
-      if (!(verboseStruct[i].setval & si_opt_2)
+      if (!(verboseStruct[i].setval & verbose)
       && ((verboseStruct[i].setval & save2)))
       {
@@ -357 +357 @@
     }
     PrintLn();
-  //  PrintS(p);
   }
   #endif

Singular/ipshell.cc

@@ -1279 +1279 @@
   idhdl h=(idhdl)v->data;
   //Print("iiInternalExport('%s',%d)%s\n", v->name, toLev,"");
-  if (IDLEV(h)==0) Warn("`%s` is already global",IDID(h));
+  if (IDLEV(h)==0)
+  {
+    if (!BVERBOSE(V_REDEFINE)) Warn("`%s` is already global",IDID(h));
+  }
   else
   {
@@ -1438 +1441 @@
         if ((pack==currPack) && (old==(idhdl)v->data))
         {
-          Warn("`%s` is already global",IDID(old));
+          if (!BVERBOSE(V_REDEFINE)) Warn("`%s` is already global",IDID(old));
           break;
         }

Singular/table.h

@@ -189 +189 @@
 ,{D(jjMSTD),       MSTD_CMD,        LIST_CMD,       MODUL_CMD     , NO_PLURAL |ALLOW_RING}
 ,{D(jjNAMEOF),     NAMEOF_CMD,      STRING_CMD,     ANY_TYPE      , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjNAMES_I),    NAMES_CMD,       LIST_CMD,       INT_CMD       , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjNAMES),      NAMES_CMD,       LIST_CMD,       PACKAGE_CMD   , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjNAMES),      NAMES_CMD,       LIST_CMD,       RING_CMD      , ALLOW_PLURAL |ALLOW_RING}