===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v
retrieving revision 1.10
retrieving revision 1.17
diff -u -p -r1.10 -r1.17
--- OpenXM_contrib2/asir2000/parse/parse.y	2001/09/03 07:01:10	1.10
+++ OpenXM_contrib2/asir2000/parse/parse.y	2003/05/16 07:56:16	1.17
@@ -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.9 2001/09/03 01:04:28 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.16 2003/05/14 09:18:38 noro Exp $ 
 */
 %{
 #define malloc(x) GC_malloc(x)
@@ -63,9 +63,9 @@
 
 #define NOPR (prresult=0)
 
-extern int gdef;
+extern int gdef,mgdef;
 extern SNODE parse_snode;
-extern int main_parser;
+extern int main_parser, allow_create_var;
 
 int prresult;
 
@@ -89,7 +89,7 @@ extern jmp_buf env;
 	pointer p;
 }
 
-%token <i> STRUCT POINT NEWSTRUCT ANS FDEF PFDEF GLOBAL CMP OR AND CAR CDR QUOTED
+%token <i> STRUCT POINT NEWSTRUCT ANS FDEF PFDEF MODDEF MODEND GLOBAL MGLOBAL GLOBALF CMP OR AND CAR CDR QUOTED
 %token <i> DO WHILE FOR IF ELSE BREAK RETURN CONTINUE PARIF MAP RECMAP TIMER GF2NGEN GFPNGEN GFSNGEN GETOPT
 %token <i> FOP_AND FOP_OR FOP_IMPL FOP_REPL FOP_EQUIV FOP_NOT LOP
 %token <p> FORMULA UCASE LCASE STR SELF BOPASS
@@ -98,7 +98,7 @@ extern jmp_buf env;
 %type <p> desc rawstr
 %type <f> expr pexpr opt
 %type <s> stat complex
-%type <n> stats node _node pvars members optlist
+%type <n> stats node _node pvars vars members optlist
 
 %right '=' BOPASS
 %right '?' ':'
@@ -132,6 +132,10 @@ stat 	: tail
 			{ $$ = 0; }
 		| GLOBAL { gdef=1; } pvars { gdef=0; } tail
 			{ $$ = 0; }
+		| GLOBALF vars tail
+			{ register_proto($2); $$ = 0; }
+		| MGLOBAL { mgdef=1; } pvars { mgdef=0; } tail
+			{ $$ = 0; }
 		| STRUCT rawstr '{' members '}' tail
 			{ structdef($2,$4); $$ = 0; }
 		| expr tail
@@ -160,12 +164,16 @@ stat 	: tail
 			{ $$ = mksnode(3,S_PFDEF,$1,$3,$7); NOPR; }
 		| PFDEF LCASE '(' node ')'
 			{ $$ = mksnode(3,S_PFDEF,$2,$4,0); NOPR; }
-		| FDEF LCASE { mkpvs(); } '(' node ')' desc '{' stats '}'
+		| FDEF LCASE { mkpvs($2); } '(' node ')' desc '{' stats '}'
 			{
 				mkuf($2,asir_infile->name,$5,
-					mksnode(1,S_CPLX,$9),$1,asir_infile->ln,$7); 
+					mksnode(1,S_CPLX,$9),$1,asir_infile->ln,$7,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 +181,7 @@ tail	: ';' 
 			{ if ( main_parser ) prresult = 1; } 
 		| '$' 
 			{ if ( main_parser ) prresult = 0; } 
+;
 desc	:
 			{ $$ = 0; }
 		| STR
@@ -186,6 +195,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
@@ -261,23 +275,27 @@ pexpr	: STR
 		| LCASE '(' node ')' 
 			{
 				gen_searchf($1,(FUNC *)&val);
+				print_crossref(val);
 				$$ = mkfnode(2,I_FUNC,val,mkfnode(1,I_LIST,$3));
 			}
 
 		| LCASE '(' node '|' optlist ')' 
 			{
 				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 ')' 
@@ -297,6 +315,13 @@ pexpr	: STR
 			{
 				$$ = 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);
@@ -316,7 +341,7 @@ pexpr	: STR
 			{ $$ = 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);
@@ -357,7 +382,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