Changeset 15ca85 in git for Singular/fevoices.cc

Timestamp:

Oct 26, 2017, 5:23:31 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

d779ed4fd5d9854632a2afc7075d8b0066c9402f

Parents:

71e2bd7ba0cdb5092b01012d7067e04d08d3b8ed

Message:

opt: simplification in feReadLine

File:

• Singular/fevoices.cc (modified) (2 diffs)

Singular/fevoices.cc

@@ -38 +38 @@
 FILE *File_Profiling=NULL;
 
-// output/print buffer:
-#define INITIAL_PRINT_BUFFER 24*1024L
 // line buffer for reading:
 // minimal value for MAX_FILE_BUFFER: 4*4096 - see Tst/Long/gcd0_l.tst
 // this is an upper limit for the size of monomials/numbers read via the interpreter
 #define MAX_FILE_BUFFER 4*4096
-// static long feBufferLength=INITIAL_PRINT_BUFFER;
-//static char * feBuffer=(char *)omAlloc(INITIAL_PRINT_BUFFER);
 
 /**************************************************************************
@@ -538 +534 @@
       if (currentVoice->sw==BI_buffer)
       {
+        BOOLEAN show_echo=FALSE;
+        char *anf;
+        long len;
         if (startfptr==0)
         {
-          char *anf=currentVoice->buffer;
+          anf=currentVoice->buffer;
           const char *ss=strchr(anf,'\n');
-          long len;
           if (ss==NULL) len=strlen(anf);
           else          len=ss-anf;
+          show_echo=TRUE;
+        }
+        else if (/*(startfptr>0) &&*/
+        (currentVoice->buffer[startfptr-1]=='\n'))
+        {
+          anf=currentVoice->buffer+startfptr;
+          const char *ss=strchr(anf,'\n');
+          if (ss==NULL) len=strlen(anf);
+          else          len=ss-anf;
+          show_echo=TRUE;
+          yylineno++;
+        }
+        if (show_echo)
+        {
           char *s=(char *)omAlloc(len+2);
           strncpy(s,anf,len+2);
           s[len+1]='\0';
-          fePrintEcho(s,b);
-          omFree((ADDRESS)s);
-        }
-        else if (/*(startfptr>0) &&*/
-        (currentVoice->buffer[startfptr-1]=='\n'))
-        {
-          char *anf=currentVoice->buffer+startfptr;
-          const char *ss=strchr(anf,'\n');
-          long len;
-          if (ss==NULL) len=strlen(anf);
-          else          len=ss-anf;
-          char *s=(char *)omAlloc(len+2);
-          strncpy(s,anf,len+2);
-          s[len+1]='\0';
-          yylineno++;
           fePrintEcho(s,b);
           omFree((ADDRESS)s);