=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/ctrl.c,v retrieving revision 1.36 retrieving revision 1.40 diff -u -p -r1.36 -r1.40 --- OpenXM_contrib2/asir2000/builtin/ctrl.c 2005/08/24 06:28:39 1.36 +++ OpenXM_contrib2/asir2000/builtin/ctrl.c 2013/01/30 08:03:18 1.40 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.35 2005/02/17 03:12:19 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.39 2009/02/05 08:37:02 ohara Exp $ */ #include "ca.h" #include "parse.h" @@ -60,7 +60,7 @@ struct ftab ctrl_tab[] = { extern int error_in_timer; extern int prtime,nez,echoback,bigfloat; -extern int GC_free_space_numerator,GC_free_space_divisor,debug_up; +extern int debug_up; extern int GC_max_heap_size,Verbose,hideargs,hex_output,do_server_in_X11; extern int do_message,do_terse; extern int ox_batch,ox_check,ox_exchange_mathcap; @@ -73,6 +73,7 @@ extern int real_binary; extern int allow_laurent; #if defined(INTERVAL) extern int zerorewrite; +extern int Itvplot; #endif extern int double_output; extern int use_new_hensel; @@ -82,6 +83,8 @@ extern Obj user_defined_prompt; extern int asir_setenv; extern int show_orderspec; extern int no_debug_on_error; +extern int diag_period; +extern int weight_check; static struct { char *key; @@ -120,8 +123,11 @@ static struct { {"allow_laurent",&allow_laurent}, {"show_orderspec",&show_orderspec}, {"no_debug_on_error",&no_debug_on_error}, + {"diag_period",&diag_period}, + {"weight_check",&weight_check}, #if defined(INTERVAL) {"zerorewrite",&zerorewrite}, + {"itvplotsize",&Itvplot}, #endif {0,0}, }; @@ -131,6 +137,7 @@ NODE arg; Q *rp; { int t,i,n; + int nm,dv; N num,den; Q c; char *key; @@ -145,16 +152,18 @@ Q *rp; if ( !strcmp(key,"adj") ) { /* special treatment is necessary for "adj" */ if ( argc(arg) == 1 ) { - UTON(GC_free_space_divisor,num); - UTON(GC_free_space_numerator,den); + Risa_GC_get_adj(&nm,&dv); + UTON(dv,num); + UTON(nm,den); } else { c = (Q)ARG1(arg); if ( !c ) error("ctrl : adj : invalid argument"); num = NM(c); den = !DN(c)?ONEN:DN(c); - GC_free_space_divisor = BD(num)[0]; - GC_free_space_numerator = BD(den)[0]; + dv = BD(num)[0]; + nm = BD(den)[0]; + Risa_GC_set_adj(nm,dv); } NDTOQ(num,den,1,*rp); return;