=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parser.c,v retrieving revision 1.2 retrieving revision 1.9 diff -u -p -r1.2 -r1.9 --- OpenXM_contrib2/asir2000/parse/parser.c 2000/08/21 08:31:47 1.2 +++ OpenXM_contrib2/asir2000/parse/parser.c 2008/09/04 01:42:26 1.9 @@ -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,19 +45,19 @@ * 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.8 2004/12/17 03:09:08 noro Exp $ */ #include #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; @@ -67,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; @@ -93,6 +90,7 @@ FNODE *exprp; 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 { @@ -100,6 +98,50 @@ FNODE *exprp; } } +/* 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; + void read_eval_loop() { struct oEGT egt0,egt1; extern int prtime,prresult,ox_do_copy; @@ -120,7 +162,15 @@ void read_eval_loop() { r1 = get_rtime(); if ( !ox_do_copy ) { if ( prresult ) { - printexpr(CO,LastVal); putc('\n',asir_out); + if ( user_print_function ) { + bevalf(user_print_function,mknode(1,LastVal)); + fflush(asir_out); + } else + printexpr(CO,LastVal); + if ( outputstyle == 1 ) { + putc(';',asir_out); + } + putc('\n',asir_out); fflush(asir_out); } if ( prtime ) {