Changeset 1db74ad in git

Timestamp:

Jan 28, 2010, 1:53:51 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

fd4e2f8bbaac7ceb8ac84d5f7dafa1e7fd1a6216

Parents:

d544b11776d6691410329c3725149cb11e700ab3

Message:

option qringNF

git-svn-id: file:///usr/local/Singular/svn/trunk@12471 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• grammar.cc (modified) (1 diff)
• grammar.y (modified) (1 diff)
• misc.cc (modified) (2 diffs)

Singular/grammar.cc

@@ -3637 +3637 @@
                     if (iiExport(&(yyvsp[(2) - (2)].lv),myynest-1)) YYERROR;
 #if 1
-                    //if (TEST_OPT_KEEPVARS)
-                    //{
-                      idhdl p=IDRING(h)->idroot;
-                      idhdl root=p;
-                      int prevlev=myynest-1;
-                      while (p!=NULL)
+                    idhdl p=IDRING(h)->idroot;
+                    idhdl root=p;
+                    int prevlev=myynest-1;
+                    while (p!=NULL)
+                    {
+                      if (IDLEV(p)==myynest)
                       {
-                        if (IDLEV(p)==myynest)
+                        idhdl old=root->get(IDID(p),prevlev);
+                        if (old!=NULL)
                         {
-                          idhdl old=root->get(IDID(p),prevlev);
-                          if (old!=NULL)
-                          {
-                            if (BVERBOSE(V_REDEFINE))
-                              Warn("redefining %s",IDID(p));
-                            killhdl2(old,&root,IDRING(h));
-                            IDRING(h)->idroot=root;
-                          }
-                          IDLEV(p)=prevlev;
+                          if (BVERBOSE(V_REDEFINE))
+                            Warn("redefining %s",IDID(p));
+                          killhdl2(old,&root,IDRING(h));
+                          IDRING(h)->idroot=root;
                         }
-                        p=IDNEXT(p);
+                        IDLEV(p)=prevlev;
                       }
-                      //IDRING(h)->idroot=root;
-#endif
-                    //}
+                      p=IDNEXT(p);
+                    }
+#endif
                   }
 #ifdef USE_IILOCALRING

Singular/grammar.y

@@ -1364 +1364 @@
                     if (iiExport(&$2,myynest-1)) YYERROR;
 #if 1
-                    //if (TEST_OPT_KEEPVARS)
-                    //{
-                      idhdl p=IDRING(h)->idroot;
-                      idhdl root=p;
-                      int prevlev=myynest-1;
-                      while (p!=NULL)
+                    idhdl p=IDRING(h)->idroot;
+                    idhdl root=p;
+                    int prevlev=myynest-1;
+                    while (p!=NULL)
+                    {
+                      if (IDLEV(p)==myynest)
                       {
-                        if (IDLEV(p)==myynest)
+                        idhdl old=root->get(IDID(p),prevlev);
+                        if (old!=NULL)
                         {
-                          idhdl old=root->get(IDID(p),prevlev);
-                          if (old!=NULL)
-                          {
-                            if (BVERBOSE(V_REDEFINE))
-                              Warn("redefining %s",IDID(p));
-                            killhdl2(old,&root,IDRING(h));
-                            IDRING(h)->idroot=root;
-                          }
-                          IDLEV(p)=prevlev;
+                          if (BVERBOSE(V_REDEFINE))
+                            Warn("redefining %s",IDID(p));
+                          killhdl2(old,&root,IDRING(h));
+                          IDRING(h)->idroot=root;
                         }
-                        p=IDNEXT(p);
+                        IDLEV(p)=prevlev;
                       }
-                      //IDRING(h)->idroot=root;
+                      p=IDNEXT(p);
+                    }
 #endif
-                    //}
                   }
 #ifdef USE_IILOCALRING

Singular/misc.cc

@@ -203 +203 @@
   {"fastHC",       Sy_bit(OPT_FASTHC),         ~Sy_bit(OPT_FASTHC)  },
   /* 11-19 sort in L/T */
-  {"keepvars",     Sy_bit(OPT_KEEPVARS),       ~Sy_bit(OPT_KEEPVARS) },
   {"staircaseBound",Sy_bit(OPT_STAIRCASEBOUND),~Sy_bit(OPT_STAIRCASEBOUND)  },
   {"multBound",    Sy_bit(OPT_MULTBOUND),      ~Sy_bit(OPT_MULTBOUND)  },
@@ -230 +229 @@
   {"loadProc", Sy_bit(V_LOAD_PROC), ~Sy_bit(V_LOAD_PROC)  },
   {"defRes",   Sy_bit(V_DEF_RES),   ~Sy_bit(V_DEF_RES)    },
-  {"debugMem", Sy_bit(V_DEBUG_MEM), ~Sy_bit(V_DEBUG_MEM)  },
   {"usage",    Sy_bit(V_SHOW_USE),  ~Sy_bit(V_SHOW_USE)   },
   {"Imap",     Sy_bit(V_IMAP),      ~Sy_bit(V_IMAP)       },
   {"prompt",   Sy_bit(V_PROMPT),    ~Sy_bit(V_PROMPT)     },
   {"length",   Sy_bit(V_LENGTH),    ~Sy_bit(V_LENGTH)     },
-  {"notWarnSB",Sy_bit(V_NSB),       ~Sy_bit(V_NSB)        },
   {"contentSB",Sy_bit(V_CONTENTSB), ~Sy_bit(V_CONTENTSB)  },
   {"cancelunit",Sy_bit(V_CANCELUNIT),~Sy_bit(V_CANCELUNIT)},