Changeset 210bd9 in git for Singular/tok.h

Timestamp:

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

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

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

File:

• Singular/tok.h (modified) (1 diff)

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