=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.1 retrieving revision 1.11 diff -u -p -r1.1 -r1.11 --- OpenXM_contrib2/asir2000/parse/parse.y 1999/12/03 07:39:12 1.1 +++ OpenXM_contrib2/asir2000/parse/parse.y 2001/09/05 09:01:28 1.11 @@ -1,21 +1,64 @@ -/* $OpenXM: OpenXM/src/asir99/parse/parse.y,v 1.2 1999/11/18 05:42:03 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * 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@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, + * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. + * + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.10 2001/09/03 07:01:10 noro Exp $ +*/ %{ #define malloc(x) GC_malloc(x) #define realloc(x,y) GC_realloc(x,y) #define free(x) GC_free(x) -#if defined(THINK_C) -#define alloca(x) GC_malloc(x) -#endif #if defined(TOWNS) #include #endif #include #include "ca.h" -#if !defined(THINK_C) #include #include -#endif #include "parse.h" #define NOPR (prresult=0) @@ -31,6 +74,7 @@ static FNODE t; static NODE a,b; static NODE2 a2; static pointer val; +static QUOTE quote; extern jmp_buf env; %} @@ -45,8 +89,8 @@ extern jmp_buf env; pointer p; } -%token STRUCT POINT NEWSTRUCT ANS FDEF PFDEF GLOBAL CMP OR AND CAR CDR -%token DO WHILE FOR IF ELSE BREAK RETURN CONTINUE PARIF MAP TIMER GF2NGEN GFPNGEN GETOPT +%token STRUCT POINT NEWSTRUCT ANS FDEF PFDEF GLOBAL CMP OR AND CAR CDR QUOTED +%token DO WHILE FOR IF ELSE BREAK RETURN CONTINUE PARIF MAP RECMAP TIMER GF2NGEN GFPNGEN GFSNGEN GETOPT %token FOP_AND FOP_OR FOP_IMPL FOP_REPL FOP_EQUIV FOP_NOT LOP %token

FORMULA UCASE LCASE STR SELF BOPASS %token

'+' '-' '*' '/' '^' '%' @@ -54,7 +98,7 @@ extern jmp_buf env; %type

desc rawstr %type expr pexpr opt %type stat complex -%type stats node _node pvars fields members optlist +%type stats node _node pvars members optlist %right '=' BOPASS %right '?' ':' @@ -88,12 +132,8 @@ stat : tail { $$ = 0; } | GLOBAL { gdef=1; } pvars { gdef=0; } tail { $$ = 0; } - | STRUCT rawstr '{' fields '}' tail + | STRUCT rawstr '{' members '}' tail { structdef($2,$4); $$ = 0; } - | STRUCT rawstr '{' fields '}' pvars tail - { structdef($2,$4); setstruct($2,$6); $$ = 0; } - | STRUCT rawstr pvars tail - { setstruct($2,$3); $$ = 0; } | expr tail { $$ = mksnode(1,S_SINGLE,$1); } | complex @@ -141,13 +181,6 @@ desc : complex : '{' stats '}' { $$ = mksnode(1,S_CPLX,$2); } ; -fields : - { $$ = 0; } - | fields members tail - { MKNODE(a,0,$2); appendtonode($1,(pointer)a,&$$); } - | fields STRUCT rawstr members tail - { MKNODE(a,$3,$4); appendtonode($1,(pointer)a,&$$); } - ; members : rawstr { MKNODE($$,$1,0); } | members ',' rawstr @@ -196,6 +229,8 @@ pexpr : STR { $$ = mkfnode(0,I_GF2NGEN); } | GFPNGEN { $$ = mkfnode(0,I_GFPNGEN); } + | GFSNGEN + { $$ = mkfnode(0,I_GFSNGEN); } | LCASE { FUNC f; @@ -225,32 +260,26 @@ pexpr : STR } | LCASE '(' node ')' { - searchf(sysf,$1,(FUNC *)&val); - if ( !val ) - searchf(ubinf,$1,(FUNC *)&val); - if ( !val ) - searchpf($1,(FUNC *)&val); - if ( !val ) - searchf(usrf,$1,(FUNC *)&val); - if ( !val ) - appenduf($1,(FUNC *)&val); + gen_searchf($1,(FUNC *)&val); $$ = mkfnode(2,I_FUNC,val,mkfnode(1,I_LIST,$3)); } | LCASE '(' node '|' optlist ')' { - searchf(sysf,$1,(FUNC *)&val); - if ( !val ) - searchf(ubinf,$1,(FUNC *)&val); - if ( !val ) - searchpf($1,(FUNC *)&val); - if ( !val ) - searchf(usrf,$1,(FUNC *)&val); - if ( !val ) - appenduf($1,(FUNC *)&val); + gen_searchf($1,(FUNC *)&val); $$ = mkfnode(3,I_FUNC_OPT,val, mkfnode(1,I_LIST,$3),mkfnode(1,I_LIST,$5)); } + | MAP '(' LCASE ',' node ')' + { + gen_searchf($3,(FUNC *)&val); + $$ = mkfnode(2,I_MAP,val,mkfnode(1,I_LIST,$5)); + } + | RECMAP '(' LCASE ',' node ')' + { + gen_searchf($3,(FUNC *)&val); + $$ = mkfnode(2,I_RECMAP,val,mkfnode(1,I_LIST,$5)); + } | LCASE '{' node '}' '(' node ')' { searchpf($1,(FUNC *)&val); @@ -260,18 +289,9 @@ pexpr : STR { $$ = mkfnode(2,I_GETOPT,$3); } - | MAP '(' LCASE ',' node ')' + | GETOPT '(' ')' { - searchf(sysf,$3,(FUNC *)&val); - if ( !val ) - searchf(ubinf,$3,(FUNC *)&val); - if ( !val ) - searchpf($3,(FUNC *)&val); - if ( !val ) - searchf(usrf,$3,(FUNC *)&val); - if ( !val ) - appenduf($3,(FUNC *)&val); - $$ = mkfnode(2,I_MAP,val,mkfnode(1,I_LIST,$5)); + $$ = mkfnode(2,I_GETOPT,0); } | TIMER '(' expr ',' expr ',' expr ')' { @@ -293,7 +313,7 @@ pexpr : STR | CDR '(' expr ')' { $$ = mkfnode(1,I_CDR,$3); } | '(' expr ')' - { $$ = $2; } + { $$ = mkfnode(1,I_PAREN,$2); } | UCASE { if ( main_parser ) @@ -318,7 +338,7 @@ pexpr : STR } } | pexpr POINT rawstr - { memberofstruct($1,$3,&$$); } + { $$ = mkfnode(2,I_POINT,$1,$3); } ; expr : pexpr { $$ = $1; } @@ -337,7 +357,7 @@ expr : pexpr | '+' expr %prec PLUS { $$ = $2; } | '-' expr %prec MINUS - { $$ = mkfnode(3,I_BOP,$1,0,$2); } + { $$ = mkfnode(1,I_MINUS,$2); } | expr '+' expr { $$ = mkfnode(3,I_BOP,$2,$1,$3); } | expr '-' expr @@ -378,5 +398,7 @@ expr : pexpr { $$ = mkfnode(1,I_EV,$2); } | NEWSTRUCT '(' rawstr ')' { $$ = mkfnode(1,I_NEWCOMP,(int)structtoindex($3)); } + | QUOTED '(' expr ')' + { MKQUOTE(quote,$3); $$ = mkfnode(1,I_FORMULA,(pointer)quote); } ; %%