===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.h,v
retrieving revision 1.3
retrieving revision 1.7
diff -u -p -r1.3 -r1.7
--- OpenXM_contrib2/asir2000/parse/parse.h	2000/08/21 08:31:47	1.3
+++ OpenXM_contrib2/asir2000/parse/parse.h	2000/12/08 06:43:11	1.7
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -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.2 2000/07/14 08:26:41 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.h,v 1.6 2000/12/05 01:24:57 noro Exp $ 
 */
-# if defined(THINK_C) || defined(VISUAL)
+# if defined(VISUAL)
 #include <time.h>
 #else
 #include <sys/time.h>
@@ -68,7 +68,7 @@ typedef enum {
 	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_LOP,
-	I_OPT, I_GETOPT
+	I_OPT, I_GETOPT, I_POINT
 } fid;
 
 /* identifiers for statements */
@@ -319,7 +319,7 @@ extern int Verbose;
 #define fflush w_fflush
 #endif
 
-#if defined(THINK_C) || defined(VISUAL)
+#if defined(VISUAL)
 NODE mknode(int,...);
 FNODE mkfnode(int,fid,...);
 SNODE mksnode(int,sid,...);
@@ -333,10 +333,8 @@ void call_usrf();
 
 /* prototypes */
 
-#if 1 || defined(THINK_C) || defined(VISUAL)
-void dp_ptozp2_d(NODE,int,DP,DP,DP *,DP *);
-void dp_ptozp_d(NODE,int,DP,DP *);
-void dp_ptozp_d_old(NODE,int,DP,DP *);
+void dp_ptozp2_d(DP,DP,DP *,DP *);
+void dp_ptozp_d(DP,DP *);
 void dp_vtod(Q *,DP,DP *);
 void dp_idivv_hist(Q,DP *);
 void dp_igcdv_hist(DP,Q *);
@@ -544,7 +542,7 @@ void getmember(FNODE,Obj *);
 void getmemberp(FNODE,Obj **);
 void help(char *);
 void instov(PFINS ,V *);
-void memberofstruct(FNODE,char *,FNODE *);
+Obj memberofstruct(COMP,char *);
 void mkpf(char *,Obj ,int ,V *,int (*)(),double (*)(),int (*)(),PF *);
 void mkpfins(PF ,V *,V *);
 void mkuf(char *,char *,NODE,SNODE,int,int,char *);
@@ -565,7 +563,7 @@ void showbps(void);
 void showpos(void);
 void simplify_ins(PFINS ,Obj *);
 void sprintvars(char *,VS);
-void structdef(char *,NODE);
+int structdef(char *,NODE);
 void substfp(VL ,Obj ,PF ,PF ,Obj *);
 void substfr(VL ,Obj ,PF ,PF ,Obj *);
 void substfv(VL ,V ,PF ,PF ,Obj *);
@@ -582,97 +580,3 @@ void divcomp(VL,COMP,COMP,COMP *);
 void chsgncomp(COMP,COMP *);
 void pwrcomp(VL,COMP,Obj,COMP *);
 int compcomp(VL,COMP,COMP);
-#else
-int arf_comp();
-int complist();
-int complist();
-int getcompsize();
-int getpvar();
-int getpvar();
-int gettype();
-int indextotype();
-int loadfile();
-int loadfiles();
-int makepvar();
-int membertoindex();
-int qcoefp();
-int qcoefr();
-int rangecheck();
-int structtoindex();
-pointer eval();
-pointer evalf();
-pointer evalif();
-pointer evalnode();
-pointer evalpf();
-pointer evalparif();
-pointer evalpv();
-pointer evalstat();
-void _mkpfins();
-void appendpfins();
-void appenduf();
-void arf_add();
-void arf_chsgn();
-void arf_div();
-void arf_init();
-void arf_mul();
-void arf_pwr();
-void arf_remain();
-void arf_sub();
-void bp();
-void clearbp();
-void debug();
-void debug_init();
-void delbp();
-void derivr();
-void derivvar();
-void duppfins();
-void error();
-void evalins();
-void evalnodebody();
-void evalp();
-void evalr();
-void evalv();
-void getarrayp();
-void getmember();
-void getmemberp();
-void help();
-void instov();
-void memberofstruct();
-void mkpf();
-void mkpfins();
-void mkuf();
-void newstruct();
-void optobj();
-void println();
-void printvars();
-void resetpvs();
-void searchc();
-void searchf();
-void searchpf();
-void searchsn();
-void setbp();
-void setf();
-void setstruct();
-void showbp();
-void showbps();
-void showpos();
-void simplify_ins();
-void sprintvars();
-void structdef();
-void substfp();
-void substfr();
-void substfv();
-void substpr();
-void substr();
-void appendtonode();
-void getarray();
-void putarray();
-
-void addcomp();
-void subcomp();
-void mulcomp();
-void divcomp();
-void chsgncomp();
-void pwrcomp();
-int compcomp();
-#endif