Changeset 3c0710 in git for Singular/grammar.cc

Timestamp:

Nov 14, 2016, 3:14:23 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

59ef0762a78769ee649f91a7c5efbe2f6cca9c3063f46d58a72834b7842693e4f7b37f3a08a1b55b

Parents:

3fec5d04607bb2dbc78498417a5ca31c056e2b82

Message:

4-1-0: sources

File:

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

Singular/grammar.cc

@@ -756 +756 @@
     1125,  1132,  1140,  1152,  1168,  1187,  1191,  1195,  1200,  1204,
     1208,  1212,  1216,  1221,  1227,  1233,  1239,  1245,  1251,  1257,
-    1269,  1276,  1280,  1317,  1324,  1329,  1346,  1352,  1352,  1355,
-    1423,  1427,  1456,  1469,  1486,  1495,  1500,  1508,  1520,  1539,
-    1549,  1568,  1591,  1597,  1609,  1615
+    1269,  1276,  1280,  1317,  1324,  1329,  1342,  1348,  1348,  1351,
+    1419,  1423,  1452,  1465,  1482,  1491,  1496,  1504,  1516,  1535,
+    1545,  1564,  1587,  1593,  1605,  1611
 };
 #endif
@@ -3907 +3907 @@
 #line 1330 "grammar.y"
     {
-          #ifdef SINGULAR_4_1
           yyInRingConstruction = FALSE;
           sleftv tmp;
@@ -3915 +3914 @@
           if (iiExprArithM(&tmp,&(yyvsp[(4) - (7)].lv),'[')) YYERROR;
           if (iiAssignCR(&(yyvsp[(2) - (7)].lv),&tmp)) YYERROR;
-          #else
-          YYERROR;
-          #endif
         ;}
     break;
@@ -3924 +3920 @@
 
 /* Line 1464 of yacc.c  */
-#line 1347 "grammar.y"
+#line 1343 "grammar.y"
     {
             if (((yyvsp[(1) - (2)].i)!=LIB_CMD)||(jjLOAD((yyvsp[(2) - (2)].name),TRUE))) YYERROR;
@@ -3933 +3929 @@
 
 /* Line 1464 of yacc.c  */
-#line 1356 "grammar.y"
+#line 1352 "grammar.y"
     {
             if (((yyvsp[(1) - (2)].i)==KEEPRING_CMD) && (myynest==0))
@@ -4003 +3999 @@
 
 /* Line 1464 of yacc.c  */
+#line 1420 "grammar.y"
+    {
+            type_cmd(&((yyvsp[(2) - (2)].lv)));
+          ;}
+    break;
+
+  case 161:
+
+/* Line 1464 of yacc.c  */
 #line 1424 "grammar.y"
-    {
-            type_cmd(&((yyvsp[(2) - (2)].lv)));
-          ;}
-    break;
-
-  case 161:
-
-/* Line 1464 of yacc.c  */
-#line 1428 "grammar.y"
     {
             //Print("typ is %d, rtyp:%d\n",$1.Typ(),$1.rtyp);
@@ -4040 +4036 @@
 
 /* Line 1464 of yacc.c  */
-#line 1457 "grammar.y"
+#line 1453 "grammar.y"
     {
             int i; TESTSETINT((yyvsp[(3) - (5)].lv),i);
@@ -4058 +4054 @@
 
 /* Line 1464 of yacc.c  */
-#line 1470 "grammar.y"
+#line 1466 "grammar.y"
     {
             if (currentVoice->ifsw==1)
@@ -4080 +4076 @@
 
 /* Line 1464 of yacc.c  */
-#line 1487 "grammar.y"
+#line 1483 "grammar.y"
     {
             int i; TESTSETINT((yyvsp[(3) - (5)].lv),i);
@@ -4094 +4090 @@
 
 /* Line 1464 of yacc.c  */
-#line 1496 "grammar.y"
+#line 1492 "grammar.y"
     {
             if (exitBuffer(BT_break)) YYERROR;
@@ -4104 +4100 @@
 
 /* Line 1464 of yacc.c  */
-#line 1501 "grammar.y"
+#line 1497 "grammar.y"
     {
             if (contBuffer(BT_break)) YYERROR;
@@ -4114 +4110 @@
 
 /* Line 1464 of yacc.c  */
-#line 1509 "grammar.y"
+#line 1505 "grammar.y"
     {
             /* -> if(!$2) break; $3; continue;*/
@@ -4128 +4124 @@
 
 /* Line 1464 of yacc.c  */
-#line 1521 "grammar.y"
+#line 1517 "grammar.y"
     {
             /* $2 */
@@ -4149 +4145 @@
 
 /* Line 1464 of yacc.c  */
-#line 1540 "grammar.y"
+#line 1536 "grammar.y"
     {
             idhdl h = enterid((yyvsp[(2) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE);
@@ -4164 +4160 @@
 
 /* Line 1464 of yacc.c  */
-#line 1550 "grammar.y"
+#line 1546 "grammar.y"
     {
             idhdl h = enterid((yyvsp[(1) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE);
@@ -4188 +4184 @@
 
 /* Line 1464 of yacc.c  */
-#line 1569 "grammar.y"
+#line 1565 "grammar.y"
     {
             omFree((ADDRESS)(yyvsp[(3) - (4)].name));
@@ -4213 +4209 @@
 
 /* Line 1464 of yacc.c  */
-#line 1592 "grammar.y"
+#line 1588 "grammar.y"
     {
             // decl. of type proc p(int i)
@@ -4224 +4220 @@
 
 /* Line 1464 of yacc.c  */
-#line 1598 "grammar.y"
+#line 1594 "grammar.y"
     {
             // decl. of type proc p(i)
@@ -4238 +4234 @@
 
 /* Line 1464 of yacc.c  */
-#line 1610 "grammar.y"
+#line 1606 "grammar.y"
     {
             iiRETURNEXPR.Copy(&(yyvsp[(3) - (4)].lv));
@@ -4249 +4245 @@
 
 /* Line 1464 of yacc.c  */
-#line 1616 "grammar.y"
+#line 1612 "grammar.y"
     {
             if ((yyvsp[(1) - (3)].i)==RETURN)
@@ -4263 +4259 @@
 
 /* Line 1464 of yacc.c  */
-#line 4264 "grammar.cc"
+#line 4260 "grammar.cc"
       default: break;
     }