Changeset c94e823 in git

Timestamp:

Jun 27, 2002, 4:01:12 PM (22 years ago)

Author:

Anne Frühbis-Krüger <anne@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

131741204f267749e08d5e5c5ee81bf81658001b

Parents:

a3b38303c6c8160d0fbe955295aec7ba0ea21e02

Message:

*anne: fixed bug in modgen if parsing large %C sections
       (buffer size problem in grammar.y, fixed by doing output line by line)


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

Location:

modules/modgen

Files:

• grammar.y (modified) (3 diffs)
• makefile.cc (modified) (2 diffs)
• scanner.l (modified) (2 diffs)

modules/modgen/grammar.y

@@ -1 +1 @@
 /*
- * $Id: grammar.y,v 1.16 2002-06-18 15:09:15 anne Exp $
+ * $Id: grammar.y,v 1.17 2002-06-27 14:01:11 anne Exp $
  */
 
@@ -693 +693 @@
 sect4:  SECT4START codeline SECT4END
         {
-          fprintf(module_def.modfp, "%s", $2);
         };
 
@@ -703 +702 @@
         | codeline CODEPART
         {
+          fprintf(module_def.modfp, "%s", $2);
         }
         ;

modules/modgen/makefile.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: makefile.cc,v 1.9 2002-06-26 12:03:16 anne Exp $ */
+/* $Id: makefile.cc,v 1.10 2002-06-27 14:01:11 anne Exp $ */
 /*
 * ABSTRACT: lib parsing
@@ -89 +89 @@
   fprintf(fp, "CC\t= gcc\n");
   fprintf(fp, "CXX\t= gcc\n");
-  fprintf(fp, "CFLAGS\t= -DNDEBUG -DBUILD_MODULE -I. -I%s/include\n",TOPSRCDIR);
-  fprintf(fp, "DCFLAGS\t= -DBUILD_MODULE -I. -I%s/include\n",TOPSRCDIR);
+#warning "PROBLEM: nice place for include file has to be found"
+  fprintf(fp, "CFLAGS\t= -DNDEBUG -DBUILD_MODULE -I. -I%s/Singular -I%s/include\n",PREFIX,EXEC_PREFIX);
+  fprintf(fp, "DCFLAGS\t= -DBUILD_MODULE -I. -I%s/Singular -I%s/include\n",PREFIX,EXEC_PREFIX);
   fprintf(fp, "#LD\t=\n");
   fprintf(fp, "\n");
   fprintf(fp, "instdir          = %s\n", inst_dir );
-  fprintf(fp, "INSTALL\t\t= %s/Singular/install-sh -c\n", TOPSRCDIR);
+#warning "PROBLEM: do we also install install-sh when installing Singular?"
+  fprintf(fp, "INSTALL\t\t= %s/Singular/install-sh -c\n", PREFIX);
   fprintf(fp, "INSTALL_PROGRAM\t= ${INSTALL}\n");
   fprintf(fp, "INSTALL_DATA\t= ${INSTALL} -m 644\n");

modules/modgen/scanner.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: scanner.l,v 1.12 2000-05-01 19:14:49 krueger Exp $ */
+/* $Id: scanner.l,v 1.13 2002-06-27 14:01:12 anne Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -391 +391 @@
 <SECT4>{
         {NL}    { yylineno++; }
-        .*(\n?) { lvalp->name = yytext; return CODEPART; }
+        .*(\n?) { lvalp->name = yytext; 
+                  return CODEPART; }
 
         <<EOF>>  { sectnum = 0;
                    iseof=1;
                    return SECT4END;
-                   /*yyterminate();*/
+                   /* yyterminate(); */
                  }
        }