===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/compile.c,v
retrieving revision 1.1.1.1
retrieving revision 1.7
diff -u -p -r1.1.1.1 -r1.7
--- OpenXM_contrib2/asir2000/parse/compile.c	1999/12/03 07:39:12	1.1.1.1
+++ OpenXM_contrib2/asir2000/parse/compile.c	2015/08/14 13:51:56	1.7
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/parse/compile.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/compile.c,v 1.6 2015/08/08 14:19:42 fujimoto Exp $ 
+*/
 #include <ctype.h>
 #include "ca.h"
 #include "base.h"
@@ -145,14 +193,14 @@ SNODE f;
 		case S_BP:
 			if ( !nextbp && (!FA1(f) || compile((FNODE)FA1(f))) ) {
 				if ( (FNODE)FA2(f) ) {
-#if PARI
+#if defined(PARI)
 					extern FILE *outfile;
 					outfile = stderr;
 #endif
 					asir_out = stderr;
 					printexpr(CO,compile((FNODE)FA2(f)));
 					putc('\n',asir_out); fflush(asir_out);
-#if PARI
+#if defined(PARI)
 					outfile = stdout;
 #endif
 					asir_out = stdout;
@@ -542,12 +590,13 @@ FUNC *r;
 	f->name = name; f->id = A_PARI; f->argc = 0; f->f.binf = 0;
 }
 
-void mkuf(name,fname,args,body,startl,endl,desc)
+void mkuf(name,fname,args,body,startl,endl,desc,module)
 char *name,*fname;
 NODE args;
 SNODE body;
 int startl,endl;
 char *desc;
+MODULE module;
 {
 	FUNC f;
 	USRF t;
@@ -581,8 +630,8 @@ char *desc;
 		fprintf(stderr,"%s() defined.\n",name); */
 	t=(USRF)MALLOC(sizeof(struct oUSRF));
 	t->args=args; BDY(t)=body; t->pvs = CPVS; t->fname = fname; 
-	t->startl = startl; t->endl = endl; t->vol = asir_infile->vol;
-	t->desc = desc;
+	t->startl = startl; t->endl = endl;
+	t->desc = desc; t->module = module;
 	f->id = A_USR; f->argc = argc; f->f.usrf = t;
 	CPVS = GPVS;
 	clearbp(f);