===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/pvar.c,v
retrieving revision 1.1.1.1
retrieving revision 1.6
diff -u -p -r1.1.1.1 -r1.6
--- OpenXM_contrib2/asir2000/parse/pvar.c	1999/12/03 07:39:12	1.1.1.1
+++ OpenXM_contrib2/asir2000/parse/pvar.c	2001/10/09 01:36:25	1.6
@@ -1,11 +1,59 @@
-/* $OpenXM: OpenXM/src/asir99/parse/pvar.c,v 1.1.1.1 1999/11/10 08:12:34 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * 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@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
+ * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
+ *
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.5 2000/12/05 01:24:57 noro Exp $ 
+*/
 #include "ca.h"
 #include "parse.h"
 
 NODE PVSS;
 
 void mkpvs()
- {
+{
 	VS pvs;
 
 	pvs = (VS)MALLOC(sizeof(struct oVS));
@@ -15,8 +63,7 @@ void mkpvs()
 	CPVS = pvs; 
 }
 
-void pushpvs(f)
-FUNC f;
+void pushpvs(FUNC f)
 {
 	VS pvs;
 	NODE node;
@@ -55,8 +102,7 @@ void poppvs() {
 
 int gdef;
 
-int makepvar(str)
-char *str;
+int makepvar(char *str)
 {
 	int c;
 
@@ -77,8 +123,7 @@ char *str;
 
 extern FUNC parse_targetf;
 
-int searchpvar(str)
-char *str;
+int searchpvar(char *str)
 {
 	VS pvs;
 	int i;
@@ -93,10 +138,7 @@ char *str;
 		return i;
 }
 
-int getpvar(pvs,str,searchonly)
-VS pvs;
-char *str;
-int searchonly;
+int getpvar(VS pvs,char *str,int searchonly)
 {
 	struct oPV *va;
 	PV v;
@@ -127,19 +169,10 @@ void closecurrentinput()
 	if ( asir_infile && !asir_infile->fp )
 		return;
 
-#if defined(THINK_C) || defined(VISUAL)
-#if defined(THINK_C)
-	void setDir(short);
-
+#if defined(VISUAL)
 	fclose(asir_infile->fp); 
-	setDir(asir_infile->vol);
 	unlink(asir_infile->tname);
-	resetDir();
 #else
-	fclose(asir_infile->fp); 
-	unlink(asir_infile->tname);
-#endif
-#else
 	PCLOSE(asir_infile->fp);
 #endif
 	asir_infile = NEXT(asir_infile);
@@ -176,46 +209,15 @@ void restorepvs()
 	nextbplevel = saved_nextbplevel;
 }
 
-void storeans(p)
-pointer p;
+void storeans(pointer p)
 {
 	if ( APVS->asize == APVS->n )
 		reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV));
 	APVS->va[APVS->n++].priv = p; 
 }
 
-#if 1
-pointer evalpv(id,expr,f)
-int id;
-FNODE expr;
-pointer f;
-{
-	pointer a,val = 0;
-	pointer *addr;
-
-	if ( expr->id != I_PVAR && expr->id != I_CAST )
-		error("evalpv : invalid assignment");
-	switch ( id ) {
-		case I_PRESELF:
-			getmemberp((FNODE)expr,(Obj **)&addr);
-			(*((ARF)f)->fp)(CO,*addr,ONE,&val); *addr = val; break;
-		case I_POSTSELF:
-			getmemberp((FNODE)expr,(Obj **)&addr);
-			val = *addr; (*((ARF)f)->fp)(CO,*addr,ONE,&a); *addr = a; break;
-		case I_PVAR:
-			getmember((FNODE)expr,(Obj *)&val); break;
-		case I_ASSPVAR:
-			getmemberp((FNODE)expr,(Obj **)&addr); *addr = val = eval((FNODE)f); break;
-	}
-	return val;
-}
-#endif
-
 #if 0
-pointer evalpv(id,tree,f)
-int id;
-NODE2 tree;
-pointer f;
+pointer evalpv(int id,NODE2 tree,pointer f)
 {
 	pointer a,val = 0;
 	pointer *addr;