Changeset e39eb55 in git

Timestamp:

Aug 12, 2011, 10:20:39 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

56d3c66235e3148151d587d3e4b7e9e3e86bd342

Parents:

74bb49bd78c4c6f75879051c97675236707b61f0

Message:

fix tr. 355 again

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

Location:

Singular

Files:

• grammar.cc (modified) (1 diff)
• grammar.y (modified) (1 diff)
• ipid.cc (modified) (1 diff)

Singular/grammar.cc

@@ -3251 +3251 @@
             if (b!=NULL)
             {
-              if (yyvsp[-6].lv.rtyp==IDHDL) 
-                newRingHdl=enterid(ring_name, myynest, RING_CMD,
+              newRingHdl=enterid(ring_name, myynest, RING_CMD,
                                    &(yyvsp[-6].lv.req_packhdl->idroot),FALSE);
               yyvsp[-6].lv.CleanUp();

Singular/grammar.y

@@ -1287 +1287 @@
             if (b!=NULL)
             {
-              if ($2.rtyp==IDHDL)
               newRingHdl=enterid(ring_name, myynest, RING_CMD,
                                    &($2.req_packhdl->idroot),FALSE);

Singular/ipid.cc

@@ -233 +233 @@
 idhdl enterid(const char * s, int lev, int t, idhdl* root, BOOLEAN init, BOOLEAN search)
 {
+  if (s==NULL) return NULL;
   idhdl h;
   s=omStrDup(s);