===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v
retrieving revision 1.9
retrieving revision 1.15
diff -u -p -r1.9 -r1.15
--- OpenXM_contrib2/asir2000/parse/parse.y	2001/09/03 01:04:28	1.9
+++ OpenXM_contrib2/asir2000/parse/parse.y	2003/05/14 06:20:12	1.15
@@ -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.8 2001/08/21 01:39:39 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.14 2002/12/22 02:08:29 takayama 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,8 +89,8 @@ extern jmp_buf env;
 	pointer p;
 }
 
-%token <i> STRUCT POINT NEWSTRUCT ANS FDEF PFDEF GLOBAL CMP OR AND CAR CDR QUOTED
-%token <i> DO WHILE FOR IF ELSE BREAK RETURN CONTINUE PARIF MAP RECMAP TIMER GF2NGEN GFPNGEN GETOPT
+%token <i> STRUCT POINT NEWSTRUCT ANS FDEF PFDEF MODDEF GLOBAL MGLOBAL 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
 %token <p> '+' '-' '*' '/' '^' '%'
@@ -132,6 +132,8 @@ stat 	: tail
 			{ $$ = 0; }
 		| GLOBAL { gdef=1; } pvars { gdef=0; } tail
 			{ $$ = 0; }
+		| MGLOBAL { mgdef=1; } pvars { mgdef=0; } tail
+			{ $$ = 0; }
 		| STRUCT rawstr '{' members '}' tail
 			{ structdef($2,$4); $$ = 0; }
 		| expr tail
@@ -163,9 +165,14 @@ stat 	: tail
 		| FDEF LCASE { mkpvs(); } '(' 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 { CUR_MODULE = mkmodule($2); } '{' stats '}'
+			{
+				CUR_MODULE = 0;
+				$$ = 0; NOPR;
+			}
 	  	| error tail
 			{ yyerrok; $$ = 0; }
 		;
@@ -173,6 +180,7 @@ tail	: ';' 
 			{ if ( main_parser ) prresult = 1; } 
 		| '$' 
 			{ if ( main_parser ) prresult = 0; } 
+;
 desc	:
 			{ $$ = 0; }
 		| STR
@@ -229,6 +237,8 @@ pexpr	: STR
 			{ $$ = mkfnode(0,I_GF2NGEN); }
 		| GFPNGEN
 			{ $$ = mkfnode(0,I_GFPNGEN); }
+		| GFSNGEN
+			{ $$ = mkfnode(0,I_GFSNGEN); }
 	 	| LCASE
 			{
 				FUNC f;
@@ -295,6 +305,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);
@@ -314,7 +331,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);
@@ -355,7 +372,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