=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/global.c,v retrieving revision 1.27 retrieving revision 1.37 diff -u -p -r1.27 -r1.37 --- OpenXM/src/kan96xx/Kan/global.c 2003/11/20 09:20:36 1.27 +++ OpenXM/src/kan96xx/Kan/global.c 2015/09/29 01:52:14 1.37 @@ -1,4 +1,4 @@ -/* global.c $OpenXM: OpenXM/src/kan96xx/Kan/global.c,v 1.26 2003/08/21 12:30:15 takayama Exp $ */ +/* global.c $OpenXM: OpenXM/src/kan96xx/Kan/global.c,v 1.36 2011/10/05 05:46:14 takayama Exp $ */ #include #include #include "datatype.h" @@ -79,6 +79,7 @@ int Commutative = 0; int UseCriterion1 = 0; int UseCriterion2B = 0; int OutputStyle = '*'; +int COutput = 0; /* C sytle output of polynomial */ int Wrap = 0; /* output.c */ int Verbose = 0; int ReduceLowerTerms = 1; @@ -103,12 +104,15 @@ int CmoDMSOutputOption = 0; /* Output with (1) RING_BY_NAME or (0) DMS_OF_N_VARIABLES. plugin/cmo.c */ int SecureMode = 0; +int RestrictedMode = 0; +int RestrictedMode_saved = 0; int Ecart = 0; int EcartAutomaticHomogenization = 0; int TraceLift = 0; struct ring *TraceLift_ringmod = NULL; int DoCancel = 0; int QuoteMode = 0; +int UseDsmall = 0; /* global variables for stackmachine.c */ int VerboseStack = 1; /* 0 is quiet, 1 is standard, 2 ... */ @@ -129,10 +133,6 @@ jmp_buf EnvOfStackMachine; #endif #endif -#if defined(__CYGWIN__) -int errno; -#endif - struct object NullObject; struct object NoObject; @@ -141,7 +141,7 @@ int Lookup[TYPES][TYPES]; int Quiet = 0; int TimerOn = 0; -char *VersionString = "3.030821"; +char *VersionString = "3.050615"; char *LeftBracket = NULL; char *RightBracket = NULL; @@ -161,6 +161,8 @@ FILE *Fk = NULL; /* Initialized to stdout in stackmac stackmachine_init() { int i,j; extern FILE *BaseFp; + /* GC_init(); */ + GC_INIT(); OxSystemVersion = VersionString; Fstack = stdout; /* initialize output stream */ Fk = stdout; @@ -169,9 +171,11 @@ stackmachine_init() { /* initialize null object */ NullObject.tag = 0; NullObject.lc.op = NullObject.rc.op = (struct object *)NULL; + NullObject.attr = (struct object *)NULL; /* findUserdictionary returns NoObject if it cannot find the key.*/ NoObject.tag = -1; NoObject.lc.op = NoObject.rc.op = (struct object *)NULL; + NoObject.attr = (struct object *)NULL; /* Initalize lookup table */ for (i=0; i