[e-cvs] cvs commit: e/src/jsrc/org/erights/e/elib/prim BERunner.java FERunnerEvent.java
markm@eros.cs.jhu.edu
markm@eros.cs.jhu.edu
Fri, 16 Nov 2001 04:39:09 -0500
markm 01/11/16 04:39:08
Modified: src Makefile
src/esrc/com/skyhunter/e/lang
runConfinedSourceFuncAuthor.emaker
sourceRunnerAuthor.emaker
src/esrc/com/skyhunter/e/security
capRingControllerMakerAuthorOld.emaker
oldPowerboxControllerMakerAuthor.emaker
powerboxControllerMakerAuthor.emaker
src/esrc/com/skyhunter/eDesk
navPanelControllerMakerAuthor.emaker
progressWindowMakerAuthor.emaker
serverDescVowAuthor.emaker
src/esrc/org/erights/e/elang/cmd cmdMakerMaker.updoc
controlLoopMaker.emaker controlLoopMaker.updoc
src/esrc/org/erights/e/elang/interp BaseInterpMaker.emaker
src/esrc/org/erights/e/elib/slot EverFormulaMaker.emaker
LamportSlotMaker.emaker
src/esrc/scripts ButtonPointer.e eBrowser.e eDesk.e echat.e
elmer2.e evalServer.e pasteRun.e
src/jsrc/org/erights/e/elang/evm CatchExpr.java
src/jsrc/org/erights/e/elang/interp ScopeSetup.java
src/jsrc/org/erights/e/elib/prim BERunner.java
FERunnerEvent.java
Removed: src/esrc/scripts eDeskPlus.e
Log:
eDesk works. No more sprout. More tracing
Revision Changes Path
1.122 +2 -2 e/src/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/Makefile,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- Makefile 2001/11/09 01:17:20 1.121
+++ Makefile 2001/11/16 09:39:06 1.122
@@ -7,8 +7,8 @@
# Prefix tagging this release's attributes
PREFIX=E
-DOTVER=0.8.10beta2
-TAGVER=0_8_10beta2
+DOTVER=0.8.10gamma1
+TAGVER=0_8_10gamma1
RELEASE=working
TOP=..
1.4 +4 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- runConfinedSourceFuncAuthor.emaker 2001/11/10 23:51:50 1.3
+++ runConfinedSourceFuncAuthor.emaker 2001/11/16 09:39:06 1.4
@@ -5,7 +5,7 @@
def interpret() :any {
traceln("starting run prep")
def ScopeSetupMaker := <unsafe:org.erights.e.elang.interp.ScopeSetup>
- var scope := ScopeSetupMaker universal()
+ var outerScope := ScopeSetupMaker universal() diverge()
def subInterp {
to blockAtTop() {
# ignored
@@ -15,11 +15,12 @@
}
delegate { interp }
}
- scope := scope sprout() bindFinal("interp", subInterp)
+ # XXX What is subInterp for?
+ outerScope bindFinal("interp", subInterp)
traceln("made scope 2")
try {
def tree := e__quasiParser(sourceText)
- def result := tree eval(scope)
+ def result := tree eval(outerScope)
traceln("\n# value: " + result)
traceln("shown")
result
1.5 +5 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sourceRunnerAuthor.emaker 2001/11/10 23:51:50 1.4
+++ sourceRunnerAuthor.emaker 2001/11/16 09:39:06 1.5
@@ -5,7 +5,6 @@
def interpret() :any {
traceln("starting run prep")
def ScopeSetupMaker := <unsafe:org.erights.e.elang.interp.ScopeSetup>
- var scope := ScopeSetupMaker privileged(false, stdout, stdout, interp)
def subInterp {
to blockAtTop() {
# ignored
@@ -15,8 +14,11 @@
}
delegate { interp }
}
- scope := scope sprout() bindFinal("interp", subInterp)
- traceln("made scope 2")
+ def scope := ScopeSetupMaker privileged(false,
+ stdout,
+ stdout,
+ subInterp)
+ traceln("made scope")
try {
def tree := e__quasiParser(sourceText)
def result := tree eval(scope)
1.2 +1 -1 e/src/esrc/com/skyhunter/e/security/capRingControllerMakerAuthorOld.emaker
Index: capRingControllerMakerAuthorOld.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/e/security/capRingControllerMakerAuthorOld.emaker,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- capRingControllerMakerAuthorOld.emaker 2001/08/08 06:00:20 1.1
+++ capRingControllerMakerAuthorOld.emaker 2001/11/16 09:39:06 1.2
@@ -14,7 +14,7 @@
to getTimer() :near {timer}
to getTempDirectory() :near {tempDir}
}
- def bind capRingController {
+ bind capRingController {
to getCapRing() :near {capRing}
to addReadable(nickname,file) {}
to addWriteable(nickname,file) {}
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oldPowerboxControllerMakerAuthor.emaker 2001/11/10 23:51:51 1.4
+++ oldPowerboxControllerMakerAuthor.emaker 2001/11/16 09:39:06 1.5
@@ -90,7 +90,7 @@
}
}
- def bind caplet := launchCaplet(capletSource)
+ bind caplet := launchCaplet(capletSource)
powerboxController
}
}
1.6 +3 -3 e/src/esrc/com/skyhunter/e/security/powerboxControllerMakerAuthor.emaker
Index: powerboxControllerMakerAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/e/security/powerboxControllerMakerAuthor.emaker,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- powerboxControllerMakerAuthor.emaker 2001/11/10 19:40:36 1.5
+++ powerboxControllerMakerAuthor.emaker 2001/11/16 09:39:06 1.6
@@ -198,7 +198,7 @@
traceln("agreedUrlProtocols: " + agreedUrlProtocols)
powersMap[powerbox URL_MAKER()] := urlMakerMaker new(agreedUrlProtocols)
}
- def bind powerbox {
+ bind powerbox {
to requestExit() {
#interp continueAtTop()
}
@@ -267,7 +267,7 @@
to setCap(key, value) {powersMap[key] := value}
to launchSource(capletAuthorSource) {
def capletAuthor := runSource(capletAuthorSource)
- def bind caplet := capletAuthor(powerbox, awt__uriGetter, swing__uriGetter)
+ bind caplet := capletAuthor(powerbox, awt__uriGetter, swing__uriGetter)
}
to launchFile(capletFile) {
def capletAuthorSource := capletFile getText()
@@ -280,7 +280,7 @@
powerboxController launchSource(capletAuthorSource)
}
to startExternalCaplet(theCaplet) {
- def bind caplet := theCaplet
+ bind caplet := theCaplet
}
}
}
1.3 +31 -31 e/src/esrc/com/skyhunter/eDesk/navPanelControllerMakerAuthor.emaker
Index: navPanelControllerMakerAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/eDesk/navPanelControllerMakerAuthor.emaker,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navPanelControllerMakerAuthor.emaker 2001/11/10 19:40:36 1.2
+++ navPanelControllerMakerAuthor.emaker 2001/11/16 09:39:06 1.3
@@ -12,16 +12,16 @@
//**********
def navPanelControllerMakerAuthor(unsafe__uriGetter, awt__uriGetter, swing__uriGetter, traceln) :any {
-
+
def JPanel__quasiParser := <import:org.erights.ex.swing.JPanelQParserMaker> new(awt__uriGetter, swing__uriGetter)
def promiseAllResolved := <import:com.skyhunter.e.net.promiseAllResolved>
def uiKit := <import:com.skyhunter.ex.swing.uiKitAuthor>(awt__uriGetter,
swing__uriGetter)
-
+
def dirIcon := <swing:ImageIcon> new(<resource:com/skyhunter/eDesk/icons/folder.gif>)
-
+
def moreRecentVowFuncMaker := <import:com.skyhunter.e.net.moreRecentVowFuncMaker>
-
+
def diskNavStub {
to dupNavigator() :near {diskNavStub}
to getStorageName() :String {""}
@@ -31,7 +31,7 @@
to listCurrentSubdirectoriesAndFiles() :pbc {[[],[]]}
match [verb, args] {}
}
-
+
def unAssociatedIcon := <swing:ImageIcon> new(<resource:com/skyhunter/eDesk/icons/stranger.gif>)
def cellRenderer {
to getListCellRendererComponent(listPanel, cell,
@@ -46,7 +46,7 @@
component
}
}
-
+
def dirNameFromPath(path) :pbc {
traceln("path: " + path)
def parts := path split("/")
@@ -54,7 +54,7 @@
parts[parts size() - 2] + "/"
} else {""}
}
-
+
def computeSuffix(name) :near {
def parts := name split(".")
def size := parts size()
@@ -64,7 +64,7 @@
parts[size - 1]
}
}
-
+
class cellMaker(var name, isDir, suffixMapper) :near {
var component := null
var label := null
@@ -78,12 +78,12 @@
var icon := unAssociatedIcon
if (isDir) {
icon := dirIcon
- } else {
- def optApp := suffixMapper optAppByPetSuffix(computeSuffix(name))
+ } else {
+ def optApp := suffixMapper optAppByPetSuffix(computeSuffix(name))
if (optApp != null) {
traceln ("found suffix app: " + optApp)
icon := <swing:ImageIcon> new(optApp["Icon"])
- }
+ }
}
iconPane := <swing:JLabel> new(icon)
iconPane setIcon(icon)
@@ -102,7 +102,7 @@
to getIconPane() :near {iconPane}
}
}
-
+
def composeCellArray(dirsFiles, suffixMapper) :pbc {
def list := [] diverge()
for each in dirsFiles[0] {
@@ -113,7 +113,7 @@
}
list snapshot()
}
-
+
class navPanelControllerMaker(optHigherDirControllerVow, optLowerDirControllerVow, suffixMapper, windowController) :near {
def localReactor
var diskNavRcvr := diskNavStub
@@ -127,9 +127,9 @@
"Refresh", def act(){localReactor reload()})
def mainPanel := JPanel`$refreshButton $locationLabel.X
$listScroller.Y > `
-
+
def navPanelController
-
+
def listPaneListener{
to mouseClicked(theEvent) {
#traceln("into mouseClicked")
@@ -154,13 +154,13 @@
windowController showFilePopup(navPanelController, theEvent getX(),
theEvent getY())
}
-
+
}
match _ {}
}
listPanel addMouseListener(listPaneListener)
-
- def bind localReactor {
+
+ bind localReactor {
to reload() {
windowController setStatus("Refreshing Listing")
def currentPathVow := recentPathVow (diskNavRcvr <- getCurrentPath())
@@ -176,10 +176,10 @@
}
}
}
-
+
def navReactors := [] asMap() diverge()
-
-
+
+
def listSelectionListener {
to valueChanged(event) {
def onlyOne := listPanel getSelectedValues() size() == 1
@@ -193,17 +193,17 @@
}
}
listPanel addListSelectionListener(listSelectionListener)
-
+
def dragDropKit := <import:com.skyhunter.e.awt.dnd.dragDropKit> (awt__uriGetter, traceln)
def getFileRcvrs() :any {navPanelController getSelectedFileRcvrs() }
- dragDropKit setupLocalDragSource(listPanel , getFileRcvrs )
-
+ dragDropKit setupLocalDragSource(listPanel , getFileRcvrs )
+
def clear() {
for each => stub in navReactors {each cleared(navPanelController)}
diskNavRcvr := diskNavStub
localReactor reload()
}
-
+
def lowerPaneReactor {
to openingDir(controller) {
traceln("opening dir reached in lower listener")
@@ -223,14 +223,14 @@
lowerController <- addNavReactor(lowerPaneReactor)
}
} catch prob {traceln("disaster with lowerController: " + prob)}
-
+
def upperPaneReactor {
to goingUp(controller) {
for each => stub in navReactors {each goingUp(navPanelController)}
diskNavRcvr := controller dupDiskNavRcvr()
localReactor reload()
for each => stub in navReactors {each wentUp(navPanelController)}
-
+
}
to lowerDirOpening(controller) {}
to wentUp(controller) {}
@@ -252,14 +252,14 @@
}
match [verb, args] {traceln("Got verb in upperPaneReactor: " + verb)}
}
-
+
when (optHigherDirControllerVow) -> doneHigher(higherController) {
if (higherController != null) {
higherController <- addNavReactor(upperPaneReactor)
}
} catch prob {traceln("disaster with higherController: " + prob)}
-
- def bind navPanelController {
+
+ bind navPanelController {
to setDiskNavRcvr(newNavRcvr) {
diskNavRcvr := newNavRcvr
localReactor reload()
@@ -305,7 +305,7 @@
diskNavRcvr <- changeToSubdirectory(newDirName)
#listPanel clearSelection()
traceln("about to change dir: " + diskNavRcvr)
-
+
localReactor reload()
traceln("about to tell reactors opened")
for each => stub in navReactors { each openedDir(navPanelController)}
1.3 +1 -1 e/src/esrc/com/skyhunter/eDesk/progressWindowMakerAuthor.emaker
Index: progressWindowMakerAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/eDesk/progressWindowMakerAuthor.emaker,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- progressWindowMakerAuthor.emaker 2001/11/10 19:40:36 1.2
+++ progressWindowMakerAuthor.emaker 2001/11/16 09:39:06 1.3
@@ -9,7 +9,7 @@
myFrame pack()
myFrame setSize(150,50)
myFrame show()
- def bind progressWindow {
+ bind progressWindow {
to setProgress(amountCopied) {
def percent := (amountCopied *100) _/ fileSize
myProgressPane setValue(percent)
1.3 +1 -1 e/src/esrc/com/skyhunter/eDesk/serverDescVowAuthor.emaker
Index: serverDescVowAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/eDesk/serverDescVowAuthor.emaker,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- serverDescVowAuthor.emaker 2001/11/10 19:40:36 1.2
+++ serverDescVowAuthor.emaker 2001/11/16 09:39:06 1.3
@@ -66,7 +66,7 @@
#mainFrame setSize(400,200)
mainFrame show()
- def bind configReady() {
+ bind configReady() {
#traceln("made it")
configSolver resolve (`
<serverDesc>
1.6 +14 -14 e/src/esrc/org/erights/e/elang/cmd/cmdMakerMaker.updoc
Index: cmdMakerMaker.updoc
===================================================================
RCS file: /cvs/e/src/esrc/org/erights/e/elang/cmd/cmdMakerMaker.updoc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cmdMakerMaker.updoc 2001/08/24 17:14:02 1.5
+++ cmdMakerMaker.updoc 2001/11/16 09:39:06 1.6
@@ -1,12 +1,12 @@
? def TextWriterMaker := <import:org.erights.e.elib.base.TextWriter>
# value: <import:org.erights.e.elib.base.TextWriter>
-
+
? def cmd__uriGetter := <import:org.erights.e.elang.cmd.*>
# value: <import:org.erights.e.elang.cmd.*>
-
+
? def cmdMakerMaker := <cmd:cmdMakerMaker>
# value: <cmdMakerMaker>
-
+
? def SystemGC {
> to gc() {
> println("System.gc()")
@@ -14,22 +14,22 @@
> }
> }
# value: <SystemGC>
-
+
? def cmdLoopMaker := <cmd:cmdLoopMakerAuthor>(SystemGC)
# value: <cmdLoopMaker>
-
+
? def ScopeSetup := <unsafe:org.erights.e.elang.interp.ScopeSetup>
# value: <unsafe:org.erights.e.elang.interp.ScopeSetup>
-
+
? def [altout, altoutBuf] := TextWriterMaker makeBufferingPair()
# value: [<TextWriter>, ]
-
+
? def [alterr, alterrBuf] := TextWriterMaker makeBufferingPair()
# value: [<TextWriter>, ]
-
+
? def cmdLoop
# value: <Eventual ref>
-
+
? def props := interp getProps(); null
? def privileged := ScopeSetup privileged(true,
> altout,
@@ -37,11 +37,11 @@
> props,
> cmdLoop)
# value: org.erights.e.elang.scope.MutableScope@366999
-
- ? def bind cmdLoop := cmdLoopMaker new(["a", "b"], props, privileged)
+
+ ? bind cmdLoop := cmdLoopMaker new(["a", "b"], props, privileged)
# value: <cmdLoop>
-
+
? def cmdMaker := cmdMakerMaker new(cmdLoop, altoutBuf, alterrBuf)
# value: <cmdMaker>
-
- ?
+
+ ?
1.2 +2 -2 e/src/esrc/org/erights/e/elang/cmd/controlLoopMaker.emaker
Index: controlLoopMaker.emaker
===================================================================
RCS file: /cvs/e/src/esrc/org/erights/e/elang/cmd/controlLoopMaker.emaker,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- controlLoopMaker.emaker 2001/08/20 05:07:43 1.1
+++ controlLoopMaker.emaker 2001/11/16 09:39:06 1.2
@@ -41,7 +41,7 @@
}
}
- def bind internalLoop() {
+ bind internalLoop() {
myIsAlarmSet := false
if (myShouldBlock) {
# do nothing
@@ -65,7 +65,7 @@
}
}
- def bind controlLoop {
+ bind controlLoop {
to blockAtTop() {
if (myOptExitPair == null) {
# Don't block if we should exit. We won't execute any more
1.2 +29 -29 e/src/esrc/org/erights/e/elang/cmd/controlLoopMaker.updoc
Index: controlLoopMaker.updoc
===================================================================
RCS file: /cvs/e/src/esrc/org/erights/e/elang/cmd/controlLoopMaker.updoc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- controlLoopMaker.updoc 2001/08/20 05:07:43 1.1
+++ controlLoopMaker.updoc 2001/11/16 09:39:06 1.2
@@ -1,22 +1,22 @@
? def cmd__uriGetter := <import:org.erights.e.elang.cmd.*>
# value: <import:org.erights.e.elang.cmd.*>
-
+
? def controlLoopMaker := <cmd:controlLoopMaker>
# value: <controlLoopMaker>
-
+
? def reactor {
> match [verb, args] {
> println(`$verb$args`)
> }
> }
# value: <reactor>
-
+
? def ctrl := controlLoopMaker new()
# value: <controlLoop_7>
-
+
? ctrl addStatusReactor(reactor)
? ctrl enqueue(thunk{println("foo")})
- ?
+ ?
foo
reactToEnqueue[1]
reactToSuccess[1, false]
@@ -25,12 +25,12 @@
> ctrl blockAtTop()
> ctrl enqueue(thunk{println("baz")})
> )
- ?
+ ?
reactToEnqueue[2]
reactToEnqueue[3]
reactToBlock[1]
? ctrl continueAtTop()
- ?
+ ?
bar
reactToSuccess[2, false]
baz
@@ -38,7 +38,7 @@
reactToQueueEmpty[3]
? def [p,r] := PromiseMaker()
# value: [<Eventual ref>, <Open Resolver>]
-
+
? def event() {
> println("before")
> println("after")
@@ -46,48 +46,48 @@
> ctrl waitAtTop(p)
> }
# value: <event>
-
+
? ctrl enqueue(event)
- ?
+ ?
before
after
reactToEnqueue[4]
reactToEnqueue[5]
reactToSuccess[4, true]
reactToBlock[4]
- ?
+ ?
? r resolve(3)
- ?
+ ?
next
reactToSuccess[5, false]
reactToQueueEmpty[5]
? def exitPairVow := ctrl getExitPairVow()
# value: <Eventual ref>
-
+
? exitPairVow
# value: <Eventual ref>
-
+
? def event2() {
> ctrl exitAtTop()
> println(`exit: ${ctrl getExitPairVow()}`)
> ctrl enqueue(thunk{println("already dead")})
> }
# value: <event2>
-
+
? ctrl enqueue(event2)
- ?
+ ?
exit: <Eventual ref>
reactToEnqueue[6]
reactToEnqueue[7]
reactToSuccess[6, false]
reactToExit[6, 0, null]
- ?
+ ?
? exitPairVow
# value: [0, null]
-
+
? def ctrl3
# value: <Eventual ref>
-
+
? def event3() {
> println("before")
> println("after")
@@ -95,13 +95,13 @@
> ctrl3 blockAtTop()
> }
# value: <event3>
-
- ? def bind ctrl3 := controlLoopMaker new()
+
+ ? bind ctrl3 := controlLoopMaker new()
# value: <controlLoop_7>
-
+
? ctrl3 addStatusReactor(reactor)
? ctrl3 enqueue(event3)
- ?
+ ?
before
after
reactToEnqueue[1]
@@ -110,18 +110,18 @@
reactToBlock[1]
? def exitPairVow3 := ctrl3 getExitPairVow()
# value: <Eventual ref>
-
+
? exitPairVow3
# value: <Eventual ref>
-
+
? ctrl3 exitAtTop()
- ?
+ ?
reactToExit[1, 0, null]
- ?
+ ?
? exitPairVow3
# value: [0, null]
-
- ?
+
+ ?
1.15 +1 -0 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BaseInterpMaker.emaker 2001/11/10 23:51:51 1.14
+++ BaseInterpMaker.emaker 2001/11/16 09:39:06 1.15
@@ -97,6 +97,7 @@
? def scope := ScopeSetupMaker privileged(true,
> stdout,
> stderr,
+ > interp getProps(),
> interpPromise)
# value: org.erights.e.elang.scope.MutableScope@1fe110
1.3 +6 -6 e/src/esrc/org/erights/e/elib/slot/EverFormulaMaker.emaker
Index: EverFormulaMaker.emaker
===================================================================
RCS file: /cvs/e/src/esrc/org/erights/e/elib/slot/EverFormulaMaker.emaker,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EverFormulaMaker.emaker 2001/03/15 11:45:06 1.2
+++ EverFormulaMaker.emaker 2001/11/16 09:39:06 1.3
@@ -35,7 +35,7 @@
def EverFormulaMaker {
# @param formula A function of a list of input values, to be
- # obtained from the inputSlots.
+ # obtained from the inputSlots.
# @param inputSlots A list of read-only lamport slots, or objects
# that act as such.
to new (formula, inputSlots) :any {
@@ -89,7 +89,7 @@
optReactors := null
# The fact that we had downstream reactors to notify
# is sufficient demonstration of interest for us to
- # reregister with our sources.
+ # reregister with our sources.
localInterest()
}
}
@@ -97,7 +97,7 @@
# We register and reregister the EverReactor with the input
# lamport slots so it can get notified.
- def bind EverReactor {
+ bind EverReactor {
to reactToUpdate(newValue, newSrcGen, newSource) {
if (optSources == null) {
optSources := [] diverge()
@@ -119,7 +119,7 @@
# The EverFormula itself acts like a read-only lamport slot
# on the calculated value of the formula.
- def bind EverFormula {
+ bind EverFormula {
# Synchronously returns the locally cached value, but also
# arranges for this value to become more current. Only a
@@ -128,7 +128,7 @@
localInterest()
value
}
-
+
# reactor wants to be informed of any changes more recent
# than my lastGeneration. If we've got more news, let it know
# immediately. Otherwise, remember to inform it. In
@@ -151,4 +151,4 @@
}
}
}
-}
+}
1.5 +1 -1 e/src/esrc/org/erights/e/elib/slot/LamportSlotMaker.emaker
Index: LamportSlotMaker.emaker
===================================================================
RCS file: /cvs/e/src/esrc/org/erights/e/elib/slot/LamportSlotMaker.emaker,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LamportSlotMaker.emaker 2001/04/16 08:10:31 1.4
+++ LamportSlotMaker.emaker 2001/11/16 09:39:06 1.5
@@ -141,7 +141,7 @@
}
# The read-write facet of the LamportSlot.
- def bind LamportSlot {
+ bind LamportSlot {
# For debugging purposes
to printOn(out :TextWriter) {
1.17 +4 -4 e/src/esrc/scripts/ButtonPointer.e
Index: ButtonPointer.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/ButtonPointer.e,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ButtonPointer.e 2001/11/09 01:17:20 1.16
+++ ButtonPointer.e 2001/11/16 09:39:06 1.17
@@ -16,7 +16,7 @@
def text := file getText()
if (text =~ `@left<!-- #BeginEditable "$varName" -->@oldValue<!-- #EndEditable -->@right` &&
oldValue != newValue) {
-
+
file setText(`$left<!-- #BeginEditable "$varName" -->$newValue<!-- #EndEditable -->$right`)
}
} else {
@@ -78,7 +78,7 @@
}
while (true) {
def [level, name] := getLine(tocReader)
-
+
if (level > prevLevel) {
# name is the first child of prev.
require(level == prevLevel + 1,
@@ -86,7 +86,7 @@
nest()
# 'parent[name]' is redundant. Oh well.
parent setDownButton(parent[name])
-
+
} else {
while (prevLevel > level) {
# name is the next sibling of an ancestor of prev
@@ -299,7 +299,7 @@
# we're done
} else {
# kludge around lack of args in eBrowser's Run action
- def bind fileName := "c:/e/doc"
+ bind fileName := "c:/e/doc"
}
def wdir := <file: fileName>
1.49 +2 -2 e/src/esrc/scripts/eBrowser.e
Index: eBrowser.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/eBrowser.e,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- eBrowser.e 2001/11/13 02:13:54 1.48
+++ eBrowser.e 2001/11/16 09:39:06 1.49
@@ -898,7 +898,7 @@
}
}
- def bind eBrowser {
+ bind eBrowser {
to save() {
if (textModel saveFileIsSet()) {
textModel setText(textPane getText())
@@ -980,7 +980,7 @@
if (tail =~ `@name(@rest`) {
insertSection := `$name new($rest`
} else {insertSection := tail}
- } else if (insert =~ `@{leader} def bind @{tail}`) {
+ } else if (insert =~ `@{leader} bind @{tail}`) {
insertSection := tail
} else if (insert =~ `@{leader} def @{tail}`) {
insertSection := tail
1.2 +8 -11 e/src/esrc/scripts/eDesk.e
Index: eDesk.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/eDesk.e,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eDesk.e 2001/10/27 17:34:08 1.1
+++ eDesk.e 2001/11/16 09:39:07 1.2
@@ -325,9 +325,6 @@
def fileProgressObserverStub {
match _ {}
}
-def quickEditMaker := <import:com.skyhunter.eDesk.quickEditMakerAuthor>(traceln, awt__uriGetter,
- swing__uriGetter, connectionWarning,
- standardWindow, dialogVowMaker )
traceln("about to compile navigatorWindowMaker")
@@ -382,9 +379,9 @@
def navPanelController1
def navPanelController2
def navPanelController3
- def bind navPanelController1 := navPanelControllerMaker new(null, navPanelController2, installedAppsManager , navPanelServer )
- def bind navPanelController2 := navPanelControllerMaker new(navPanelController1, navPanelController3, installedAppsManager , navPanelServer )
- def bind navPanelController3 := navPanelControllerMaker new(navPanelController2, null, installedAppsManager, navPanelServer )
+ bind navPanelController1 := navPanelControllerMaker new(null, navPanelController2, installedAppsManager , navPanelServer )
+ bind navPanelController2 := navPanelControllerMaker new(navPanelController1, navPanelController3, installedAppsManager , navPanelServer )
+ bind navPanelController3 := navPanelControllerMaker new(navPanelController2, null, installedAppsManager, navPanelServer )
class navWinActionMaker(actionName) :near {
def action() {E call(navigatorWindow, actionName, [])}
@@ -552,7 +549,7 @@
traceln("launch initiated")
}
}
- def bind navPanelServer {
+ bind navPanelServer {
to setStatus(text) {setStatus(text)}
to showFilePopup(navPanelController, showX, showY) {
def myNavigatorRcvr := navPanelController dupDiskNavRcvr()
@@ -865,11 +862,11 @@
forwarderMaker new(farToFile), forwarderMaker new(farFromFile))
when (firstvow) -> done(result) {
traceln("copyaction success: " + result)
- def bind vow := result
+ bind vow := result
} catch prob {
traceln("copyaction failure: " + prob + prob eStack())
traceln("now trying backup strategy")
- def bind vow := farToFile <- getToCopier() <- copyEventually(forwarderMaker new(farFromFile),
+ bind vow := farToFile <- getToCopier() <- copyEventually(forwarderMaker new(farFromFile),
fileProgressObserverMaker new("Copying " + fileName, farToFile),
forwarderMaker new(farToFile), forwarderMaker new(farFromFile))
@@ -1179,7 +1176,7 @@
introducer setNetConfig(netConfig)
introducer setVatIdentity(keyPair)
introducer onTheAir()
- def bind sturdyConn := sturdyRef reincarnate(conn, swissBase)
+ bind sturdyConn := sturdyRef reincarnate(conn, swissBase)
}
def capFile := <file: configMap["capabilityFile"]>
def cap := introducer sturdyToURI(sturdyConn)
@@ -1222,7 +1219,7 @@
traceln("connection failure" + err)
}
}
- def bind ftController {
+ bind ftController {
to copyFrom(fromFilePromises,fromDiskNavigator) {
copyBuffer := fromFilePromises
copyBufferDiskNavigator := fromDiskNavigator <- dupNavigator()
1.14 +3 -3 e/src/esrc/scripts/echat.e
Index: echat.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/echat.e,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- echat.e 2001/11/11 23:32:16 1.13
+++ echat.e 2001/11/16 09:39:07 1.14
@@ -62,11 +62,11 @@
introducer setNetConfig(netConfig)
introducer setVatIdentity(keyPair)
introducer onTheAir()
- def bind sturdyChatReceiver := sturdyRef reincarnate(chatReceiver, swissBase)
+ bind sturdyChatReceiver := sturdyRef reincarnate(chatReceiver, swissBase)
} else {
traceln("once only incarnation")
introducer onTheAir()
- def bind sturdyChatReceiver := sturdyRef(chatReceiver)
+ bind sturdyChatReceiver := sturdyRef(chatReceiver)
}
traceln(introducer)
traceln(sturdyChatReceiver)
@@ -201,7 +201,7 @@
# facet of chatController sent to other chatter with only appropriate
# messages
class chatReceiverMaker(var chatController) :any {
- def bind chatReceiver {
+ bind chatReceiver {
to receive(message) { chatController receive(message) }
to receiveFriend(friend, name) :any {
chatController receiveFriend(friend, name)
1.3 +1 -1 e/src/esrc/scripts/elmer2.e
Index: elmer2.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/elmer2.e,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elmer2.e 2001/09/07 05:49:19 1.2
+++ elmer2.e 2001/11/16 09:39:07 1.3
@@ -34,7 +34,7 @@
outs,
outs,
cmdLoop)
- def bind cmdLoop := cmdLoopMaker new(["elmer2"],
+ bind cmdLoop := cmdLoopMaker new(["elmer2"],
interp getProps(),
scope)
def cmdMaker := cmdMakerMaker new(cmdLoop, outs, outs, outs)
1.6 +5 -5 e/src/esrc/scripts/evalServer.e
Index: evalServer.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/evalServer.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- evalServer.e 2001/09/14 04:55:01 1.5
+++ evalServer.e 2001/11/16 09:39:07 1.6
@@ -32,20 +32,20 @@
alterr,
props,
cmdLoop)
- def bind cmdLoop := cmdLoopMaker new(args, props, privileged)
+ bind cmdLoop := cmdLoopMaker new(args, props, privileged)
def cmdMaker := cmdMakerMaker new(cmdLoop, altoutBuf, alterrBuf)
def scriptEvaluator {
- # Schedules sourceCode to be evaluated as the next top level command
- # in the scriptEvaluator's currents (at that time) scope, and
+ # Schedules sourceCode to be evaluated as the next top level command
+ # in the scriptEvaluator's currents (at that time) scope, and
# returns a vow for a textual report of the outcome
to evalCmdReportVow(sourceCode) :any {
def [reportVow, cmd] := cmdMaker newReporter(sourceCode)
cmdLoop enqueue(cmd)
reportVow
}
- # Schedules sourceCode to be evaluated as the next top level command
- # in the scriptEvaluator's currents (at that time) scope, and
+ # Schedules sourceCode to be evaluated as the next top level command
+ # in the scriptEvaluator's currents (at that time) scope, and
# returns a vow for an object representing the outcome
to evalCmdValueVow(sourceCode) :any {
def [valueVow, cmd] := cmdMaker newValuer(sourceCode)
1.10 +5 -8 e/src/esrc/scripts/pasteRun.e
Index: pasteRun.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/pasteRun.e,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pasteRun.e 2001/11/10 23:51:51 1.9
+++ pasteRun.e 2001/11/16 09:39:07 1.10
@@ -24,12 +24,6 @@
trace("ready")
def ScopeSetupMaker := <unsafe:org.erights.e.elang.interp.ScopeSetup>
trace("made scoper")
- var scope := ScopeSetupMaker privileged(false,
- stdout,
- stderr,
- interp getProps(),
- interp)
- trace("made scope1")
def subInterp {
to blockAtTop() {
# ignored
@@ -40,8 +34,11 @@
delegate { interp }
}
trace("made subInterp")
- scope := scope sprout() bindFinal("interp", subInterp)
- trace("made scope2")
+ def scope := ScopeSetupMaker privileged(false,
+ stdout,
+ stderr,
+ subInterp)
+ trace("made scope")
try {
def tree := e__quasiParser(sourceString)
trace("made tree")
1.18 +4 -0 e/src/jsrc/org/erights/e/elang/evm/CatchExpr.java
Index: CatchExpr.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/evm/CatchExpr.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CatchExpr.java 2001/11/10 19:40:39 1.17
+++ CatchExpr.java 2001/11/16 09:39:07 1.18
@@ -20,6 +20,7 @@
*/
import org.erights.e.develop.exception.ExceptionMgr;
+import org.erights.e.develop.trace.Trace;
import org.erights.e.elang.scope.EvalContext;
import org.erights.e.elang.visitors.ETreeVisitor;
import org.erights.e.elib.eio.TextWriter;
@@ -97,6 +98,9 @@
//non-Exception, that propogates out rather than the original
//problem.
throw ExceptionMgr.asSafe(ex);
+ }
+ if (Trace.causality.debug && Trace.ON) {
+ Trace.causality.debugm("caught by E-lang catcher: ", ex);
}
return myCatcher.subEval(ctx, forValue);
}
1.73 +11 -11 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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ScopeSetup.java 2001/11/13 02:13:54 1.72
+++ ScopeSetup.java 2001/11/16 09:39:08 1.73
@@ -201,7 +201,7 @@
* importer (bound to "import:") with transparent-enough caches. It
* conveys no substantial authority, and so can be given out freely.
*/
- static public Scope universal() {
+ static public OuterScope universal() {
return universalMaker().copy().scope();
}
@@ -211,10 +211,10 @@
* This scope contains the root magic powers, so should only be given to
* fully trusted entities.
*/
- static public Scope privileged(boolean interactive,
- TextWriter stdout,
- TextWriter stderr,
- Object interp)
+ static public OuterScope privileged(boolean interactive,
+ TextWriter stdout,
+ TextWriter stderr,
+ Object interp)
{
ConstMap props = (ConstMap)E.as(E.call(interp, "getProps"),
ConstMap.class);
@@ -229,11 +229,11 @@
* If the interp isn't resolved yet, the props must be provided
* explicitly.
*/
- static public Scope privileged(boolean interactive,
- TextWriter stdout,
- TextWriter stderr,
- ConstMap props,
- Object interpPromise)
+ static public OuterScope privileged(boolean interactive,
+ TextWriter stdout,
+ TextWriter stderr,
+ ConstMap props,
+ Object interpPromise)
{
// XXX need some decent way to handle magic powers.
StaticMaker entropyMaker =
@@ -313,7 +313,7 @@
pm.init("sturdyRef", optSturdifier);
//pm.init("privilegedScope", privScope);
- Scope priv = pm.scope(interactive);
+ OuterScope priv = pm.scope(interactive);
privResolver.resolve(priv);
return priv;
}
1.4 +4 -3 e/src/jsrc/org/erights/e/elib/prim/BERunner.java
Index: BERunner.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/prim/BERunner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BERunner.java 2001/11/10 19:40:45 1.3
+++ BERunner.java 2001/11/16 09:39:08 1.4
@@ -151,9 +151,10 @@
return;
} catch (Throwable t) {
if (Trace.causality.error) {
- Trace.causality.errorReportException(t,
- "Exception made it all the way out of the run " +
- "loop. Restarting it.");
+ Trace.causality.errorReportException
+ (t,
+ "Exception made it all the way out of the run " +
+ "loop. Restarting it.");
}
}
}
1.4 +4 -3 e/src/jsrc/org/erights/e/elib/prim/FERunnerEvent.java
Index: FERunnerEvent.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/prim/FERunnerEvent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FERunnerEvent.java 2001/11/11 00:15:30 1.3
+++ FERunnerEvent.java 2001/11/16 09:39:08 1.4
@@ -67,9 +67,10 @@
} catch (Throwable t) {
if (Trace.causality.error) {
- Trace.causality.errorReportException(t,
- "Exception made it all the way out of the awt run " +
- "loop. Continuing anyway.");
+ Trace.causality.errorReportException
+ (t,
+ "Exception made it all the way out of the awt run " +
+ "loop. Continuing anyway.");
}
} finally {
FERunner.THE_ONE.myServingTicket = -1;