===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/ctrl.c,v
retrieving revision 1.24
retrieving revision 1.36
diff -u -p -r1.24 -r1.36
--- OpenXM_contrib2/asir2000/builtin/ctrl.c	2003/10/20 09:17:52	1.24
+++ OpenXM_contrib2/asir2000/builtin/ctrl.c	2005/08/24 06:28:39	1.36
@@ -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.23 2003/10/19 02:54:41 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.35 2005/02/17 03:12:19 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -54,19 +54,23 @@ void Pctrl();
 
 struct ftab ctrl_tab[] = {
 	{"ctrl",Pctrl,-2},
+	{"asir_env",Pctrl,-2},
 	{0,0,0},
 };
 
+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 GC_max_heap_size,Verbose,hideargs,hex_output,do_server_in_X11;
-extern int do_message;
+extern int do_message,do_terse;
 extern int ox_batch,ox_check,ox_exchange_mathcap;
 extern int f4_nocheck;
 extern int StrassenSize;
 extern int outputstyle;
 extern int fortran_output;
 extern int real_digit;
+extern int real_binary;
+extern int allow_laurent;
 #if defined(INTERVAL)
 extern int zerorewrite;
 #endif
@@ -75,15 +79,19 @@ extern int use_new_hensel;
 extern int print_quote;
 extern int show_crossref;
 extern Obj user_defined_prompt;
+extern int asir_setenv;
+extern int show_orderspec;
+extern int no_debug_on_error;
 
 static struct {
 	char *key;
 	int *val;
 } ctrls[] = {
+	{"error_in_timer",&error_in_timer},
 	{"cputime",&prtime},
 	{"nez",&nez},
 	{"echo",&echoback},
-#if defined(DO_PLOT)
+#if defined(PARI)
 	{"bigfloat",&bigfloat},
 #endif
 	{"verbose",&Verbose},
@@ -92,8 +100,10 @@ static struct {
 	{"hex",&hex_output},
 	{"debug_window",&do_server_in_X11},
 	{"message",&do_message},
+	{"terse",&do_terse},
 	{"debug_up",&debug_up},
 	{"no_prompt",&do_quiet},
+	{"asir_setenv",&asir_setenv},
 	{"ox_batch",&ox_batch},
 	{"ox_check",&ox_check},
 	{"ox_exchange_mathcap",&ox_exchange_mathcap},
@@ -102,10 +112,14 @@ static struct {
 	{"outputstyle",&outputstyle},
 	{"double_output",&double_output},
 	{"real_digit",&real_digit},
+	{"real_binary",&real_binary},
 	{"fortran_output",&fortran_output},
 	{"new_hensel",&use_new_hensel},
 	{"print_quote",&print_quote},
 	{"show_crossref",&show_crossref},
+	{"allow_laurent",&allow_laurent},
+	{"show_orderspec",&show_orderspec},
+	{"no_debug_on_error",&no_debug_on_error},
 #if defined(INTERVAL)
 	{"zerorewrite",&zerorewrite},
 #endif
@@ -147,18 +161,21 @@ Q *rp;
 	} else if ( !strcmp(key,"prompt") ) {
 		/* special treatment is necessary for "prompt" */
 		if ( argc(arg) == 1 ) {
-			*rp = (Q)user_defined_prompt;
+		  if ((!do_quiet) && (user_defined_prompt == (Obj)0)) *rp=ONE;
+          else *rp = (Q)user_defined_prompt;
 		} else {
 			c = (Q)ARG1(arg);
-			if ( !c || OID(c) == O_STR ) {
-				if ( OID(c) == O_STR ) {
-					str = BDY((STRING)c);
-				 	for ( i = 0, n = 0; str[i]; i++ )
-						if ( str[i] == '%' )
-							n++;
-					if ( n >= 2 )
-						error("ctrl : prompt : invalid prompt specification");	
-				}
+			if ( !c ) {
+				do_quiet = 1;
+				user_defined_prompt = 0;
+				*rp = 0;
+			} else if ( OID(c) == O_STR ) {
+				str = BDY((STRING)c);
+			 	for ( i = 0, n = 0; str[i]; i++ )
+					if ( str[i] == '%' )
+						n++;
+				if ( n >= 2 )
+					error("ctrl : prompt : invalid prompt specification");	
 				do_quiet = 1;
 				user_defined_prompt = (Obj)c;
 				*rp = c;