Changeset 4fc4d1 in git

Timestamp:

May 5, 1998, 8:07:21 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fc1e8c8fa09db4d2b18765fbe4d20d724ccf84c7

Parents:

b0721b2a7867e9d2b6e60b19e20942e0eca2842f

Message:

* hannes/obachman: improved scanner performance (larger blocks)


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

File:

• Singular/febase.inc (modified) (3 diffs)

Singular/febase.inc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.inc,v 1.8 1998-04-30 17:17:36 Singular Exp $ */
+/* $Id: febase.inc,v 1.9 1998-05-05 18:07:21 Singular Exp $ */
 /*
 * ABSTRACT: handling of 'voices'
@@ -432 +432 @@
 int feReadLine(char* b, int l)
 {
-  // try to read from the buffer:
-  // b[1] = '\0';
+  // try to read from the buffer into b, max l chars
   if ((currentVoice->buffer!=NULL)
   && (currentVoice->buffer[currentVoice->fptr]!='\0'))
@@ -446 +445 @@
       b[i]=currentVoice->buffer[currentVoice->fptr];
       i++;
-      if ((c<' ')
-      || (c==';')
-      || (c==')')
-      || (c=='}')
-      || (c=='"')
-      || (c=='$')) break;
+      if (yy_noeof==noeof_block)
+      {
+        if (c<' ')  yylineno++;
+        else if (c=='}') break;
+      }
+      else if (yy_noeof==noeof_string) 
+      {
+        if (c<' ')  yylineno++;
+        else if (c=='"') break;
+      }
+      else
+      {
+        if ((c<' ') ||
+        (c==';') ||
+        (c==')')
+        )
+          break;
+      }          
       if (i>=l) break;
       currentVoice->fptr++;