===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.h,v
retrieving revision 1.18
retrieving revision 1.48
diff -u -p -r1.18 -r1.48
--- OpenXM_contrib2/asir2000/parse/parse.h	2003/05/14 06:20:12	1.18
+++ OpenXM_contrib2/asir2000/parse/parse.h	2008/09/01 06:20:33	1.48
@@ -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.17 2003/04/02 09:43:33 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.h,v 1.47 2007/04/30 02:14:34 noro Exp $ 
 */
 # if defined(VISUAL)
 #include <time.h>
@@ -67,8 +67,9 @@ typedef enum {
 	I_FUNC, I_FUNC_OPT, I_IFUNC, I_MAP, I_RECMAP, I_PFDERIV,
 	I_ANS, I_PVAR, I_ASSPVAR, 
 	I_FORMULA, I_LIST, I_STR, I_NEWCOMP, I_CAR, I_CDR, I_CAST,
-	I_COM, I_PROC, I_INDEX, I_EV, I_TIMER, I_GF2NGEN, I_GFPNGEN, I_GFSNGEN,
-	I_LOP, I_OPT, I_GETOPT, I_POINT, I_QUOTE, I_PAREN, I_MINUS
+	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_QARG, I_FUNC_HEAD,
 } fid;
 
 /* identifiers for statements */
@@ -77,7 +78,8 @@ typedef enum {
 	S_BP, S_PFDEF,
 	S_SINGLE, S_CPLX, 
 	S_IFELSE, S_FOR, S_DO,
-	S_BREAK, S_RETURN, S_CONTINUE
+	S_BREAK, S_RETURN, S_CONTINUE,
+	S_MODULE
 } sid;
 
 /* identifiers for comparison operators */
@@ -121,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;
@@ -133,16 +137,23 @@ struct oTKWD {
 	int token;
 };
 
+typedef struct fid_spec {
+	fid id;
+	farg_type type[10];
+} *fid_spec_p;
+
 typedef struct oARF {
 	char *name;
 	void (*fp)();
 } *ARF;
 
 typedef struct oFUNC {
-	char *name;
+	char *name,*fullname;
 	int argc;
 	int type;
+	int secure;
 	aid id;
+	unsigned int quote;
 	union {
 		void (*binf)();
 		struct oUSRF *usrf;
@@ -185,7 +196,10 @@ typedef struct oPFINS {
 #define NEWPF(p) ((p)=(PF)MALLOC(sizeof(struct oPF)))
 
 typedef struct oFNODE {
-	fid id;
+	short id;
+	unsigned normalized:1;
+	unsigned expanded:2;
+	unsigned coef:1;
 	pointer arg[1];
 } *FNODE;
 
@@ -215,6 +229,7 @@ struct ftab {
 	char *name;
 	void (*f)();
 	int argc;
+	unsigned int quote;
 };
 
 #define MKPVI(a,b,c)\
@@ -264,25 +279,33 @@ switch ( id ) {\
 
 #define DEFSIZE 32
 #define PVGLOBAL(i) (((unsigned int)(i))|(1<<30))
-#define PVMGLOBAL(i) (((unsigned int)(i))|(3<<30))
+#define PVMGLOBAL(i) (((unsigned int)(i))|(2<<30))
+#define PVPATTERN(i) (((unsigned int)(i))|(3<<30))
 #define PVATTR(i) (((unsigned int)(i))>>30)
 #define PVIND(i) (((unsigned int)(i))&0x3fffffff)
 #define GETPV(i,p) \
 (PVATTR(i)==0?(int)((p)=CPVS->va[(unsigned int)(i)].priv)\
-             :PVATTR(i)==1?(int)((p)=GPVS->va[PVIND(i)].priv)\
-                          :(int)((p)=MPVS->va[PVIND(i)].priv))
+   :PVATTR(i)==1?(int)((p)=GPVS->va[PVIND(i)].priv)\
+      :PVATTR(i)==2?(int)((p)=MPVS->va[PVIND(i)].priv)\
+         :(int)((p)=PPVS->va[PVIND(i)].priv))
+
 #define GETPVREF(i,p) \
 (PVATTR(i)==0?(int)((p)=&(CPVS->va[(unsigned int)(i)].priv))\
-             :PVATTR(i)==1?(int)((p)=&(GPVS->va[PVIND(i)].priv))\
-                          :(int)((p)=&(MPVS->va[PVIND(i)].priv)))
+   :PVATTR(i)==1?(int)((p)=&(GPVS->va[PVIND(i)].priv))\
+      :PVATTR(i)==2?(int)((p)=&(MPVS->va[PVIND(i)].priv))\
+         :(int)((p)=&(PPVS->va[PVIND(i)].priv)))
+
 #define GETPVNAME(i,p) \
 (PVATTR(i)==0?(int)((p)=CPVS->va[(unsigned int)(i)].name)\
-             :PVATTR(i)==1?(int)((p)=GPVS->va[PVIND(i)].name)\
-                          :(int)((p)=MPVS->va[PVIND(i)].name))
+   :PVATTR(i)==1?(int)((p)=GPVS->va[PVIND(i)].name)\
+      :PVATTR(i)==2?(int)((p)=MPVS->va[PVIND(i)].name)\
+         :(int)((p)=PPVS->va[PVIND(i)].name))
+
 #define ASSPV(i,p) \
 (PVATTR(i)==0?(int)(CPVS->va[(unsigned int)(i)].priv=(pointer)(p))\
-             :PVATTR(i)==1?(int)(GPVS->va[PVIND(i)].priv=(pointer)(p))\
-                          :(int)(MPVS->va[PVIND(i)].priv=(pointer)(p)))
+   :PVATTR(i)==1?(int)(GPVS->va[PVIND(i)].priv=(pointer)(p))\
+      :PVATTR(i)==2?(int)(MPVS->va[PVIND(i)].priv=(pointer)(p))\
+         :(int)(PPVS->va[PVIND(i)].priv=(pointer)(p)))
 
 #define NEWNODE2(a) ((a)=(NODE2)MALLOC(sizeof(struct oNODE2)))
 #define MKNODE2(a,b,c,d) \
