Stephen Compall avatar Stephen Compall committed 6b60239

Replace `valid-widget-p' calls with `valid-widget' check-types, where it seems useful

Comments (0)

Files changed (2)

src/widgets/composite.lisp

 	     child composite))
     (lambda (&optional (callee nil callee-supplied-p))
       (assert (cons-in-list-p place (composite-widgets composite)))
-      (cond ((and callee-supplied-p (valid-widget-p callee))
+      (cond (callee-supplied-p
+	     (check-type callee valid-widget
+			 "a potential member of a composite")
 	     (rplaca place callee)
 	     (setf (widget-parent callee) composite)
 	     (mark-dirty composite))
-	    (callee-supplied-p
-	     (error "Attempted to write invalid widget ~A to composite ~A" 
-		    callee composite))
 	    (t (car place))))))
 
 (defun cons-in-list-p (cell list)

src/widgets/selector-mixin.lisp

 	     child selector))
     (lambda (&optional (callee nil callee-supplied-p))
       (assert (find place (selector-mixin-panes selector)))
-      (cond ((and callee-supplied-p (valid-widget-p callee))
+      (cond (callee-supplied-p
+	     (check-type callee valid-widget
+			 "a potential pane of a selector-mixin")
 	     (rplacd place callee)
 	     (setf (widget-parent callee) selector)
 	     (mark-dirty selector))
-	    (callee-supplied-p
-	     (error "Attempted to write invalid widget ~A to selector-mixin ~A" 
-		    callee selector))
 	    (t (cdr place))))))
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.