Changeset c3776f in git for modules/modgen

Timestamp:

Feb 14, 2000, 10:47:10 PM (24 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

e56e690882b68d43ad8fdea3b2fb6491b114bb09

Parents:

6f9fc9da63f8977922660d8b028df13336cec5b4

Message:

       * scanner.l:
         - fixed linenumbering (example section)
         - extended command within C-definition
         - Added recognition of 'static', and '#'


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

File:

• modules/modgen/scanner.l (modified) (5 diffs)

modules/modgen/scanner.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: scanner.l,v 1.5 2000-01-27 12:40:55 krueger Exp $ */
+/* $Id: scanner.l,v 1.6 2000-02-14 21:47:10 krueger Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -125 +125 @@
 %x SECT3
 %x PROCDECL
+%x EXAMPLE
 
 %x pdef
@@ -259 +260 @@
                   return PROCDECLTOK;
                 }
-        example+{WSNL}+"{" {
+        example {
                   printf(">>>EXAMPLE\n");
-                  brace1 = 1; /* { */
+                  brace1 = 0; /* { */
                   brace2 = 0; /* ( */
                   brace3 = 0; /* [ */
-                  push_state(YYSTATE, CODEBLOCK2, "CODEBLOCK2");
+                  push_state(YYSTATE, EXAMPLE, "EXAMPLE");
                   return EXAMPLETOK;
                 }
+        static  { return STATICTOK; }
+        {NAME}  { 
+                   int i,tok;
+#if DEBUG > 1
+                   printf("(%d) VAR: %s\n", yylineno, yytext);
+#endif
+                   i = IsCmd(yytext, tok);
+#if DEBUG > 1
+                   printf("Res=%d, %d => %s\n", i, tok,
+                          i ? "VARTYPETOK" : "NAME");
+#endif
+                   if(i) {
+                     lvalp->tp.name = strdup(yytext);
+                     lvalp->tp.typ = tok;
+                     push_state(YYSTATE, PROCDECL, "PROCDECL");
+                     return VARTYPETOK;
+                   }
+                   else {
+                     //do_return++;
+                     lvalp->name = strdup(yytext);
+                     push_state(YYSTATE, PROCDECL, "PROCDECL");
+                     return NAME;
+                   }
+                 }
         .       { printf("<<<'%s' ", yytext); }
-
-       }
+       }
+
+<EXAMPLE>{
+        {NL}    { yylineno++; }
+        {WS}    /* ignore */
+        "{"     { brace1++;
+                  switch_state(YYSTATE, CODEBLOCK2, "CODEBLOCK2");
+                  return '{';
+                }
+        .       { printf("ERROR <<<'%s' ", yytext); }
+}
 
 <SECT3>{
@@ -321 +355 @@
          ")"     { return ')'; }
          ","     { return ','; }
+         "#"     { return '#'; }
          "="     { return '='; }
          ";"     { return ';'; }
@@ -365 +400 @@
 <PROCCMDBLOCK>{
        {col}  { pop_state(); return ';'; }
-        "("     { return '('; }
-        ")"     { return ')'; }
-       {WS}    /* ignore */
+        "("   { return '('; }
+        ")"   { return ')'; }
+        ","   { return ','; }
+       {WS}   /* ignore */
        {NAME} { lvalp->name = strdup(yytext); return NAME; }
+       {NL}   { yylineno++; }
+       "::"   { return MCOLONCOLON; }
        .      { printf("PCB: '%s'\n", yytext); }
        }