[e-cvs] cvs commit: e/src/test/esrc updoc.updoc
markm@eros.cs.jhu.edu
markm@eros.cs.jhu.edu
Sat, 10 Nov 2001 18:51:52 -0500
markm 01/11/10 18:51:52
Modified: src/esrc/com/skyhunter/e/lang
runConfinedSourceFuncAuthor.emaker
sourceRunnerAuthor.emaker
src/esrc/com/skyhunter/e/security
oldPowerboxControllerMakerAuthor.emaker
src/esrc/org/erights/e/elang/cmd cmdLoopMakerAuthor.emaker
cmdMakerMaker.emaker
src/esrc/org/erights/e/elang/interp BaseInterpMaker.emaker
InterpLoop.emaker
src/esrc/scripts eBrowser.e pasteRun.e
src/jsrc notes.txt
src/jsrc/net/vattp/data MsgTransformer.java
src/jsrc/org/erights/e/elang/evm NounPattern.java
Pattern.java
src/jsrc/org/erights/e/elang/interp Loader.java
ScopeSetup.java
src/jsrc/org/erights/e/elang/scope Scope.java ScopeMap.java
src/jsrc/org/erights/e/elang/visitors BindFramesVisitor.java
src/jsrc/org/erights/e/elib/ref Proxy.java
src/jsrc/org/erights/e/elib/tables AtomicTwine.java
Column.java KeyColumn.java
src/jsrc/org/erights/e/extern/timer TimerWatcher.java
src/test/esrc updoc.updoc
Log:
removed pov E code. More formatting
Revision Changes Path
1.3 +1 -1 e/src/esrc/com/skyhunter/e/lang/runConfinedSourceFuncAuthor.emaker
Index: runConfinedSourceFuncAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/e/lang/runConfinedSourceFuncAuthor.emaker,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- runConfinedSourceFuncAuthor.emaker 2001/11/10 19:40:35 1.2
+++ runConfinedSourceFuncAuthor.emaker 2001/11/10 23:51:50 1.3
@@ -19,7 +19,7 @@
traceln("made scope 2")
try {
def tree := e__quasiParser(sourceText)
- def result := tree eval(scope newPov())
+ def result := tree eval(scope)
traceln("\n# value: " + result)
traceln("shown")
result
1.4 +1 -1 e/src/esrc/com/skyhunter/e/lang/sourceRunnerAuthor.emaker
Index: sourceRunnerAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/e/lang/sourceRunnerAuthor.emaker,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sourceRunnerAuthor.emaker 2001/11/10 19:40:35 1.3
+++ sourceRunnerAuthor.emaker 2001/11/10 23:51:50 1.4
@@ -19,7 +19,7 @@
traceln("made scope 2")
try {
def tree := e__quasiParser(sourceText)
- def result := tree eval(scope newPov())
+ def result := tree eval(scope)
traceln("\n# value: " + result)
traceln("shown")
result
1.4 +1 -1 e/src/esrc/com/skyhunter/e/security/oldPowerboxControllerMakerAuthor.emaker
Index: oldPowerboxControllerMakerAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/e/security/oldPowerboxControllerMakerAuthor.emaker,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- oldPowerboxControllerMakerAuthor.emaker 2001/11/10 19:40:36 1.3
+++ oldPowerboxControllerMakerAuthor.emaker 2001/11/10 23:51:51 1.4
@@ -17,7 +17,7 @@
try {
def tree := e__quasiParser(sourceTwine)
traceln("made tree")
- result := tree eval(scope1 newPov())
+ result := tree eval(scope1)
traceln("confined Interpretation done")
traceln("\n# value: " + result)
traceln("confined shown")
1.5 +5 -7 e/src/esrc/org/erights/e/elang/cmd/cmdLoopMakerAuthor.emaker
Index: cmdLoopMakerAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/org/erights/e/elang/cmd/cmdLoopMakerAuthor.emaker,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cmdLoopMakerAuthor.emaker 2001/08/20 05:07:43 1.4
+++ cmdLoopMakerAuthor.emaker 2001/11/10 23:51:51 1.5
@@ -3,17 +3,16 @@
def controlLoopMaker := <cmd:controlLoopMaker>
def cmdLoopMakerAuthor(SystemGC) :any {
-
+
class cmdLoopMaker(args, props, topScope) :any {
def super := controlLoopMaker new()
- def topPov := topScope newPov()
- var expandFlag :boolean :=
+ var expandFlag :boolean :=
propUtils testProp(props, "e.interp.expand")
- var showsJavaStackFlag :boolean :=
+ var showsJavaStackFlag :boolean :=
propUtils testProp(props, "e.interp.shows-java-stack")
- var showsEStackFlag :boolean :=
+ var showsEStackFlag :boolean :=
propUtils testProp(props, "e.interp.shows-e-stack")
def results := [] diverge()
@@ -31,8 +30,7 @@
to setShowsJavaStack(newFlag) { showsJavaStackFlag := newFlag }
to setShowsEStack(newFlag) { showsEStackFlag := newFlag }
- to getTopScope() :any { topPov[0] }
- to getTopPov() :any { topPov }
+ to getTopScope() :any { topScope }
to getResult(i) :any { results[i] }
to pushResult(result) {
1.8 +3 -3 e/src/esrc/org/erights/e/elang/cmd/cmdMakerMaker.emaker
Index: cmdMakerMaker.emaker
===================================================================
RCS file: /cvs/e/src/esrc/org/erights/e/elang/cmd/cmdMakerMaker.emaker,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cmdMakerMaker.emaker 2001/09/14 04:55:01 1.7
+++ cmdMakerMaker.emaker 2001/11/10 23:51:51 1.8
@@ -28,12 +28,12 @@
to newValuer(sourceCode) :any {
def [resultVow, resultRes] := PromiseMaker()
def cmdValuer() {
- def pov := cmdLoop getTopPov()
+ def scope := cmdLoop getTopScope()
var success := true
def result := try {
- # should deal with embedded $-holes as result[i]
+ # XXX should deal with embedded $-holes as result[i]
def expr := EParser(sourceCode)
- expr eval(pov)
+ expr eval(scope)
} catch problem {
success := false
Ref broken(problem)
1.14 +3 -6 e/src/esrc/org/erights/e/elang/interp/BaseInterpMaker.emaker
Index: BaseInterpMaker.emaker
===================================================================
RCS file: /cvs/e/src/esrc/org/erights/e/elang/interp/BaseInterpMaker.emaker,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BaseInterpMaker.emaker 2001/07/08 02:13:04 1.13
+++ BaseInterpMaker.emaker 2001/11/10 23:51:51 1.14
@@ -81,9 +81,9 @@
> <import:org.erights.e.elang.interp.BaseInterpMaker>
# value: <BaseInterpMaker>
- ? def EvalFuncMaker(pov) :any {
+ ? def EvalFuncMaker(scope) :any {
> def evalFunc(eExpr) :any {
- > eExpr eval(pov)
+ > eExpr eval(scope)
> }
> }
# value: <EvalFuncMaker>
@@ -100,10 +100,7 @@
> interpPromise)
# value: org.erights.e.elang.scope.MutableScope@1fe110
- ? def pov := scope newPov
- # value: [org.erights.e.elang.scope.MutableScope@1fe110]
-
- ? def evalFunc := EvalFuncMaker(pov)
+ ? def evalFunc := EvalFuncMaker(scope)
# value: <evalFunc>
? evalFunc(e`2 + 3`)
1.6 +2 -2 e/src/esrc/org/erights/e/elang/interp/InterpLoop.emaker
Index: InterpLoop.emaker
===================================================================
RCS file: /cvs/e/src/esrc/org/erights/e/elang/interp/InterpLoop.emaker,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InterpLoop.emaker 2001/03/11 04:32:56 1.5
+++ InterpLoop.emaker 2001/11/10 23:51:51 1.6
@@ -41,9 +41,9 @@
}
}
-def baseEvalFuncMaker(pov) :any {
+def baseEvalFuncMaker(scope) :any {
def baseEvalFunc(eExpr) :any {
- eExpr eval(pov)
+ eExpr eval(scope)
}
}
1.46 +2 -2 e/src/esrc/scripts/eBrowser.e
Index: eBrowser.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/eBrowser.e,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- eBrowser.e 2001/11/10 19:40:37 1.45
+++ eBrowser.e 2001/11/10 23:51:51 1.46
@@ -277,7 +277,7 @@
try {
def tree := e__quasiParser(sourceTwine)
traceln("made tree")
- result := tree eval(scope1 newPov())
+ result := tree eval(scope1)
traceln("confined Interpretation done")
resultPane append("\n# value: " + result)
traceln("confined shown")
@@ -345,7 +345,7 @@
try {
def tree := e__quasiParser(sourceTwine)
traceln("made tree")
- def result := tree eval(scope2 newPov())
+ def result := tree eval(scope2)
traceln("Interpretation done")
resultPane setText("Execution ended:\n# value: " + result)
statusPane setText("Execution ended")
1.9 +1 -1 e/src/esrc/scripts/pasteRun.e
Index: pasteRun.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/pasteRun.e,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pasteRun.e 2001/03/26 19:39:44 1.8
+++ pasteRun.e 2001/11/10 23:51:51 1.9
@@ -45,7 +45,7 @@
try {
def tree := e__quasiParser(sourceString)
trace("made tree")
- def result := tree eval(scope newPov())
+ def result := tree eval(scope)
trace("Interpretation done")
outPlace append("\n# value: " + result)
trace("shown")
1.2 +5 -9 e/src/jsrc/notes.txt
Index: notes.txt
===================================================================
RCS file: /cvs/e/src/jsrc/notes.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- notes.txt 2001/11/09 04:47:34 1.1
+++ notes.txt 2001/11/10 23:51:51 1.2
@@ -18,7 +18,8 @@
. clean up mutable scopes
. arrange so that locals don't need to grow
. bindSlot
-. move LoaderScope, PackageScope, and UnsafeLoaderScope into a separate hierarchy
+. move LoaderScope, PackageScope, and UnsafeLoaderScope into a separate
+ hierarchy
. get mutable scopes working
. send notes.txt to markm
. copy nodes for scopeMap, source positions,
@@ -26,14 +27,15 @@
NOTES:
. New locals are introduced by the top of the world, method, matcher, loop
. staticScope is called in computeStaticScope, EBuilder, and eval()
-. IgnorePattern should not be a kernel type; it's just a degenerate case of FinalPattern.
+. IgnorePattern should not be a kernel type; it's just a degenerate case of
+ FinalPattern.
. mutable scopes are only when interacting with the user
. command line
. elmer
. updoc
. never for a lazy evaluation
- each top level expression in an emaker evaluates separately
- - semanticaly complicted an unnecessary
+ - semanticaly complicted and unnecessary
. emakers see top level expressions within the emaker as outers.
.? should top-level defs in an emaker shadow outers (e.g., println)
. yes
@@ -57,12 +59,6 @@
Reference:
<import: foo> => import__uriGetter get("foo")
-
-Charlie 408 248-4604
-clandau@macslab.com
-
-don lavoie
-703-791-0152
final normal form vs slot normal form
1.3 +1 -3 e/src/jsrc/net/vattp/data/MsgTransformer.java
Index: MsgTransformer.java
===================================================================
RCS file: /cvs/e/src/jsrc/net/vattp/data/MsgTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MsgTransformer.java 2001/11/10 19:40:37 1.2
+++ MsgTransformer.java 2001/11/10 23:51:51 1.3
@@ -27,9 +27,7 @@
*
* @author Bill Frantz
*/
-
-/*package*/
-abstract class MsgTransformer {
+/*package*/ abstract class MsgTransformer {
/**
* Get any information which will be required to resume a suspended
1.3 +3 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NounPattern.java 2001/11/10 19:40:39 1.2
+++ NounPattern.java 2001/11/10 23:51:51 1.3
@@ -55,7 +55,7 @@
* @see org.erights.e.elang.evm.VarPattern
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-abstract public class NounPattern extends Pattern {
+public abstract class NounPattern extends Pattern {
/**
* A set of all the variable names that may not be shadowed (ie,
@@ -95,12 +95,12 @@
}
}
- abstract public NounExpr getNoun();
+ public abstract NounExpr getNoun();
/**
*
*/
- abstract public Object welcome(ETreeVisitor visitor);
+ public abstract Object welcome(ETreeVisitor visitor);
/**
* A Definer will never return null for this. It is named
1.30 +2 -2 e/src/jsrc/org/erights/e/elang/evm/Pattern.java
Index: Pattern.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/evm/Pattern.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Pattern.java 2001/11/10 19:40:39 1.29
+++ Pattern.java 2001/11/10 23:51:51 1.30
@@ -28,8 +28,8 @@
/**
- * A Pattern 1) "evaluates" in a pov, 2) matches some specimen
- * object, 3) binding names in this pov to values derived (usually
+ * A Pattern 1) "evaluates" in a scope, 2) matches some specimen
+ * object, 3) binding names in this scope to values derived (usually
* extracted) from the specimen, and 4) returns whether the match was
* successful.
*
1.3 +2 -3 e/src/jsrc/org/erights/e/elang/interp/Loader.java
Index: Loader.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/interp/Loader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Loader.java 2001/11/10 19:40:41 1.2
+++ Loader.java 2001/11/10 23:51:51 1.3
@@ -29,10 +29,9 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-/*package*/
-abstract public class Loader implements EPrintable {
+public abstract class Loader implements EPrintable {
- abstract public Object get(String name);
+ public abstract Object get(String name);
/**
*
1.69 +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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ScopeSetup.java 2001/11/10 19:40:41 1.68
+++ ScopeSetup.java 2001/11/10 23:51:51 1.69
@@ -62,7 +62,7 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-abstract public class ScopeSetup {
+public abstract class ScopeSetup {
static private final Scope[] NO_SCOPES = {};
1.47 +6 -6 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Scope.java 2001/11/10 19:40:41 1.46
+++ Scope.java 2001/11/10 23:51:51 1.47
@@ -34,8 +34,8 @@
import java.io.StringWriter;
/**
- * A ConstMap (sort of) from names (strings) to slots.
- * Scopes inherit from each other in a DAG, so they can
+ * A ConstMap (sort of) from names (strings) to {@link Slot}s.
+ * Scopes inherit from each other in a tree, so they can
* be used to model nesting lexical environments. The associations in
* the most leafward part of a Scope are called "locals". <p>
*
@@ -53,9 +53,9 @@
myScopeMap = map;
}
- abstract public EvalContext newContext(int numLocals);
+ public abstract EvalContext newContext(int numLocals);
- abstract public Slot getSlot(String name);
+ public abstract Slot getSlot(String name);
/**
* Gets the value of the slot associated with name. Just a
@@ -76,13 +76,13 @@
/**
* Return a new scope that does not share outers data structures with the receiver.
*/
- abstract public Scope sprout();
+ public abstract Scope sprout();
public ScopeMap scopeMap() {
return myScopeMap;
}
- abstract public NounExpr reserveOuter(String name);
+ public abstract NounExpr reserveOuter(String name);
/**
*
1.3 +5 -5 e/src/jsrc/org/erights/e/elang/scope/ScopeMap.java
Index: ScopeMap.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/scope/ScopeMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScopeMap.java 2001/11/10 19:40:41 1.2
+++ ScopeMap.java 2001/11/10 23:51:51 1.3
@@ -40,11 +40,11 @@
return new ScopeMapBase(initial);
}
- abstract public NounExpr getNoun(String name);
+ public abstract NounExpr getNoun(String name);
- abstract public boolean contains(String name);
+ public abstract boolean contains(String name);
- abstract public int count();
+ public abstract int count();
public ScopeMap with(String varName, NounExpr noun) {
assertShadowable(varName);
@@ -54,7 +54,7 @@
/*
* Return the set of all names mapped by the receiver.
*/
- abstract public Set namesSet();
+ public abstract Set namesSet();
/*
* Make a new contour within the receiver.
@@ -68,7 +68,7 @@
* because it is a special name or because it is already defined
* in the innermost contour.
*/
- abstract public void assertShadowable(String varName);
+ public abstract void assertShadowable(String varName);
}
/**
1.3 +3 -3 e/src/jsrc/org/erights/e/elang/visitors/BindFramesVisitor.java
Index: BindFramesVisitor.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/visitors/BindFramesVisitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BindFramesVisitor.java 2001/11/10 19:40:43 1.2
+++ BindFramesVisitor.java 2001/11/10 23:51:51 1.3
@@ -42,7 +42,7 @@
import java.util.ArrayList;
import java.util.HashMap;
-abstract public class BindFramesVisitor extends CopyVisitor {
+public abstract class BindFramesVisitor extends CopyVisitor {
static private final NounExpr[] NOUN_PROTO = {};
@@ -127,9 +127,9 @@
xformEExpr(slotGuardExpr));
}
- abstract protected NounExpr newFinal(String varName);
+ protected abstract NounExpr newFinal(String varName);
- abstract protected NounExpr newVar(String varName);
+ protected abstract NounExpr newVar(String varName);
/**
*
1.7 +1 -2 e/src/jsrc/org/erights/e/elib/ref/Proxy.java
Index: Proxy.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/ref/Proxy.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Proxy.java 2001/11/10 19:40:46 1.6
+++ Proxy.java 2001/11/10 23:51:51 1.7
@@ -44,8 +44,7 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-/*package*/
-abstract class Proxy extends Ref {
+/*package*/ abstract class Proxy extends Ref {
/**
* While I'm handled, I delegate many of my decisions to my handler.
1.8 +1 -2 e/src/jsrc/org/erights/e/elib/tables/AtomicTwine.java
Index: AtomicTwine.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/tables/AtomicTwine.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AtomicTwine.java 2001/11/10 19:40:48 1.7
+++ AtomicTwine.java 2001/11/10 23:51:51 1.8
@@ -26,8 +26,7 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-/*package*/
-abstract class AtomicTwine extends Twine {
+/*package*/ abstract class AtomicTwine extends Twine {
static private final long serialVersionUID = 2310317145102038297L;
1.17 +8 -8 e/src/jsrc/org/erights/e/elib/tables/Column.java
Index: Column.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/tables/Column.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Column.java 2001/11/10 19:40:48 1.16
+++ Column.java 2001/11/10 23:51:51 1.17
@@ -28,7 +28,7 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-abstract /*package*/ class Column implements Cloneable {
+/*package*/ abstract class Column implements Cloneable {
/*package*/ Column() {
}
@@ -37,7 +37,7 @@
* A shallow copy of the column. The members are shared, not copied.
* The new Column is restricted to only holding members of type membType.
*/
- abstract protected Column diverge(Class membType);
+ protected abstract Column diverge(Class membType);
/**
* Argument defaults to memberType()
@@ -49,34 +49,34 @@
/**
*
*/
- abstract /*package*/ Object get(int pos);
+ /*package*/ abstract Object get(int pos);
/**
* All the members of the column must conform to this type
*/
- abstract /*package*/ Class memberType();
+ /*package*/ abstract Class memberType();
/**
* Makes a new column just like this one, except of the specified
* size and without any members.
*/
- abstract /*package*/ Column newVacant(int capacity);
+ /*package*/ abstract Column newVacant(int capacity);
/**
*
*/
- abstract /*package*/ int capacity();
+ /*package*/ abstract int capacity();
/**
*
*/
- abstract /*package*/ void put(int pos, Object value);
+ /*package*/ abstract void put(int pos, Object value);
/**
* Stop pointing at an object from this pos. If this is a scalar
* column, does nothing
*/
- abstract /*package*/ void vacate(int pos);
+ /*package*/ abstract void vacate(int pos);
/**
* memberType defaults to Object
1.16 +3 -3 e/src/jsrc/org/erights/e/elib/tables/KeyColumn.java
Index: KeyColumn.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/tables/KeyColumn.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- KeyColumn.java 2001/11/10 19:40:48 1.15
+++ KeyColumn.java 2001/11/10 23:51:51 1.16
@@ -29,7 +29,7 @@
*
* @author <a href="mailto:markm@erights.org">Mark S. Miller</a>
*/
-abstract /*package*/ class KeyColumn extends Column {
+/*package*/ abstract class KeyColumn extends Column {
/**
* Used to ensure ints are positive
@@ -182,7 +182,7 @@
* Returns the pos at which key resides, or -1 if the key is
* absent from the map.
*/
- abstract /*package*/ int findPosOf(Object key);
+ /*package*/ abstract int findPosOf(Object key);
/**
* Returns the first good size for a key column that's no less
@@ -271,7 +271,7 @@
* @return the pos at which the key now resides in the
* map, or -1 if we need more room.
*/
- abstract /*package*/ int store(Object key);
+ /*package*/ abstract int store(Object key);
/**
*
1.6 +1 -2 e/src/jsrc/org/erights/e/extern/timer/TimerWatcher.java
Index: TimerWatcher.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/extern/timer/TimerWatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TimerWatcher.java 2001/11/10 19:40:50 1.5
+++ TimerWatcher.java 2001/11/10 23:51:52 1.6
@@ -21,8 +21,7 @@
/**
* Base class for Timeout and Clock objects
*/
-/*package*/
-abstract class TimerWatcher {
+/*package*/ abstract class TimerWatcher {
/**
* Notification (from within the package) that the timeout has tripped.
1.4 +8 -5 e/src/test/esrc/updoc.updoc
Index: updoc.updoc
===================================================================
RCS file: /cvs/e/src/test/esrc/updoc.updoc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- updoc.updoc 1999/11/02 01:06:07 1.3
+++ updoc.updoc 2001/11/10 23:51:52 1.4
@@ -72,10 +72,10 @@
> oo println("\n")
> }
> }
-> to runTest(pov) {
+> to runTest(scope) {
> def tree := e__quasiParser(myCode)
> try {
-> myOptNewOutput := ""+tree eval(pov)
+> myOptNewOutput := ""+tree eval(scope)
> myOptNewLabel := "value"
> } catch prob {
> myOptNewLabel := "problem"
@@ -307,7 +307,10 @@
#
# ]
-? define pov := ScopeSetupMaker privileged(false, stdout, interp.props, interp) newPov
+? define privScope := ScopeSetupMaker privileged(false,
+> stdout,
+> interp.props,
+> interp)
# value: [org.erights.e.elang.scope.ScopeImpl@1bf75c]
? def p0 := p[0]
@@ -321,7 +324,7 @@
#
#
-? p0 runTest(pov)
+? p0 runTest(privScope)
# value: value
? p0
@@ -344,7 +347,7 @@
# value: true
? for i => carrot in p {
-> carrot runTest(pov)
+> carrot runTest(privScope)
> result &= carrot reportOn(stdout indent(""+`$i: `))
> }
old: bar