From 108ea45edebe23267cc7f4d8620f034fd1b39b81 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Mon, 19 Jul 2010 07:27:31 +0000 Subject: * interp/g-opt.boot ($VMsideEffectFreeOperators): Include byte relation operators and bitmakst operators. * interp/g-util.boot: Expand them. * algebra/data.spad.pamphlet (Byte): Now satisfies Logic. Tidy. (SystemNonNegativeInteger): Likewise. * algebra/java.spad.pamphlet (JVMBytecode): Rename from JavaBytecode. (JVMClassFileAccess): New. (JVMFieldAccess): Likewise. (JVMMethodAccess): Likewise. (JVMConstantTag): Likewise. (JVMOpcode): Likewise. --- src/algebra/Makefile.pamphlet | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/algebra/Makefile.pamphlet') diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 06f10433..24d15915 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -521,6 +521,8 @@ $(OUT)/KTVLOGIC.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) $(OUT)/BYTE.$(FASLEXT) $(OUT)/PROPFUN1.$(FASLEXT): $(OUT)/PROPFRML.$(FASLEXT) $(OUT)/PROPFUN2.$(FASLEXT): $(OUT)/PROPFRML.$(FASLEXT) $(OUT)/DIFEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT) +$(OUT)/BYTE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) +$(OUT)/SYSNNI.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) axiom_algebra_layer_6 = \ PROPFRML PROPFUN1 AUTOMOR CARTEN2 CHARPOL COMPLEX2 \ @@ -829,7 +831,7 @@ axiom_algebra_layer_15 = \ FRAMALG FRAMALG- MDAGG ODPOL \ PLOT RMCAT2 ROIRC SDPOL \ ULS ULSCONS TUBETOOL UPXSCCA \ - UPXSCCA- JAVACODE POLY BYTEBUF OVERSET \ + UPXSCCA- JVMBCODE POLY BYTEBUF OVERSET \ ULSCCAT ULSCCAT- UTS UTSCAT UTSCAT- axiom_algebra_layer_15_nrlibs = \ @@ -1073,7 +1075,8 @@ axiom_algebra_layer_user = \ ASP20 ASP30 ASP31 ASP35 ASP41 ASP42 \ ASP74 ASP77 ASP80 ASP29 IRFORM COMPILER \ ITFORM ELABOR TALGOP YDIAGRAM LINELT DBASIS \ - LINFORM LINBASIS + LINFORM LINBASIS JVMOP JVMCFACC JVMFDACC JVMMDACC \ + JVMCSTTG axiom_algebra_layer_user_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_user)) @@ -1160,6 +1163,11 @@ $(OUT)/DBASIS.$(FASLEXT): $(OUT)/ORDFIN.$(FASLEXT) $(OUT)/KVTFROM.$(FASLEXT) $(OUT)/LINFORM.$(FASLEXT): $(OUT)/DBASIS.$(FASLEXT) \ $(OUT)/VSPACE.$(FASLEXT) $(OUT)/LINELT.$(FASLEXT) +$(OUT)/JVMOP.$(FASLEXT): $(OUT)/JVMBCODE.$(FASLEXT) +$(OUT)/JVMCFACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) +$(OUT)/JVMFDACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) +$(OUT)/JVMMDACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) + @ \section{Broken Files} -- cgit v1.2.3