===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.h,v
retrieving revision 1.18
retrieving revision 1.36
diff -u -p -r1.18 -r1.36
--- OpenXM_contrib2/asir2000/parse/parse.h	2003/05/14 06:20:12	1.18
+++ OpenXM_contrib2/asir2000/parse/parse.h	2005/08/25 18:59:11	1.36
@@ -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.35 2005/07/27 04:35:11 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
 } 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 */
@@ -133,15 +135,21 @@ 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;
 	union {
 		void (*binf)();
@@ -293,11 +301,15 @@ switch ( id ) {\
 extern VS GPVS,CPVS,EPVS,APVS,MPVS;
 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 +326,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 +345,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 +381,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,7 +475,8 @@ 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);
@@ -598,12 +612,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 +757,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 +779,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 +802,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);