small cleanups

pinocchio · Jan 20, 2014 · 0994481 · 0994481
1 parent e71515f
commit 0994481
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 11 deletions.
diff --git a/repository/Pinocchio.package/PDebugger.class/instance/compile..st b/repository/Pinocchio.package/PDebugger.class/instance/compile..st
@@ -1,4 +1,4 @@
-shelling
+shell
 compile: code
 	| method |
 	method := 'method', String lf, code.

diff --git a/repository/Pinocchio.package/PDebugger.class/instance/debugShellWithAction..st b/repository/Pinocchio.package/PDebugger.class/instance/debugShellWithAction..st
@@ -14,7 +14,7 @@ debugShellWithAction: action
 			^ result ].
 	input = 'i'
 		ifTrue:
-			[ PStreamInspector inspect: self currentSelf. ^ self debugShellWithAction: action ].
+			[ self currentSelf inspect. PVTermOutputDriver stdout lf. ^ self debugShellWithAction: action ].
 	input = 'j'
 		ifTrue:
 			[ stepBlock := self skipBlock: 2. ^ action value ]
diff --git a/repository/Pinocchio.package/PDebugger.class/instance/displayPrompt.st b/repository/Pinocchio.package/PDebugger.class/instance/displayPrompt.st
@@ -1,3 +1,3 @@
-shelling
+shell
 displayPrompt
 	PVTermOutputDriver stdout << 'pidb> '
diff --git a/repository/Pinocchio.package/PDebugger.class/instance/interpretFromStdin.st b/repository/Pinocchio.package/PDebugger.class/instance/interpretFromStdin.st
@@ -1,3 +1,5 @@
-shelling
+shell
 interpretFromStdin
-	^ self interpretLine: PFile stdin readLine
+	| readline |
+	readline := PReadLine from: PFile stdin to: PVTermOutputDriver stderr for: self.
+	^ self interpretLine: readline readLine. 
diff --git a/repository/Pinocchio.package/PDebugger.class/instance/interpretLine..st b/repository/Pinocchio.package/PDebugger.class/instance/interpretLine..st
@@ -1,4 +1,4 @@
-shelling
+shell
 interpretLine: code
 	(code = 's' or: [ code = 'o' or: [ code = 'i' or: [ code = 'j']]])
 		ifTrue: [ ^ escapeShell value: code ].

diff --git a/repository/Pinocchio.package/PDebugger.class/instance/isReady..st b/repository/Pinocchio.package/PDebugger.class/instance/isReady..st
@@ -0,0 +1,3 @@
+shell
+isReady: code
+	^ true
diff --git a/repository/Pinocchio.package/PDebugger.class/instance/parsesUntil..st b/repository/Pinocchio.package/PDebugger.class/instance/parsesUntil..st
@@ -0,0 +1,6 @@
+shell
+parsesUntil: code
+	[ PSmalltalkGrammar instance parseStatements: code ]
+		on: PEGParsingFailure
+		do: [ :ex | ex input atEnd ifFalse: [ ^ ex input position ] ].
+	^ nil
diff --git a/repository/Pinocchio.package/PDebugger.class/instance/print..st b/repository/Pinocchio.package/PDebugger.class/instance/print..st
@@ -1,3 +1,3 @@
-shelling
+shell
 print: msg
 	self indent. (PVTermOutputDriver stderr) << msg; lf.
diff --git a/repository/Pinocchio.package/PDebugger.class/instance/shell.st b/repository/Pinocchio.package/PDebugger.class/instance/shell.st
@@ -1,4 +1,4 @@
-shelling
+shell
 shell
 	escapeShell := [ :input | ^ input ].
 	true whileTrue: [ 

diff --git a/repository/Pinocchio.package/PDebugger.class/methodProperties.json b/repository/Pinocchio.package/PDebugger.class/methodProperties.json
@@ -3,13 +3,15 @@
 		 },
 	"instance" : {
 		"compile:" : "ToonVerwaest 9/7/2010 17:13",
-		"debugShellWithAction:" : "ToonVerwaest 8/6/2010 16:57",
+		"debugShellWithAction:" : "ToonVerwaest 10/14/2010 06:52",
 		"defaultStepBlock" : "DavidGurtner 4/28/2010 13:27",
 		"displayPrompt" : "ToonVerwaest 8/13/2010 15:22",
 		"executeAction:" : "DavidGurtner 4/28/2010 14:05",
 		"indent" : "ToonVerwaest 8/13/2010 15:22",
-		"interpretFromStdin" : "ToonVerwaest 8/6/2010 16:42",
+		"interpretFromStdin" : "ToonVerwaest 10/14/2010 06:43",
 		"interpretLine:" : "DavidGurtner 4/28/2010 14:02",
+		"isReady:" : "ToonVerwaest 10/14/2010 06:45",
+		"parsesUntil:" : "ToonVerwaest 10/14/2010 06:46",
 		"perror:" : "ToonVerwaest 8/6/2010 16:55",
 		"print:" : "ToonVerwaest 8/13/2010 15:22",
 		"printStacktrace" : "DavidGurtner 3/26/2010 00:00",

diff --git a/repository/Pinocchio.package/monticello.meta/version b/repository/Pinocchio.package/monticello.meta/version