Changeset 799ce1 in git

Timestamp:

May 5, 1998, 3:46:39 PM (25 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

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

Children:

8d525d24817ecbbf4965a24b18bdb2b1554fef76

Parents:

95ba43dd6254b9f183dccb7cc9ca1463c7f1f302

Message:

Modified Files:
	iplib.cc libparse.l mod2.h.in libparse.cc
Changed output of 'loading libraries'
enabled option(debugLib)


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

Location:

Singular

Files:

• iplib.cc (modified) (3 diffs)
• libparse.l (modified) (13 diffs)
• mod2.h.in (modified) (2 diffs)

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.22 1998-05-05 13:20:46 obachman Exp $ */
+/* $Id: iplib.cc,v 1.23 1998-05-05 13:46:37 krueger Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -507 +507 @@
 #  endif
 //  if (BVERBOSE(V_LOAD_LIB)) Print( "// ** loading %s...", libnamebuf);
+  extern int lpverbose;
+  if (BVERBOSE(V_DEBUG_LIB)) lpverbose=1; else lpverbose=0;
   yylplex(newlib, libnamebuf, &lib_style);
   if(yylp_errno) {
@@ -518 +520 @@
     return TRUE;
   }
-  if (BVERBOSE(V_LOAD_LIB)) Print( "// ** loaded %s", libnamebuf);
+  if (BVERBOSE(V_LOAD_LIB)) Print( "// ** loaded %s %s", libnamebuf,
+                                   text_buffer);
   if( (lib_style == OLD_LIBSTYLE) && (BVERBOSE(V_LOAD_LIB)))
     Warn( "library %s has an old format. Please fix it for the next time",

Singular/libparse.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: libparse.l,v 1.18 1998-05-05 12:07:01 schmidt Exp $ */
+/* $Id: libparse.l,v 1.19 1998-05-05 13:46:38 krueger Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -248 +248 @@
                printf("Version:%s;\n", libnamebuf);
 #else
-               //text_buffer = mstrdup(libnamebuf);
-               print_version(mode, libnamebuf);
+               text_buffer = mstrdup(libnamebuf);
 #endif
              }
@@ -260 +259 @@
              BEGIN(pdef);
              found_proc_in_proc = 0;
+             proc[0]='\0';
+             sscanf( yytext, "%*[^p]proc %s", proc);
+             if(strlen(proc)<1) sscanf( yytext, "proc %s", proc);
 #if YYLPDEBUG > 1
              printf("Newlib:%s\n", newlib);
@@ -269 +271 @@
                }
                pi = (procinfo *)malloc(sizeof(procinfo));
-               iiInitSingularProcinfo(pi, newlib, yytext+5, yylplineno,
+               iiInitSingularProcinfo(pi, newlib, proc, yylplineno,
                                         current_pos(0), p_static);
 #else STANDALONE_PARSER
              if( mode == LOAD_LIB) {
-               proc[0]='\0';
-               sscanf( yytext, "%*[^p]proc %s", proc);
-               if(strlen(proc)<1) sscanf( yytext, "proc %s", proc);
                h0 = enterid( mstrdup(proc), myynest, PROC_CMD,
                                    &idroot, FALSE );
@@ -287 +286 @@
                SET_DEF_END(mode, pi, current_pos(yyleng+1));
 #if YYLPDEBUG
-               if(lpverbose>1) printf("PROC %d at %d/%d: (%d) %s\n", p_static,
-                      yylplineno, current_pos(0), brace1, yytext);
+               if(lpverbose)
+                  printf("// %s PROC '%s' at line %d,%d: (%d).\n", 
+                      p_static ? "local" : "global", proc,
+                      yylplineno, current_pos(0), brace1);
 #endif
                p_static=FALSE;
@@ -299 +300 @@
              SET_EXAMPLE_START(mode, pi, yylplineno, current_pos(0));
 #if YYLPDEBUG
-             if(lpverbose>1) printf("EXAMPLE at %d/%d (%d)\n", yylplineno,
+             if(lpverbose)
+                printf("//     EXAMPLE at line %d,%d (%d)\n", yylplineno,
                     current_pos(0), brace1);
 #endif
@@ -310 +312 @@
 <header>({comment}+{tos}+{dolar}+Id:+{string}+[^\n]*)|({comment}+{tos}+{dolar}+Header:+{string}+[^\n]*) {
              make_version(yytext, 0);
-             //print_version(mode, "");
 #if YYLPDEBUG > 1
              printf("+(id)HEAD:%s\n", yytext);
@@ -326 +327 @@
            }
 <header>^proc\  { yyless(0);
-             //print_version(mode, libfile);
              BEGIN(INITIAL);
              yymore();
@@ -338 +338 @@
 
 <header>^LIB[ \t]+"\""   { quote++;
-             //print_version(mode, libfile);
              BEGIN(libcmd);
            }
@@ -346 +345 @@
              printf(" HEAD:%s\n", yytext);
 #endif
-             //print_version(mode, libfile);
              yyless(0);
              BEGIN(help);
@@ -434 +432 @@
              } else {
                brace1++; BEGIN(pbody);
+               if(lpverbose)
+                  printf("//     BODY at line %d,%d (%d)\n", yylplineno,
+                      current_pos(0), brace1);
                SET_BODY_START(mode, pi, yylplineno, current_pos(0));
              }
@@ -489 +490 @@
 <poldhelp>"{" {
                 brace1++; BEGIN(pbody);
+                if(lpverbose)
+                   printf("//     BODY at line %d,%d (%d)\n", yylplineno,
+                       current_pos(0), brace1);
 #if YYLPDEBUG > 1
                 printf("BEGIN(pbody){=%d, (=%d, [=%d\n", brace1, brace2, brace3);
@@ -508 +512 @@
 <phelp>"{" {
              brace1++; BEGIN(pbody);
+             if(lpverbose)
+                printf("//     BODY at line %d,%d (%d)\n", yylplineno,
+                    current_pos(0), brace1);
 #if YYLPDEBUG > 1
              printf("BEGIN(pbody){=%d, (=%d, [=%d\n", brace1, brace2, brace3);

Singular/mod2.h.in

@@ -132 +132 @@
 /* Define to use new namespaces techniks */
 #undef HAVE_NAMESPACES
+#undef HAVE_DYNAMIC_LOADING
 
 /* Define to use scanner when loading libraries */
@@ -206 +207 @@
 #  undef YYLPDEBUG
 #else
-#  define YYLPDEBUG 0
+#  define YYLPDEBUG 1
 #endif