Changeset 460c65f in git

Timestamp:

Jan 5, 2010, 12:19:11 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

835d837d628ffb434ebd7c6219fa7994bdd7d61e

Parents:

1fca0364b35f46a90cbfe6c56518e4c6d8425aeb

Message:

move stuff from structs

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

Location:

kernel

Files:

• febase.cc (modified) (1 diff)
• febase.h (modified) (2 diffs)
• feread.cc (modified) (1 diff)

kernel/febase.cc

@@ -26 +26 @@
 #include "omalloc.h"
 #include "dError.h"
-#include "../Singular/ipshell.h"
 
 #define fePutChar(c) fputc((uchar)(c),stdout)

kernel/febase.h

@@ -98 +98 @@
 extern BOOLEAN feWarn;
 extern BOOLEAN feOut;
+extern int  traceit ;
+#define TRACE_SHOW_PROC   1
+#define TRACE_SHOW_LINENO 2
+#define TRACE_SHOW_LINE   4
+#define TRACE_SHOW_RINGS  8
+#define TRACE_SHOW_LINE1  16
+#define TRACE_BREAKPOINT  32
+#define TRACE_TMP_BREAKPOINT  64
+extern int  myynest;
+
 
 
@@ -137 +147 @@
 /* the C++-part: */
 
+typedef enum { LANG_NONE, LANG_TOP, LANG_SINGULAR, LANG_C, LANG_MAX} language_defs;
+// LANG_TOP     : Toplevel package only
+// LANG_SINGULAR:
+// LANG_C       :
+//
+
+class proc_singular
+{
+public:
+  long   proc_start;       // position where proc is starting
+  long   def_end;          // position where proc header is ending
+  long   help_start;       // position where help is starting
+  long   help_end;         // position where help is starting
+  long   body_start;       // position where proc-body is starting
+  long   body_end;         // position where proc-body is ending
+  long   example_start;    // position where example is starting
+  long   proc_end;         // position where proc is ending
+  int    proc_lineno;
+  int    body_lineno;
+  int    example_lineno;
+  char   *body;
+  long help_chksum;
+};
+
+struct proc_object
+{
+//public:
+  BOOLEAN (*function)(leftv res, leftv v);
+};
+union uprocinfodata
+{
+public:
+  proc_singular  s;        // data of Singular-procedure
+  struct proc_object    o; // pointer to binary-function
+};
+
+typedef union uprocinfodata procinfodata;
+
+class procinfo;
+typedef procinfo *         procinfov;
+
+class procinfo
+{
+public:
+  char          *libname;
+  char          *procname;
+  package       pack;
+  language_defs language;
+  short         ref;
+  char          is_static;        // if set, proc not accessible for user
+  char          trace_flag;
+  procinfodata  data;
+};
 enum   feBufferTypes
 {

kernel/feread.cc

@@ -48 +48 @@
 /* ===================================================================*/
 #if defined(HAVE_READLINE) || defined(HAVE_DYN_RL) || defined(HAVE_LIBREADLINE)
-
-#include "../Singular/ipshell.h"
 
 #ifndef STDOUT_FILENO