X-Git-Url: http://git.hcoop.net/clinton/parenscript.git/blobdiff_plain/f5d36fb80deafa96b8130aade39d8033b5f11dd8..cb8f8e58295db370220ad7c2f0f3d8d48fdc2442:/src/compilation-interface.lisp

diff --git a/src/compilation-interface.lisp b/src/compilation-interface.lisp
dissimilarity index 97%
index ec1dce6..e148901 100644
--- a/src/compilation-interface.lisp
+++ b/src/compilation-interface.lisp
@@ -1,102 +1,35 @@
-(in-package :parenscript)
-
-(defmacro with-new-compilation-environment ((var) &body body)
-  `(let* ((,var (make-basic-compilation-environment))
-	  (*compilation-environment* ,var))
-    ,@body))
-    
-(defun translate-ast (compiled-expr
-		      &key
-		      (comp-env *compilation-environment*)
-		      (output-stream *standard-output*)
-		      (output-spec :javascript)
-		      (pretty-print t))
-  "Translates a compiled Parenscript program (compiled with COMPILE-PAREN-FORM)
-to a Javascript string.  Outputs to the stream OUTPUT-STREAM in the language given
-by OUTPUT-SPEC, pretty printing if PRETTY-PRINT is non-null.
-
-OUTPUT-SPEC must be :javascript at the moment."
-  (declare (ignore comp-env))
-  (when (not (eql :javascript output-spec))
-    (error "Unsupported output-spec for translation: ~A" output-spec))
-  (when (eql :javascript output-spec)
-;    (if (not pretty-print)
-;	(js-translate compiled-expr :statement output-stream)
-	(write-string (string-join
-		       (ps-js::js-to-statement-strings compiled-expr 0)
-		       (string #\Newline))
-		      output-stream)))
-
-(defun non-nil-comp-env ()
-  "Returns a sane compilation environment.  Either the one currently bound or a new
-one."
-  (or *compilation-environment*
-      (make-basic-compilation-environment)))
-
-
-(defun compile-script (script-form
-		       &key
-		       (output-spec :javascript)
-		       (pretty-print t)
-		       (output-stream nil)
-		       (toplevel-p t)
-		       (comp-env (non-nil-comp-env)))
-  "Compiles the Parenscript form SCRIPT-FORM into the language specified by OUTPUT-SPEC.
-Non-null PRETTY-PRINT values result in a pretty-printed output code.  If OUTPUT-STREAM
-is NIL, then the result is a string; otherwise code is output to the OUTPUT-STREAM stream.
-COMP-ENV is the compilation environment in which to compile the form.
-
-This is the main function used by Parenscript users to compile their code to Javascript (and
-potentially other languages)."
-  (macrolet ((with-output-stream ((var) &body body)
-	       `(if (null output-stream)
-		 (with-output-to-string (,var)
-		   ,@body)
-		 (let ((,var output-stream))
-		   ,@body))))
-    ;; we might want to bind this rather than set it
-    (setf (comp-env-compiling-toplevel-p comp-env) toplevel-p)
-    (with-output-stream (stream)
-      (let* ((*compilation-environment* comp-env)
-	     (compiled (let ((first-result (compile-parenscript-form comp-env script-form)))
-                         (if (not toplevel-p)
-                             first-result
-                             (progn
-                               (setf (comp-env-compiling-toplevel-p comp-env) nil)
-                               (compile-parenscript-form comp-env first-result))))))
-	(translate-ast
-	 compiled
-;	 (compile-script-form script-form :comp-env comp-env)
-	 :comp-env comp-env
-	 :output-stream stream
-	 :output-spec output-spec
-	 :pretty-print pretty-print)))))
-
-(defun ps-to-string (expr)
-  "Given an AST node, compiles it to a Javascript string."
-  (string-join
-   (ps-js::js-to-statement-strings (compile-script-form expr) 0)
-   (string #\Newline)))
-
-;;; SEXPs -> Javascript string functionality
-(defmacro script (&body body)
-  "A macro that returns a Javascript string of the supplied Parenscript forms."
-  `(script* '(progn ,@body)))
-
-(defun script* (&rest body)
-  "Return the javascript string representing BODY.
-Body is evaluated."
-  (compile-script `(progn ,@body)))
-
-;;; Handy synonyms
-(defmacro ps (&body body)
-  `(script ,@body))
-
-(defmacro ps* (&body body)
-  `(script* ,@body))
-
-(defmacro js (&body body)
-  `(script ,@body))
-
-(defmacro js* (&body body)
-  `(script* ,@body))
+(in-package :parenscript)
+
+(defmacro ps (&body body)
+  "Given Parenscript forms (an implicit progn), compiles those forms
+to a JavaScript string at macro-expansion time."
+  `(concatenate 'string ,@(parenscript-print (compile-parenscript-form `(progn ,@body) :expecting :statement))))
+
+(defmacro ps-doc (&body body)
+  "Expands Parenscript forms in a clean environment."
+  (let ((*ps-gensym-counter* 0)
+        (*ps-special-variables* nil))
+     (macroexpand-1 `(ps ,@body))))
+
+(defun ps1* (ps-form)
+  (apply #'concatenate 'string
+         (mapcar (lambda (x)
+                   (if (stringp x)
+                       x
+                       (eval x)))
+                 (parenscript-print (compile-parenscript-form ps-form :expecting :statement)))))
+
+(defun ps* (&rest body)
+  "Compiles BODY to a JavaScript string.
+Body is evaluated."
+  (ps1* `(progn ,@body)))
+
+(defvar *js-inline-string-delimiter* #\"
+  "Controls the string delimiter char used when compiling Parenscript in ps-inline.")
+
+(defun ps-inline* (form &optional (*js-string-delimiter* *js-inline-string-delimiter*))
+  (concatenate 'string "javascript:" (ps1* form)))
+
+(defmacro ps-inline (form &optional (string-delimiter '*js-inline-string-delimiter*))
+  `(let ((*js-string-delimiter* ,string-delimiter))
+     (concatenate 'string "javascript:" ,@(parenscript-print (compile-parenscript-form form :expecting :statement)))))