Changeset 41bef1 in git for Singular/grammar.y

Timestamp:

Apr 6, 2010, 11:48:07 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b28edcc719c8787868b435698baa56dc28a2cf41

Parents:

69b4990f59641fb854b4b0c6b4c68f32a163ae9d

Message:

^C/option a fixed

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

File:

• Singular/grammar.y (modified) (1 diff)

Singular/grammar.y

@@ -390 +390 @@
             if(siCntrlc)
             {
-              siCntrlc=FALSE;
-              MYYERROR("abort...");
-            }
-            if (errorreported)
+              WerrorS("abort...");
+              while((currentVoice!=NULL) && (currentVoice->prev!=NULL)) exitVoice();
+              if (currentVoice!=NULL) currentVoice->ifsw=0;
+            }
+            if (errorreported) /* also catches abort... */
             {
               yyerror("");