Changeset e514ee in git

Timestamp:

Nov 24, 1999, 6:09:39 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

5d32fdb9ecb9fff4978a30bd8fb80b5e9fcdb7b0

Parents:

17b9209be23f46743b20ed712fa0ce186bc1a6ae

Message:

* hannes; moved breakpoint from extra.cc to iparith.cc (new command breakpoint)


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

Files:

• Singular/extra.cc (modified) (2 diffs)
• Singular/iparith.cc (modified) (5 diffs)
• Singular/tok.h (modified) (2 diffs)
• doc/general.doc (modified) (previous)
• doc/reference.doc (modified) (previous)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.118 1999-11-19 16:42:39 obachman Exp $ */
+/* $Id: extra.cc,v 1.119 1999-11-24 17:09:34 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -1003 +1003 @@
     else
 #endif
-/*==================== sdb-debugger =================*/
-    if (strcmp(sys_cmd, "breakpoint") == 0)
-    {
-      if (h==NULL)
-      {
-       sdb_show_bp();
-       return FALSE;
-      }
-      else if (h->Typ()==PROC_CMD)
-      {
-        int lineno=0;
-        if ((h->next!=NULL) && (h->next->Typ()==INT_CMD))
-        {
-          lineno=(int)h->next->Data();
-        }
-        return sdb_set_breakpoint(h->Name(),lineno);
-      }
-      else
-      {
-        WerrorS("system(\"breakpoint\",`proc`[,`int`]) expected");
-        return TRUE;
-      }
-    }
-    else
 /*==================== sdb_flags =================*/
     if (strcmp(sys_cmd, "sdb_flags") == 0)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.189 1999-11-24 14:07:22 obachman Exp $ */
+/* $Id: iparith.cc,v 1.190 1999-11-24 17:09:35 Singular Exp $ */
 
 /*
@@ -21 +21 @@
 #include "mmemory.h"
 #include "febase.h"
+#include "sdb.h"
 #include "longalg.h"
 #include "polys.h"
@@ -130 +131 @@
   { "betti",       0, BETTI_CMD ,         CMD_12},
   { "break",       0, BREAK_CMD ,         BREAK_CMD},
+  { "breakpoint",  0, BREAKPOINT_CMD ,    CMD_M},
   { "char",        0, CHARACTERISTIC_CMD ,CMD_1},
   { "char_series", 0, CHAR_SERIES_CMD ,   CMD_1},
@@ -4366 +4368 @@
 };
 /*=================== operations with many arg.: static proc =================*/
+static BOOLEAN jjBREAK0(leftv res, leftv v)
+{
+  sdb_show_bp();
+  return FALSE;
+}
+static BOOLEAN jjBREAK1(leftv res, leftv v)
+{
+  if(v->Typ()==PROC_CMD)
+  {
+    int lineno=0;
+    if((v->next!=NULL) && (v->next->Typ()==INT_CMD))
+    {
+      lineno=(int)v->next->Data();
+    }
+    return sdb_set_breakpoint(v->Name(),lineno);
+  }
+  return TRUE;
+}
 static BOOLEAN jjCALL1ARG(leftv res, leftv v)
 {
@@ -4877 +4897 @@
 // proc         cmd               res            number_of_args
  {jjKLAMMER_PL,  '(',           ANY_TYPE,           -2  }
+,{jjBREAK0,    BREAKPOINT_CMD,  NONE,               0  }
+,{jjBREAK1,    BREAKPOINT_CMD,  NONE,               -2  }
 ,{jjCALL2ARG,  COEF_CMD,        MATRIX_CMD,         2  }
 ,{jjCOEF_M,    COEF_CMD,        NONE,               4  }

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: tokens, types for interpreter; general macros
 */
-/* $Id: tok.h,v 1.30 1999-11-24 14:02:47 wichmann Exp $ */
+/* $Id: tok.h,v 1.31 1999-11-24 17:09:36 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -46 +46 @@
   ATTRIB_CMD,
   BAREISS_CMD,
+  BREAKPOINT_CMD,
   CHARACTERISTIC_CMD,
   CHARSTR_CMD,