mcclim-cvs August 2007

mcclim-cvs@common-lisp.net

3 participants
26 discussions

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 20 Aug '07

20 Aug '07

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv380/Drei Modified Files: lisp-syntax.lisp Log Message: Handle weirdly placed quote characters in Lisp syntax. --- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp 2007/08/13 21:58:44 1.29 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp 2007/08/20 18:43:06 1.30 @@ -1395,7 +1395,8 @@ "Return the bottom token object for `token', return `token' or the form that `token' quotes, peeling away all quote forms." (labels ((descend (form) - (cond ((form-quoted-p form) + (cond ((and (form-quoted-p form) + (rest (children form))) (descend (first-form (children form)))) (t form)))) (descend token)))

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 20 Aug '07

20 Aug '07

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv29471 Modified Files: NEWS Log Message: Added mention of the delimiter gesture support to NEWS. --- /project/mcclim/cvsroot/mcclim/NEWS 2007/02/07 12:44:16 1.21 +++ /project/mcclim/cvsroot/mcclim/NEWS 2007/08/20 18:32:26 1.22 @@ -1,4 +1,5 @@ * Changes in mcclim-0.9.5 relative to 0.9.4: +** Drei now has better support for delimiter gestures. ** Installation: the systems clim-listener, scigraph, clim-examples, and clouseau can now be loaded without loading the system mcclim first.

1 0

[mcclim-cvs] CVS mcclim/Doc
by thenriksen 20 Aug '07

20 Aug '07

Update of /project/mcclim/cvsroot/mcclim/Doc In directory clnet:/tmp/cvs-serv18549/Doc Modified Files: drei.texi docstrings.lisp Log Message: Finished documentation for syntax command tables. --- /project/mcclim/cvsroot/mcclim/Doc/drei.texi 2007/01/22 11:37:12 1.7 +++ /project/mcclim/cvsroot/mcclim/Doc/drei.texi 2007/08/20 17:52:44 1.8 @@ -1245,7 +1245,29 @@ In order to provide conditionally active command tables, Drei defines the @class{syntax-command-table} class. While this class is meant to facilitate the addition of commands to syntaxes when they are run in a -specific context (for example, a large editor application adding a Show -Macroexpansion command to Lisp syntax), their modus operandi is general -enough to be used for all conditional activity of command tables. +specific context (for example, a large editor application adding a +@command{Show Macroexpansion} command to Lisp syntax), their modus +operandi is general enough to be used for all conditional activity of +command tables. This is useful for making commands available that +could not be generally implemented for all Drei instances --- +returning to the @command{Show Macroexpansion} example, such a command +can only be implemented if there is a sufficiently large place to show +the expansion, and this might not be available for a generic Drei +input-editor instance, but could be provided by an application +designed for it. +Syntax command tables work by conditionally inheriting from other +command tables, so it is necessary to define one (or more) command +tables for the commands you wish to make conditionally available. + +When providing a @var{:command-table} argument to +@fmacro{define-syntax} that names a syntax command table, an instance +of the syntax command table will be used for the syntax. + +@include class-drei-syntax-syntax-command-table.texi + +@include fun-drei-syntax-use-editor-commands-p.texi + +@include fun-drei-syntax-additional-command-tables.texi + +@include macro-drei-syntax-define-syntax-command-table.texi --- /project/mcclim/cvsroot/mcclim/Doc/docstrings.lisp 2006/12/21 12:22:03 1.1 +++ /project/mcclim/cvsroot/mcclim/Doc/docstrings.lisp 2007/08/20 17:52:44 1.2 @@ -764,26 +764,37 @@ (format *texinfo-output* "@findex ~A~%" title))))) (defun texinfo-inferred-body (doc) - (when (member (get-kind doc) '(class structure condition)) - (let ((name (get-name doc))) - ;; class precedence list - (format *texinfo-output* "Class precedence list: @code{~(~{@w{~A}~^, ~}~)}~%~%" - (remove-if (lambda (class) (hide-superclass-p name class)) - (mapcar #'class-name (class-precedence-list (progn (finalize-inheritance (find-class name)) - (find-class name)))))) - ;; slots - (let ((slots (remove-if (lambda (slot) (hide-slot-p name slot)) - (class-direct-slots (find-class name))))) - (when slots - (format *texinfo-output* "Slots:~%@itemize~%") - (dolist (slot slots) - (format *texinfo-output* "@item ~(@code{~A} ~ + (cond ((member (get-kind doc) '(class structure condition)) + (let ((name (get-name doc))) + ;; class precedence list + (format *texinfo-output* "Class precedence list: @code{~(~{@w{~A}~^, ~}~)}~%~%" + (remove-if (lambda (class) (hide-superclass-p name class)) + (mapcar #'class-name (class-precedence-list (progn (finalize-inheritance (find-class name)) + (find-class name)))))) + ;; slots + (let ((slots (remove-if (lambda (slot) (hide-slot-p name slot)) + (class-direct-slots (find-class name))))) + (when slots + (format *texinfo-output* "Slots:~%@itemize~%") + (dolist (slot slots) + (format *texinfo-output* "@item ~(@code{~A} ~ ~@[--- initargs: @code{~{@w{~S}~^, ~}}~]~)~%~%" - (slot-definition-name slot) - (slot-definition-initargs slot)) - ;; FIXME: Would be neater to handler as children - (write-texinfo-string (docstring slot t))) - (format *texinfo-output* "@end itemize~%~%")))))) + (slot-definition-name slot) + (slot-definition-initargs slot)) + ;; FIXME: Would be neater to handler as children + (write-texinfo-string (docstring slot t))) + (format *texinfo-output* "@end itemize~%~%"))))) + ((eq (get-kind doc) 'generic-function) + (let* ((method-combination + (sb-mop:generic-function-method-combination + (fdefinition (get-name doc)))) + (combination-name (sb-pcl::method-combination-type-name + method-combination)) + (options (sb-pcl::method-combination-options method-combination))) + (unless (eq combination-name 'standard) + (format *texinfo-output* + "Method combination: @code{~A} (~(~{@w{~A}~^, ~}~))~%~%" + combination-name options)))))) (defun texinfo-body (doc) (write-texinfo-string (get-string doc)))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 20 Aug '07

20 Aug '07

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv18549/Drei Modified Files: syntax.lisp Log Message: Finished documentation for syntax command tables. --- /project/mcclim/cvsroot/mcclim/Drei/syntax.lisp 2007/01/17 10:02:08 1.5 +++ /project/mcclim/cvsroot/mcclim/Drei/syntax.lisp 2007/08/20 17:52:44 1.6 @@ -88,24 +88,29 @@ syntax to use standard editor commands, you should *not* inherit from `editor-table' - the command tables containing the editor commands will be added automatically, as long as this function -returns T.") +returns true. For most syntax command tables, you do not need to +define a method for this generic function, you really do want the +standard editor commands for all but the most esoteric +syntaxes.") (:method ((command-table standard-command-table)) t)) (defgeneric additional-command-tables (editor command-table) (:method-combination append) - (:documentation "Get a list of additional command tables that -should be checked for commands in addition to those + (:documentation "Return a list of additional command tables +that should be checked for commands in addition to those `command-table' inherits from. The idea is that methods are -specialised to `editor', and that those methods may call the -function again recursively with a new `editor' argument to -provide arbitrary granularity for command-table-selection. For -instance, some commands may be applicable in a situation where -the editor is a pane or gadget in its own right, but not when it -functions as an input-editor. In this case, a method could be -defined for `application-frame' as the `editor' argument, that -calls `additional-command-tables' again with whatever the -\"current\" editor instance is.") +specialised to `editor' (which is at first a Drei instance), and +that those methods may call the function again recursively with a +new `editor' argument to provide arbitrary granularity for +command-table-selection. For instance, some commands may be +applicable in a situation where the editor is a pane or gadget in +its own right, but not when it functions as an input-editor. In +this case, a method could be defined for `application-frame' as +the `editor' argument, that calls `additional-command-tables' +again with whatever the \"current\" editor instance is. The +default method on this generic function just returns the empty +list.") (:method append (editor command-table) '()))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 20 Aug '07

20 Aug '07

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv5440/Drei Modified Files: basic-commands.lisp editing.lisp Log Message: Print a message and beep not only for unsuccessful motion but also for editing. --- /project/mcclim/cvsroot/mcclim/Drei/basic-commands.lisp 2007/01/17 12:02:04 1.5 +++ /project/mcclim/cvsroot/mcclim/Drei/basic-commands.lisp 2007/08/20 14:58:28 1.6 @@ -33,6 +33,20 @@ (in-package :drei-commands) +(defmacro handling-motion-limit-errors ((unit-plural &key (beep t) + (display-message t)) + &body body) + "Evaluate body, if a `motion-limit-error' is signalled, beep if +`beep' is true (the default), and display a message stating that +there are no more `unit-plural's if `display-message' is +true (the default)." + `(handler-case (progn ,@body) + (motion-limit-error () + ,(when beep + `(beep)) + ,(when display-message + `(display-message ,(concatenate 'string "No more " unit-plural)))))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; ;;; Motion commands. @@ -75,12 +89,10 @@ ,(concat "Move point forward by one " noun ". With a numeric argument N, move point forward by N " plural ". With a negative argument -N, move point backward by N " plural ".") - (handler-case (,forward *current-point* - (SYNTAX *current-buffer*) - COUNT) - (motion-limit-error () - (beep) - (display-message ,(concat "No more " plural))))) + (handling-motion-limit-errors (,plural) + (,forward *current-point* + (SYNTAX *current-buffer*) + COUNT))) (DEFINE-COMMAND (,com-backward :NAME T :COMMAND-TABLE ,command-table) @@ -88,12 +100,10 @@ ,(concat "Move point backward by one " noun ". With a numeric argument N, move point backward by N " plural ". With a negative argument -N, move point forward by N " plural ".") - (handler-case (,backward *current-point* - (SYNTAX *current-buffer*) - COUNT) - (motion-limit-error () - (beep) - (display-message ,(concat "No more " plural))))))))) + (handling-motion-limit-errors (,plural) + (,backward *current-point* + (SYNTAX *current-buffer*) + COUNT))))))) ;;; Manually define some commands @@ -113,24 +123,18 @@ "Move point forward by one object. With a numeric argument N, move point forward by N objects. With a negative argument -N, move point backward by M objects." - (handler-case - (forward-object *current-point* - count) - (motion-limit-error nil - (beep) - (display-message "No more objects")))) + (handling-motion-limit-errors ("objects") + (forward-object *current-point* + count))) (define-command (com-backward-object :name t :command-table movement-table) ((count 'integer :prompt "number of objects")) "Move point backward by one object. With a numeric argument N, move point backward by N objects. With a negative argument -N, move point forward by N objects." - (handler-case - (backward-object *current-point* - count) - (motion-limit-error nil - (beep) - (display-message "No more objects")))) + (handling-motion-limit-errors ("objects") + (backward-object *current-point* + count))) ;;; Autogenerate commands (define-motion-commands word movement-table) @@ -280,13 +284,11 @@ that many " plural ". Successive kills append to the kill ring.") - (handler-case (,forward-kill *current-point* - (syntax *current-buffer*) - count - (eq (command-name *previous-command*) ',com-kill)) - (motion-limit-error () - (beep) - (display-message ,(concat "No more " plural " to kill"))))) + (handling-motion-limit-errors (,plural) + (,forward-kill *current-point* + (syntax *current-buffer*) + count + (eq (command-name *previous-command*) ',com-kill)))) ;; Backward Kill Unit (define-command (,com-backward-kill @@ -298,13 +300,11 @@ that many " plural ". Successive kills append to the kill ring.") - (handler-case (,backward-kill *current-point* - (syntax *current-buffer*) - count - (eq (command-name *previous-command*) ',com-backward-kill)) - (motion-limit-error () - (beep) - (display-message ,(concat "No more " plural "to kill"))))) + (handling-motion-limit-errors (,plural) + (,backward-kill *current-point* + (syntax *current-buffer*) + count + (eq (command-name *previous-command*) ',com-backward-kill)))) ;; Delete Unit (define-command (,com-delete :name t :command-table ,command-table) @@ -349,11 +349,9 @@ transpose that " noun " with the next one. With point before the first " noun " of the buffer, transpose the first two " plural " of the buffer.") - (handler-case (,transpose *current-point* - (syntax *current-buffer*)) - (motion-limit-error () - (beep) - (display-message ,(concat "No more " plural " to transpose"))))))))) + (handling-motion-limit-errors (,plural) + (,transpose *current-point* + (syntax *current-buffer*)))))))) ;;; Some manually defined commands @@ -371,9 +369,10 @@ "Delete the object after point. With a numeric argument, kill that many objects after (or before, if negative) point." - (if killp - (forward-kill-object *current-point* count) - (forward-delete-object *current-point* count))) + (handling-motion-limit-errors ("objects") + (if killp + (forward-kill-object *current-point* count) + (forward-delete-object *current-point* count)))) (define-command (com-backward-delete-object :name t :command-table deletion-table) ((count 'integer :prompt "Number of Objects") @@ -381,9 +380,10 @@ "Delete the object before point. With a numeric argument, kills that many objects before (or after, if negative) point." - (if killp - (backward-kill-object *current-point* count) - (backward-delete-object *current-point* count))) + (handling-motion-limit-errors ("objects") + (if killp + (backward-kill-object *current-point* count #'error-limit-action) + (backward-delete-object *current-point* count #'error-limit-action)))) ;; We require somewhat special behavior from Kill Line, so define a ;; new function and use that to implement the Kill Line command. --- /project/mcclim/cvsroot/mcclim/Drei/editing.lisp 2007/04/27 21:37:14 1.5 +++ /project/mcclim/cvsroot/mcclim/Drei/editing.lisp 2007/08/20 14:58:28 1.6 @@ -82,12 +82,14 @@ (:documentation ,(concat "Delete COUNT " plural " beginning from MARK."))) (defmethod ,forward-delete - (mark syntax &optional (count 1) limit-action) + (mark syntax &optional (count 1) + (limit-action #'error-limit-action)) (let ((mark2 (clone-mark mark))) (,forward mark2 syntax count limit-action) (delete-region mark mark2))) (defmethod ,forward-delete :around - (mark syntax &optional (count 1) limit-action) + (mark syntax &optional (count 1) + (limit-action #'error-limit-action)) (cond ((minusp count) (,backward-delete mark syntax (- count) limit-action)) ((plusp count) @@ -98,12 +100,14 @@ (:documentation ,(concat "Delete COUNT " plural " backwards beginning from MARK."))) (defmethod ,backward-delete - (mark syntax &optional (count 1) limit-action) + (mark syntax &optional (count 1) + (limit-action #'error-limit-action)) (let ((mark2 (clone-mark mark))) (,backward mark2 syntax count limit-action) (delete-region mark mark2))) (defmethod ,backward-delete :around - (mark syntax &optional (count 1) limit-action) + (mark syntax &optional (count 1) + (limit-action #'error-limit-action)) (cond ((minusp count) (,forward-delete mark syntax (- count) limit-action)) ((plusp count) @@ -114,7 +118,8 @@ (:documentation ,(concat "Kill COUNT " plural " beginning from MARK."))) (defmethod ,forward-kill - (mark syntax &optional (count 1) concatenate-p limit-action) + (mark syntax &optional (count 1) concatenate-p + (limit-action #'error-limit-action)) (let ((start (offset mark))) (,forward mark syntax count limit-action) (unless (mark= mark start) @@ -128,7 +133,8 @@ (region-to-sequence start mark))) (delete-region start mark)))) (defmethod ,forward-kill :around - (mark syntax &optional (count 1) concatenate-p limit-action) + (mark syntax &optional (count 1) concatenate-p + (limit-action #'error-limit-action)) (declare (ignore concatenate-p)) (cond ((minusp count) (,backward-kill mark syntax (- count) limit-action)) @@ -140,7 +146,8 @@ (:documentation ,(concat "Kill COUNT " plural " backwards beginning from MARK."))) (defmethod ,backward-kill - (mark syntax &optional (count 1) concatenate-p limit-action) + (mark syntax &optional (count 1) concatenate-p + (limit-action #'error-limit-action)) (let ((start (offset mark))) (,backward mark syntax count limit-action) (unless (mark= mark start) @@ -154,7 +161,8 @@ (region-to-sequence start mark))) (delete-region start mark)))) (defmethod ,backward-kill :around - (mark syntax &optional (count 1) concatenate-p limit-action) + (mark syntax &optional (count 1) concatenate-p + (limit-action #'error-limit-action)) (declare (ignore concatenate-p)) (cond ((minusp count) (,forward-kill mark syntax (- count) limit-action))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 20 Aug '07

20 Aug '07

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv30204/Drei Modified Files: input-editor.lisp Log Message: Fixed last known Drei input-editing-stream issue by implementing Goatee-style handling of :REPLACE keyword parameter to STREAM-REPLACE-INPUT (not mentioned in the spec). --- /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2007/02/19 00:12:22 1.17 +++ /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2007/08/20 14:27:13 1.18 @@ -165,8 +165,8 @@ (loop with buffer = (buffer (drei-instance stream)) until (>= (stream-scan-pointer stream) (size buffer)) - while (typep (buffer-object buffer (stream-scan-pointer stream)) - 'noise-string) + while (or (typep #1=(buffer-object buffer (stream-scan-pointer stream)) 'noise-string) + (delimiter-gesture-p #1#)) do (incf (stream-scan-pointer stream))) (setf (input-position stream) (stream-scan-pointer stream)))) @@ -310,7 +310,7 @@ (start 0) (end (length new-input)) (buffer-start (input-position stream)) - rescan) + (rescan nil rescan-supplied-p)) (check-type start integer) (check-type end integer) (check-type buffer-start integer) @@ -338,7 +338,11 @@ ;; Make the buffer reflect the changes in the array. (synchronize-input-buffer-array stream)) (display-drei drei) - (when (or rescan (not equal)) + ;; XXX: This behavior for the :rescan parameter is not mentioned + ;; explicitly in any CLIM guide, but McCLIM input-editing + ;; machinery relies on it. + (when (and (or rescan (not equal)) + (or rescan (not rescan-supplied-p))) (queue-rescan stream)) ;; We have to return "the position in the input buffer". We ;; return the insertion position.

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 20 Aug '07

20 Aug '07

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv30204 Modified Files: input-editing.lisp decls.lisp Log Message: Fixed last known Drei input-editing-stream issue by implementing Goatee-style handling of :REPLACE keyword parameter to STREAM-REPLACE-INPUT (not mentioned in the spec). --- /project/mcclim/cvsroot/mcclim/input-editing.lisp 2006/12/12 22:36:32 1.55 +++ /project/mcclim/cvsroot/mcclim/input-editing.lisp 2007/08/20 14:27:14 1.56 @@ -382,6 +382,7 @@ (adjust-array so-far (length input) :fill-pointer (length input)) (replace so-far input) + ;; XXX: Relies on non-specified behavior of :rescan. (replace-input stream input :rescan nil))) (multiple-value-bind (object success input) (complete-input-rescan stream func partial-completers @@ -420,9 +421,8 @@ :n-columns 1) (declare (ignore event)) (if item - (progn - (setf (values input success object nmatches) - (values (car item) t menu-object 1))) + (setf (values input success object nmatches) + (values (car item) t menu-object 1)) (setf success nil nmatches 0)))) (unless (and (eq mode :complete) (not success)) --- /project/mcclim/cvsroot/mcclim/decls.lisp 2007/02/07 12:44:16 1.46 +++ /project/mcclim/cvsroot/mcclim/decls.lisp 2007/08/20 14:27:14 1.47 @@ -581,10 +581,42 @@ ;;; 24.4 Reading and Writing of Tokens (defgeneric replace-input - (stream new-input &key start end buffer-start rescan)) + (stream new-input &key start end buffer-start rescan) + ;; XXX: Nonstandard behavior for :rescan. + (:documentation "Replaces the part of the input editing stream +`stream's input buffer that extends from `buffer-start' to its +scan pointer with the string `new-input'. `buffer-start' defaults +to the current input position of stream, which is the position at +which the current accept \"session\" starts. `start' and `end' can be +supplied to specify a subsequence of `new-input'; start defaults to +0 and end defaults to the length of `new-input'. + +`replace-input' will queue a rescan by calling `queue-rescan' if +the new input does not match the old input, or `rescan' is +true. If `rescan' is explicitly provided as NIL, no rescan will +be queued in any case. + +The returned value is the position in the input buffer.")) + (defgeneric presentation-replace-input (stream object type view - &key buffer-start rescan query-identifier for-context-type)) + &key buffer-start rescan query-identifier for-context-type) + (:documentation "Like `replace-input', except that the new +input to insert into the input buffer is gotten by presenting +`object' with the presentation type `type' and view +`view'. `buffer-start' and `rescan' are as for `replace-input', +and `query-identifier' and `for-context-type' as as for +`present'. + +Typically, this function will be implemented by calling +`present-to-string' on `object', `type', `view', and +`for-context-type', and then calling `replace-input' on the +resulting string. + +If the object cannot be transformed into an acceptable textual +form, it may be inserted as a special \"accept result\" that is +considered a single gesture. These accept result objects have no +standardised form.")) ;;; 27.3 Command Menus

1 0

[mcclim-cvs] CVS mcclim/Drei/Tests/cl-automaton
by thenriksen 15 Aug '07

15 Aug '07

Update of /project/mcclim/cvsroot/mcclim/Drei/Tests/cl-automaton In directory clnet:/tmp/cvs-serv25734/Drei/Tests/cl-automaton Modified Files: state-and-transition-tests.lisp regexp-tests.lisp eqv-hash-tests.lisp automaton-tests.lisp Log Message: Revamped the Drei test suite infrastructure slightly. --- /project/mcclim/cvsroot/mcclim/Drei/Tests/cl-automaton/state-and-transition-tests.lisp 2006/12/04 07:54:51 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/cl-automaton/state-and-transition-tests.lisp 2007/08/15 10:03:31 1.2 @@ -23,7 +23,7 @@ (cl:in-package :drei-tests) (def-suite state-and-transition-tests :description "The test -suite for CL-AUTOMATON state-and-transition related tests.") +suite for CL-AUTOMATON state-and-transition related tests." :in automaton-tests) (in-suite state-and-transition-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/cl-automaton/regexp-tests.lisp 2006/12/04 07:54:51 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/cl-automaton/regexp-tests.lisp 2007/08/15 10:03:32 1.2 @@ -23,7 +23,7 @@ (cl:in-package :drei-tests) (def-suite regexp-tests :description "The test suite for -CL-AUTOMATON regexp related tests.") +CL-AUTOMATON regexp related tests." :in automaton-tests) (in-suite regexp-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/cl-automaton/eqv-hash-tests.lisp 2006/12/04 07:54:51 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/cl-automaton/eqv-hash-tests.lisp 2007/08/15 10:03:32 1.2 @@ -23,7 +23,7 @@ (cl:in-package :drei-tests) (def-suite eqv-hash-tests :description "The test suite for -CL-AUTOMATON eqv-hash related tests.") +CL-AUTOMATON eqv-hash related tests." :in automaton-tests) (in-suite eqv-hash-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/cl-automaton/automaton-tests.lisp 2006/12/04 07:54:51 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/cl-automaton/automaton-tests.lisp 2007/08/15 10:03:32 1.2 @@ -23,7 +23,7 @@ (cl:in-package :drei-tests) (def-suite automaton-tests :description "The test suite for -CL-AUTOMATON related tests.") +CL-AUTOMATON related tests." :in drei-tests) (in-suite automaton-tests)

1 0

[mcclim-cvs] CVS mcclim/Drei/Tests
by thenriksen 15 Aug '07

15 Aug '07

Update of /project/mcclim/cvsroot/mcclim/Drei/Tests In directory clnet:/tmp/cvs-serv25734/Drei/Tests Modified Files: undo-tests.lisp testing.lisp rectangle-tests.lisp motion-tests.lisp lisp-syntax-tests.lisp kill-ring-tests.lisp editing-tests.lisp core-tests.lisp buffer-tests.lisp buffer-streams-tests.lisp base-tests.lisp Log Message: Revamped the Drei test suite infrastructure slightly. --- /project/mcclim/cvsroot/mcclim/Drei/Tests/undo-tests.lisp 2006/12/04 07:54:51 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/undo-tests.lisp 2007/08/15 10:03:32 1.2 @@ -21,7 +21,7 @@ (cl:in-package :drei-tests) (def-suite undo-tests :description "The test suite for tests -related to Drei's undo system.") +related to Drei's undo system." :in drei-tests) (in-suite undo-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/testing.lisp 2007/02/17 17:54:06 1.4 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/testing.lisp 2007/08/15 10:03:32 1.5 @@ -23,7 +23,7 @@ (cl:in-package :drei-tests) ;; Define some stuff to ease the pain of writing repetitive test -;; cases. Also provide test-running entry point. +;; cases. Also provide global test-suite and test-running entry point. (defclass delegating-standard-buffer (delegating-buffer) () (:default-initargs :implementation (make-instance 'standard-buffer))) @@ -93,34 +93,11 @@ (with-bound-drei-special-variables (,drei :minibuffer nil) ,@body))))) +(def-suite drei-tests :description "The test suite for all Drei +test cases. Has nested test suites for the actual tests.") + (defun run-tests () - (format t "Testing buffer protocol implementation(s)~%") - (run! 'buffer-tests) - (format t "Testing basic functions~%") - (run! 'base-tests) - (format t "Testing the kill ring~%") - (run! 'kill-ring-tests) - (format t "Testing mark motion~%") - (run! 'motion-tests) - (format t "Testing text editing functions~%") - (run! 'editing-tests) - (format t "Testing miscellaneus editor functions~%") - (run! 'core-tests) - (format t "Testing buffer-based gray streams~%") - (run! 'buffer-streams-tests) - (format t "Testing rectangle editing~%") - (run! 'rectangle-tests) - (format t "Testing undo~%") - (run! 'undo-tests) - (format t "Testing the Lisp syntax module~%") - (run! 'lisp-syntax-tests) - - (format t "Running the CL-AUTOMATON tests~%") - (format t "Testing regular expressions~%") - (run! 'regexp-tests) - (format t "Testing eqv-hash~%") - (run! 'eqv-hash-tests) - (format t "Testing states and transitions~%") - (run! 'state-and-transition-tests) - (format t "Testing core automata functions~%") - (run! 'automaton-tests)) + "Run the Drei test suite. A dot will be printed for each passed +test, a \"f\" for each failed test, a \"X\" for each test that +causes an error, and an \"s\" for each skipped test." + (run! 'drei-tests)) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/rectangle-tests.lisp 2006/12/04 07:54:51 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/rectangle-tests.lisp 2007/08/15 10:03:32 1.2 @@ -21,7 +21,7 @@ (cl:in-package :drei-tests) (def-suite rectangle-tests :description "The test suite for -rectangle-editing related tests.") +rectangle-editing related tests." :in drei-tests) (in-suite rectangle-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/motion-tests.lisp 2007/04/27 21:37:15 1.3 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/motion-tests.lisp 2007/08/15 10:03:32 1.4 @@ -22,7 +22,7 @@ (cl:in-package :drei-tests) (def-suite motion-tests :description "The test suite for -DREI-MOTION related tests.") +DREI-MOTION related tests." :in drei-tests) (in-suite motion-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/lisp-syntax-tests.lisp 2007/08/13 21:58:43 1.5 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/lisp-syntax-tests.lisp 2007/08/15 10:03:32 1.6 @@ -25,7 +25,7 @@ explicitly tested. Instead, it is hoped that any defects will be caught by other test cases, all of which depend on correct parsing. Also, redisplay is not tested, because no-one has any -idea how to do it.") +idea how to do it." :in drei-tests) (in-suite lisp-syntax-tests) @@ -1797,6 +1797,7 @@ ;; Also, as fun as infinite recursion would be... disable this ;; test before running the suite. (let ((*run-self-compilation-test* nil)) - (format t "Re-running Drei test suite with newly evaluated Drei definitions~%") - (run-tests))) + (format *test-dribble* "~%Re-running Drei test suite with newly evaluated Drei definitions~%") + (is-true (results-status (let ((fiveam:*test-dribble* (make-broadcast-stream))) + (fiveam:run 'drei-tests)))))) (skip "Sensibly skipping self-compilation test. Set DREI-TESTS:*RUN-SELF-COMPILATION-TEST* to true if you don't want to skip it"))) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/kill-ring-tests.lisp 2006/12/04 07:54:51 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/kill-ring-tests.lisp 2007/08/15 10:03:32 1.2 @@ -27,7 +27,7 @@ (in-package :drei-tests) (def-suite kill-ring-tests :description "The test suite for DREI-KILL-RING -related tests.") +related tests." :in drei-tests) (in-suite kill-ring-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/editing-tests.lisp 2006/12/04 07:54:51 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/editing-tests.lisp 2007/08/15 10:03:32 1.2 @@ -23,7 +23,7 @@ (cl:in-package :drei-tests) (def-suite editing-tests :description "The test suite for -DREI-EDITING related tests.") +DREI-EDITING related tests." :in drei-tests) (in-suite editing-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/core-tests.lisp 2007/02/13 12:14:11 1.3 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/core-tests.lisp 2007/08/15 10:03:32 1.4 @@ -23,7 +23,7 @@ (cl:in-package :drei-tests) (def-suite core-tests :description "The test suite for -DREI-CORE related tests.") +DREI-CORE related tests." :in drei-tests) (in-suite core-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/buffer-tests.lisp 2006/12/04 07:54:51 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/buffer-tests.lisp 2007/08/15 10:03:32 1.2 @@ -28,7 +28,7 @@ (cl:in-package :drei-tests) (def-suite buffer-tests :description "The test suite for -buffer-protocol related tests.") +buffer-protocol related tests." :in drei-tests) (in-suite buffer-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/buffer-streams-tests.lisp 2007/01/15 11:35:53 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/buffer-streams-tests.lisp 2007/08/15 10:03:32 1.2 @@ -23,7 +23,7 @@ (cl:in-package :drei-tests) (def-suite buffer-streams-tests :description "The test suite for -buffer-streams related tests.") +buffer-streams related tests." :in drei-tests) (in-suite buffer-streams-tests) --- /project/mcclim/cvsroot/mcclim/Drei/Tests/base-tests.lisp 2007/02/13 12:14:11 1.2 +++ /project/mcclim/cvsroot/mcclim/Drei/Tests/base-tests.lisp 2007/08/15 10:03:32 1.3 @@ -26,7 +26,7 @@ (cl:in-package :drei-tests) (def-suite base-tests :description "The test suite for DREI-BASE -related tests.") +related tests." :in drei-tests) (in-suite base-tests)

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 15 Aug '07

15 Aug '07

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv25734 Modified Files: mcclim.asd Log Message: Revamped the Drei test suite infrastructure slightly. --- /project/mcclim/cvsroot/mcclim/mcclim.asd 2007/08/13 21:58:46 1.57 +++ /project/mcclim/cvsroot/mcclim/mcclim.asd 2007/08/15 10:03:32 1.58 @@ -327,10 +327,10 @@ "cl-automaton" :depends-on ("testing") :components - ((:file "eqv-hash-tests") - (:file "state-and-transition-tests") - (:file "automaton-tests") - (:file "regexp-tests"))) + ((:file "automaton-tests") + (:file "state-and-transition-tests" :depends-on ("automaton-tests")) + (:file "eqv-hash-tests" :depends-on ("automaton-tests")) + (:file "regexp-tests" :depends-on ("automaton-tests")))) (:file "packages") (:file "testing" :depends-on ("packages")) (:file "buffer-tests" :depends-on ("testing"))

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

mcclim-cvs August 2007