===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.h,v
retrieving revision 1.45
retrieving revision 1.49
diff -u -p -r1.45 -r1.49
--- OpenXM_contrib2/asir2000/parse/parse.h	2006/02/08 02:11:19	1.45
+++ OpenXM_contrib2/asir2000/parse/parse.h	2008/11/18 20:52:47	1.49
@@ -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.44 2005/12/10 14:14:16 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.h,v 1.48 2008/09/01 06:20:33 noro Exp $ 
 */
 # if defined(VISUAL)
 #include <time.h>
@@ -123,7 +123,7 @@ typedef struct oPV {
 typedef struct oINFILE {
 	char *name;
 	FILE *fp;
-	jmp_buf jmpbuf;
+	JMP_BUF jmpbuf;
 	int ready_for_longjmp;
 	int ln;
 	struct oINFILE *next;
@@ -198,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;
@@ -895,7 +895,8 @@ pointer evalmapf(FUNC f,FNODE a);
 pointer eval_rec_mapf(FUNC f,FNODE a);
 pointer beval_rec_mapf(FUNC f,NODE node);
 pointer bevalf(FUNC f,NODE a);
-pointer evalif(FNODE f,FNODE a);
+pointer bevalf_with_opts(FUNC f,NODE a,NODE opts);
+pointer evalif(FNODE f,FNODE a,FNODE opt);
 pointer evalpf(PF pf,NODE args,NODE deriv);
 void evalnodebody(NODE sn,NODE *dnp);
 void gen_searchf(char *name,FUNC *r);