[e-cvs] cvs commit: e/src/jsrc/org/quasiliteral/term Term.java
markm@eros.cs.jhu.edu
markm@eros.cs.jhu.edu
Thu, 13 Dec 2001 19:06:01 -0500
markm 01/12/13 19:06:01
Modified: src/jsrc/org/capml/dom Node.java Text.java
src/jsrc/org/erights/e/elang/evm AssignExpr.java
CallExpr.java NounPattern.java
src/jsrc/org/erights/e/elang/interp ScopeSetup.java
src/jsrc/org/erights/e/elang/scope InnerScope.java
OuterScope.java Scope.java
src/jsrc/org/erights/e/elib/base ClassDesc.java
MethodNode.java TypeDesc.java
src/jsrc/org/erights/e/elib/serial
PassByConstructionGuard.java PassByProxyGuard.java
src/jsrc/org/erights/e/elib/slot NullOkMaker.java
SimpleSlotMaker.java
src/jsrc/org/quasiliteral/term Term.java
Added: src/jsrc/org/erights/e/elib/slot BothGuard.java
Log:
the delta3 release
Revision Changes Path
1.13 +1 -1 e/src/jsrc/org/capml/dom/Node.java
Index: Node.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/capml/dom/Node.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Node.java 2001/12/13 05:01:31 1.12
+++ Node.java 2001/12/14 00:06:00 1.13
@@ -17,13 +17,13 @@
*/
import org.erights.e.elib.eio.TextWriter;
+import org.erights.e.elib.prim.E;
import org.erights.e.elib.serial.PassByConstruction;
import org.erights.e.elib.serial.Persistent;
import org.erights.e.elib.tables.AssocFunc;
import org.erights.e.elib.tables.ConstList;
import org.erights.e.elib.tables.Iteratable;
import org.erights.e.elib.tables.Selfless;
-import org.erights.e.elib.prim.E;
import org.quasiliteral.astro.Astro;
import org.quasiliteral.astro.AstroBuilder;
1.12 +1 -1 e/src/jsrc/org/capml/dom/Text.java
Index: Text.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/capml/dom/Text.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Text.java 2001/12/13 05:01:31 1.11
+++ Text.java 2001/12/14 00:06:00 1.12
@@ -16,12 +16,12 @@
* comment. <p>
*/
+import org.erights.e.develop.format.StringHelper;
import org.erights.e.elib.eio.TextWriter;
import org.erights.e.elib.prim.E;
import org.erights.e.elib.prim.StaticMaker;
import org.erights.e.elib.tables.ConstList;
import org.erights.e.elib.tables.EmptyTwine;
-import org.erights.e.develop.format.StringHelper;
import org.quasiliteral.astro.Astro;
import org.quasiliteral.astro.AstroBuilder;
1.34 +1 -1 e/src/jsrc/org/erights/e/elang/evm/AssignExpr.java
Index: AssignExpr.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/evm/AssignExpr.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- AssignExpr.java 2001/12/12 06:35:57 1.33
+++ AssignExpr.java 2001/12/14 00:06:00 1.34
@@ -21,8 +21,8 @@
import org.erights.e.develop.exception.NestedException;
import org.erights.e.elang.scope.EvalContext;
-import org.erights.e.elang.visitors.ETreeVisitor;
import org.erights.e.elang.syntax.EParser;
+import org.erights.e.elang.visitors.ETreeVisitor;
import org.erights.e.elib.eio.TextWriter;
import org.erights.e.elib.ref.Ref;
import org.erights.e.elib.tables.FlexList;
1.35 +0 -2 e/src/jsrc/org/erights/e/elang/evm/CallExpr.java
Index: CallExpr.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/evm/CallExpr.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- CallExpr.java 2001/12/12 06:35:57 1.34
+++ CallExpr.java 2001/12/14 00:06:00 1.35
@@ -27,8 +27,6 @@
import org.erights.e.elib.prim.E;
import org.erights.e.elib.ref.Ref;
import org.erights.e.elib.tables.FlexList;
-import org.quasiliteral.astro.Astro;
-import org.quasiliteral.quasiterm.QuasiBuilder;
import java.io.IOException;
1.8 +0 -1 e/src/jsrc/org/erights/e/elang/evm/NounPattern.java
Index: NounPattern.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/evm/NounPattern.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NounPattern.java 2001/12/12 06:35:57 1.7
+++ NounPattern.java 2001/12/14 00:06:00 1.8
@@ -23,7 +23,6 @@
import org.erights.e.elang.visitors.ETreeVisitor;
import org.erights.e.elib.eio.TextWriter;
import org.erights.e.elib.ref.Ref;
-import org.erights.e.elib.tables.ESet;
import org.erights.e.elib.tables.FlexList;
import org.erights.e.elib.tables.FlexMap;
1.81 +1 -1 e/src/jsrc/org/erights/e/elang/interp/ScopeSetup.java
Index: ScopeSetup.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/interp/ScopeSetup.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ScopeSetup.java 2001/12/12 06:35:57 1.80
+++ ScopeSetup.java 2001/12/14 00:06:00 1.81
@@ -47,12 +47,12 @@
import org.erights.e.elib.slot.SlotDefiner;
import org.erights.e.elib.slot.VoidMaker;
import org.erights.e.elib.tables.ConstMap;
+import org.erights.e.elib.tables.ConstSet;
import org.erights.e.elib.tables.ESet;
import org.erights.e.elib.tables.Equalizer;
import org.erights.e.elib.tables.FlexList;
import org.erights.e.elib.tables.FlexMap;
import org.erights.e.elib.tables.Twine;
-import org.erights.e.elib.tables.ConstSet;
import org.erights.e.elib.util.ClassCache;
import org.erights.e.meta.java.io.FileGetter;
import org.quasiliteral.text.SimpleQuasiParser;
1.8 +1 -1 e/src/jsrc/org/erights/e/elang/scope/InnerScope.java
Index: InnerScope.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/scope/InnerScope.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InnerScope.java 2001/12/12 06:35:58 1.7
+++ InnerScope.java 2001/12/14 00:06:00 1.8
@@ -20,9 +20,9 @@
*/
import org.erights.e.elang.evm.NounExpr;
+import org.erights.e.elib.eio.TextWriter;
import org.erights.e.elib.slot.Slot;
import org.erights.e.elib.util.AlreadyDefinedException;
-import org.erights.e.elib.eio.TextWriter;
import java.io.IOException;
1.9 +1 -1 e/src/jsrc/org/erights/e/elang/scope/OuterScope.java
Index: OuterScope.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/scope/OuterScope.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OuterScope.java 2001/12/12 06:35:58 1.8
+++ OuterScope.java 2001/12/14 00:06:00 1.9
@@ -21,10 +21,10 @@
import org.erights.e.elang.evm.NounExpr;
import org.erights.e.elang.evm.OuterNounExpr;
+import org.erights.e.elib.eio.TextWriter;
import org.erights.e.elib.slot.Slot;
import org.erights.e.elib.tables.ConstMap;
import org.erights.e.elib.util.AlreadyDefinedException;
-import org.erights.e.elib.eio.TextWriter;
import java.io.IOException;
1.54 +2 -3 e/src/jsrc/org/erights/e/elang/scope/Scope.java
Index: Scope.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/scope/Scope.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Scope.java 2001/12/12 06:35:58 1.53
+++ Scope.java 2001/12/14 00:06:00 1.54
@@ -24,16 +24,15 @@
import org.erights.e.elang.evm.NounExpr;
import org.erights.e.elang.interp.Help;
import org.erights.e.elang.interp.ScopeSetup;
+import org.erights.e.elib.base.ClassDesc;
+import org.erights.e.elib.eio.EPrintable;
import org.erights.e.elib.eio.TextWriter;
import org.erights.e.elib.eio.UnQuote;
-import org.erights.e.elib.eio.EPrintable;
import org.erights.e.elib.slot.FinalSlotMaker;
import org.erights.e.elib.slot.Slot;
-import org.erights.e.elib.tables.ConstList;
import org.erights.e.elib.tables.ConstMap;
import org.erights.e.elib.tables.ConstSet;
import org.erights.e.elib.util.AlreadyDefinedException;
-import org.erights.e.elib.base.ClassDesc;
import java.io.IOException;
import java.io.StringWriter;
1.32 +0 -1 e/src/jsrc/org/erights/e/elib/base/ClassDesc.java
Index: ClassDesc.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/base/ClassDesc.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ClassDesc.java 2001/12/12 06:35:58 1.31
+++ ClassDesc.java 2001/12/14 00:06:00 1.32
@@ -35,7 +35,6 @@
import org.erights.e.meta.java.lang.ArrayGuardSugar;
import org.erights.e.meta.java.lang.InterfaceGuardSugar;
-import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.math.BigInteger;
1.20 +3 -4 e/src/jsrc/org/erights/e/elib/base/MethodNode.java
Index: MethodNode.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/base/MethodNode.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MethodNode.java 2001/12/10 18:27:00 1.19
+++ MethodNode.java 2001/12/14 00:06:00 1.20
@@ -19,9 +19,8 @@
Contributor(s): ______________________________________.
*/
+import org.erights.e.elib.slot.BothGuard;
import org.erights.e.elib.slot.SimpleSlotMaker;
-import org.erights.e.elib.slot.SlotGuard;
-import org.erights.e.elib.slot.ValueGuard;
import org.erights.e.elib.tables.ConstList;
import org.erights.e.elib.tables.FlexList;
import org.erights.e.elib.tables.FlexMap;
@@ -76,13 +75,13 @@
* Should be overridden by subclasses that can be more informative
*/
public MessageDesc makeMessageType(String verb) {
- SlotGuard any = SimpleSlotMaker.THE_ONE;
+ BothGuard any = SimpleSlotMaker.THE_ONE;
ParamDesc[] pType1 = { new ParamDesc(null, any) };
ConstList pTypes = ConstList.fromArray(pType1).multiply(arity());
return new MessageDesc("Missing docComment",
verb,
pTypes,
- (ValueGuard)any);
+ any);
}
/**
1.16 +2 -3 e/src/jsrc/org/erights/e/elib/base/TypeDesc.java
Index: TypeDesc.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/base/TypeDesc.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TypeDesc.java 2001/11/10 19:40:44 1.15
+++ TypeDesc.java 2001/12/14 00:06:00 1.16
@@ -25,10 +25,9 @@
import org.erights.e.elib.prim.E;
import org.erights.e.elib.prim.Thrower;
import org.erights.e.elib.serial.Persistent;
+import org.erights.e.elib.slot.BothGuard;
import org.erights.e.elib.slot.SettableSlotMaker;
import org.erights.e.elib.slot.Slot;
-import org.erights.e.elib.slot.SlotGuard;
-import org.erights.e.elib.slot.ValueGuard;
import org.erights.e.elib.tables.ConstList;
import org.erights.e.elib.tables.ConstMap;
import org.erights.e.elib.tables.FlexMap;
@@ -44,7 +43,7 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-public class TypeDesc implements Persistent, ValueGuard, SlotGuard {
+public class TypeDesc implements Persistent, BothGuard {
private String myDocComment;
1.12 +2 -3 e/src/jsrc/org/erights/e/elib/serial/PassByConstructionGuard.java
Index: PassByConstructionGuard.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/serial/PassByConstructionGuard.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PassByConstructionGuard.java 2001/11/10 19:40:47 1.11
+++ PassByConstructionGuard.java 2001/12/14 00:06:01 1.12
@@ -23,10 +23,9 @@
import org.erights.e.elib.prim.Thrower;
import org.erights.e.elib.ref.Ref;
+import org.erights.e.elib.slot.BothGuard;
import org.erights.e.elib.slot.SettableSlotMaker;
import org.erights.e.elib.slot.Slot;
-import org.erights.e.elib.slot.SlotGuard;
-import org.erights.e.elib.slot.ValueGuard;
import org.erights.e.elib.tables.ConstList;
import org.erights.e.elib.util.OneArgFunc;
@@ -35,7 +34,7 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-public class PassByConstructionGuard implements ValueGuard, SlotGuard {
+public class PassByConstructionGuard implements BothGuard {
static public final PassByConstructionGuard THE_ONE =
new PassByConstructionGuard();
1.8 +2 -3 e/src/jsrc/org/erights/e/elib/serial/PassByProxyGuard.java
Index: PassByProxyGuard.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/serial/PassByProxyGuard.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PassByProxyGuard.java 2001/11/10 19:40:47 1.7
+++ PassByProxyGuard.java 2001/12/14 00:06:01 1.8
@@ -23,10 +23,9 @@
import org.erights.e.elib.prim.Thrower;
import org.erights.e.elib.ref.Ref;
+import org.erights.e.elib.slot.BothGuard;
import org.erights.e.elib.slot.SettableSlotMaker;
import org.erights.e.elib.slot.Slot;
-import org.erights.e.elib.slot.SlotGuard;
-import org.erights.e.elib.slot.ValueGuard;
import org.erights.e.elib.util.OneArgFunc;
/**
@@ -34,7 +33,7 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-public class PassByProxyGuard implements ValueGuard, SlotGuard {
+public class PassByProxyGuard implements BothGuard {
static public final PassByProxyGuard THE_ONE =
new PassByProxyGuard();
1.10 +1 -1 e/src/jsrc/org/erights/e/elib/slot/NullOkMaker.java
Index: NullOkMaker.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/slot/NullOkMaker.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NullOkMaker.java 2001/11/10 19:40:48 1.9
+++ NullOkMaker.java 2001/12/14 00:06:01 1.10
@@ -43,7 +43,7 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-public class NullOkMaker implements ValueGuard, SlotGuard {
+public class NullOkMaker implements BothGuard {
static public final NullOkMaker THE_ONE = new NullOkMaker();
1.7 +1 -1 e/src/jsrc/org/erights/e/elib/slot/SimpleSlotMaker.java
Index: SimpleSlotMaker.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/slot/SimpleSlotMaker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleSlotMaker.java 2001/11/10 19:40:48 1.6
+++ SimpleSlotMaker.java 2001/12/14 00:06:01 1.7
@@ -30,7 +30,7 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-public class SimpleSlotMaker implements ValueGuard, SlotGuard {
+public class SimpleSlotMaker implements BothGuard {
/** The one instance */
static public final SimpleSlotMaker THE_ONE = new SimpleSlotMaker();
1.1 e/src/jsrc/org/erights/e/elib/slot/BothGuard.java
Index: BothGuard.java
===================================================================
package org.erights.e.elib.slot;
//This file is hereby placed in the public domain
/**
*
* @author <a href="mailto:markm@caplet.com">Mark Miller</a>
*/
public interface BothGuard extends SlotGuard, ValueGuard {
}
1.17 +0 -1 e/src/jsrc/org/quasiliteral/term/Term.java
Index: Term.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/quasiliteral/term/Term.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Term.java 2001/12/12 06:36:00 1.16
+++ Term.java 2001/12/14 00:06:01 1.17
@@ -10,7 +10,6 @@
import org.erights.e.elib.tables.Selfless;
import org.erights.e.elib.tables.Twine;
import org.quasiliteral.astro.Astro;
-import org.quasiliteral.astro.AstroArg;
import org.quasiliteral.astro.AstroBuilder;
import org.quasiliteral.astro.AstroTag;