Changeset 552

Timestamp:

06/19/08 10:37:38 (5 months ago)

Author:

weyrick

Message:

add optional readline support to php interactive mode

Files:

• trunk/pcc/compiler/Makefile (modified) (3 diffs)
• trunk/pcc/compiler/commandline.scm (modified) (4 diffs)
• trunk/pcc/compiler/pdb.scm (modified) (1 diff)
• trunk/pcc/compiler/target.scm (modified) (1 diff)

trunk/pcc/compiler/Makefile

@@ -2 +2 @@
-include $(PCC_ROOT)/bigloo-rules.mk
-
-
+$(READLINE_SRFI)
-CCOMMONFLAGS    = -I. -I$(BGL_DEFAULT_LIB_DIR) 
-
@@ -53 +53 @@
-
-pcc_$(SU): $(PHPEVAL_LIBS) $(C_POPULATION)  commandline_$(SU).o
-
+$(READLINE_BL_LIB)
-
-pcc: pcc_$(SU)
@@ -116 +116 @@
-        cp pdb_$(SU) pdb
-
-# we have to override these to add in READLINE_BL_LIB if it's available, since we can't do it
-# conditionally in the module clause
-pdb_s.o: pdb.scm
-        $(BIGLOO) $(BSAFEFLAGS) $(READLINE_BL_LIB) $(READLINE_SRFI) $(BIGLOO_PIC)  -c pdb.scm -o pdb_s.o
-pdb_u.o: pdb.scm
-        $(BIGLOO) $(BUNSAFEFLAGS) $(READLINE_BL_LIB) $(READLINE_SRFI) $(BIGLOO_PIC)  -c pdb.scm -o pdb_u.o

trunk/pcc/compiler/commandline.scm

@@ -23 +23 @@
-   (include "php-runtime.sch")
-   (library profiler)
+   (cond-expand
+      (HAVE_LIBREADLINE (library pcc-rl)))
-   (import (driver "driver.scm")
-           (declare "declare.scm")
@@ -137 +139 @@
-        (if (maybe-add-script-argv "-a")
-            (begin
+               (cond-expand (HAVE_LIBREADLINE (history-init)))
+               (add-target-option! pcc-prompt-display: pcc-prompt-display)
+               (add-target-option! pcc-readline: pcc-readline)
-               (widen!::php-repl-target *current-target*))))
-       
@@ -497 +502 @@
-        (exit 1)))))
-
+; used in interactive mode
+(define (pcc-prompt-display)
+   (cond-expand (HAVE_LIBREADLINE #f)
+                (else
+                 (display "\npcc > "))))
+
+(define (pcc-readline)
+   (let ((cmd (cond-expand (HAVE_LIBREADLINE
+                            (readline "pcc > "))
+                           (else
+                            (read-line)))))
+      (cond-expand (HAVE_LIBREADLINE
+                    (when (string? cmd)
+                       (history-add cmd))))
+      cmd))
+;
-
-(define (usage-header)
@@ -503 +524 @@
-           "Usage: pcc [options] <input-files> [-- script args]"
-           "see pcc -h for help with command line options"))
-
-
-

trunk/pcc/compiler/pdb.scm

@@ -22 +22 @@
-(module pcc-debugger
-   (library php-runtime)
+   (cond-expand
+      (HAVE_LIBREADLINE (library pcc-rl)))
-   (include "php-runtime.sch")
-   (library profiler)

trunk/pcc/compiler/target.scm

@@ -140 +140 @@
-(define-method (build-target target::php-repl-target)
-   (with-access::php-repl-target target (options)
-
+
+
+
-                                               *dynamic-load-path*)))
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-           (display* "pcc > "
-           (let ((input (read-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-        (print
+
+
+
+
+
+
+
+
+
+
+
+    (pcc-prompt-display
+    (let ((input (pcc-read
+
+
+
+
+
+
+
+
+
+
+
+ (print)
-
-(define-method (build-target target::scheme-repl-target)