===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v
retrieving revision 1.7
retrieving revision 1.20
diff -u -p -r1.7 -r1.20
--- OpenXM_contrib2/asir2000/parse/parse.y 2001/08/20 09:50:35 1.7
+++ OpenXM_contrib2/asir2000/parse/parse.y 2003/05/23 00:11:59 1.20
@@ -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/parse.y,v 1.6 2001/04/20 02:34:24 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.19 2003/05/20 06:15:01 noro Exp $
*/
%{
#define malloc(x) GC_malloc(x)
@@ -63,9 +63,9 @@
#define NOPR (prresult=0)
-extern int gdef;
+extern int gdef,mgdef,ldef;
extern SNODE parse_snode;
-extern int main_parser;
+extern int main_parser, allow_create_var;
int prresult;
@@ -89,8 +89,9 @@ extern jmp_buf env;
pointer p;
}
-%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 GETOPT
+%token STRUCT POINT NEWSTRUCT ANS FDEF PFDEF MODDEF MODEND
+%token GLOBAL MGLOBAL LOCAL LOCALF 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
'+' '-' '*' '/' '^' '%'
@@ -98,7 +99,7 @@ extern jmp_buf env;
%type
desc rawstr
%type expr pexpr opt
%type stat complex
-%type stats node _node pvars members optlist
+%type stats node _node pvars vars members optlist
%right '=' BOPASS
%right '?' ':'
@@ -131,9 +132,15 @@ start : stat
stat : tail
{ $$ = 0; }
| GLOBAL { gdef=1; } pvars { gdef=0; } tail
- { $$ = 0; }
+ { $$ = 0; NOPR; }
+ | MGLOBAL { mgdef=1; } pvars { mgdef=0; } tail
+ { $$ = 0; NOPR; }
+ | LOCAL { ldef=1; } pvars { ldef=0; } tail
+ { $$ = 0; NOPR; }
+ | LOCALF vars tail
+ { appenduflist($2); $$ = 0; NOPR; }
| STRUCT rawstr '{' members '}' tail
- { structdef($2,$4); $$ = 0; }
+ { structdef($2,$4); $$ = 0; NOPR; }
| expr tail
{ $$ = mksnode(1,S_SINGLE,$1); }
| complex
@@ -158,14 +165,18 @@ stat : tail
{ $$ = mksnode(3,S_DO,$1,$2,$5); }
| LCASE '(' node ')' ':' '=' expr tail
{ $$ = mksnode(3,S_PFDEF,$1,$3,$7); NOPR; }
- | PFDEF LCASE '(' node ')'
+ | PFDEF LCASE '(' node ')' tail
{ $$ = mksnode(3,S_PFDEF,$2,$4,0); NOPR; }
- | FDEF LCASE { mkpvs(); } '(' node ')' desc '{' stats '}'
+ | FDEF LCASE { mkpvs($2); } '(' { ldef = 1; } node { ldef = -1; } ')' desc '{' stats '}'
{
- mkuf($2,asir_infile->name,$5,
- mksnode(1,S_CPLX,$9),$1,asir_infile->ln,$7);
+ mkuf($2,asir_infile->name,$6,
+ mksnode(1,S_CPLX,$11),$1,asir_infile->ln,$9,CUR_MODULE);
$$ = 0; NOPR;
}
+ | MODDEF LCASE tail
+ { CUR_MODULE = mkmodule($2); MPVS = CUR_MODULE->pvs; $$ = 0; NOPR; }
+ | MODEND tail
+ { CUR_MODULE = 0; MPVS = 0; $$ = 0; NOPR; }
| error tail
{ yyerrok; $$ = 0; }
;
@@ -173,6 +184,7 @@ tail : ';'
{ if ( main_parser ) prresult = 1; }
| '$'
{ if ( main_parser ) prresult = 0; }
+;
desc :
{ $$ = 0; }
| STR
@@ -186,6 +198,11 @@ members : rawstr
| members ',' rawstr
{ appendtonode($1,$3,&$$); }
;
+vars : LCASE
+ { MKNODE($$,$1,0); }
+ | vars ',' LCASE
+ { appendtonode($1,$3,&$$); }
+ ;
pvars : UCASE
{ val = (pointer)makepvar($1); MKNODE($$,val,0); }
| pvars ',' UCASE
@@ -229,6 +246,8 @@ pexpr : STR
{ $$ = mkfnode(0,I_GF2NGEN); }
| GFPNGEN
{ $$ = mkfnode(0,I_GFPNGEN); }
+ | GFSNGEN
+ { $$ = mkfnode(0,I_GFSNGEN); }
| LCASE
{
FUNC f;
@@ -258,32 +277,30 @@ 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);
+ print_crossref(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);
+ print_crossref(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);
+ print_crossref(val);
+ $$ = mkfnode(2,I_MAP,val,mkfnode(1,I_LIST,$5));
+ }
+ | RECMAP '(' LCASE ',' node ')'
+ {
+ gen_searchf($3,(FUNC *)&val);
+ print_crossref(val);
+ $$ = mkfnode(2,I_RECMAP,val,mkfnode(1,I_LIST,$5));
+ }
| LCASE '{' node '}' '(' node ')'
{
searchpf($1,(FUNC *)&val);
@@ -293,36 +310,21 @@ 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);
}
- | RECMAP '(' LCASE ',' node ')'
- {
- 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_RECMAP,val,mkfnode(1,I_LIST,$5));
- }
| TIMER '(' expr ',' expr ',' expr ')'
{
$$ = mkfnode(3,I_TIMER,$3,$5,$7);
}
+ | PARIF '(' LCASE ')'
+ {
+ searchf(parif,$3,(FUNC *)&val);
+ if ( !val )
+ mkparif($3,(FUNC *)&val);
+ $$ = mkfnode(2,I_FUNC,val,0);
+ }
| PARIF '(' LCASE ',' node ')'
{
searchf(parif,$3,(FUNC *)&val);
@@ -339,10 +341,10 @@ pexpr : STR
| CDR '(' expr ')'
{ $$ = mkfnode(1,I_CDR,$3); }
| '(' expr ')'
- { $$ = $2; }
+ { $$ = mkfnode(1,I_PAREN,$2); }
| UCASE
{
- if ( main_parser )
+ if ( main_parser || allow_create_var )
$$ = mkfnode(2,I_PVAR,makepvar($1),0);
else {
ind = searchpvar($1);
@@ -383,7 +385,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