Changeset 551

Timestamp:

06/18/08 11:58:46 (5 months ago)

Author:

weyrick

Message:

don't bail on parse errors in php interactive mode. part of #3598

Files:

• trunk/pcc/compiler/driver.scm (modified) (4 diffs)
• trunk/pcc/compiler/evaluate.scm (modified) (1 diff)
• trunk/pcc/compiler/target.scm (modified) (1 diff)

trunk/pcc/compiler/driver.scm

@@ -56 +56 @@
-    (dump-flow input-file)
-    (dump-preprocessed input-file)
+    (php-repl-eval code)
-    (interpret input-file)
-    (debug input-file)
@@ -640 +641 @@
-    (with-input-from-string (string-append "<?php " (mkstr code) " ?>")
-       (lambda ()
- : eval()'d code" *PHP-FILE* (mkstr *PHP-LINE*)
+: eval()'d code" *PHP-FILE*
-          ))))
-
+(define (php-repl-token-error escape proc msg token)
+   (let ((outmsg (format "~%~a" msg)))
+      (fprint (current-error-port) outmsg)
+      (escape 'nop)))
+
+(define (php-repl-eval code)
+   (evaluate
+    (with-input-from-string (string-append "<?php " (mkstr code) " ?>")
+       (lambda ()
+          (%do-parse (read-string) 'php-repl "Interactive Shell: " php-repl-token-error)
+          ))))
-
-(define (evaluate-from-file file name-to-use)
@@ -707 +719 @@
-(define %%memoized-parses #f)
-
+(define (%do-parse input-string main-name filename handler)
+   (with-input-from-string input-string
+      (lambda ()
+         (try (parse (php-preprocess (current-input-port) filename)
+                     main-name filename)
+              handler))))
+
-(define (%memoized-parse input-string main-name filename)
-   ;; save the result of parsing a file so that we can skip parsing it next time
@@ -712 +731 @@
-                      ;(debug-trace 0 "Parsing " filename " for the first time")
-                      (set! %%memo-miss-count (+ %%memo-miss-count 1))
-
-
-
-
-
+
-      ;; I think that memoization will only help when running as a web
-      ;; server, because it only speeds up the 2nd and subsequent

trunk/pcc/compiler/evaluate.scm

@@ -100 +100 @@
-      ((list? node) (evaluate-block node))
-      ((eqv? node :next) :next)
+      ((eqv? node 'nop) #t) ; bad parse in interactive mode
-      (else (error 'evaluate "Don't know what to do with node: "
-                   (with-output-to-string

trunk/pcc/compiler/target.scm

@@ -160 +160 @@
-                          (try
-                           (begin
-
+repl-
-                              (print))
-                           (lambda (e p m o)