X-Git-Url: http://git.hcoop.net/clinton/parenscript.git/blobdiff_plain/7590646c235e00a07b693400a46c27119c2f27ef..1e8ddaee0ed20bffcb7ecb65203ee3d8725d2c1b:/src/package.lisp

diff --git a/src/package.lisp b/src/package.lisp
dissimilarity index 78%
index 12d28dd..4e04212 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -1,307 +1,376 @@
-(in-package :cl-user)
-;;;; Package definitions for the Parenscript 
-;; #: 
-
-(eval-when (:compile-toplevel :load-toplevel)
-  ;; exports shared between PARENSCRIPT and PARENSCRIPT.JAVASCRIPT
-  (defparameter *shared-symbols-ps-js*
-    '(
-      ;; literals
-      #:t
-      #:f
-      #:true
-      #:nil
-      #:this
-      #:false
-      #:undefined
-      
-      ;; keywords
-      #:break
-      #:continue
-      
-      ;; array literals
-      #:array
-      #:list
-      #:aref
-      #:make-array
-      
-      ;; operators
-      #:! #:not #:~
-      #:* #:/ #:%
-      #:+ #:-
-      #:<< #:>>
-      #:>>>
-      #:< #:> #:<= #:>=
-      #:in
-      #:eql #:== #:!= #:=
-      #:=== #:!==
-      #:&
-      #:^
-      #:\|
-      #:\&\& #:and
-      #:\|\| #:or
-      #:>>= #:<<=
-      #:*= #:/= #:%= #:+= #:\&= #:^= #:\|= #:~=
-      #:++ #:--
-      #:1+ #:1-
-      #:incf #:decf
-      
-      ;; body forms
-      #:progn
-      
-      ;; function definition
-      #:defun
-      #:lambda
-      
-      ;; object literals
-      #:create
-      #:slot-value
-      #:with-slots
-      
-      ;; macros
-      #:macrolet
-      #:symbol-macrolet
-      
-      ;; if
-      #:if
-      #:when
-      #:unless
-      
-      ;; single argument statements
-      #:return
-      #:throw
-      
-      ;; single argument expressions
-      #:delete
-      #:void
-      #:typeof
-      #:instanceof
-      #:new
-      
-      ;; assignment
-      #:setf
-      
-      ;; variables
-      #:defvar
-      
-      ;; iteration
-      #:for
-      #:doeach
-      #:while
-      
-      ;; with
-      #:with
-      
-      ;; case
-      #:switch
-      #:case
-      #:default
-      
-      ;; try throw catch
-      #:try
-      
-      ;; regex literals
-      #:regex
-      
-      ;; conditional compilation (IE)
-      #:cc-if)
-    "Symbols exported from both the Parenscript and Javascript packages 
-that are also valid as Parenscript symbols for the corresponding script packages."))
-
-  
-
-(defpackage parenscript.javascript
-  (:use :common-lisp)
-  (:nicknames javascript ps-js)
-  #.(cons :export *shared-symbols-ps-js*)
-  (:export
-   ;; translate
-   #:js-to-strings
-   #:js-to-statement-strings
-   )
-  (:documentation "The package used to define Javascript special forms.  Most of Parenscript
-is defined as macros on top of Javascript special forms"))
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defparameter *parenscript-lang-exports*
-    (append 
-     *shared-symbols-ps-js*
-     '(
-       ;; package system
-       #:defpackage
-       #:in-package
-
-       ;; eval-when
-       #:eval-when
-       ;; macros
-       #:macrolet
-       #:symbol-macrolet
-       
-       ;; lisp eval
-       #:lisp
-       
-       ;; assignment
-       #:setf
-       
-       #:let
-       
-       ;; iteration
-       #:do
-       #:dotimes
-       #:dolist
-       #:doeach
-       #:while
-       
-       ;; v v v STUFF WE SHOULD PROBABLY MOVE TO OTHER LIBS v v v
-       
-       ;; CSS
-       #:css
-       #:css-to-string
-       #:css-inline
-       #:css-file
-
-       ;; html generator for javascript
-       #:html
-       ))
-    "List of (uninterned) symbols. Contains all symbols considerred
-part of the Parenscript language.  These should be exported within
-both the Lisp package and the script package for Parenscript."))
-
-(defpackage :parenscript
-  (:use :common-lisp :parenscript.javascript)
-  (:nicknames :js :ps)
-  #.(cons :export *shared-symbols-ps-js*)
-  #.(cons :export *parenscript-lang-exports*)
-  (:export
-   ;; compiler
-   #:compile-script
-   #:compile-script-file
-   #:compile-parenscript-file
-   #:compile-parenscript-file-to-string
-   #:script
-   #:script*
-   #:ps
-   #:ps*
-   #:with-new-compilation-environment ; tentative
-   #:with-compilation-environment     ; tentative
-   #:*compilation-environment*
-   
-   ;; package system
-   #:*enable-package-system*
-   #:find-script-package
-   #:script-intern
-   #:script-export
-   #:find-script-symbol
-   #:comp-env-current-package
-   #:symbol-script-package
-   #:script-package-name
-   
-   ;; for parenscript macro definition within lisp
-   #:defscriptmacro
-   #:defpsmacro ; should we use one or the other of these?
-   #:defmacro/js
-   #:defmacro+js
-   #:import-macros-from-lisp
-   
-   ;; gensym
-   #:with-unique-ps-names
-   #:gen-script-name
-   #:gen-script-name-string
-   #:gen-ps-name
-
-   ;; deprecated interface
-   #:gen-js-name
-   #:gen-js-name-string
-   #:with-unique-js-names
-   #:defjsmacro
-   #:js-compile
-   #:js ; replaced by #:script
-   #:js*
-   #:js-inline
-   #:js-inline*
-   #:js-file
-   #:js-script
-   #:js-to-strings
-   #:js-to-statement-strings
-   #:js-to-string
-   #:js-to-line
-   ))
-
-(in-package :parenscript)
-(import 
- '(defscriptclass
-   define-script-special-form
-   defscriptmacro
-   symbol-to-js
-   script-quote
-   *package-prefix-style*
-   *script-macro-env*
-   compile-to-statement
-   compile-to-block
-   compile-to-symbol
-   compile-to-expression
-   symbol-script-package
-   script-package-name
-   list-join
-   list-to-string
-   append-to-last
-   prepend-to-first
-   string-join
-   val-to-string
-   string-split
-   script-special-form-p
-   make-macro-env-dictionary
-   script-equal
-   compile-script-form
-   ) 
- :parenscript.javascript)
-
-(defpackage parenscript.reader
-  (:nicknames parenscript-reader)
-  (:use :common-lisp :parenscript)
-  (:shadow #:readtablep
-           #:readtable-case
-           #:copy-readtable
-           #:get-macro-character
-           #:get-dispatch-macro-character
-           #:set-macro-character
-           #:set-dispatch-macro-character
-           #:make-dispatch-macro-character
-           #:set-syntax-from-char
-           #:read-preserving-whitespace
-           #:read
-           #:read-from-string
-           #:read-delimited-list
-           #:backquote-comma-dot
-           #:backquote
-           #:backquote-comma
-           #:backquote-comma-at
-           
-           #:*read-eval*
-           #:*read-base*
-           #:*read-default-float-format*
-           #:*read-suppress*
-           #:*readtable*
-           #:*read-suppress*
-           #:*reader-error*
-           #:*read-suppress*
-           
-           #:readtable
-           #:backquote
-           #:reader-error)
-  (:export
-    #:read
-    #:read-from-string
-    #:read-delimited-list)
-  (:documentation "The Parenscript reader.  Used for reading Parenscript
-forms."))
-
-(defpackage parenscript.global
-  (:nicknames "GLOBAL")
-  (:documentation "Symbols interned in the global package are serialized in Javascript
-as non-prefixed identifiers."))
-
-(defpackage parenscript.user
-  (:use :parenscript)
-  (:nicknames ps-user paren-user parenscript-user)
-  (:documentation "The default package a user is inside of when compiling code."))
\ No newline at end of file
+(in-package "CL-USER")
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defparameter *parenscript-lang-exports*
+    '(;; literals
+      #:t
+      #:f
+      #:true
+      #.(symbol-name 'nil) ; for case-sensitive Lisps like some versions of Allegro
+      #:this
+      #:false
+      #:undefined
+      #:{}
+
+      ;; keywords
+      #:break
+      #:continue
+
+      ;; array literals
+      #:array
+      #:list
+      #:aref
+      #:elt
+      #:make-array
+      #:[]
+
+      ;; operators
+      #:! #:not #:~
+      #:* #:/ #:%
+      #:+ #:-
+      #:<< #:>>
+      #:>>>
+      #:< #:> #:<= #:>=
+      #:in
+      #:== #:!= #:=
+      #:=== #:!==
+      #:&
+      #:^
+      #:\|
+      #:\&\& #:and
+      #:\|\| #:or
+      #:>>= #:<<=
+      #:*= #:/= #:%= #:+= #:\&= #:^= #:\|= #:~=
+      #:incf #:decf
+      
+      ;; compile-time stuff
+      #:eval-when
+
+      ;; body forms
+      #:progn
+
+      ;; object literals
+      #:create
+      #:with-slots
+
+      ;; if
+      #:if
+      #:when
+      #:unless
+
+      ;; single argument statements
+      #:return
+      #:throw
+
+      ;; single argument expressions
+      #:delete
+      #:void
+      #:typeof
+      #:instanceof
+      #:new
+
+      ;; assignment and binding
+      #:setf
+      #:defsetf
+      #:psetf
+      #:setq
+      #:psetq
+      #:let*
+      #:let
+
+      ;; variables
+      #:var
+      #:defvar
+
+      ;; iteration
+      #:labeled-for
+      #:for
+      #:for-in
+      #:while
+      #:do
+      #:do*
+      #:dotimes
+      #:dolist
+      #:loop
+
+      ;; with
+      #:with
+
+      ;; case
+      #:switch
+      #:case
+      #:default
+
+      ;; try throw catch
+      #:try
+
+      ;; regex literals
+      #:regex
+
+      ;; conditional compilation (IE)
+      #:cc-if
+
+      ;; function definition
+      #:defun
+      #:lambda
+      #:labels
+
+      ;; lambda lists
+      #:&key
+      #:&rest
+      #:&body
+      #:&optional
+      #:&aux
+      #:&environment
+      #:&key-object
+
+      ;; slot access
+      #:with-slots
+      #:slot-value
+
+      ;; macros
+      #:macrolet
+      #:symbol-macrolet
+      #:define-symbol-macro
+      #:define-ps-symbol-macro
+      #:defmacro
+
+      ;; lisp eval
+      #:lisp
+
+      ;; v v v STUFF WE SHOULD PROBABLY MOVE TO OTHER LIBS v v v
+
+      ;; html generator for javascript
+      #:*ps-html-empty-tag-aware-p*
+      #:*ps-html-mode*
+      #:ps-html
+      #:who-ps-html
+
+      ;; utils
+      #:do-set-timeout
+      #:max
+      #:min
+      #:floor
+      #:ceiling
+      #:round
+      #:sin
+      #:cos
+      #:tan
+      #:asin
+      #:acos
+      #:atan
+      #:pi
+      #:sinh
+      #:cosh
+      #:tanh
+      #:asinh
+      #:acosh
+      #:atanh
+      #:1+
+      #:1-
+      #:abs
+      #:evenp
+      #:oddp
+      #:exp
+      #:expt
+      #:log
+      #:sqrt
+      #:random
+      #:ignore-errors
+      #:concatenate
+      #:concat-string
+      #:length
+      #:defined
+      #:undefined
+      #:@
+      #:chain
+      #:with-lambda
+      #:stringp
+      #:numberp
+      #:functionp
+      #:objectp
+      #:memoize
+      #:append
+      #:apply
+      #:destructuring-bind
+
+      ;; DOM accessing utils
+      #:inner-html
+      #:uri-encode
+      #:attribute
+      #:offset
+      #:scroll
+      #:inner
+      #:client
+      
+      ;; js runtime utils
+      #:*ps-lisp-library*
+      #:mapcar
+      #:map-into
+      #:map
+      #:map-until
+      #:member
+      #:append
+      #:set-difference
+      ))
+  (defparameter *parenscript-interface-exports*
+    '(;; compiler
+      #:*js-target-version*
+      #:compile-script
+      #:ps
+      #:ps-to-stream
+      #:ps-doc
+      #:ps-doc*
+      #:ps*
+      #:ps-inline
+      #:ps-inline*
+      #:*ps-read-function*
+      #:ps-compile-file
+      #:ps-compile-stream
+      ;; for parenscript macro definition within lisp
+      #:defpsmacro
+      #:defmacro/ps
+      #:defmacro+ps
+      #:import-macros-from-lisp
+
+      ;; gensym
+      #:ps-gensym
+      #:with-ps-gensyms
+      #:ps-once-only
+      #:*ps-gensym-counter*
+
+      ;; naming and namespaces
+      #:ps-package-prefix
+      #:obfuscate-package
+      #:unobfuscate-package
+
+      ;; printer
+      #:symbol-to-js-string
+      #:*js-string-delimiter*
+      #:*js-inline-string-delimiter*
+      #:*ps-print-pretty*
+      #:*indent-num-spaces*
+      ))
+  (defparameter *parenscript-interface-deprecated-exports*
+    '(;; deprecated interface
+      #:define-script-symbol-macro
+      #:gen-js-name
+      #:with-unique-js-names
+      #:defjsmacro
+      #:js-compile
+      #:js-inline
+      #:js-inline*
+      #:js
+      #:js*
+      #:symbol-to-js
+      ))
+
+  (defparameter *javascript-exports*
+    '(;;; for representing js code as s-expressions
+
+      ;; operators
+      ; arithmetic
+      #:+
+      #:-
+      #:*
+      #:/
+      #:%
+
+      ; bitwise
+      #:&
+      #:|\||
+      #:^
+      #:~
+      #:>>
+      #:<<
+      #:>>>
+
+      ; assignment
+      #:=
+      #:+=
+      #:-=
+      #:*=
+      #:/=
+      #:%=
+      #:&=
+      #:\|=
+      #:^+
+      #:>>=
+      #:<<=
+      #:>>>=
+
+      ; increment/decrement
+      #:++
+      #:--
+
+      ; comparison
+      #:==
+      #:===
+      #:!=
+      #:!==
+      #:>
+      #:>=
+      #:<
+      #:<=
+
+      ; logical
+      #:&&
+      #:||||
+      #:!
+      
+      ; misc
+      #:? ; ternary
+      #:|,|
+      #:delete
+      #:function
+      #:get
+      #:in
+      #:instanceof
+      #:new
+      #:this
+      #:typeof
+      #:void
+      #:null
+      
+
+      ;; statements
+      #:block
+      #:break
+      #:continue
+      #:do-while
+      #:for
+      #:for-in
+      #:if
+      #:label
+      #:return
+      #:switch
+      #:throw
+      #:try
+      #:var
+      #:while
+      #:with
+
+      
+      #:unary-operator
+      #:literal
+      #:array
+      #:aref
+      #:operator
+      #:cond
+      #:lambda
+      #:object
+      #:variable
+      #:slot-value
+      #:escape
+      ))
+  )
+
+(defpackage "PARENSCRIPT"
+  (:use "COMMON-LISP" "ANAPHORA")
+  (:nicknames "JS" "PS")
+  #.(cons :export *parenscript-lang-exports*)
+  #.(cons :export *parenscript-interface-exports*)
+  #.(cons :export *parenscript-interface-deprecated-exports*)
+  #.(cons :export *javascript-exports*)
+  )
+