Changeset e13573 in git

Timestamp:

Apr 24, 1998, 12:01:12 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

7ce376ee8ce495c683e7f0dff5afa5cf217c5905

Parents:

b06a25ad4cff4b2d53c1d954b1a01da40d0a9fb9

Message:

*** empty log message ***


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

Location:

Singular

Files:

• grammar.y (modified) (3 diffs)
• iparith.cc (modified) (1 diff)

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.27 1998-04-23 18:52:54 Singular Exp $ */
+/* $Id: grammar.y,v 1.28 1998-04-24 10:01:10 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -256 +256 @@
 %token <i> WHILE_CMD
 %token <i> RETURN
+%token <i> END_GRAMMAR
 %token <i> PARAMETER
 
@@ -1475 +1476 @@
         | RETURN '(' ')'
           {
-            if(iiRETURNEXPR==NULL) YYERROR;
-            iiRETURNEXPR[myynest].Init();
-            iiRETURNEXPR[myynest].rtyp=NONE;
-            if (exitBuffer(BT_proc)) YYERROR;
-          }
-        ;
+            if ($1==RETURN)
+            {
+              if(iiRETURNEXPR==NULL) YYERROR;
+              iiRETURNEXPR[myynest].Init();
+              iiRETURNEXPR[myynest].rtyp=NONE;
+              if (exitBuffer(BT_proc)) YYERROR;
+            }
+          }
+        ;

Singular/iparith.cc

@@ -254 +254 @@
   { "resultant",   0, RESULTANT_CMD,      CMD_3},
   { "return",      0, RETURN ,            RETURN},
+  { "RETURN",      0, END_GRAMMAR ,       RETURN},
   { "ring",        0, RING_CMD ,          RING_CMD},
   { "rvar",        0, IS_RINGVAR ,        CMD_1},