Commit 4d2bd18f authored by Dave Cooper's avatar Dave Cooper

removed reserved words from regression tests

parent 4d91b9d3
......@@ -71,6 +71,8 @@ o allow input of required input-slots.
(use-raphael? (the have-valid-instance-and-inputs?))
(use-x3dom? (the have-valid-instance-and-inputs?))
(root-object-type 'null-part :settable)
)
:computed-slots
......@@ -103,7 +105,7 @@ o allow input of required input-slots.
(the menu-section)
)))
(root-object-type 'null-part :settable)
(at-true-root? (typep (the root-object parent) 'assembly))
......
......@@ -31,4 +31,7 @@
(:file "rest/source/sequence")
(:file "zzinit/source/initialize")
(:file "zzinit/source/zzinit")))
(:file "zzinit/source/zzinit")
(:static-file "README")
))
......@@ -409,6 +409,9 @@ overview of <tt>define-object</tt> syntax."
(check-syntax name input-slots computed-slots objects hidden-objects
functions methods documentation trickle-down-slots query-slots)
(remhash name *reserved-words-hash*)
(with-gdl-message-symbols (:new t)
(let ((mixins (if (or no-vanilla-mixin?
......
......@@ -126,6 +126,59 @@ checkbox-form-control."
(the-object child possible-nil?))))
(append (the children) (the hidden-children)))))
("List of HTML sections to be scanned and possibly replaced in response to
GDL Ajax calls. Override this slot at your own risk. The default is all
sections who are most recently laid out on the respondent sheet, and
this is set programmatically every time the sheet section's main-div
is demanded."
html-sections
(mapcar #'(lambda(section-root-path)
(the root (follow-root-path section-root-path)))
(the %html-section-root-paths%)))
("List of GDL objects, which should be of type 'base-form-control.
<p>
[Note -- this slot is not really necessary for protecting out-of-bounds sequence references
anymore, the form-control processor protects against this by itself now].
</p>
These objects are validated and bashed first, in the order given. If the cardinality
of one form-control depends on another as in the example below, then you should list
those dependent objects first. Default is nil.
:examples
<pre>
...
:computed-slots ((number-of-nozzles (the number-of-nozzles-form value))
(ordered-form-controls
(append (list-elements (the inner-flange-form))
(list (the number-of-nozzles-form)))))
:objects
((inner-flange-form
:type 'menu-form-control
:choice-plist (list :hey \"hey\" :now \"now\")
:default :hey
:sequence (:size (the number-of-nozzles)))
(number-of-nozzles-form
:type 'text-form-control
:prompt \"Number of Shell Nozzles Required: \"
:domain :number
:default 0)
</pre>
"
ordered-form-controls nil)
)
......@@ -158,15 +211,7 @@ checkbox-form-control."
(%html-section-root-paths% nil :settable)
("List of HTML sections to be scanned and possibly replaced in response to
GDL Ajax calls. Override this slot at your own risk. The default is all
sections who are most recently laid out on the respondent sheet, and
this is set programmatically every time the sheet section's main-div
is demanded."
html-sections
(mapcar #'(lambda(section-root-path)
(the root (follow-root-path section-root-path)))
(the %html-section-root-paths%)))
("List of GDL objects. All the children or hidden-children
......@@ -203,46 +248,7 @@ of type base-form-control."
("List of GDL objects, which should be of type 'base-form-control.
<p>
[Note -- this slot is not really necessary for protecting out-of-bounds sequence references
anymore, the form-control processor protects against this by itself now].
</p>
These objects are validated and bashed first, in the order given. If the cardinality
of one form-control depends on another as in the example below, then you should list
those dependent objects first. Default is nil.
:examples
<pre>
...
:computed-slots ((number-of-nozzles (the number-of-nozzles-form value))
(ordered-form-controls
(append (list-elements (the inner-flange-form))
(list (the number-of-nozzles-form)))))
:objects
((inner-flange-form
:type 'menu-form-control
:choice-plist (list :hey \"hey\" :now \"now\")
:default :hey
:sequence (:size (the number-of-nozzles)))
(number-of-nozzles-form
:type 'text-form-control
:prompt \"Number of Shell Nozzles Required: \"
:domain :number
:default 0)
</pre>
"
ordered-form-controls nil)
("Boolean. This switch determines whether all form-controls should be preset
before the final setting, in order to allow any interdependencies to be detected
......
......@@ -149,10 +149,9 @@ the browser in development mode). Defaults to NIL (the empty list)."
(host nil :defaulting)
(query-toplevel nil :settable)
)
(query-toplevel nil :settable))
:computed-slots
(
......
(gwl:define-package :gdl-lift-tests)
(in-package :gdl-lift-tests)
(define-condition not-raised (error)
......
......@@ -4,14 +4,14 @@
:objects
((drawing :type 'box-annotated-drawing
:objects (list (the box)))
:dl-objects (list (the box)))
(box :type 'box
:length 10 :width 20 :height 30)))
(define-object box-annotated-drawing (base-drawing)
:input-slots (objects (character-size 15)
:input-slots (dl-objects (character-size 15)
(witness-line-gap 10)
(witness-line-length 15)
(witness-line-ext 5))
......@@ -23,7 +23,7 @@
:width (half (the width))
:center (translate (the center) :rear (half (the-child length))
:left (half (the-child width)))
:objects (the objects)
:objects (the dl-objects)
:annotation-objects (list (the main-length-dim)))
......@@ -34,7 +34,7 @@
:width (half (the width))
:center (translate (the center) :rear (half (the-child length))
:right (half (the-child width)))
:objects (the objects)
:objects (the dl-objects)
:annotation-objects (list (the top-width-dim) (the top-length-dim)))
......@@ -51,7 +51,7 @@
:projection-vector (getf *standard-views* :front)
:length (half (the length))
:center (translate (the center) :front (half (the-child length)))
:objects (the objects)
:objects (the dl-objects)
:annotation-objects (list (the bottom-length-dim)))
......
......@@ -73,9 +73,9 @@
(width 10)
(height 10)
(sew-and-orient? nil)
(other-brep (list (the faces top-face) (the faces bottom-face)
(the faces right-face) (the faces left-face)
(the faces rear-face) (the faces front-face)))
(other-brep (list (the box-faces top-face) (the box-faces bottom-face)
(the box-faces right-face) (the box-faces left-face)
(the box-faces rear-face) (the box-faces front-face)))
(regression-test-data (append (multiple-value-list (the precise-properties))
(the %curves-to-draw%)
......@@ -84,7 +84,7 @@
:hidden-objects
((box :type 'box)
(faces :type 'box-faces)))
(box-faces :type 'box-faces)))
......@@ -98,9 +98,9 @@
(width 10)
(height 10)
(sew-and-orient? nil)
(breps (list (the faces top-face brep) (the faces bottom-face brep)
(the faces right-face brep) (the faces left-face brep)
(the faces rear-face brep) (the faces front-face brep)))
(breps (list (the box-faces top-face brep) (the box-faces bottom-face brep)
(the box-faces right-face brep) (the box-faces left-face brep)
(the box-faces rear-face brep) (the box-faces front-face brep)))
(regression-test-data (append (multiple-value-list (the precise-properties))
(the %curves-to-draw%)
......@@ -109,7 +109,7 @@
:hidden-objects
((box :type 'box)
(faces :type 'box-faces)))
(box-faces :type 'box-faces)))
(register-test-definition 'merged-solid-test-bt)
......
......@@ -29,19 +29,19 @@
(plane-normal (make-vector 0 0 -1))
(distance 1)
(control-points (list (make-point 0 0 0)
(make-point 2 3.0 0.0)
(make-point 4 2.0 0.0)
(make-point 5 0.0 0.0)
(make-point 4 -2.0 0.0)
(make-point 2 -3.0 0.0)
(make-point 0 0 0)))
(points (list (make-point 0 0 0)
(make-point 2 3.0 0.0)
(make-point 4 2.0 0.0)
(make-point 5 0.0 0.0)
(make-point 4 -2.0 0.0)
(make-point 2 -3.0 0.0)
(make-point 0 0 0)))
(regression-test-data (multiple-value-list (the b-spline-data))))
:objects
((curve :type 'b-spline-curve
:control-points (the control-points)
:control-points (the points)
:degree 4)))
......
......@@ -26,13 +26,13 @@
(define-object reparameterized-curve-test (surf::reparameterized-curve)
:input-slots
((control-points (list (make-point 0 0 0)
(make-point 2 3.0 0.0)
(make-point 4 2.0 0.0)
(make-point 5 0.0 0.0)
(make-point 4 -2.0 0.0)
(make-point 2 -3.0 0.0)
(make-point 0 0 0)))
((points (list (make-point 0 0 0)
(make-point 2 3.0 0.0)
(make-point 4 2.0 0.0)
(make-point 5 0.0 0.0)
(make-point 4 -2.0 0.0)
(make-point 2 -3.0 0.0)
(make-point 0 0 0)))
(curve-in (the b-spline-curve)))
......@@ -41,7 +41,7 @@
:objects
((b-spline-curve :type 'b-spline-curve
:control-points (the control-points))))
:control-points (the points))))
(register-test-definition 'reparameterized-curve-test)
......@@ -119,11 +119,20 @@ this is not a surface-curve, this will return an error."
("GDL Curve. Specify this if you want this curve to be a clone of
an existing curve. (note - this uses a shared underlying curve object,
it does not make a copy)" built-from nil)
;;
;; FLAG -- made this not be :defaulting anymore because tolerance
;; is not declared as trickle-down anywhere.
;;
#+nil
("Number. Approximation tolerance for display purposes. Defaults to the tolerance of the
built-from curve, if one exists, otherwise defaults to the *display-tolerance*."
tolerance (if (the built-from) (the built-from tolerance) *display-tolerance*) :settable :defaulting)
("Number. Approximation tolerance for display purposes. Defaults to the tolerance of the
built-from curve, if one exists, otherwise defaults to the *display-tolerance*."
tolerance (if (the built-from) (the built-from tolerance) *display-tolerance*) :settable)
(surf nil)
(parameterization :inherited :settable)
......@@ -147,9 +156,7 @@ built-from curve, if one exists, otherwise defaults to the *display-tolerance*."
:computed-slots
((regression-test-data (multiple-value-list (the b-spline-data)))
(measure (let ((tolerance (or (the tolerance)
((measure (let ((tolerance (or (the tolerance)
*display-tolerance*)))
(* tolerance (curve-extent *geometry-kernel* (the native-curve)))))
......
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