Changeset 8e153e in git

Timestamp:

Apr 17, 2000, 9:21:24 AM (23 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

1d46f5b70e82c10c361435b8f012c15e4259c91f

Parents:

ad25acec8dc31a886e076a58c7936b36b268bda8

Message:

some work on error handling while parsing input file


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

Location:

modules/modgen

Files:

• grammar.y (modified) (4 diffs)
• main.cc (modified) (1 diff)
• scanner.l (modified) (4 diffs)

modules/modgen/grammar.y

@@ -1 +1 @@
 /*
- * $Id: grammar.y,v 1.11 2000-03-30 06:35:44 krueger Exp $
+ * $Id: grammar.y,v 1.12 2000-04-17 07:21:24 krueger Exp $
  */
 
@@ -19 +19 @@
 
 int sectnum = 1;
+int iseof = 0;
 extern moddef module_def;
 extern int yylineno;
@@ -34 +35 @@
 void yyerror(char * fmt)
   {
+    if(!iseof) printf("%s at line %d\n", fmt, yylineno);
   }
 
@@ -92 +94 @@
 part1: initmod sect1 sect1end
         {
+          if(do_create_makefile)mod_create_makefile(&module_def);
+          if(write_intro(&module_def)) {
+            return(myyyerror("Error while creating files\n"));
+          }
+        }
+        | sect1 sect1end
+        {
+          write_mod_init(&module_def, module_def.fmtfp);
+          if(do_create_makefile)mod_create_makefile(&module_def);
+          if(write_intro(&module_def)) {
+            return(myyyerror("Error while creating files\n"));
+          }
+        }
+        | sect1end
+        {
+          write_mod_init(&module_def, module_def.fmtfp);
           if(do_create_makefile)mod_create_makefile(&module_def);
           if(write_intro(&module_def)) {

modules/modgen/main.cc

@@ -123 +123 @@
   do {
       i=yyparse();
-      if(!i) printf("FINISH? (%d)\n", i);
-      else
-        if(debug)printf("NEXT LOOP at line %d (%s) %d\n", yylineno, yytext, i);
+      switch(i) {
+          case 0:
+            printf("FINISH? %s (%d)\n", yytext, yylineno); break;
+          case 1:
+            if(debug>2)
+              printf("NEXT LOOP at line %d (%s) %d\n", yylineno, yytext, i);
+            if(strlen(yytext))
+              printf("something went wrong at line %d\n", yylineno);
+            break;
+          default:
+            break;
+      }
   }
   while (!i);

modules/modgen/scanner.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: scanner.l,v 1.10 2000-03-30 06:35:45 krueger Exp $ */
+/* $Id: scanner.l,v 1.11 2000-04-17 07:21:24 krueger Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -28 +28 @@
 #  define YYLP_MISS_BR2   11
 #  define YYLP_MISS_BR3   12
+
+  extern int iseof;
 
   int offset = 0;
@@ -316 +318 @@
 
         <<EOF>>  { sectnum = 0;
+                   iseof=1;
                    return SECT3END;
                    /*yyterminate();*/
@@ -438 +441 @@
 extern "C" {
   int yywrap() {
-    printf("===================== yywrap() =====================\n");
     return 1;
   }