Changeset 210bd9 in git

Timestamp:

Jan 27, 2010, 7:40:47 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

af92df51b8d5feaf30e639aaa8980a541c934eb8

Parents:

690e21e881c763e9c23a2f83759a44488fbf2ea0

Message:

moved option marcos to options.h

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

Location:

Singular

Files:

• attrib.cc (modified) (1 diff)
• extra.cc (modified) (1 diff)
• feOpt.cc (modified) (1 diff)
• fglm.cc (modified) (1 diff)
• grammar.cc (modified) (1 diff)
• grammar.y (modified) (1 diff)
• interpolation.cc (modified) (1 diff)
• iparith.cc (modified) (1 diff)
• ipassign.cc (modified) (1 diff)
• ipid.cc (modified) (1 diff)
• iplib.cc (modified) (1 diff)
• ipshell.cc (modified) (1 diff)
• libparse.cc (modified) (1 diff)
• libparse.l (modified) (1 diff)
• misc.cc (modified) (2 diffs)
• sdb.cc (modified) (1 diff)
• silink.cc (modified) (1 diff)
• subexpr.cc (modified) (1 diff)
• tesths.cc (modified) (1 diff)
• tok.h (modified) (1 diff)
• walk.cc (modified) (1 diff)
• walk_ip.cc (modified) (1 diff)

Singular/attrib.cc

@@ -16 +16 @@
 #include "mod2.h"
 #include "omalloc.h"
+#include "options.h"
 #include "tok.h"
 #include "ipid.h"

Singular/extra.cc

@@ -35 +35 @@
 
 #include "tok.h"
+#include "options.h"
 #include "ipid.h"
 #include "polys.h"

Singular/feOpt.cc

@@ -10 +10 @@
 #include <stdlib.h>
 #include "mod2.h"
+#include "options.h"
 #include "feOpt.h"
 

Singular/fglm.cc

@@ -21 +21 @@
 #ifdef HAVE_FGLM
 #include "tok.h"
-#include "structs.h"
+#include "options.h"
 #include "polys.h"
 #include "ideals.h"

Singular/grammar.cc

@@ -336 +336 @@
 #include "omalloc.h"
 #include "tok.h"
+#include "options.h"
 #include "stype.h"
 #include "ipid.h"

Singular/grammar.y

@@ -18 +18 @@
 #include "omalloc.h"
 #include "tok.h"
+#include "options.h"
 #include "stype.h"
 #include "ipid.h"

Singular/interpolation.cc

@@ -5 +5 @@
 
 #include "mod2.h"
-#include "structs.h"
+#include "options.h"
 #include "febase.h"
 #include "ideals.h"

Singular/iparith.cc

@@ -17 +17 @@
 #include "mod2.h"
 #include "tok.h"
+#include "options.h"
 #include "ipid.h"
 #include "intvec.h"

Singular/ipassign.cc

@@ -15 +15 @@
 #include "mod2.h"
 #include "tok.h"
+#include "options.h"
 #include "ipid.h"
 #include "intvec.h"

Singular/ipid.cc

@@ -14 +14 @@
 #include "omalloc.h"
 #include "tok.h"
+#include "options.h"
 #include "ipshell.h"
 #include "intvec.h"

Singular/iplib.cc

@@ -16 +16 @@
 #include "static.h"
 #include "tok.h"
+#include "options.h"
 #include "ipid.h"
 #include "omalloc.h"

Singular/ipshell.cc

@@ -15 +15 @@
 #include "mod2.h"
 #include "tok.h"
+#include "options.h"
 #include "ipid.h"
 #include "intvec.h"

Singular/libparse.cc

@@ -1069 +1069 @@
   #include "ipid.h"
   #include "tok.h"
+  #include "options.h"
   #include "febase.h"
   #include "omalloc.h"

Singular/libparse.l

@@ -20 +20 @@
   #include "ipid.h"
   #include "tok.h"
+  #include "options.h"
   #include "febase.h"
   #include "omalloc.h"

Singular/misc.cc

@@ -18 +18 @@
 #include "structs.h"
 #include "tok.h"
+#include "options.h"
 #include "febase.h"
 #include "cntrlc.h"
@@ -366 +367 @@
         #ifdef YYDEBUG
         #if YYDEBUG
+        /*debugging the bison grammar --> grammar.cc*/
+        extern int    yydebug;
         if (BVERBOSE(V_YACC)) yydebug=1;
         else                  yydebug=0;

Singular/sdb.cc

@@ -11 +11 @@
 #include "mod2.h"
 #include "tok.h"
+#include "options.h"
 #include "omalloc.h"
 #include "febase.h"

Singular/silink.cc

@@ -16 +16 @@
 #include "mod2.h"
 #include "tok.h"
+#include "options.h"
 #include <omalloc.h>
 #include "febase.h"

Singular/subexpr.cc

@@ -16 +16 @@
 #include "intvec.h"
 #include "tok.h"
+#include "options.h"
 #include "ipid.h"
 #include "intvec.h"

Singular/tesths.cc

@@ -17 +17 @@
 #include "mod2.h"
 #include "tok.h"
