===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parser.c,v
retrieving revision 1.2
retrieving revision 1.13
diff -u -p -r1.2 -r1.13
--- OpenXM_contrib2/asir2000/parse/parser.c	2000/08/21 08:31:47	1.2
+++ OpenXM_contrib2/asir2000/parse/parser.c	2018/03/29 01:32:54	1.13
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -45,88 +45,148 @@
  * 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.1.1.1 1999/12/03 07:39:12 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parser.c,v 1.12 2018/03/28 05:27:22 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
 #include "parse.h"
 
-extern int main_parser;
+extern int main_parser, allow_create_var;
 extern char *parse_strp;
 extern SNODE parse_snode;
 extern FUNC parse_targetf;
+extern int outputstyle;
 
-int mainparse(snodep)
-SNODE *snodep;
+int mainparse(SNODE *snodep)
 {
-	int ret;
+  int ret;
 
-	main_parser = 1;
-	ret = yyparse();
-	*snodep = parse_snode;
-	return ret;
+  main_parser = 1;
+  ret = yyparse();
+  *snodep = parse_snode;
+  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;
-	int i,n;
-	char c;
+  char buf0[BUFSIZ];
+  char *buf;
+  int i,n;
+  char c;
 
 
-	n = strlen(str);
-	if ( n >= BUFSIZ )
-		buf = (char *)ALLOCA(n+1);
-	else
-		buf = buf0;
-	for ( i = 0; ; i++, str++ ) {
-		c = *str;
-		if ( !c || c == '\n' ) {
-			buf[i] = ';'; buf[i+1] = 0; break;
-		} else
-			buf[i] = c;
-	}
-	parse_strp = buf;
-	parse_targetf = f;
-	main_parser = 0;
-	if ( yyparse() || !parse_snode || parse_snode->id != S_SINGLE ) {
-		*exprp = 0; return 0;
-	} else {
-		*exprp = (FNODE)FA0(parse_snode); return 1;
-	}
+  n = strlen(str);
+  if ( n >= BUFSIZ )
+    buf = (char *)ALLOCA(n+1);
+  else
+    buf = buf0;
+  for ( i = 0; ; i++, str++ ) {
+    c = *str;
+    if ( !c || c == '\n' ) {
+      buf[i] = ';'; buf[i+1] = 0; break;
+    } else
+      buf[i] = c;
+  }
+  parse_strp = buf;
+  parse_targetf = f;
+  main_parser = 0;
+  allow_create_var = 0;
+  if ( yyparse() || !parse_snode || parse_snode->id != S_SINGLE ) {
+    *exprp = 0; return 0;
+  } else {
+    *exprp = (FNODE)FA0(parse_snode); return 1;
+  }
 }
 
+/* allows to create a new variable */
+/* returns SNODE */
+
+int exprparse_create_var(FUNC f,char *str,SNODE *statp)
+{
+  char buf0[BUFSIZ];
+  char *buf;
+  int i,n;
+  char c;
+
+
+  n = strlen(str);
+  if ( n >= BUFSIZ )
+    buf = (char *)ALLOCA(n+1);
+  else
+    buf = buf0;
+  for ( i = 0; ; i++, str++ ) {
+    c = *str;
+    if ( !c || c == '\n' ) {
+      buf[i] = ';'; buf[i+1] = 0; break;
+    } else
+      buf[i] = c;
+  }
+  parse_strp = buf;
+  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;
-	extern int prtime,prresult,ox_do_copy;
-	SNODE snode;
-	double r0,r1;
-	double get_rtime();
-	extern Obj LastVal;
+  struct oEGT egt0,egt1;
+  extern int prtime,prresult,ox_do_copy;
+  SNODE snode;
+  double r0,r1;
+  double get_rtime();
+  extern Obj LastVal;
 
-	LastVal = 0;
-	while ( 1 ) {
-		mainparse(&snode);
-		nextbp = 0;
-		get_eg(&egt0);
-		r0 = get_rtime();
-		LastVal = evalstat(snode); 
-		storeans(LastVal);
-		get_eg(&egt1);
-		r1 = get_rtime();
-		if ( !ox_do_copy ) {
-			if ( prresult ) {
-				printexpr(CO,LastVal); putc('\n',asir_out);
-				fflush(asir_out);
-			}
-			if ( prtime ) {
-				printtime(&egt0,&egt1,r1-r0);
-			}
-			prompt();
-		}
-	}
+  LastVal = 0;
+  while ( 1 ) {
+    mainparse(&snode);
+    nextbp = 0;
+    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 ) {
+          bevalf(user_print_function,mknode(1,LastVal));
+#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();
+    }
+  }
 }