From b8a4296ea50f31577fa6ee695ef900a4637ee0c9 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 31 Aug 2007 18:04:31 +0000 Subject: [PATCH] r11859: Canonicalize whitespace --- cl-readline.c | 34 +++++++++++++++++----------------- cl-termios.c | 14 +++++++------- packages.lisp | 14 +++++++------- readline.lisp | 42 +++++++++++++++++++++--------------------- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/cl-readline.c b/cl-readline.c index 63874f6..3697a77 100644 --- a/cl-readline.c +++ b/cl-readline.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003 Nikodemus Siivola - * + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -8,10 +8,10 @@ * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -43,10 +43,10 @@ add_completion (char * str) { int cmp = strcmp (str, tmp->str); if (0 == cmp) - return 1; - + return 1; + if (0 < cmp) - break; + break; /* printf ("-skip- (%s)\n", tmp->str);*/ @@ -57,13 +57,13 @@ add_completion (char * str) node = malloc (sizeof (node_t)); if (!node) return 0; - + node->next = tmp; node->str = strdup (str); if (! pre) collection = node; - else + else pre->next = node; return 1; @@ -80,15 +80,15 @@ custom_completer (const char * str, int target) root = NULL; node_t * tmp = collection; while (len && tmp) - { - if (0 == strncmp (str, tmp->str, len)) - { - root = tmp; - return strdup (root->str); - } - else - tmp = tmp->next; - } + { + if (0 == strncmp (str, tmp->str, len)) + { + root = tmp; + return strdup (root->str); + } + else + tmp = tmp->next; + } return (char *)NULL; } else if (root && (0 == strncmp (str, root->str, len))) diff --git a/cl-termios.c b/cl-termios.c index cfc9a8b..221dc63 100644 --- a/cl-termios.c +++ b/cl-termios.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003 Nikodemus Siivola - * + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -8,10 +8,10 @@ * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -49,13 +49,13 @@ save_term (void) return 1; } - + void restore_term (void) { state_t * tmp = stack; if (!stack) return; - + tcsetattr (STDIN_FILENO, TCSANOW, stack->attr); stack = stack->next; @@ -66,8 +66,8 @@ restore_term (void) int no_echo (void) { - struct termios attr; - if (! (isatty (STDIN_FILENO) && save_term ())) + struct termios attr; + if (! (isatty (STDIN_FILENO) && save_term ())) return 0; tcgetattr (STDIN_FILENO, &attr); diff --git a/packages.lisp b/packages.lisp index 51c0b1a..cd3ecf1 100644 --- a/packages.lisp +++ b/packages.lisp @@ -1,5 +1,5 @@ ;; Copyright (c) 2003 Nikodemus Siivola -;; +;; ;; Permission is hereby granted, free of charge, to any person obtaining ;; a copy of this software and associated documentation files (the ;; "Software"), to deal in the Software without restriction, including @@ -7,10 +7,10 @@ ;; distribute, sublicense, and/or sell copies of the Software, and to ;; permit persons to whom the Software is furnished to do so, subject to ;; the following conditions: -;; +;; ;; The above copyright notice and this permission notice shall be included ;; in all copies or substantial portions of the Software. -;; +;; ;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -21,7 +21,7 @@ (defpackage readline (:nicknames rl) - (:use cl uffi) + (:use cl uffi) (:export add-completion add-history @@ -35,11 +35,11 @@ )) (uffi:load-foreign-library "/lib/libreadline.so.4" - :module "readline") + :module "readline") (uffi:load-foreign-library "cl-readline.o" - :module "cl-readline") + :module "cl-readline") (uffi:load-foreign-library "cl-termios.o" - :module "cl-termios") + :module "cl-termios") diff --git a/readline.lisp b/readline.lisp index ea2dede..18b48c0 100644 --- a/readline.lisp +++ b/readline.lisp @@ -1,5 +1,5 @@ ;; Copyright (c) 2003 Nikodemus Siivola -;; +;; ;; Permission is hereby granted, free of charge, to any person obtaining ;; a copy of this software and associated documentation files (the ;; "Software"), to deal in the Software without restriction, including @@ -7,10 +7,10 @@ ;; distribute, sublicense, and/or sell copies of the Software, and to ;; permit persons to whom the Software is furnished to do so, subject to ;; the following conditions: -;; +;; ;; The above copyright notice and this permission notice shall be included ;; in all copies or substantial portions of the Software. -;; +;; ;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -18,7 +18,7 @@ ;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + (in-package readline) (defvar *whitespace* (list #\Space #\Tab)) @@ -31,8 +31,8 @@ (defmacro ignore-end-of-file (&body forms) `(catch 'end-of-file (handler-bind ((end-of-file (lambda (e) - (declare (ignore e)) - (throw 'end-of-file nil)))) + (declare (ignore e)) + (throw 'end-of-file nil)))) ,@forms))) (def-function ("readline" c-readline) @@ -66,7 +66,7 @@ :returning :void) (let (pkg) - + (defun add-completion (string) "Add STRING as a custom-completion." (setq pkg nil) @@ -77,14 +77,14 @@ "Clear all custom-completions." (setq pkg nil) (c-clear-completions)) - + (defun use-package-complete (package) "Load symbols in package CL-USER as custom-completions." (unless (eql pkg package) (setq pkg package) (clear-completions) (do-symbols (sym (find-package package)) - (add-completion (string-downcase (string sym))))) + (add-completion (string-downcase (string sym))))) (use-custom-complete) nil)) @@ -97,29 +97,29 @@ (with-cstring (c-string string) (c-add-history c-string)) string) - + (defun readline (&key (prompt "") (history t)) "Read a line from current TTY with line-editing." (with-cstring (c-prompt prompt) (let* ((str (convert-and-free-foreign-string (c-readline c-prompt))) - (str2 (string-trim *whitespace* str))) + (str2 (string-trim *whitespace* str))) (when (and history (not (string= "" str2))) - (add-history str2)) + (add-history str2)) str))) (defun readexpr (&key - (primary-prompt "=> ") - (secondary-prompt "| ") - (history t)) + (primary-prompt "=> ") + (secondary-prompt "| ") + (history t)) "Read an expression from current TTY with line-editing." (let (expr) (do* ((str (readline :prompt primary-prompt :history history) - (readline :prompt secondary-prompt :history history)) - (input str (concatenate 'string input " " str))) - ((ignore-end-of-file - (setq expr (with-input-from-string (in input) - (read in nil nil)))) - expr)))) + (readline :prompt secondary-prompt :history history)) + (input str (concatenate 'string input " " str))) + ((ignore-end-of-file + (setq expr (with-input-from-string (in input) + (read in nil nil)))) + expr)))) ;; ;; Termios -- 2.34.1