Changeset ad4bc9 in git

Timestamp:

May 6, 1999, 6:53:35 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

c59d88ee06883f262adb708e6846ac13d54018e3

Parents:

8d4732632f41e8c44b6ae3e871af2513fba44823

Message:

* hannes: Debugger-changes, typo fixes


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

Files:

• Singular/extra.cc (modified) (3 diffs)
• Singular/febase.inc (modified) (8 diffs)
• Singular/grammar.y (modified) (6 diffs)
• Singular/ipid.cc (modified) (8 diffs)
• Singular/sdb.cc (modified) (10 diffs)
• Singular/sdb.h (modified) (2 diffs)
• doc/examples.doc (modified) (previous)
• doc/general.doc (modified) (previous)
• doc/math.doc (modified) (previous)
• doc/pdata.doc (modified) (previous)
• doc/start.doc (modified) (previous)
• doc/types.doc (modified) (previous)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.90 1999-04-29 11:38:40 Singular Exp $ */
+/* $Id: extra.cc,v 1.91 1999-05-06 16:53:21 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -940 +940 @@
         {
           sdb_lines[i]=lineno;
+          sdb_files[i]=p->libname;
           i++;
           Print("breakpoint %d, at line %d in %s\n",i,lineno,p->procname);
@@ -948 +949 @@
       {
         WerrorS("system(\"breakpoint\",`proc`,`int`) expected");
+        return TRUE;
+      }
+      return FALSE;
+    }
+    else
+/*==================== sdb_flags =================*/
+    if (strcmp(sys_cmd, "sdb_flags") == 0)
+    {
+      if ((h!=NULL) && (h->Typ()==INT_CMD))
+      {
+        sdb_flags=(int)h->Data();
+      }
+      else
+      {
+        WerrorS("system(\"sdb_flags\",`int`) expected");
+        return TRUE;
+      }
+      return FALSE;
+    }
+    else
+/*==================== sdb_edit =================*/
+    if (strcmp(sys_cmd, "sdb_edit") == 0)
+    {
+      if ((h!=NULL) && (h->Typ()==PROC_CMD))
+      {
+        procinfov p=(procinfov)h->Data();
+        sdb_edit(p);
+      }
+      else
+      {
+        WerrorS("system(\"sdb_edit\",`proc`) expected");
         return TRUE;
       }

Singular/febase.inc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.inc,v 1.23 1999-04-29 16:57:12 Singular Exp $ */
+/* $Id: febase.inc,v 1.24 1999-05-06 16:53:22 Singular Exp $ */
 /*
 * ABSTRACT: handling of 'voices'
@@ -430 +430 @@
   && (currentVoice->pi->trace_flag!=0))
   {
-    sdb(currentVoice, anf, len_s, b);
+    sdb(currentVoice, anf, len_s);
   }
   prompt_char = '.';
@@ -447 +447 @@
     {
   NewBuff:
-      int i=0;
-      int startfptr=currentVoice->fptr;
+      register int i=0;
+      long startfptr=currentVoice->fptr;
+      long tmp_ptr=currentVoice->fptr;
       l--;
       loop
       {
-        char c=
-        b[i]=currentVoice->buffer[currentVoice->fptr];
+        register char c=
+        b[i]=currentVoice->buffer[tmp_ptr/*currentVoice->fptr*/];
         i++;
         if (yy_noeof==noeof_block)
@@ -469 +470 @@
         }
         if (i>=l) break;
-        currentVoice->fptr++;
-        if(currentVoice->buffer[currentVoice->fptr]=='\0') break;
-      }
+        tmp_ptr++;/*currentVoice->fptr++;*/
+        if(currentVoice->buffer[tmp_ptr/*currentVoice->fptr*/]=='\0') break;
+      }
+      currentVoice->fptr=tmp_ptr;
       b[i]='\0';
       if (currentVoice->sw==BI_buffer)
@@ -522 +524 @@
       s=fe_fgets_stdin(fe_promptstr,
                        currentVoice->buffer+offset,
-                       (4096-1-sizeof(ADDRESS))-offset);
+                       (4096-1-sizeof(ADDRESS))-offset);
     }
     else if (currentVoice->sw==BI_file)
@@ -530 +532 @@
     }
     //else /* BI_buffer */ s==NULL  => return 0
