Changeset 1db74ad in git for Singular/grammar.cc

Timestamp:

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

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

fd4e2f8bbaac7ceb8ac84d5f7dafa1e7fd1a6216

Parents:

d544b11776d6691410329c3725149cb11e700ab3

Message:

option qringNF

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

File:

• Singular/grammar.cc (modified) (1 diff)

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