Changeset 7fd611 in git

Timestamp:

May 18, 1998, 11:32:07 AM (25 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

2f786f772c07a297f5aeb1e84266fbeb9c80861d

Parents:

edb75871a6a2c6003867916fbd03788e11c667bd

Message:

pretty-printing of help


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

Location:

Singular

Files:

• iplib.cc (modified) (4 diffs)
• libparse.l (modified) (4 diffs)

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.25 1998-05-13 14:53:45 Singular Exp $ */
+/* $Id: iplib.cc,v 1.26 1998-05-18 09:32:07 krueger Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -130 +130 @@
   char buf[256], *s = NULL, *p;
   long procbuflen;
-
+  
   FILE * fp = feFopen( pi->libname, "rb", NULL, TRUE );
   if (fp==NULL)
@@ -140 +140 @@
   if(part==0)
   { // load help string
+    int i, offset=0;
     long head = pi->data.s.def_end - pi->data.s.proc_start;
     procbuflen = pi->data.s.help_end - pi->data.s.help_start;
@@ -151 +152 @@
     s[procbuflen+head+1] = '\n';
     s[procbuflen+head+2] = '\0';
+    offset=0;
+    for(i=0;i<=procbuflen+head+2; i++) {
+      if(s[i]=='\\' &&
+         (s[i+1]=='"' || s[i+1]=='{' || s[i+1]=='}' || s[i+1]=='\\')) {
+        i++;
+        offset++;
+      }
+      if(offset>0) s[i-offset] = s[i];
+    }
     return(s);
   }

Singular/libparse.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: libparse.l,v 1.21 1998-05-09 14:34:31 krueger Exp $ */
+/* $Id: libparse.l,v 1.22 1998-05-18 09:32:07 krueger Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -451 +451 @@
               }
             }
+<pdef>({comment}[^\n]*)  { }
+<pdef>\/\/*      { old_state = YYSTATE; BEGIN(comment); }
 <pdef>.    {
              if(brace2<=0) {
@@ -738 +740 @@
   if((last_cmd == LP_INFO)&&(mode == GET_INFO))
   {
+    int i, offset=0;
     long current_location = ftell(yylpin);
     int len = (int)(current_pos(0) - string_start);
@@ -745 +748 @@
     fseek(yylpin, current_location, SEEK_SET);
     text_buffer[len]='\0';
+    offset=0;
+    for(i=0;i<=len; i++) {
+      if(text_buffer[i]=='\\' &&
+         (text_buffer[i+1]=='"' || text_buffer[i+1]=='{' ||
+          text_buffer[i+1]=='}' || text_buffer[i+1]=='\\')) {
+        i++;
+        offset++;
+      }
+      if(offset>0) text_buffer[i-offset] = text_buffer[i];
+    }
   }
 #  endif /* STANDALONE_PARSER */