===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.h,v
retrieving revision 1.26
retrieving revision 1.33
diff -u -p -r1.26 -r1.33
--- OpenXM_contrib2/asir2000/parse/parse.h	2004/02/05 08:28:54	1.26
+++ OpenXM_contrib2/asir2000/parse/parse.h	2004/10/27 08:21:47	1.33
@@ -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.25 2004/02/04 07:42:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.h,v 1.32 2004/07/13 07:59:54 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_RANGE
+	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 */
@@ -133,6 +134,11 @@ struct oTKWD {
 	int token;
 };
 
+typedef struct fid_spec {
+    fid id;
+	farg_type type[10];
+} *fid_spec_p;
+
 typedef struct oARF {
 	char *name;
 	void (*fp)();
@@ -142,6 +148,7 @@ typedef struct oFUNC {
 	char *name,*fullname;
 	int argc;
 	int type;
+	int secure;
 	aid id;
 	union {
 		void (*binf)();
@@ -300,7 +307,8 @@ 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 SYMBOL Symbol_grlex, Symbol_glex, Symbol_lex;
+extern NODE current_option;
 
 #if defined(VISUAL_LIB)
 #include <w_stdio.h>
@@ -792,8 +800,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);