===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parser.c,v
retrieving revision 1.6
retrieving revision 1.12
diff -u -p -r1.6 -r1.12
--- OpenXM_contrib2/asir2000/parse/parser.c	2003/06/07 16:40:26	1.6
+++ OpenXM_contrib2/asir2000/parse/parser.c	2018/03/28 05:27:22	1.12
@@ -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/parse/parser.c,v 1.5 2002/12/09 00:42:15 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parser.c,v 1.11 2015/08/14 13:51:56 fujimoto Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -57,8 +57,7 @@ extern SNODE parse_snode;
 extern FUNC parse_targetf;
 extern int outputstyle;
 
-int mainparse(snodep)
-SNODE *snodep;
+int mainparse(SNODE *snodep)
 {
 	int ret;
 
@@ -68,10 +67,7 @@ SNODE *snodep;
 	return ret;
 }
 
-int exprparse(f,str,exprp)
-FUNC f;
-char *str;
-FNODE *exprp;
+int exprparse(FUNC f,char *str,FNODE *exprp)
 {
 	char buf0[BUFSIZ];
 	char *buf;
@@ -103,11 +99,9 @@ FNODE *exprp;
 }
 
 /* allows to create a new variable */
+/* returns SNODE */
 
-int exprparse_create_var(f,str,exprp)
-FUNC f;
-char *str;
-FNODE *exprp;
+int exprparse_create_var(FUNC f,char *str,SNODE *statp)
 {
 	char buf0[BUFSIZ];
 	char *buf;
@@ -131,14 +125,23 @@ FNODE *exprp;
 	parse_targetf = f;
 	main_parser = 0;
 	allow_create_var = 1;
+#if 0
 	if ( yyparse() || !parse_snode || parse_snode->id != S_SINGLE ) {
 		*exprp = 0; return 0;
 	} else {
 		*exprp = (FNODE)FA0(parse_snode); return 1;
 	}
+#else
+	if ( yyparse() || !parse_snode ) {
+		*statp = 0; return 0;
+	} else {
+		*statp = parse_snode; return 1;
+	}
+#endif
 }
 
 extern FUNC user_print_function;
+extern f_break,f_continue,f_return;
 
 void read_eval_loop() {
 	struct oEGT egt0,egt1;
@@ -155,24 +158,34 @@ void read_eval_loop() {
 		get_eg(&egt0);
 		r0 = get_rtime();
 		LastVal = evalstat(snode); 
+		f_break = f_continue = f_return = 0;
 		storeans(LastVal);
 		get_eg(&egt1);
 		r1 = get_rtime();
 		if ( !ox_do_copy ) {
 			if ( prresult ) {
-				if ( user_print_function )
+				if ( user_print_function ) {
 					bevalf(user_print_function,mknode(1,LastVal));
-				else
+#if !defined(__MINGW32__)
+					fflush(asir_out);
+#endif
+				} else
 					printexpr(CO,LastVal);
 				if ( outputstyle == 1 ) {
 					putc(';',asir_out);
 				}
 				putc('\n',asir_out);
+#if !defined(__MINGW32__)
 				fflush(asir_out);
+#endif
 			}
 			if ( prtime ) {
 				printtime(&egt0,&egt1,r1-r0);
 			}
+#if defined(__MINGW32__)
+			fflush(asir_out);
+			fflush(stderr);
+#endif
 			prompt();
 		}
 	}