===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.h,v
retrieving revision 1.44
retrieving revision 1.55
diff -u -p -r1.44 -r1.55
--- OpenXM_contrib2/asir2000/parse/parse.h	2005/12/10 14:14:16	1.44
+++ OpenXM_contrib2/asir2000/parse/parse.h	2015/08/14 13:51:56	1.55
@@ -45,9 +45,9 @@
  * 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.43 2005/11/06 01:27:28 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.h,v 1.54 2015/08/06 10:01:53 fujimoto Exp $ 
 */
-# if defined(VISUAL)
+# if defined(VISUAL) || defined(__MINGW32__)
 #include <time.h>
 #else
 #include <sys/time.h>
@@ -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;
@@ -339,7 +341,7 @@ extern NODE current_option;
 #define fflush w_fflush
 #endif
 
-#if defined(__GNUC__) || defined(VISUAL) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
+#if defined(__GNUC__) || defined(VISUAL) || defined(__MINGW32__) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
 NODE mknode(int,...);
 FNODE mkfnode(int,fid,...);
 SNODE mksnode(int,sid,...);
@@ -465,7 +467,6 @@ void tty_reset(void);
 void set_timer(int);
 void reset_timer(void);
 void int_handler(int);
-void int_handler(int);
 void segv_handler(int);
 void bus_handler(int);
 void fpe_handler(int);
@@ -484,7 +485,7 @@ int yyparse(void);
 void nodetod(NODE,DP *);
 void poppvs(void);
 int length(NODE);
-int get_heapsize(void);
+size_t get_heapsize(void);
 int searchpvar(char *);
 void mkparif(char *,FUNC *);
 void makevar(char *,P *);
@@ -513,10 +514,8 @@ void printv(VL,V);
 void sprintv(VL,V);
 int arf_comp(VL, Obj, Obj);
 int complist(VL, LIST, LIST);
-int complist(VL, LIST, LIST);
 int getcompsize(int);
 int getpvar(VS,char *,int);
-int getpvar(VS,char *,int);
 int gettype(unsigned int);
 int indextotype(int,int);
 int loadfile(char *);
@@ -652,7 +651,6 @@ void dp_mbase(NODE hlist,NODE *mbase);
 void dp_idiv(DP p,Q c,DP *rp);
 void dp_ptozp2(DP p0,DP p1,DP *hp,DP *rp);
 void dp_ptozp(DP p,DP *rp);
-int eqdl(int nv,DL dl1,DL dl2);
 void _dpmod_to_vect(DP f,DL *at,int *b);
 void _tf_to_vect_compress(NODE tf,DL *at,CDP *b);
 void dp_to_vect(DP f,DL *at,Q *b);
@@ -824,7 +822,6 @@ void prompt() ;
 void sprompt(char *ptr);
 void process_args(int ac,char **av);
 void sig_init() ;
-static void (*old_int)(int);;
 void asir_save_handler() ;
 void asir_set_handler() ;
 void asir_reset_handler() ;
@@ -893,7 +890,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);