Changeset 14b6448 in git

Timestamp:

Dec 12, 2000, 12:06:00 PM (22 years ago)

Author:

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

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

a3abdbc6c5cd89db3e2c383b2b8babb0c3bbedbf

Parents:

de7793b9aaa39c2f00b6e30ee4ad5c82915497aa

Message:

*anne: added category=... and LIB("...") to libparse.l


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

File:

• Singular/libparse.l (modified) (14 diffs)

Singular/libparse.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: libparse.l,v 1.42 2000-09-18 09:19:11 obachman Exp $ */
+/* $Id: libparse.l,v 1.43 2000-12-12 11:06:00 anne Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -27 +27 @@
 #define YY_SKIP_YYWRAP
 
-typedef enum { LP_NONE, LP_INFO, LP_VERSION} lib_cmds;
+typedef enum { LP_NONE, LP_INFO, LP_CATEGORY, LP_VERSION} lib_cmds;
 
 int libread(FILE* f, char* buf, int max_size);
@@ -58 +58 @@
 int texinfo_out = 0;
 int found_info=0,
+    found_cat=0,
     found_version=0,
     found_oldhelp = 0,
@@ -243 +244 @@
 %x help
 %x libcmd
+%x libcmd2
 %x pdef
 %x phead
@@ -254 +256 @@
 %x comment
 %x info
+%x category
 %x version
 
@@ -263 +266 @@
          yyless(4); old_state = YYSTATE; BEGIN(info);
        }
-
+(category+{eqnl}+{quote}+{strings}+{quote}) {
+         yyless(8); old_state = YYSTATE; BEGIN(category);
+       }
 (version+{eqnl}+{quote}+{strings}+{quote}) {
              found_version++;
@@ -392 +397 @@
            }
 
+LIB[ \t]*"(\"" { quote++; brace2++;
+             BEGIN(libcmd2);
+           }
+
 <header>({comment}+{tos}+{dolar}+Id:+{string}+[^\n]*)|({comment}+{tos}+{dolar}+Header:+{string}+[^\n]*) {
              make_version(yytext, 0);
@@ -412 +421 @@
              yymore();
            }
-<header>(info+{eqnl}+{quote})|(version+{eqnl}+{quote}) {
+<header>(info+{eqnl}+{quote})|(version+{eqnl}+{quote})|(category+{eqnl}+{quote}) {
              yyless(0);
              *lib_style = NEW_LIBSTYLE;
@@ -422 +431 @@
              BEGIN(libcmd);
            }
+<header>^LIB[ \t]+"(\""   { quote++; brace2++;
+             BEGIN(libcmd2);
+           }
 <header>\n { yylplineno++; }
 <header>.  {
@@ -441 +453 @@
              BEGIN(INITIAL);
            }
-<help>(info+{eqnl}+{quote})|(version+{eqnl}+{quote}) {
+<help>(info+{eqnl}+{quote})|(version+{eqnl}+{quote})|(category+{eqnl}+{quote}) {
              yyless(0);
              *lib_style = NEW_LIBSTYLE;
@@ -456 +468 @@
              BEGIN(libcmd);
            }
+<help>^LIB[ \t]+"(\""     { quote++; brace2++;
+             BEGIN(libcmd2);
+           }
 
 <help>\n { yylplineno++; }
@@ -472 +487 @@
 
 <libcmd>{string}"\""     { quote--;
+             yytext[yyleng-1] = '\0';
+             #ifndef STANDALONE_PARSER
+             if ( mode == LOAD_LIB )
+             {
+               library_stack->push(newlib, yytext);
+             }
+             #endif /* STANDALONE_PARSER */
+             #if YYLPDEBUG
+             if(lpverbose>1) printf("LIB:'%s'\n", yytext);
+             #endif
+             BEGIN(INITIAL);
+           }
+<libcmd2>{string}"\")"     { quote--; brace2--;
              yytext[yyleng-1] = '\0';
              #ifndef STANDALONE_PARSER
@@ -707 +735 @@
 <info>.  { }
 
+<category>{quote} {
+             quote++; BEGIN(string);
+             found_cat++;
+             string_start = current_pos(yyleng);
+             *lib_style = NEW_LIBSTYLE;
+             last_cmd = LP_CATEGORY;
+       }
+<category>\n { yylplineno++; }
+<category>.  { }
+
 <string>"\""             { quote--;
                            #ifdef HAVE_NAMESPACES
@@ -858 +896 @@
 {
 #ifdef STANDALONE_PARSER
-  if (texinfo_out && last_cmd == LP_INFO)
+  if (texinfo_out && (last_cmd == LP_INFO || last_cmd == LP_CATEGORY))
   {
     long current_location = ftell(yylpin), i = string_start, quote = 0;
     char c;
-    printf("$info = <<EOT;\n");
+    if (last_cmd == LP_INFO)
+    {
+      printf("$info = <<EOT;\n");
+    }
+    else
+    {
+      printf("$category = <<EOT;\n");
+    }
     fseek (yylpin, i, SEEK_SET);
     while (i< current_location)