Changeset c2da0a in git

Timestamp:

Apr 20, 1998, 12:05:55 PM (26 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

365819b7d885a4cbf318e09a20d2ae8dce0b45a4

Parents:

b35b93807f117d1b5cb55df216eefd3920e0d91f

Message:

Bug fixes for libparse


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

Location:

Singular

Files:

• libparse.h (modified) (1 diff)
• libparse.l (modified) (10 diffs)
• libparse.sed (added)
• utils.cc (modified) (1 diff)
• utils.h (modified) (1 diff)

Singular/libparse.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: libparse.h,v 1.3 1998-04-06 16:27:19 krueger Exp $ */
+/* $Id: libparse.h,v 1.4 1998-04-20 10:05:53 krueger Exp $ */
 /*
 * ABSTRACT: lib parsing
 */
-#include "subexpr.h"
+#ifndef STANDALONE_PARSER
+#  include "subexpr.h"
+#endif
 typedef enum { LOAD_LIB, GET_INFO } lp_modes;
 typedef enum { OLD_LIBSTYLE, NEW_LIBSTYLE } lib_style_types;

Singular/libparse.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: libparse.l,v 1.6 1998-04-16 08:12:55 pohl Exp $ */
+/* $Id: libparse.l,v 1.7 1998-04-20 10:05:54 krueger Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -21 +21 @@
 #  include "febase.h"
 #  include "mmemory.h"
-#  include "libparse.h"
-#endif
+#endif
+#include "libparse.h"
 
 #ifdef HAVE_LIBPARSER
@@ -40 +40 @@
 int quote  = 0;  /* " */
 int offset = 0;
-int p_static = 0;
+BOOLEAN p_static = FALSE;
 int old_state = 0;
 lib_cmds last_cmd = LP_NONE;
@@ -112 +112 @@
 #ifdef STANDALONE_PARSER
 procinfov pi;
-procinfo *iiInitSingularProcinfo(procinfov pi, char *libname,
-                                 char *procname, int line, long pos,
-                                 int pstatic = 0);
 printpi(procinfov pi);
 pi_clear(procinfov pi);
@@ -236 +233 @@
            }
 
-static     { p_static=1; }
+static     { p_static=TRUE; }
 
 (proc[ \t]+{name})|([ \t]proc[ \t]+{name}) {
              char proc[256];
              BEGIN(pdef);
-#if YYLPDEBUG
+#if YYLPDEBUG > 0
              printf("Newlib:%s\n", newlib);
 #endif
 #ifdef STANDALONE_PARSER
-             if ( pi != NULL ) {
-               printpi(pi);
-               pi_clear(pi);
-             }
-             pi = (procinfo *)malloc(sizeof(procinfo));
-             iiInitSingularProcinfo(pi, newlib, yytext+5, yylplineno,
+               if ( pi != NULL ) {
+                 printpi(pi);
+                 pi_clear(pi);
+               }
+               pi = (procinfo *)malloc(sizeof(procinfo));
+               iiInitSingularProcinfo(pi, newlib, yytext+5, yylplineno,
                                         current_pos(0), p_static);
 #else STANDALONE_PARSER
@@ -271 +268 @@
                       yylplineno, current_pos(0), brace1, yytext);
 #endif
-               p_static=0;
+               p_static=FALSE;
+#ifndef STANDALONE_PARSER
              }
+#endif STANDALONE_PARSER
            }
 example    {
@@ -546 +545 @@
 
 \n                       { yylplineno++; }
-;                        { p_static = 0;
+;                        { p_static = FALSE;
 #if YYLPDEBUG
                             printf("%s", yytext);
 #endif
                          }
-.                        { p_static = 0; 
+.                        { p_static = FALSE; 
                            yylp_errno = YYLP_BAD_CHAR;
 #if YYLPDEBUG
@@ -625 +624 @@
 void copy_string(lp_modes mode)
 {
+#ifndef STANDALONE_PARSER
   if((last_cmd == LP_INFO)&&(mode == GET_INFO)) {
     long current_location = ftell(yylpin);
@@ -633 +633 @@
     fseek(yylpin, current_location, SEEK_SET);
   }
+#endif /* STANDALONE_PARSER */
 }
 
@@ -667 +668 @@
   yylplex(argv[0], argv[0], &lib_style);
   if(yylp_errno) {
-    printf("ERROR accured: ");
+    printf("ERROR accured: [%d] ", yylp_errno);
     printf(yylp_errlist[yylp_errno], yylplineno);
     printf("\n");

Singular/utils.cc

@@ -9 +9 @@
 procinfo *iiInitSingularProcinfo(procinfov pi, char *libname,
                                  char *procname, int line, long pos,
-                                 int pstatic = 0)
+                                 BOOLEAN pstatic = FALSE)
 {
   pi->libname = (char *)malloc(strlen(libname)+1);

Singular/utils.h

@@ -1 +1 @@
 /*
  */
+
+typedef short BOOLEAN;
+
+#ifndef FALSE
+#define FALSE       0
+#endif
+
+#ifndef TRUE
+#define TRUE        1
+#endif
 
 class procinfo;