-    //{
-    //  return 0;
-    //}
+    // done by the default return
   }
   if (s!=NULL)
@@ -556 +556 @@
   /* else if (s==NULL) */
   {
-    char *err=NULL;
+    char *err;
     switch(yy_noeof)
     {
@@ -579 +579 @@
         break;
       default:
-        break;
-    }
-    if (err!=NULL)
-      Werror("premature end of file while reading %s",err);
+        return 0;
+    }
+    Werror("premature end of file while reading %s",err);
     return 0;
   }

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.59 1999-04-16 07:53:32 obachman Exp $ */
+/* $Id: grammar.y,v 1.60 1999-05-06 16:53:23 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -39 +39 @@
 #include "ipshell.h"
 #include "ipconv.h"
+#include "sdb.h"
 #include "ideals.h"
 #include "numbers.h"
@@ -121 +122 @@
   if ((currentVoice!=NULL)
   && (currentVoice->prev!=NULL)
-  && (myynest>0))
+  && (myynest>0)
+  && ((sdb_flags &1)==0))
   {
     Werror("leaving %s",VoiceName());
@@ -323 +325 @@
             #endif
             prompt_char = '>';
+            if (sdb_flags & 2) { sdb_flags=0; YYERROR; }
             if(siCntrlc)
             {
@@ -377 +380 @@
             yyerror("");
             yyerrok;
+            if ((sdb_flags & 1) && currentVoice->pi!=NULL)
+            {
+              currentVoice->pi->trace_flag |=1;
+            } 
+            else
             if (myynest>0)
             {
@@ -391 +399 @@
               exitVoice();
             }
+            if (sdb_flags &2) sdb_flags=1;
           }
         ;

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.31 1999-03-16 15:33:13 Singular Exp $ */
+/* $Id: ipid.cc,v 1.32 1999-05-06 16:53:24 Singular Exp $ */
 
 /*
@@ -65 +65 @@
     {
       return h;
-    }  
+    }
 #endif
 // =============================================================
@@ -89 +89 @@
     l=IDLEV(h);
     if ((l==0)||(l==lev))
-    { 
+    {
       id=IDID(h);
       if (*(short *)s==*(short *)id)
@@ -350 +350 @@
     if(t==PACKAGE_CMD) {
       killhdl(h,&NSROOT(namespaceroot->root));
-    } else 
+    } else
 #endif /* HAVE_NAMESPACES */
     {
@@ -416 +416 @@
 #ifdef HAVE_NAMESPACES
   // package -------------------------------------------------------------
-  else if (IDTYP(h) == PACKAGE_CMD) {
-    if(IDPACKAGE(h)->language!=LANG_TOP) {
+  else if (IDTYP(h) == PACKAGE_CMD)
+  {
+    if(IDPACKAGE(h)->language!=LANG_TOP)
+    {
       if(!paKill(IDPACKAGE(h))) return;
-    } else {
-      if(strcmp(IDID(h), "Top")!=0) {
+    }
+    else
+    {
+      if(strcmp(IDID(h), "Top")!=0)
+      {
         if(!paKill(IDPACKAGE(h))) return;
       }
-      else {
+      else
+      {
         if(!paKill(IDPACKAGE(h), TRUE)) return;
       }
@@ -857 +863 @@
   ns->name    = mstrdup(name);
   ns->myynest = nesting;
-  
+
   //ns->currRing = currRing;
   //ns->currRingHdl = currRingHdl;
@@ -915 +921 @@
 {
   namehdl nshdl = namespaceroot;
-      
+
   for(nshdl=namespaceroot; nshdl->isroot != TRUE; nshdl = nshdl->next) {
     //Print("NSstack: %s:%d, nesting=%d\n", nshdl->name, nshdl->lev, nshdl->myynest);
@@ -931 +937 @@
   }
   return TRUE;
-  
-}
-#endif /* HAVE_NAMESPACES */
+
+}
+#endif /* HAVE_NAMESPACES */

Singular/sdb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sdb.cc,v 1.3 1999-04-29 16:57:18 Singular Exp $ */
+/* $Id: sdb.cc,v 1.4 1999-05-06 16:53:25 Singular Exp $ */
 /*
 * ABSTRACT: Singular debugger
 */
 
+#include <unistd.h>   // for unlink,fork,execlp,getpid
+#include <sys/wait.h> // for wait
 #include "mod2.h"
 #include "tok.h"
@@ -16 +18 @@
 
 int sdb_lines[]={-1,-1,-1,-1,-1,-1,-1,-1};
+char * sdb_files[6];
+int sdb_flags=1;
 
 int sdb_checkline(char f)
@@ -31 +35 @@
 }
 
+void sdb_edit(procinfo *pi)
+{
+  char * filename = "/tmp/sd000000";
+  sprintf(filename+7,"%d",getpid());
+  FILE *fp=fopen(filename,"w");
+  if (fp==NULL)
+  {
+    Print("cannot open %s\n",filename);
+    return;
+  }
+  if (pi->language!= LANG_SINGULAR)
+  {
+    Print("cannot edit type %d\n",pi->language);
+    fclose(fp);
+    fp=NULL;
+  }
+  else
+  {
+    char *editor=getenv("EDITOR");
+    if (editor==NULL)
+      editor=getenv("VISUAL");
+    if (editor==NULL)
+      editor="vi";
+
+    if (pi->data.s.body==NULL)
+    {
+      iiGetLibProcBuffer(pi);
+      if (pi->data.s.body==NULL)
+      {
+        PrintS("cannot get the procedure body\n");
+        fclose(fp);
+        unlink(filename);
+        return;
+      }
+    }
+
+    fwrite(pi->data.s.body,1,strlen(pi->data.s.body),fp);
+    fclose(fp);
+
+    int pid=fork();
+    if (pid!=0)
+    {
+      wait(&pid);
+    }
+    else if(pid==0)
+    {
+      execlp(editor,editor,filename,NULL);
+      Print("cannot exec %s\n",editor);
+    }
+    else
+    {
+      PrintS("cannot fork\n");
+    }
+
+    fp=fopen(filename,"r");
+    if (fp==NULL)
+    {
+      Print("cannot read from %s\n",filename);
+    }
+    else
+    {
+      fseek(fp,0L,SEEK_END);
+      long len=ftell(fp);
+      fseek(fp,0L,SEEK_SET);
+
+      FreeL((ADDRESS)pi->data.s.body);
+      pi->data.s.body=(char *)AllocL((int)len+1);
+      myfread( pi->data.s.body, len, 1, fp);
+      pi->data.s.body[len]='\0';
+      fclose(fp);
+    }
+  }
+  unlink(filename);
+}
+
+static char *sdb_find_arg(char *p)
+{
+  p++;
+  while (*p==' ') p++;
+  char *pp=p;
+  while (*pp>' ') pp++;
+  *pp='\0';
+  return p;
+}
+
 static char sdb_lastcmd='c';
 
-void sdb(Voice * currentVoice, char * currLine, int len, char *b)
+void sdb(Voice * currentVoice, const char * currLine, int len)
 {
   int bp=0;
@@ -44 +133 @@
     {
       char gdb[80];
-      char *p=currLine+len-1;
+      char *p=(char *)currLine+len-1;
       while ((*p<=' ') && (p!=currLine))
       {
@@ -52 +141 @@
 
       currentVoice->pi->trace_flag&= ~1; // delete flag for "all lines"
-      fprintf(stdout,"(%s,%d) >>",currentVoice->filename,yylineno);mflush();
+      Print("(%s,%d) >>",currentVoice->filename,yylineno);
       fwrite(currLine,1,len,stdout);
-      fprintf(stdout,"<<\nbreakpoint %d (p..,f,b,c,n,q,e..)\n",bp);mflush();
-      fgets(gdb,80,stdin);
-      p=gdb;
+      Print("<<\nbreakpoint %d (press ? for list of commands)\n",bp);
+      p=fe_fgets_stdin("!",gdb,80);
       while (*p==' ') p++;
       if (*p >' ')
@@ -62 +150 @@
         sdb_lastcmd=*p;
       }
-      printf("command:%c\n",sdb_lastcmd);
+      Print("command:%c\n",sdb_lastcmd);
       switch(sdb_lastcmd)
       {
+        case '?':
+        case 'h':
+        {
+          PrintS(
+          "b - print backtrace of calling stack\n"
+          "c - continue\n"
+          "d - delete current breakpoint\n"
+          "e - edit the current procedure (current call will be aborted)\n"
+          "h,? - display this help screen\n"
+          "n - execute current line, break at next line\n"
+          "p <var> - display type and value of the variable <var>\n"
+          "q <flags> - quit debugger, set debugger flags(0,1,2)\n"
+          "Q - quit Singular\n");
+          int i;
+          for(i=0;i<7;i++)
+          {
+            if (sdb_lines[i] != -1)
+              Print("breakpoint %d at line %d in %s\n",
+                i,sdb_lines[i],sdb_files[i]);
+          }
+          break;
+        }
         case 'd':
         {
-          fprintf(stdout,"delete break point %d\n",bp);
+          Print("delete break point %d\n",bp);
           currentVoice->pi->trace_flag &= (~Sy_bit(bp));
           if (bp!=0)
@@ -73 +183 @@
             sdb_lines[bp-1]=-1;
           }
-          int f=currentVoice->pi->trace_flag;
-          fprintf(stdout,"active breakpoints: \n");
-          int i;
-          for(i=1;i<=7;i++)
-          {
-            f=f>>1;
-            if (f&1)
-              fprintf(stdout,"%d:line %d", i,  sdb_lines[i-1]);
-          }
-          fprintf(stdout,"\n");
           break;
         }
@@ -90 +190 @@
         case 'e':
         {
-          int i=strlen(b);
-          while ((i>=0) && (b[i]<=' ')) i--;
-          if (i<0)
-          {
-            fprintf(stdout,"cannot set ~ at empty line\n");
-            break;
-          }
-          if (b[i]!=';')
-          {
-            fprintf(stdout,"cannot set ~ at char `%c`\n",b[i]);
-            break;
-          }
-          b[i+1]='~';
-          b[i+2]=';';
-          b[i+3]='\n';
-          b[i+4]='\0';
-          return;
-        }
-//          sdb_lastcmd='c';
-//          if (*(p+1)!=' ')
-//          {
-//            printf("?? no string to execute\n");
-//          }
-//          else
-//          {
-//            p+=2;
-//            char *s=(char *)AllocL(strlen(p) + 4);
-//            strcpy( s,p);
-//            strcat( s,"\n;\n");
-//            newBuffer(s,BT_execute);
-//          }
-//          return;
-//        }
+          sdb_edit(currentVoice->pi);
+          sdb_flags=2;
+          return;
+        }
         case 'p':
         {
-          p+=2;
-          char *pp=p+1;
-          while (*pp>' ') pp++;
-          *pp='\0';
-          printf("request `%s`",p);
+          p=sdb_find_arg(p);
+          Print("request `%s`",p);
           idhdl h=ggetid(p,TRUE);
-          if (h==NULL) printf("NULL\n");
+          if (h==NULL)
+            PrintS("NULL\n");
           else
           {
@@ -138 +207 @@
             tmp.rtyp=IDHDL;
             tmp.data=h;
-            printf("(type %s):",Tok2Cmdname(tmp.Typ()));
+            Print("(type %s):",Tok2Cmdname(tmp.Typ()));
             tmp.Print();
           }
@@ -147 +216 @@
           break;
         case 'q':
+        {
+          p=sdb_find_arg(p);
+          if (*p!='\0')
+          {
+            sdb_flags=atoi(p);
+            Print("new sdb_flags:%d\n",sdb_flags);
+          }
+          return;
+        }
+        case 'Q':
           m2_end(999);
         case 'c':

Singular/sdb.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sdb.h,v 1.3 1999-04-29 16:57:18 Singular Exp $ */
+/* $Id: sdb.h,v 1.4 1999-05-06 16:53:25 Singular Exp $ */
 /*
 * ABSTRACT: Singular debugger
@@ -10 +10 @@
 
 #include "febase.h"
+#include "structs.h"
 
-extern int sdb_lines[];
+extern int    sdb_lines[];
+extern char * sdb_files[];
+extern int    sdb_flags;
 
-void sdb(Voice * currentVoice, char * currLine, int len, char * buffer);
+void sdb_edit(procinfo *pi);
+void sdb(Voice * currentVoice, const char * currLine, int len);
 #endif