Changeset db45a2 in git

Timestamp:

Aug 10, 2011, 4:02:17 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

1085d42039758a8ec5ff857d7c0b1d53388050e6

Parents:

92d6849100514317f65f8b2200dd0ec32ce68b7c

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-10 16:02:17+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:18:26+01:00

Message:

fix grammar.y/grammar.cc

Location:

Singular

Files:

• grammar.cc (modified) (23 diffs)
• grammar.y (modified) (2 diffs)
• ipid.cc (modified) (1 diff)
• ipid.h (modified) (1 diff)
• ipshell.h (modified) (1 diff)
• misc_ip.cc (modified) (1 diff)

Singular/grammar.cc

@@ -324 +324 @@
 #include <misc/options.h>
 #include <Singular/stype.h>
+#include <Singular/fehelp.h>
 #include <Singular/ipid.h>
 #include <misc/intvec.h>
@@ -788 +789 @@
     1084,  1097,  1096,  1104,  1109,  1116,  1124,  1136,  1152,  1171,
     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,  1414,  1443,  1456,  1473,  1482,
-    1487,  1495,  1507,  1526,  1537,  1557,  1581,  1587,  1599,  1606
+    1221,  1227,  1233,  1239,  1245,  1251,  1263,  1270,  1274,  1311,
+    1321,  1334,  1334,  1337,  1409,  1413,  1442,  1455,  1472,  1481,
+    1486,  1494,  1506,  1525,  1536,  1556,  1580,  1586,  1598,  1605
 };
 #endif
@@ -2308 +2309 @@
               if (strcmp(tmp,yyvsp[0].name)!=0)
               {
-                nlRead(yyvsp[0].name,&n);
+                n_Read(yyvsp[0].name,&n,coeffs_BIGINT);
                 yyval.lv.rtyp=BIGINT_CMD;
                 yyval.lv.data = n;
@@ -3275 +3276 @@
 
   case 149:
-#line 1313 "grammar.y"
+#line 1312 "grammar.y"
     {
             const char *ring_name = yyvsp[0].lv.name;
@@ -3285 +3286 @@
 
   case 150:
-#line 1323 "grammar.y"
+#line 1322 "grammar.y"
     {
             if ((yyvsp[-1].i!=LIB_CMD)||(iiLibCmd(yyvsp[0].name,TRUE,TRUE,TRUE)))
@@ -3299 +3300 @@
 
   case 153:
-#line 1339 "grammar.y"
+#line 1338 "grammar.y"
     {
             if ((yyvsp[-1].i==KEEPRING_CMD) && (myynest==0))
@@ -3371 +3372 @@
 
   case 154:
-#line 1411 "grammar.y"
+#line 1410 "grammar.y"
     {
             type_cmd(&(yyvsp[0].lv));
@@ -3378 +3379 @@
 
   case 155:
-#line 1415 "grammar.y"
+#line 1414 "grammar.y"
     {
             //Print("typ is %d, rtyp:%d\n",$1.Typ(),$1.rtyp);
@@ -3404 +3405 @@
 
   case 156:
-#line 1444 "grammar.y"
+#line 1443 "grammar.y"
     {
             int i; TESTSETINT(yyvsp[-2].lv,i);
@@ -3420 +3421 @@
 
   case 157:
-#line 1457 "grammar.y"
+#line 1456 "grammar.y"
     {
             if (currentVoice->ifsw==1)
@@ -3440 +3441 @@
 
   case 158:
-#line 1474 "grammar.y"
+#line 1473 "grammar.y"
     {
             int i; TESTSETINT(yyvsp[-2].lv,i);
@@ -3452 +3453 @@
 
   case 159:
-#line 1483 "grammar.y"
+#line 1482 "grammar.y"
     {
             if (exitBuffer(BT_break)) YYERROR;
@@ -3460 +3461 @@
 
   case 160:
-#line 1488 "grammar.y"
+#line 1487 "grammar.y"
     {
             if (contBuffer(BT_break)) YYERROR;
@@ -3468 +3469 @@
 
   case 161:
-#line 1496 "grammar.y"
+#line 1495 "grammar.y"
     {
             /* -> if(!$2) break; $3; continue;*/
@@ -3480 +3481 @@
 
   case 162:
-#line 1508 "grammar.y"
+#line 1507 "grammar.y"
     {
             /* $2 */
@@ -3499 +3500 @@
 
   case 163:
-#line 1527 "grammar.y"
+#line 1526 "grammar.y"
     {
             procinfov pi;
@@ -3513 +3514 @@
 
   case 164:
-#line 1538 "grammar.y"
+#line 1537 "grammar.y"
     {
             idhdl h = enterid(yyvsp[-2].name,myynest,PROC_CMD,&IDROOT,TRUE);
@@ -3536 +3537 @@
 
   case 165:
-#line 1558 "grammar.y"
+#line 1557 "grammar.y"
     {
             omFree((ADDRESS)yyvsp[-1].name);
@@ -3560 +3561 @@
 
   case 166:
-#line 1582 "grammar.y"
+#line 1581 "grammar.y"
     {
             // decl. of type proc p(int i)
@@ -3569 +3570 @@
 
   case 167:
-#line 1588 "grammar.y"
+#line 1587 "grammar.y"
     {
             // decl. of type proc p(i)
@@ -3581 +3582 @@
 
   case 168:
-#line 1600 "grammar.y"
+#line 1599 "grammar.y"
     {
             if(iiRETURNEXPR==NULL) YYERROR;
@@ -3591 +3592 @@
 
   case 169:
-#line 1607 "grammar.y"
+#line 1606 "grammar.y"
     {
             if (yyvsp[-2].i==RETURN)
@@ -3607 +3608 @@
 
 /* Line 1010 of yacc.c.  */
-#line 3609 "grammar.cc"
+#line 3608 "grammar.cc"
 
 

Singular/grammar.y

@@ -20 +20 @@
 #include <misc/options.h>
 #include <Singular/stype.h>
+#include <Singular/fehelp.h>
 #include <Singular/ipid.h>
 #include <misc/intvec.h>
@@ -569 +570 @@
               if (strcmp(tmp,$1)!=0)
               {
-                nlRead($1,&n);
+                n_Read($1,&n,coeffs_BIGINT);
                 $$.rtyp=BIGINT_CMD;
                 $$.data = n;

Singular/ipid.cc

@@ -40 +40 @@
 omBin idrec_bin = omGetSpecBin(sizeof(idrec));
 
+coeffs coeffs_BIGINT;
+
+FILE   *feFilePending; /*temp. storage for grammar.y */
+
 proclevel *procstack=NULL;
 #define TEST

Singular/ipid.h

@@ -132 +132 @@
 extern omBin sip_package_bin;
 extern omBin idrec_bin;
+extern omBin sleftv_bin;
+
+extern coeffs coeffs_BIGINT;
+
+extern FILE   *feFilePending; /*temp. storage for grammar.y */
 #endif
 

Singular/ipshell.h

@@ -208 +208 @@
 #endif
 void rSetHdl(idhdl h);
-
-#endif
-
+ring rInit(sleftv* pn, sleftv* rv, sleftv* ord);
+idhdl rFindHdl(ring r, idhdl n, idhdl w);
+
+#endif
+

Singular/misc_ip.cc

@@ -1115 +1115 @@
   currPackHdl=h;
   basePackHdl=h;
+  coeffs_BIGINT=nInitChar(n_Q,NULL);
 
 // random generator: -----------------------------------------------