Commit c9c8940a authored by Dave Cooper's avatar Dave Cooper

Ironed out some warnings, dependencies, and build issues.

parent 8a6d5ccd
......@@ -2,7 +2,7 @@
(gwl:define-package :ta2
(:documentation #.(with-open-file (in "~/gendl/apps/ta2/description.isc") (read in)))
(:documentation #.(glisp:system-description :ta2))
(:export #:assembly))
#+nil
......
(:gwl)
\ No newline at end of file
......@@ -4,7 +4,7 @@
"The Gendl™ Translators to/from XML and potentially other high-level KBE and Knowledge formats"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130406" :depends-on nil
:version "20130406" :depends-on (:gwl)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "xml/source/package") (:file "xml/source/genworks")
......
......@@ -22,9 +22,10 @@
(:file "rest/source/parameters")
(:file "rest/source/quantification")
(:file "rest/source/aggregate") (:file "rest/source/utilities")
(:file "rest/source/null-part")
(:file "rest/source/vanilla-mixin")
(:file "rest/source/base-rule-object") (:file "rest/source/bodies")
(:file "rest/source/ignore-errors-with-backtrace")
(:file "rest/source/init") (:file "rest/source/make-part")
(:file "rest/source/null-part") (:file "rest/source/sequence")
(:file "rest/source/sequence")
(:file "zzinit/source/initialize") (:file "zzinit/source/zzinit")))
......@@ -35,19 +35,21 @@ a symbol, this is the name of the slot and there will be no default value.\"
(new-format-functions (gensym))
(class (gensym)))
`(progn
(defclass ,name ,mixin-list ,(mapcar #'(lambda(slot)
(if (atom slot)
`(,(glisp:intern (symbol-name slot) :gdl-acc) :initarg ,(make-keyword slot))
`(,(glisp:intern (symbol-name (first slot)) :gdl-acc) :initform ,(second slot)
:initarg ,(make-keyword (first slot))
:documentation ,(or (third slot) ""))))
slots) (:metaclass gdl-format-class))
(defclass ,name ,mixin-list
,(mapcar #'(lambda(slot)
(if (atom slot)
`(,(glisp:intern (symbol-name slot) :gdl-acc) :initarg ,(make-keyword slot))
`(,(glisp:intern (symbol-name (first slot)) :gdl-acc) :initform ,(second slot)
:initarg ,(make-keyword (first slot))
:documentation ,(or (third slot) ""))))
slots) (:metaclass gdl-format-class))
(let ((,class (find-class ',name)))
(let ((,old-format-functions (format-functions ,class))
(,new-format-functions ',(mapcar #'first-symbol (remove nil functions))))
(dolist (key (set-difference ,old-format-functions ,new-format-functions))
(let ((method (ignore-errors (find-method (symbol-function (glisp:intern (symbol-name key) :gdl-format)) nil
(list (find-class ',name)) nil))))
(let ((method (ignore-errors
(find-method (symbol-function (glisp:intern (symbol-name key) :gdl-format)) nil
(list (find-class ',name)) nil))))
(when method
(format t "~%Removing format function: ~a for format definition: ~s~%" key ',name)
(remove-method (symbol-function (glisp:intern (symbol-name key) :gdl-format)) method))))
......
......@@ -19,4 +19,4 @@
;; <http://www.gnu.org/licenses/>.
;;
("parameters" "quantification" "aggregate" "utilities" "vanilla-mixin")
("parameters" "quantification" "aggregate" "utilities" "null-part" "vanilla-mixin")
......@@ -964,6 +964,9 @@ a separate object hierarchy." object self)))
(define-object root-path-container ()
:input-slots (root-path))
;;
;; FLAG -- stub -- to be redefined in gwl.
;;
(define-object remote-object ())
......@@ -3,7 +3,7 @@
(asdf:defsystem #:bus :description
"The Gendl™ Wireframe School Bus Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20130406" :depends-on nil
:serial t :version "20130406" :depends-on (:gwl-graphics)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/assembly")
......
(:gwl-graphics)
\ No newline at end of file
(:gwl)
\ No newline at end of file
......@@ -3,7 +3,7 @@
(asdf:defsystem #:ledger :description
"The Gendl™ Ledger Bookkeeping Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20130406" :depends-on nil
:serial t :version "20130406" :depends-on (:gwl)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/assembly")
......
(:gwl-graphics)
\ No newline at end of file
(in-package :common-lisp-user)
(gdl:define-package :wire-world (:export #:assembly)
:documentation #.(glisp:system-description :wire-world))
(:documentation #.(glisp:system-description :wire-world)))
......@@ -4,6 +4,6 @@
"The Gendl™ Wire-World demo and test-case for wireframe tessellation and X3D output"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130406" :depends-on nil
:version "20130406" :depends-on (:gwl-graphics)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components ((:file "source/package") (:file "source/assembly")))
(:gwl-graphics :surf)
\ No newline at end of file
......@@ -3,7 +3,7 @@
(asdf:defsystem #:examples :description
"The Gendl™ examples Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130406" :depends-on nil
:version "20130406" :depends-on (:gwl-graphics :surf)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:gdl "source/primi-plane") (:gdl "source/ui-primi-plane")))
......@@ -16,7 +16,10 @@
;; <http://www.gnu.org/licenses/>.
;;
(in-package :gwl-user)
(eval-when (:compile-toplevel :load-toplevel :execute)
(gwl:define-package :examples-ui))
(in-package :examples-ui)
(define-object primi-plane-ui (base-ajax-sheet)
......
......@@ -150,7 +150,8 @@ Defaults to nil."
(dimension-text :type 'general-note
:pseudo-inputs (start-center)
:start-center (let ((point (add-vectors (the dim-text-start) (the dim-text-start-offset))))
(translate-along-vector point
......
......@@ -109,6 +109,7 @@ Color of the outline of the pie. Defaults to :black."
:pass-down (labels&colors))
(pie-pieces :type 'pie-piece
:pseudo-inputs (fraction line-color)
:sequence (:size (length (the data)))
:datum (nth (the-child index) (the data))
:label (first (nth (the-child :index) (the labels&colors)))
......
......@@ -21,6 +21,8 @@
(in-package :gwl-user)
(defparameter *locale-hash*
(let ((strings
`(:hey-now
......@@ -29,6 +31,10 @@
(let ((ht (make-hash-table :size (length strings))))
(mapc #'(lambda(key value) (setf (gethash key ht) value))
(plist-keys strings) (plist-values strings)) ht)))
(defun locale-string (key)
(gethash key *locale-hash*))
(define-object hey-now (base-ajax-sheet)
......@@ -57,4 +63,4 @@
:default (the language-default)
:choice-plist (list :english "English" :chinese "中国的"))))
(publish-gwl-app "/hey-now" 'hey-now)
\ No newline at end of file
(publish-gwl-app "/hey-now" 'hey-now)
......@@ -372,6 +372,7 @@ of this brep. Exact supported format will be documented here when ready."
:sequence (:size (length (the %native-faces%)))
:brep self
:layer (the-child index)
:pseudo-inputs (layer)
:%native-brep% (the %native-brep%)
:%native-face% (nth (the-child index) (the %native-faces%)))
......
......@@ -97,7 +97,13 @@
(cross-vectors surface-normal curve-tangent))))))
;;
;; FLAG -- move to example and/or regression tests.
;;
;; Some lisps don't recognize the above dual-blend-surface definition while still
;; in this file.
;;
#+nil
(define-object test-d-b-s (base-object)
......
......@@ -46,7 +46,6 @@
(error "start matches both start and end of curve in chain-curves"))
((and (null start-match) (null end-match))
(print-variables start start-match end-match)
(setq gdl-user::*curves* curves)
(error "curves did not chain in chain-curves"))
(start-match
(cons (nth start-match curves)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment