===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/ctrl.c,v
retrieving revision 1.38
retrieving revision 1.41
diff -u -p -r1.38 -r1.41
--- OpenXM_contrib2/asir2000/builtin/ctrl.c	2007/01/25 16:19:40	1.38
+++ OpenXM_contrib2/asir2000/builtin/ctrl.c	2014/05/12 02:35:35	1.41
@@ -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.37 2006/05/30 07:35:30 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.40 2013/01/30 08:03:18 noro 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;
@@ -84,6 +84,9 @@ extern int asir_setenv;
 extern int show_orderspec;
 extern int no_debug_on_error;
 extern int diag_period;
+extern int weight_check;
+extern char **ASIRLOADPATH;
+extern int ASIRLOADPATH_LEN;
 
 static struct {
 	char *key;
@@ -123,6 +126,7 @@ static struct {
 	{"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},
@@ -135,11 +139,15 @@ NODE arg;
 Q *rp;
 {
 	int t,i,n;
+	int nm,dv;
 	N num,den;
 	Q c;
 	char *key;
 	char buf[BUFSIZ];
 	char *str;
+	STRING s;
+	NODE node,p;
+	LIST list;
 
 	if ( !arg ) {
 		*rp = 0;
@@ -149,16 +157,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;
@@ -188,6 +198,41 @@ Q *rp;
 				do_quiet = 0;
 			} else {
 				error("ctrl : prompt : invalid argument");	
+			}
+		}
+		return;
+	} else if ( !strcmp(key,"loadpath") ) {
+		*rp = 0;
+		if ( argc(arg) == 1 ) {
+			if( ASIRLOADPATH[0] ) {
+				for(i=0; ASIRLOADPATH[i]; i++) {
+				}
+				for(i--,p=NULL; i>=0; i--,p=node) {
+					MKSTR(s,ASIRLOADPATH[i]);
+					MKNODE(node,s,p);
+				}
+				MKLIST(list,node);
+				*rp = list;
+			}
+		} else {
+			list = (LIST)ARG1(arg);
+			if ( OID(list) == O_LIST ) {
+				for(i=0,p=BDY(list); p; i++,p=NEXT(p)) {
+					s=(STRING)BDY(p);
+					if(!s || OID(s)!=O_STR) {
+						error("ctrl : loadpath : invalid argument");
+					}
+				}
+				if(i >= ASIRLOADPATH_LEN) {
+					ASIRLOADPATH_LEN = i+1;
+					ASIRLOADPATH = (char **)MALLOC(sizeof(char *)*ASIRLOADPATH_LEN);
+				}
+				for(i=0,p=BDY(list); p; i++,p=NEXT(p)) {
+					ASIRLOADPATH[i] = (char *)BDY((STRING)BDY(p));
+				}
+				ASIRLOADPATH[i] = NULL;
+			}else {
+				error("ctrl : loadpath : invalid argument");
 			}
 		}
 		return;