@@ -290,14 +313,18 @@ switch ( id ) {\
 #define BDY1(a) ((a)->body1)
 #define BDY2(a) ((a)->body2)
 
-extern VS GPVS,CPVS,EPVS,APVS,MPVS;
+extern VS GPVS,CPVS,EPVS,APVS,MPVS,PPVS;
 extern MODULE CUR_MODULE;
 extern NODE MODULE_LIST;
+extern char *CUR_FUNC;
 extern ARF addfs, subfs, mulfs, divfs, remfs, pwrfs;
 extern INFILE asir_infile;
 extern NODE usrf,sysf,noargsysf,ubinf,parif,ONENODE;
 extern int nextbp,nextbplevel;
 extern int Verbose;
+extern int do_quiet;
+extern SYMBOL Symbol_grlex, Symbol_glex, Symbol_lex;
+extern NODE current_option;
 
 #if defined(VISUAL_LIB)
 #include <w_stdio.h>
@@ -314,7 +341,7 @@ extern int Verbose;
 #define fflush w_fflush
 #endif
 
-#if defined(VISUAL) || (defined(__MACH__) && defined(__ppc__))
+#if defined(__GNUC__) || defined(VISUAL) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
 NODE mknode(int,...);
 FNODE mkfnode(int,fid,...);
 SNODE mksnode(int,sid,...);
@@ -333,6 +360,7 @@ void dp_ptozp_d(DP,DP *);
 void dp_vtod(Q *,DP,DP *);
 void dp_idivv_hist(Q,DP *);
 void dp_igcdv_hist(DP,Q *);
+void dp_ptozp3(DP,Q *,DP *);
 void dp_ptozp2(DP,DP,DP *,DP *);
 void dp_ptozp(DP,DP *);
 void dp_nf_tab_mod(DP,LIST *,int,DP *);
@@ -368,8 +396,8 @@ void dp_mod(DP,int,NODE,DP *);
 void dp_prim_mod(DP,int,DP *);
 void dp_prim(DP,DP *);
 void heu_nezgcdnpz(VL,P *,int,P *);
-void homogenize_order(struct order_spec *,int,struct order_spec *);
-int create_order_spec(Obj,struct order_spec *);
+void homogenize_order(struct order_spec *,int,struct order_spec **);
+int create_order_spec(VL,Obj,struct order_spec **);
 
 int dl_equal(int,DL,DL);
 void qltozl(Q *,int,Q *);
@@ -462,15 +490,16 @@ int get_heapsize(void);
 int searchpvar(char *);
 void mkparif(char *,FUNC *);
 void makevar(char *,P *);
-void mkpvs(void);
+void mkpvs(char *);
+MODULE mkmodule(char *);
 void stoarg(char *,int *,char **);
 void yyerror(char *);
 void closecurrentinput(void);
 void asir_terminate(int);
 void searchasirpath(char *,char **);
 void get_vars(Obj,VL *);
-void appendbinf(NODE *,char *,void(*)(),int);
-void appendubinf(char *,void(*)(),int);
+void appendbinf(NODE *,char *,void(*)(),int,unsigned int);
+void appendubinf(char *,void(*)(),int,unsigned int);
 void parif_init(void);
 void sysf_init(void);
 void makesrvar(FUNC, P *);
@@ -500,15 +529,6 @@ int qcoefp(Obj);
 int qcoefr(Obj);
 int rangecheck(Obj,int);
 int structtoindex(char *);
-pointer eval(FNODE);
-pointer evalf(FUNC,FNODE,FNODE);
-pointer bevalf(FUNC,NODE);
-pointer evalif(FNODE,FNODE);
-pointer evalnode(NODE node);
-pointer evalpf(PF,NODE);
-pointer evalparif(FUNC,NODE);
-pointer evalpv(int,FNODE,pointer);
-pointer evalstat(SNODE f);
 void _mkpfins(PF ,Obj *,V *);
 void appendpfins(V ,V *);
 void appenduf(char *,FUNC *);
@@ -598,12 +618,10 @@ int dp_redble(DP p1,DP p2);
 void sortbynm(Q *w,int n);
 int comp_nm(Q *a,Q *b);
 void qltozl(Q *w,int n,Q *dvr);
-void homogenize_order(struct order_spec *old,int n,struct order_spec *new);
 void dp_rat(DP p,DP *rp);
 void dp_mod(DP p,int mod,NODE subst,DP *rp);
 void dp_dehomo(DP p,DP *rp);
 void dp_homo(DP p,DP *rp);
-int create_order_spec(Obj obj,struct order_spec *spec);
 void dp_nf_tab_mod(DP p,LIST *tab,int mod,DP *rp);
 void dp_lnf_mod(DP p1,DP p2,NODE g,int mod,DP *r1p,DP *r2p);
 void dp_lnf_f(DP p1,DP p2,NODE g,DP *r1p,DP *r2p);
@@ -745,7 +763,7 @@ int generic_gauss_elim_mod(int **mat0,int row,int col,
 int lu_gfmmat(GFMMAT mat,unsigned int md,int *perm);
 int find_lhs_and_lu_mod(unsigned int **a,int row,int col,
 	unsigned int md,int **rinfo,int **cinfo);
-void solve_by_lu_mod(int **a,int n,int md,int **b,int l);
+void solve_by_lu_mod(int **a,int n,int md,int **b,int l,int normalize);
 int gauss_elim_mod1(int **mat,int row,int col,int md);
 int gauss_elim_geninv_mod(unsigned int **mat,int row,int col,int md);
 void solve_by_lu_gfmmat(GFMMAT lu,unsigned int md,unsigned int *b,unsigned int *x);
@@ -767,7 +785,6 @@ void igcd_cofactor(Q a,Q b,Q *gcd,Q *ca,Q *cb);
 int comp_n(N *a,N *b);
 int TypeT_NB_check(unsigned int m, unsigned int t);
 int small_jacobi(int a,int m);
-void mkpvs();
 void pushpvs(FUNC f);
 void poppvs();
 unsigned int makepvar(char *str);
@@ -791,8 +808,8 @@ void chsgnquote(QUOTE a,QUOTE *c);
 void objtoquote(Obj a,QUOTE *c);
 void polytoquote(P a,QUOTE *c);
 void dptoquote(DP a,QUOTE *c);
-void dctoquote(DCP dc,QUOTE v,QUOTE *c);
-void mptoquote(MP m,int n,QUOTE *c);
+void dctoquote(DCP dc,QUOTE v,QUOTE *c,int *sgn);
+void mptoquote(MP m,int n,QUOTE *c,int *sgn);
 void vartoquote(V v,QUOTE *c);
 void fnodetotree(FNODE f,LIST *rp);
 FNODE eval_pvar_in_fnode(FNODE f);
@@ -872,12 +889,14 @@ pointer eval(FNODE f);
 pointer evalstat(SNODE f);
 pointer evalnode(NODE node);
 pointer evalf(FUNC f,FNODE a,FNODE opt);
+pointer evalparif(FUNC f,NODE a);
+pointer evalf_deriv(FUNC f,FNODE a,FNODE deriv);
 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 evalpf(PF pf,NODE args);
+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);
 void searchf(NODE fn,char *name,FUNC *r);