===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.h,v
retrieving revision 1.43
retrieving revision 1.46
diff -u -p -r1.43 -r1.46
--- OpenXM_contrib2/asir2000/parse/parse.h	2005/11/06 01:27:28	1.43
+++ OpenXM_contrib2/asir2000/parse/parse.h	2006/03/22 09:40:03	1.46
@@ -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.h,v 1.42 2005/11/04 07:03:38 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.h,v 1.45 2006/02/08 02:11:19 noro Exp $ 
 */
 # if defined(VISUAL)
 #include <time.h>
@@ -69,7 +69,7 @@ typedef enum {
 	I_FORMULA, I_LIST, I_STR, I_NEWCOMP, I_CAR, I_CDR, I_CAST,
 	I_INDEX, I_EV, I_TIMER, I_GF2NGEN, I_GFPNGEN, I_GFSNGEN,
 	I_LOP, I_OPT, I_GETOPT, I_POINT, I_PAREN, I_MINUS,
-	I_NARYOP, I_CONS, I_FUNC_HEAD, I_ARF_OP
+	I_NARYOP, I_CONS, I_FUNC_QARG, I_FUNC_HEAD,
 } fid;
 
 /* identifiers for statements */
@@ -123,6 +123,8 @@ typedef struct oPV {
 typedef struct oINFILE {
 	char *name;
 	FILE *fp;
+	jmp_buf jmpbuf;
+	int ready_for_longjmp;
 	int ln;
 	struct oINFILE *next;
 	char *tname;
@@ -196,7 +198,7 @@ typedef struct oPFINS {
 typedef struct oFNODE {
 	short id;
 	unsigned normalized:1;
-	unsigned expanded:1;
+	unsigned expanded:2;
 	unsigned coef:1;
 	pointer arg[1];
 } *FNODE;