=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/ctrl.c,v retrieving revision 1.51 retrieving revision 1.54 diff -u -p -r1.51 -r1.54 --- OpenXM_contrib2/asir2000/builtin/ctrl.c 2016/08/24 01:33:53 1.51 +++ OpenXM_contrib2/asir2000/builtin/ctrl.c 2017/09/04 01:57:53 1.54 @@ -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.50 2016/04/01 03:04:35 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.53 2017/08/31 02:36:20 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -113,6 +113,8 @@ extern int weight_check; extern char **ASIRLOADPATH; extern int ASIRLOADPATH_LEN; extern int No_ox_reset; +extern int plot_by_bigfloat; +extern int debug_plot; static struct { char *key; @@ -153,6 +155,9 @@ static struct { {"diag_period",&diag_period}, {"weight_check",&weight_check}, {"no_ox_reset",&No_ox_reset}, + {"fake_ox_reset",&No_ox_reset}, + {"plot_by_bigfloat",&plot_by_bigfloat}, + {"debug_plot",&debug_plot}, #if defined(INTERVAL) {"zerorewrite",&zerorewrite}, {"itvplotsize",&Itvplot}, @@ -160,9 +165,7 @@ static struct { {0,0}, }; -void Pctrl(arg,rp) -NODE arg; -Q *rp; +void Pctrl(NODE arg,Q *rp) { int t,i,n; int nm,dv; @@ -242,7 +245,7 @@ Q *rp; MKNODE(node,s,p); } MKLIST(list,node); - *rp = list; + *rp = (Q)list; } } else { list = (LIST)ARG1(arg); @@ -288,12 +291,12 @@ Q *rp; return; } else if ( !strcmp(key,"oxpari_start") ) { if ( argc(arg) == 1 ) { - *rp = ox_pari_starting_function; + *rp = (Q)ox_pari_starting_function; } else { - f = (Obj)ARG1(arg); + f = (P)ARG1(arg); if ( !f || OID(f) == O_P) { ox_pari_starting_function = f; - *rp = f; + *rp = (Q)f; }else { *rp = 0; }