Changeset 103560 in git for Singular/grammar.cc

Timestamp:

Jun 10, 2011, 11:56:24 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

fd0df1f775c1d3b6f3ad50b19a825bfb5051f3a9

Parents:

ae7cad0b174b23760efd41f0bf7c461c5e33e96a

Message:

redesign of command type, fix tr. 343


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

File:

• Singular/grammar.cc (modified) (17 diffs)

Singular/grammar.cc

@@ -790 +790 @@
     1175,  1179,  1184,  1188,  1192,  1196,  1200,  1204,  1209,  1215,
     1221,  1227,  1233,  1239,  1245,  1251,  1263,  1270,  1274,  1312,
-    1322,  1335,  1335,  1338,  1410,  1419,  1448,  1461,  1478,  1487,
-    1492,  1500,  1512,  1531,  1542,  1562,  1586,  1592,  1604,  1611
+    1322,  1335,  1335,  1338,  1410,  1414,  1443,  1456,  1473,  1482,
+    1487,  1495,  1507,  1526,  1537,  1557,  1581,  1587,  1599,  1606
 };
 #endif
@@ -3375 +3375 @@
 #line 1411 "grammar.y"
     {
-            if ((yyvsp[0].lv.e!=NULL)||(yyvsp[0].lv.rtyp!=IDHDL)) yyvsp[0].lv.Print();
-            else
-            {
-              idhdl h = (idhdl)yyvsp[0].lv.data;
-              type_cmd(h);
-            }
+            type_cmd(&(yyvsp[0].lv));
           ;}
     break;
 
   case 155:
-#line 1420 "grammar.y"
+#line 1415 "grammar.y"
     {
             //Print("typ is %d, rtyp:%d\n",$1.Typ(),$1.rtyp);
@@ -3411 +3406 @@
 
   case 156:
-#line 1449 "grammar.y"
+#line 1444 "grammar.y"
     {
             int i; TESTSETINT(yyvsp[-2].lv,i);
@@ -3427 +3422 @@
 
   case 157:
-#line 1462 "grammar.y"
+#line 1457 "grammar.y"
     {
             if (currentVoice->ifsw==1)
@@ -3447 +3442 @@
 
   case 158:
-#line 1479 "grammar.y"
+#line 1474 "grammar.y"
     {
             int i; TESTSETINT(yyvsp[-2].lv,i);
@@ -3459 +3454 @@
 
   case 159:
-#line 1488 "grammar.y"
+#line 1483 "grammar.y"
     {
             if (exitBuffer(BT_break)) YYERROR;
@@ -3467 +3462 @@
 
   case 160:
-#line 1493 "grammar.y"
+#line 1488 "grammar.y"
     {
             if (contBuffer(BT_break)) YYERROR;
@@ -3475 +3470 @@
 
   case 161:
-#line 1501 "grammar.y"
+#line 1496 "grammar.y"
     {
             /* -> if(!$2) break; $3; continue;*/
@@ -3487 +3482 @@
 
   case 162:
-#line 1513 "grammar.y"
+#line 1508 "grammar.y"
     {
             /* $2 */
@@ -3506 +3501 @@
 
   case 163:
-#line 1532 "grammar.y"
+#line 1527 "grammar.y"
     {
             procinfov pi;
@@ -3520 +3515 @@
 
   case 164:
-#line 1543 "grammar.y"
+#line 1538 "grammar.y"
     {
             idhdl h = enterid(yyvsp[-2].name,myynest,PROC_CMD,&IDROOT,TRUE);
@@ -3543 +3538 @@
 
   case 165:
-#line 1563 "grammar.y"
+#line 1558 "grammar.y"
     {
             omFree((ADDRESS)yyvsp[-1].name);
@@ -3567 +3562 @@
 
   case 166:
-#line 1587 "grammar.y"
+#line 1582 "grammar.y"
     {
             // decl. of type proc p(int i)
@@ -3576 +3571 @@
 
   case 167:
-#line 1593 "grammar.y"
+#line 1588 "grammar.y"
     {
             // decl. of type proc p(i)
@@ -3588 +3583 @@
 
   case 168:
-#line 1605 "grammar.y"
+#line 1600 "grammar.y"
     {
             if(iiRETURNEXPR==NULL) YYERROR;
@@ -3598 +3593 @@
 
   case 169:
-#line 1612 "grammar.y"
+#line 1607 "grammar.y"
     {
             if (yyvsp[-2].i==RETURN)
@@ -3614 +3609 @@
 
 /* Line 1010 of yacc.c.  */
-#line 3614 "grammar.cc"
+#line 3609 "grammar.cc"