[e-cvs] cvs commit: e/src/esrc/scripts ButtonPointer.e eBrowser.e eConfig.e eDesk.e echat.e evalServer.e updoc.e
markm@eros.cs.jhu.edu
markm@eros.cs.jhu.edu
Thu, 13 Dec 2001 15:24:08 -0500
markm 01/12/13 15:24:08
Modified: src Makefile
src/esrc/com/skyhunter/e/lang vatTester.e
src/esrc/com/skyhunter/e/security
powerBoxControllerMakerAuthorTester.e
src/esrc/com/skyhunter/eBrowser
analyzeOutlineFuncAuthor.emaker
syncServerMakerAuthor.emaker syncServerTester.e
src/esrc/com/skyhunter/eDesk capLauncherAuthor.emaker
src/esrc/com/skyhunter/ex/swing toolButtonTest.e
src/esrc/com/skyhunter/installer
agreedCapsPetsVowMakerAuthor.emaker
src/esrc/scripts ButtonPointer.e eBrowser.e eConfig.e
eDesk.e echat.e evalServer.e updoc.e
Log:
eBrowser works again. traceln convention regularized to go to stderr rather than stdout
Revision Changes Path
1.128 +2 -2 e/src/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/Makefile,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- Makefile 2001/12/13 05:01:31 1.127
+++ Makefile 2001/12/13 20:24:07 1.128
@@ -7,8 +7,8 @@
# Prefix tagging this release's attributes
PREFIX=E
-DOTVER=0.8.10delta2
-TAGVER=0_8_10delta2
+DOTVER=0.8.10delta3
+TAGVER=0_8_10delta3
RELEASE=working
TOP=..
1.3 +3 -1 e/src/esrc/com/skyhunter/e/lang/vatTester.e
Index: vatTester.e
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/e/lang/vatTester.e,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vatTester.e 2001/08/24 17:14:02 1.2
+++ vatTester.e 2001/12/13 20:24:07 1.3
@@ -1,7 +1,9 @@
+def traceln(str) {stderr println(str)}
+
introducer onTheAir()
def vatMaker := <import:com.skyhunter.e.lang.vatMakerAuthor> run(
- unsafe__uriGetter, introducer, println)
+ unsafe__uriGetter, introducer, traceln)
def source := "
def bogusSyncServer(x) :any { x * 2 }
1.4 +1 -1 e/src/esrc/com/skyhunter/e/security/powerBoxControllerMakerAuthorTester.e
Index: powerBoxControllerMakerAuthorTester.e
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/e/security/powerBoxControllerMakerAuthorTester.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- powerBoxControllerMakerAuthorTester.e 2001/11/10 19:40:36 1.3
+++ powerBoxControllerMakerAuthorTester.e 2001/12/13 20:24:07 1.4
@@ -1,7 +1,7 @@
//Copyright (C) 2001 Combex. All Rights Reserved.
-def traceln := println
+def traceln(str) {stderr println(str)}
def controllerMaker := <import:com.skyhunter.e.security.powerboxControllerMakerAuthor> run(
unsafe__uriGetter, file__uriGetter, interp, traceln, stdout)
1.2 +12 -9 e/src/esrc/com/skyhunter/eBrowser/analyzeOutlineFuncAuthor.emaker
Index: analyzeOutlineFuncAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/eBrowser/analyzeOutlineFuncAuthor.emaker,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- analyzeOutlineFuncAuthor.emaker 2001/08/08 06:00:20 1.1
+++ analyzeOutlineFuncAuthor.emaker 2001/12/13 20:24:07 1.2
@@ -1,9 +1,14 @@
-#def elex := <unsafe:org.erights.e.elang.syntax.ELexer>
-def analyzeOutlineFuncAuthor(elex, stdout) :near {
+# An identifier is any Java identifier that has no dollar signs.
+def isIdentifierStart(c :char) :boolean {
+ <import:java.lang.Character> isJavaIdentifierStart(c) &&
+ c != '$'
+}
+
+def analyzeOutlineFuncAuthor(traceln) :near {
#returns [outlineList,outlineIndices,varLineList,varLineIndices]
#suitable for being passed to textModel setLines method
- def traceln(text) {stdout println(text)}
+
def analyzeSource (sourceText) :near {
def computeIndent(leadString) :any {
var spaceCount := 0
@@ -20,7 +25,7 @@
}
def newFuncList := [] diverge()
def funcLineIndices := [] diverge()
- def newVarList := []diverge()
+ def newVarList := [] diverge()
def varLineIndices := [] diverge()
var declarationType := ""
var leader := ""
@@ -55,7 +60,7 @@
# if this uses a brace in the declaration, it
# is a func
if (postDeclaration =~ `@nameArea{@theEnd` &&
- (elex isIdentifierStart(nameArea[0]))
+ (isIdentifierStart(nameArea[0]))
) {
def indent := computeIndent(leader)
def entry := `$indent $declarationType $nameArea`
@@ -63,13 +68,13 @@
funcLineIndices push(eachIndex)
# otherwise, is this a define of a variable?
} else if (postDeclaration =~ `@nameArea:=@theEnd` &&
- (elex isIdentifierStart(nameArea[0]) ||
+ (isIdentifierStart(nameArea[0]) ||
nameArea[0] == '[')
) {
def indent := computeIndent(leader)
newVarList push(`$indent $nameArea`)
varLineIndices push(eachIndex)
- } else if (elex isIdentifierStart(postDeclaration[0])){
+ } else if (isIdentifierStart(postDeclaration[0])){
# this is probably a def blah promise declaration
def indent := computeIndent(leader)
newFuncList push(`$indent $declarationType $postDeclaration`)
@@ -84,5 +89,3 @@
[newFuncList snapshot(), funcLineIndices snapshot(), newVarList snapshot(), varLineIndices snapshot()]
}
}
-
-
1.2 +4 -4 e/src/esrc/com/skyhunter/eBrowser/syncServerMakerAuthor.emaker
Index: syncServerMakerAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/eBrowser/syncServerMakerAuthor.emaker,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syncServerMakerAuthor.emaker 2001/08/08 06:00:20 1.1
+++ syncServerMakerAuthor.emaker 2001/12/13 20:24:07 1.2
@@ -1,10 +1,8 @@
//Copyright (C) 2001 Combex. All Rights Reserved.
-def syncServerMakerAuthor(unsafe__uriGetter, stdout) :near {
- def traceln(text) {stdout println(text)}
- def elex := <unsafe:org.erights.e.elang.syntax.ELexer>
- def analyzeOutline := <import:com.skyhunter.eBrowser.analyzeOutlineFuncAuthor> run(elex, stdout)
+def syncServerMakerAuthor(traceln) :near {
+ def analyzeOutline := <import:com.skyhunter.eBrowser.analyzeOutlineFuncAuthor> run(traceln)
class syncServerMaker() :near {
var textCache := ""
def syncServer {
@@ -14,8 +12,10 @@
to getVersion() :pbc {0.1}
to refreshFuncs(theText) :near {
if (theText == textCache) {
+ throw breakpoint(["same", theText, textCache])
null
} else {
+ throw breakpoint(["diff", theText, textCache])
textCache := theText
analyzeOutline(theText)
}
1.2 +2 -1 e/src/esrc/com/skyhunter/eBrowser/syncServerTester.e
Index: syncServerTester.e
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/eBrowser/syncServerTester.e,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syncServerTester.e 2001/08/08 06:00:20 1.1
+++ syncServerTester.e 2001/12/13 20:24:07 1.2
@@ -1,5 +1,6 @@
-def serverMaker := <import:com.skyhunter.eBrowser.syncServerMakerAuthor> run(unsafe__uriGetter, stdout)
+def traceln(str) {stderr println(str)}
+def serverMaker := <import:com.skyhunter.eBrowser.syncServerMakerAuthor> run(traceln)
def server := serverMaker new()
def testSource := "
def double(num) :any {2 * num}
1.3 +2 -2 e/src/esrc/com/skyhunter/eDesk/capLauncherAuthor.emaker
Index: capLauncherAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/eDesk/capLauncherAuthor.emaker,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- capLauncherAuthor.emaker 2001/11/10 19:40:36 1.2
+++ capLauncherAuthor.emaker 2001/12/13 20:24:08 1.3
@@ -5,8 +5,8 @@
def swing__uriGetter := <unsafe:javax.swing.*>
def awt__uriGetter := <unsafe:java.awt.*>
def uiKit := <import:com.skyhunter.ex.swing.uiToolsAuthor> run(awt__uriGetter, swing__uriGetter)
- def traceOut := <unsafe:java.lang.System> out()
- def trace(text) {E call(traceOut, "print(Object)", [text])}
+ def traceErr := <unsafe:java.lang.System> err()
+ def trace(text) {E call(traceErr, "print(Object)", [text])}
def traceln(text) {trace(text + "\n")}
def launchCaplet(capletSourceFile) :any {
1.4 +1 -1 e/src/esrc/com/skyhunter/ex/swing/toolButtonTest.e
Index: toolButtonTest.e
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/ex/swing/toolButtonTest.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- toolButtonTest.e 2001/04/15 05:04:26 1.3
+++ toolButtonTest.e 2001/12/13 20:24:08 1.4
@@ -5,7 +5,7 @@
def exercise() {
println("made it through the exercise")
}
-def traceln(text) {println(text)}
+def traceln(text) {stderr println(text)}
def cutUrl := <resource:com/skyhunter/e/icons/cut.gif>
println(`got url $cutUrl`)
def button := uiTools newToolButton(cutUrl, "Global cut", exercise)
1.5 +2 -2 e/src/esrc/com/skyhunter/installer/agreedCapsPetsVowMakerAuthor.emaker
Index: agreedCapsPetsVowMakerAuthor.emaker
===================================================================
RCS file: /cvs/e/src/esrc/com/skyhunter/installer/agreedCapsPetsVowMakerAuthor.emaker,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- agreedCapsPetsVowMakerAuthor.emaker 2001/11/11 23:32:16 1.4
+++ agreedCapsPetsVowMakerAuthor.emaker 2001/12/13 20:24:08 1.5
@@ -7,8 +7,8 @@
def stringDataKit := <import:com.skyhunter.installer.stringDataKit>
def JPanel__quasiParser := <import:org.erights.ex.swing.JPanelQParserMaker> new(awt__uriGetter, swing__uriGetter)
def uiKit := <import:com.skyhunter.ex.swing.uiToolsAuthor> run(awt__uriGetter, swing__uriGetter)
- def traceOut := <unsafe:java.lang.System> out()
- def trace(text) {E call(traceOut, "print(Object)", [text])}
+ def traceErr := <unsafe:java.lang.System> err()
+ def trace(text) {E call(traceErr, "print(Object)", [text])}
def traceln(text) {trace(text + "\n")}
def winImage := <swing:ImageIcon> new(
<resource:com/skyhunter/eDesk/icons/super.gif>) getImage()
1.18 +1 -1 e/src/esrc/scripts/ButtonPointer.e
Index: ButtonPointer.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/ButtonPointer.e,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ButtonPointer.e 2001/11/16 09:39:06 1.17
+++ ButtonPointer.e 2001/12/13 20:24:08 1.18
@@ -8,7 +8,7 @@
}
def traceln(msg) {
- println(msg)
+ stderr println(msg)
}
def editFile(file, varName, newValue) {
1.51 +8 -4 e/src/esrc/scripts/eBrowser.e
Index: eBrowser.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/eBrowser.e,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- eBrowser.e 2001/12/13 06:51:54 1.50
+++ eBrowser.e 2001/12/13 20:24:08 1.51
@@ -18,7 +18,6 @@
def ee__uriGetter := <import:org.erights.e.*>
-def elex := <unsafe:org.erights.e.elang.syntax.ELexer>
def eActionMaker := <unsafe:org.erights.e.ui.jed.EAction>
def eLogoURL := <resource:org/erights/e/icons/green-e-on-white-16.gif>
@@ -57,7 +56,7 @@
# set up tracing; stub out all the printing for operational version
-def traceln(str) { println(str) }
+def traceln(str) { stderr println(str) }
traceln("started")
def versionNumber := "0.3"
@@ -1110,6 +1109,7 @@
def acquireBrowseServerMaker() {
introducer onTheAir()
+ traceln("onTheAir: acquireBrowseServerMaker")
def tryAgain(e) {
traceln("trying to acquire server")
#<unsafe:org.erights.e.extern.timer.Timer> theTimer() after(10000,
@@ -1131,9 +1131,13 @@
# newest version put sync server in separate vat, same jvm
def makeFarSyncServer() {
introducer onTheAir()
+ traceln("onTheAir: makeFarSyncServer")
def vatMaker := <import:com.skyhunter.e.lang.vatMakerAuthor>(
- unsafe__uriGetter, introducer, println)
- def source := "<import:com.skyhunter.eBrowser.syncServerMakerAuthor> run(unsafe__uriGetter, stdout)"
+ unsafe__uriGetter, introducer, traceln)
+ def source :=
+ "def traceln(str) {stderr println(str)}
+ <import:com.skyhunter.eBrowser.syncServerMakerAuthor> run(traceln)"
+
def vat := vatMaker new(source, [], interp getProps(), "Sync Server Maker")
vat getRunner() setPriority(1)
def farSyncServerMaker := vat promisePrimordialObj()
1.16 +1 -1 e/src/esrc/scripts/eConfig.e
Index: eConfig.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/eConfig.e,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- eConfig.e 2001/11/11 23:32:16 1.15
+++ eConfig.e 2001/12/13 20:24:08 1.16
@@ -39,7 +39,7 @@
# set up tracing; stub out all the printing for operational version
-def traceln(str) { println(str) }
+def traceln(str) { stderr println(str) }
println("Starting E")
def System := <unsafe:java.lang.System>
1.3 +16 -16 e/src/esrc/scripts/eDesk.e
Index: eDesk.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/eDesk.e,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eDesk.e 2001/11/16 09:39:07 1.2
+++ eDesk.e 2001/12/13 20:24:08 1.3
@@ -12,7 +12,7 @@
# set up tracing; stub out all the printing for operational version
-def traceln(str) { println(str) }
+def traceln(str) { stderr println(str) }
traceln("started")
def versionNumber := "0.7"
@@ -337,7 +337,7 @@
navFrame setTitle(name)
} catch err{}
def mainPane := navFrame getContentPane()
-
+
#make the menus
def menuReactor {
to doNewWindow(){navigatorWindow dupWindow() }
@@ -368,21 +368,21 @@
])
])
navFrame setJMenuBar(menuBar)
-
+
def statusPanel := <swing:JLabel> new()
def setStatus(status) {statusPanel setText(status)}
def navPanelServer
-
+
def navPanelControllerMaker := <import:com.skyhunter.eDesk.navPanelControllerMakerAuthor> (
unsafe__uriGetter, awt__uriGetter, swing__uriGetter, println)
-
+
def navPanelController1
def navPanelController2
def navPanelController3
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, [])}
}
@@ -515,7 +515,7 @@
} catch prob {traceln("sourcefile prob in runcaplet: " + prob)}
}
to run(sourceFile, docRcvrs) {
-
+
def powerboxControllerMaker := <import:com.skyhunter.e.security.powerboxControllerMakerAuthor> run(
unsafe__uriGetter, file__uriGetter, interp, traceln, stdout)
traceln("made powerboxMaker")
@@ -537,7 +537,7 @@
traceln("returning image: " + image)
image
}
-
+
def powerboxController := powerboxControllerMaker new(
appDesc get("Name", sourceFile getCanonicalPath()),
findImage(), <file: appDesc["RunPath"]> getText())
@@ -638,12 +638,12 @@
#refreshLocal()
navFrame pack()
navFrame show()
-
+
def resetPathField() {
when (navPanelController1 getDiskNavRcvr() <- getCurrentPath()) -> done(path) {
fullPathTextField setText(path)
} catch prob {traceln("prob getting path" + prob)}
-
+
}
def navReactorForPathField {
to wentUp(c) {resetPathField()}
@@ -653,8 +653,8 @@
}
navPanelController1 addNavReactor(navReactorForPathField)
navPanelController1 setDiskNavRcvr(myDiskNavigator)
- resetPathField()
-
+ resetPathField()
+
def bind navigatorWindow {
#to getDiskNavigator(): any {diskNav1()}
to dupWindow() {
@@ -865,11 +865,11 @@
bind vow := result
} catch prob {
traceln("copyaction failure: " + prob + prob eStack())
- traceln("now trying backup strategy")
+ traceln("now trying backup strategy")
bind vow := farToFile <- getToCopier() <- copyEventually(forwarderMaker new(farFromFile),
fileProgressObserverMaker new("Copying " + fileName, farToFile),
forwarderMaker new(farToFile), forwarderMaker new(farFromFile))
-
+
}
when (vow) -> donevow(finished) {
traceln("vow resolved nicely")
@@ -1167,7 +1167,7 @@
def keyPair := introducer newVatIdentity()
introducer onTheAir()
def netConfig := introducer getNetConfig()
- def [bind sturdyConn, swissBase] :=
+ def [bind sturdyConn, swissBase] :=
sturdyRef incarnate(conn)
SerializerMaker recordFile(identityFile, [netConfig, keyPair, swissBase])
} else {
@@ -1187,7 +1187,7 @@
navigatorWindowMaker new(ftController, myHomeNavigator)
introducer onTheAir()
}
-
+
def getRemoteConnectionURI(): any {
var uri := null
def blah := eFrameMaker new("")
1.15 +2 -3 e/src/esrc/scripts/echat.e
Index: echat.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/echat.e,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- echat.e 2001/11/16 09:39:07 1.14
+++ echat.e 2001/12/13 20:24:08 1.15
@@ -19,9 +19,8 @@
# **********
# set up tracing; stub out all the printing for operational version
-def traceln(str) :any {
- println(str)
- str
+def traceln(str) {
+ stderr println(str)
}
# Ensure the user knows if he's using a clear, unencrypted connection
1.7 +1 -1 e/src/esrc/scripts/evalServer.e
Index: evalServer.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/evalServer.e,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- evalServer.e 2001/11/16 09:39:07 1.6
+++ evalServer.e 2001/12/13 20:24:08 1.7
@@ -2,7 +2,7 @@
def cmd__uriGetter := <import:org.erights.e.elang.cmd.*>
def cmdMakerMaker := <cmd:cmdMakerMaker>
-# def traceln(str) { println("\n", `evalServer $str`) }
+# def traceln(str) { stderr println("\n", `evalServer $str`) }
def traceln(str) {}
traceln("started")
1.19 +1 -1 e/src/esrc/scripts/updoc.e
Index: updoc.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/updoc.e,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- updoc.e 2001/12/13 06:51:54 1.18
+++ updoc.e 2001/12/13 20:24:08 1.19
@@ -1,6 +1,6 @@
#!/usr/bin/env e
-# def traceln(str) { println("\n", `updoc $str`) }
+# def traceln(str) { stderr println("\n", `updoc $str`) }
def traceln(str) {}
traceln("started")