diff --git a/demos/robot/source/assembly.lisp b/demos/robot/source/assembly.lisp index 20f38ac1fd2fc4754d084df1c96cfceba0440e0e..c644c69cf923ac2d21c5a6e212d5e529efa446cc 100755 --- a/demos/robot/source/assembly.lisp +++ b/demos/robot/source/assembly.lisp @@ -48,6 +48,9 @@ to the src/ directory distributed with GDL. (torso-type 'box :settable) (height 10 :settable) (head-angle 0 :settable) + + (body-angle 20 :settable) + #+nil (body-angle (let ((angle (or (parse-integer (progn ;;(format t "~&Enter a number for body angle: ~%") (let ((data (read-line))) (print-variables data) diff --git a/gendl.asd b/gendl.asd index 5c03e69a00c8f8bd9253019ba0c35f5007416019..abf00ec1c01502169c1b47ef24dde0646b11e4d2 100644 --- a/gendl.asd +++ b/gendl.asd @@ -4,7 +4,7 @@ "The Gendl® gendl Subsystem" :author "Genworks International" :license "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t :version "20180115" :depends-on - (:bordeaux-threads :uiop #-allegro :babel #-allegro :quri #-allegro :zacl :cl-lite :gwl-graphics :tasty :robot :yadd) + (:bordeaux-threads :uiop #-allegro :babel #-allegro :quri :cl-lite :gwl-graphics :tasty :robot :yadd) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #+asdf-unicode :defsystem-depends-on #+asdf-unicode () #+asdf-encodings :encoding #+asdf-encodings :utf-8 diff --git a/glisp/defsystem-depends-on.isc b/glisp/defsystem-depends-on.isc deleted file mode 100644 index 1607ffdfe8774084a2482b415bd2b463e9b82b14..0000000000000000000000000000000000000000 --- a/glisp/defsystem-depends-on.isc +++ /dev/null @@ -1 +0,0 @@ -"#-(or allegro ccl sbcl) :acl-compat #+(or ccl sbcl) :zacl" \ No newline at end of file diff --git a/glisp/depends-on.isc b/glisp/depends-on.isc index f54370c7dd2316de324f63c29fb923fdb57e6e25..de0bbb4e6d11c99c15b3cd709217f9c18064c7f3 100644 --- a/glisp/depends-on.isc +++ b/glisp/depends-on.isc @@ -1 +1 @@ -"(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :zacl)" +"(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel)" diff --git a/glisp/glisp.asd b/glisp/glisp.asd index 2288c67081db4472227061c4a8d7bca433fb72b2..476ad3d1c33fae9ccfcb029e7de902a6d82918be 100644 --- a/glisp/glisp.asd +++ b/glisp/glisp.asd @@ -7,9 +7,6 @@ :version "20170828" :depends-on ;;(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :zacl) (:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel) - ;;#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings #-(or allegro ccl sbcl) :acl-compat #+(or ccl sbcl) :zacl) - ;;#+asdf-unicode :defsystem-depends-on #+asdf-unicode (#-(or allegro ccl sbcl) :acl-compat #+(or ccl sbcl) :zacl) - ;;#+asdf-encodings :encoding #+asdf-encodings :utf-8 :components ((:file "source/presets") (:file "source/parameters") (:file "source/genworks") (:file "source/initialize") diff --git a/glisp/source/genworks.lisp b/glisp/source/genworks.lisp index 0843198c175a931720ba94fca22253d6fcd00637..33c1d5d66a0c35c255b5ee3fc892eb893230d1e6 100644 --- a/glisp/source/genworks.lisp +++ b/glisp/source/genworks.lisp @@ -428,10 +428,7 @@ the \"current\" error." ) -(defun local-port (socket) - (#+(or allegro zacl) socket:local-port - #-(or allegro zacl abcl) acl-compat.socket:local-port - #+abcl #'(lambda(socket) (declare (ignore socket) 0)) socket)) + #+nil @@ -495,16 +492,10 @@ are no longer supported by glisp:match-regexp.~%")) (when if-does-not-exist-error? (error "~&The File `~a' does not exist.~%" pathname)))) -(defun remote-host (socket) - #+(or allegro zacl) (socket:remote-host socket) - #-(or allegro zacl abcl) (acl-compat.socket:remote-host socket)) -;; -;; FLAG -- add abcl -;; -(defun local-host (socket) - #+(or allegro zacl) (socket:local-host socket) - #-(or allegro zacl abcl) (acl-compat.socket:local-host socket)) + + + (defun replace-regexp (string regexp to-string) @@ -685,17 +676,10 @@ please find implementation for the currently running lisp.~%") #+allegro `(progn ,@body)) -(defun with-timeout-sym () - "Returns the appropriate symbol for with-timeout, for substitution within macros." - #+(or allegro zacl) 'sys:with-timeout - #+abcl 'bordeaux-threads:with-timeout - #-(or allegro zacl abcl) 'acl-compat.mp:with-timeout) -(defmacro with-timeout ((seconds &body timeout-body) &body body) - #+(or allegro zacl) `(sys:with-timeout (,seconds ,@timeout-body) ,@body) - #+abcl `(bordeaux-threads:with-timeout (,seconds ,@timeout-body) ,@body) - #-(or allegro zacl abcl) `(acl-compat.mp:with-timeout (,seconds ,@timeout-body) ,@body)) + + (defmacro without-redefinition-warnings (&rest body) diff --git a/gwl/defsystem-depends-on.isc b/gwl/defsystem-depends-on.isc new file mode 100644 index 0000000000000000000000000000000000000000..c5f8d3985c275cba3bdf6a47243c9500bdab853b --- /dev/null +++ b/gwl/defsystem-depends-on.isc @@ -0,0 +1 @@ +"(#-allegro :zacl)" \ No newline at end of file diff --git a/gwl/depends-on.isc b/gwl/depends-on.isc index c3cbfc2e7792ab4577f9b7b8a27f1b94d6f9cc38..584be9bfd963c8cf79c5c3679b9776631d2613e7 100644 --- a/gwl/depends-on.isc +++ b/gwl/depends-on.isc @@ -1 +1,2 @@ -"(:bordeaux-threads :drakma :glisp #+zacl :aserve #-zacl :paserve :yason)" +;;"(:bordeaux-threads :drakma :glisp #+zacl :aserve #-zacl :paserve :yason)" +(:bordeaux-threads :drakma :glisp #-allegro :zacl-aserve #+allegro :aserve :yason) diff --git a/gwl/gwl.asd b/gwl/gwl.asd index 2aa6102695fe08b5b1cb5b2dfcd9f59f3db52036..60d73a728b3fec395dc07aaee36b28b9b618e2e4 100644 --- a/gwl/gwl.asd +++ b/gwl/gwl.asd @@ -5,13 +5,14 @@ "Dave Cooper, Genworks International" :license "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t :version "20170802" :depends-on - (:bordeaux-threads :drakma :glisp #+zacl :aserve #-zacl :paserve :yason) + (:bordeaux-threads :drakma :glisp #-allegro :zacl-aserve #+allegro :aserve :yason) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #+asdf-unicode :defsystem-depends-on #+asdf-unicode () #+asdf-encodings :encoding #+asdf-encodings :utf-8 :components ((:file "source/package") (:file "source/with-all-servers") (:file "source/defparameters") (:file "source/base-html-sheet") + (:file "source/genworks") (:file "source/html-format") (:file "source/macros") (:file "source/presets") (:file "source/base-html-utils") (:file "source/ignore-errors-with-backtrace") diff --git a/gwl/source/genworks.lisp b/gwl/source/genworks.lisp new file mode 100644 index 0000000000000000000000000000000000000000..deecd731e33223db4ffd2a05bb5e2c244c384105 --- /dev/null +++ b/gwl/source/genworks.lisp @@ -0,0 +1,31 @@ +(in-package :com.genworks.lisp) + + +(defun local-port (socket) + (#+(or allegro zacl) socket:local-port + #-(or allegro zacl abcl) acl-compat.socket:local-port + #+abcl #'(lambda(socket) (declare (ignore socket) 0)) socket)) + +(defun remote-host (socket) + #+(or allegro zacl) (socket:remote-host socket) + #-(or allegro zacl abcl) (acl-compat.socket:remote-host socket)) + +;; +;; FLAG -- add abcl +;; +(defun local-host (socket) + #+(or allegro zacl) (socket:local-host socket) + #-(or allegro zacl abcl) (acl-compat.socket:local-host socket)) + + +(defun with-timeout-sym () + "Returns the appropriate symbol for with-timeout, for substitution within macros." + #+(or allegro zacl) 'sys:with-timeout + #+abcl 'bordeaux-threads:with-timeout + #-(or allegro zacl abcl) 'acl-compat.mp:with-timeout) + +(defmacro with-timeout ((seconds &body timeout-body) &body body) + #+(or allegro zacl) `(sys:with-timeout (,seconds ,@timeout-body) ,@body) + #+abcl `(bordeaux-threads:with-timeout (,seconds ,@timeout-body) ,@body) + #-(or allegro zacl abcl) `(acl-compat.mp:with-timeout (,seconds ,@timeout-body) ,@body)) +