+#include "options.h"
 #include "ipshell.h"
 #include "febase.h"

Singular/tok.h

@@ -161 +161 @@
 #define UNKNOWN 0
 
-/*
-**  Set operations (small sets only)
-*/
-
-#define Sy_bit(x)     ((unsigned)1<<(x))
-#define Sy_inset(x,s) ((Sy_bit(x)&(s))?TRUE:FALSE)
-#define BTEST1(a)     Sy_inset((a), test)
-#define BVERBOSE(a)   Sy_inset((a), verbose)
-
-/*
-** defines for BITSETs
-*/
-
-#define V_SHOW_MEM  2
-#define V_YACC      3
-#define V_REDEFINE  4
-#define V_READING   5
-#define V_LOAD_LIB  6
-#define V_DEBUG_LIB 7
-#define V_LOAD_PROC 8
-#define V_DEF_RES   9
-#define V_DEBUG_MEM 10
-#define V_SHOW_USE  11
-#define V_IMAP      12
-#define V_PROMPT    13
-#define V_NSB       14
-#define V_CONTENTSB 15
-#define V_CANCELUNIT 16
-#define V_DEG_STOP  31
-
-
-#define OPT_PROT           0
-#define OPT_REDSB          1
-#define OPT_NOT_BUCKETS    2
-#define OPT_NOT_SUGAR      3
-#define OPT_INTERRUPT      4
-#define OPT_SUGARCRIT      5
-#define OPT_DEBUG          6
-#define OPT_REDTHROUGH     7
-#define OPT_RETURN_SB      9
-#define OPT_FASTHC        10
-#define OPT_OLDSTD        20
-#define OPT_KEEPVARS      21
-#define OPT_STAIRCASEBOUND 22
-#define OPT_MULTBOUND     23
-#define OPT_DEGBOUND      24
-#define OPT_REDTAIL       25
-#define OPT_INTSTRATEGY   26
-#define OPT_INFREDTAIL    28
-#define OPT_SB_1          29
-#define OPT_NOTREGULARITY 30
-#define OPT_WEIGHTM       31
-
-/* define ring dependent options */ 
-#define TEST_RINGDEP_OPTS \
- (Sy_bit(OPT_INTSTRATEGY) | Sy_bit(OPT_REDTHROUGH) | Sy_bit(OPT_REDTAIL))
-
-#define TEST_OPT_PROT              BTEST1(OPT_PROT)
-#define TEST_OPT_REDSB             BTEST1(OPT_REDSB)
-#define TEST_OPT_NOT_BUCKETS       BTEST1(OPT_NOT_BUCKETS)
-#define TEST_OPT_NOT_SUGAR         BTEST1(OPT_NOT_SUGAR)
-#define TEST_OPT_SUGARCRIT         BTEST1(OPT_SUGARCRIT)
-#define TEST_OPT_DEBUG             BTEST1(OPT_DEBUG)
-#define TEST_OPT_FASTHC            BTEST1(OPT_FASTHC)
-#define TEST_OPT_INTSTRATEGY       BTEST1(OPT_INTSTRATEGY)
-#define TEST_OPT_RETURN_SB         BTEST1(OPT_RETURN_SB)
-#define TEST_OPT_KEEPVARS          BTEST1(OPT_KEEPVARS)
-#define TEST_OPT_DEGBOUND          BTEST1(OPT_DEGBOUND)
-#define TEST_OPT_MULTBOUND         BTEST1(OPT_MULTBOUND)
-#define TEST_OPT_STAIRCASEBOUND    BTEST1(OPT_STAIRCASEBOUND)
-#define TEST_OPT_REDTAIL           BTEST1(OPT_REDTAIL)
-#define TEST_OPT_INFREDTAIL        BTEST1(OPT_INFREDTAIL)
-#define TEST_OPT_SB_1              BTEST1(OPT_SB_1)
-#define TEST_OPT_NOTREGULARITY     BTEST1(OPT_NOTREGULARITY)
-#define TEST_OPT_WEIGHTM           BTEST1(OPT_WEIGHTM)
-#define TEST_OPT_REDTHROUGH        BTEST1(OPT_REDTHROUGH)
-#define TEST_OPT_OLDSTD            BTEST1(OPT_OLDSTD)
-#define TEST_OPT_CONTENTSB         BVERBOSE(V_CONTENTSB)
-#define TEST_OPT_CANCELUNIT        BVERBOSE(V_CANCELUNIT)
-
-#define TEST_VERB_NSB              BVERBOSE(V_NSB)
-#define TEST_V_DEG_STOP            BVERBOSE(V_DEG_STOP)
-
 #endif

Singular/walk.cc

@@ -50 +50 @@
 #include "intvec.h"
 #include "cntrlc.h"
-#include "math.h"
-#include "structs.h"
+#include "options.h"
 #include "omalloc.h"
 #include "febase.h"

Singular/walk_ip.cc

@@ -15 +15 @@
 #include "mod2.h"
 #include "tok.h"
+#include "options.h"
 #include "ipid.h"
 #include "intvec.h"