Commit 0245a05f authored by Dave Cooper's avatar Dave Cooper

ready to finish release branch

parent 383bed65
......@@ -4,7 +4,7 @@
"The Gendl™ (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140506" :depends-on (:gwl-graphics)
:version "20140515" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl™ Web-based Development Environment (tasty)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140506" :depends-on (:tree :gwl-graphics)
:version "20140515" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -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 "20140506" :depends-on (:gwl)
:version "20140515" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl™ Tree component used by Tasty and potentially as a UI component on its own"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140506" :depends-on (:gwl-graphics)
:version "20140515" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl™ Yet Another Definition Documenter (yadd)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140506" :depends-on
:version "20140515" :depends-on
(:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:base :description
"The Gendl™ Base Core Kernel Engine" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140506" :depends-on nil
:serial t :version "20140515" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -39,7 +39,16 @@
(defmethod ,(glisp:intern message :gdl-inputs) ((,parent-arg gdl-basis) ,part-arg (,self-arg gdl-basis))
(declare (ignore ,part-arg))
(gdl-rule::lookup-parameters ,self-arg ,(make-keyword message))))) messages)))
(eval-when (:compile-toplevel :load-toplevel :execute)
(defpackage :iq (:use) (:export #:qlet)))
(eval-when (:compile-toplevel :load-toplevel :execute)
(defmacro iq:qlet ((&rest args) &rest body)
(declare (ignore args body))
(error "Query-attributes are not supported in this Gendl distribution.~%")))
(defun computed-slots-section (name computed-slots &key query?)
(mapcan
......@@ -66,6 +75,9 @@
`(defmethod ,(glisp:intern (symbol-name attr-sym) :gdl-slots) ((self ,name) &rest ,args-arg)
(declare (ignore ,args-arg))
(let ((*error-on-not-handled?* t))
(with-dependency-tracking (,attr-sym)
,(if query? `(iq:qlet (()) ,attr-expr) attr-expr))
#+nil
(with-dependency-tracking (,attr-sym)
,(if query? (error "Query-slots are not supported in this distribution of Genworks GDL.")
attr-expr)))))
......
......@@ -612,7 +612,8 @@ overview of <tt>define-object</tt> syntax."
((,self-arg ,name) ,category-arg ,message-type-arg ,base-part-type-arg
&optional (,depth-arg 0))
(append (message-list ,self-arg
:all
;;:all
,category-arg
,depth-arg ,base-part-type-arg)
(when (and (not (eql ,message-type-arg :local)) (next-method-p))
(call-next-method ,self-arg ,category-arg ,message-type-arg ,base-part-type-arg (1+ ,depth-arg)))))
......
......@@ -78,13 +78,16 @@
(mapcan #'(lambda(message)
(list message cat))
(let ((keys
(safe-sort (mapcar #'make-keyword
(funcall (glisp:intern (format nil "~a" cat) :gdl) class))
#'string<)))
(if *sort-children?*
(safe-sort (mapcar #'make-keyword
(funcall (glisp:intern (format nil "~a" cat) :gdl) class))
#'string<)
(mapcar #'make-keyword
(funcall (glisp:intern (format nil "~a" cat) :gdl) class)))))
keys)))
*message-categories*))
(otherwise (let ((messages (mapcar #'make-keyword
(funcall (glisp:intern (format nil "~a" category)) class))))
(funcall (glisp:intern (format nil "~a" category) :gdl) class))))
(mapcan #'(lambda(message)
(list message category))
messages))))))
......
......@@ -87,16 +87,16 @@ set of arms contained in the body which is contained in the robot which is conta
,(make-keyword message) 'gdl-rule:%not-handled%)))
(if (eql ,new-object 'gdl-rule:%not-handled%)
(not-handled-error ,object ',message) ,new-object))))
(cond ((and evaluate? apply?)
`(apply (symbol-function (glisp:intern (symbol-name ,message) :gdl-slots)) ,object
(cond ((and evaluate? apply?)
`(apply (symbol-function (glisp:intern (symbol-name ,message) :gdl-slots)) ,object
,args))
(evaluate?
`(funcall (symbol-function (glisp:intern (symbol-name ,message) :gdl-slots)) ,object
,@args))
(apply?
`(apply ',message ,object ,args))
(evaluate?
`(funcall (symbol-function (glisp:intern (symbol-name ,message) :gdl-slots)) ,object
,@args))
(apply?
`(apply ',message ,object ,args))
(t `(,message ,object ,@args))))
(t `(,message ,object ,@args))))
,@(rest reference-chain))))
object))
......
......@@ -106,15 +106,28 @@ nil "~a~a~a" (the :name-for-display)
#+nil
(%object-keywords% (mapcar #'make-keyword (gdl-rule::%object-keywords% self)))
#+nil
(%object-keywords% (safe-sort (append (the (message-list :category :objects))
(the (message-list :category :quantified-objects)))
#'string-lessp))
(%object-keywords% (let ((unsorted (append (the (message-list :category :objects))
(the (message-list :category :quantified-objects)))))
(if *sort-children?* (safe-sort unsorted #'string-lessp) unsorted)))
;;(%hidden-object-keywords% (mapcar #'make-keyword (gdl-rule::%hidden-object-keywords% self)))
#+nil
(%hidden-object-keywords% (safe-sort (append (the (message-list :category :hidden-objects))
(the (message-list :category :quantified-hidden-objects)))
#'string-lessp))
(%hidden-object-keywords% (let ((unsorted (append (the (message-list :category :hidden-objects))
(the (message-list :category :quantified-hidden-objects)))))
(if *sort-children?* (safe-sort unsorted #'string-lessp) unsorted)))
("Keyword symbol. The part's simple name, derived from its object specification in the parent or from
the type name if this is the root instance."
name-for-display (make-keyword (the %name%))) ;;(gdl-acc::%name% self)
......
......@@ -95,6 +95,7 @@ If you are interested in this effort we would love to hear from you at open-sour
#:*gendl-patch-level*
#:*ghostscript-path*
#:*gs-path*
#:*sort-children?*
#:*load-documentation-database?*
#:*load-source-code-database?*
#:*out-of-bounds-sequence-reference-action*
......
......@@ -23,7 +23,7 @@
;;(defparameter *gendl-version* "1585p002")
;;(defparameter *gendl-version* "1587devo")
(defparameter *gendl-version* "1587p002")
(defparameter *gendl-version* "1587p003")
;;(defparameter *gendl-version* "ql-2013-12")
(defparameter *gendl-patch-level* nil)
......@@ -202,3 +202,4 @@ values are a color indicator for the default foreground and background of graphi
(defparameter *sort-children?* t)
......@@ -3,7 +3,7 @@
(asdf:defsystem #:cl-lite :description
"The Gendl™ Compile-and-Load Lite Utility" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140506" :depends-on (:glisp)
:serial t :version "20140515" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -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 "20140506" :depends-on (:gwl-graphics)
:serial t :version "20140515" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -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 "20140506" :depends-on
:serial t :version "20140515" :depends-on
(#-gwl :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -4,7 +4,7 @@
"The Gendl™ Simplified Android Robot example " :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140506" :depends-on (:gwl-graphics)
:version "20140515" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"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 "20140506" :depends-on
:version "20140515" :depends-on
(#-gwl-graphics :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -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 "20140506" :depends-on (:gwl-graphics :surf)
:version "20140515" :depends-on (:gwl-graphics :surf)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:geom-base :description
"The Gendl™ Wireframe Geometry" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140506" :depends-on (:glisp)
:version "20140515" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:glisp :description
"The Gendl™ Common Lisp Portability" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140506" :depends-on
:serial t :version "20140515" :depends-on
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :acl-compat)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:gwl-graphics :description
"The Gendl™ GWL embedded graphics support" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140506" :depends-on (:geom-base :gwl)
:serial t :version "20140515" :depends-on (:geom-base :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:gwl :description
"The Gendl™ Generative Web Language (GWL)" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140506" :depends-on (:glisp :aserve)
:serial t :version "20140515" :depends-on (:glisp :aserve)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:regression :description
"The Gendl™ regression Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140506" :depends-on (:lift :surf :tasty)
:version "20140515" :depends-on (:lift :surf :tasty)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -207,7 +207,7 @@ built-from curve, if one exists, otherwise defaults to the *display-tolerance*."
(%curves-to-draw%
(unless (or *curve-tessellation?*
(zerop (the total-length)))
(near-to? (the total-length) 0))
(if (typep self 'arc-curve)
(call-next-method)
(if (= (the decomposed curves number-of-elements) 1)
......@@ -602,7 +602,6 @@ components of a surface point."
:3d-point (the (point (first parameter))))))) pairs)))))
#+allegro
("Surface point. Returns the first point of intersection between this curve and the surface given as an argument.
:arguments (surface \"GDL Surface object. The surface to intersect with this curve.\")
......@@ -615,7 +614,6 @@ components of a surface point."
:3d-point (the (point (first triplet)))))))
#+allegro
("List of Surface points. Returns the point(s) of intersection between this curve and the surface given as an argument.
:arguments (surface \"GDL Surface object. The surface to intersect with this curve.\")
......
......@@ -4,7 +4,7 @@
"The Gendl™ NURBS Surface and Solids Geometry Primitives" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140506" :depends-on (:geom-base)
:version "20140515" :depends-on (:geom-base)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
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