X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/e5152ebe572654951e849ba89d2c8ba4d4223e80..d7d819976cb5d84766bffd2c5272c86203687ee9:/infix.lisp diff --git a/infix.lisp b/infix.lisp index 9c77afe..64a0a30 100644 --- a/infix.lisp +++ b/infix.lisp @@ -11,12 +11,12 @@ ;;; it under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 2 of the License, or ;;; (at your option) any later version. -;;; +;;; ;;; This program is distributed in the hope that it will be useful, ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;;; GNU General Public License for more details. -;;; +;;; ;;; You should have received a copy of the GNU General Public License ;;; along with this program; if not, write to the Free Software Foundation, ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -610,11 +610,11 @@ (pushval `(loop ,@(strip-progn (parse-infix 0))))) (defopfunc bind operand - (labels ((loop () + (labels ((loopy () (let ((ids (parse-ident-list)) (valform (progn (delim '=) (parse-infix 0))) (body (if (delim '|,| nil) - (loop) + (loopy) (progn (delim 'in) (strip-progn (parse-infix 0)))))) @@ -622,7 +622,7 @@ `(let ((,(car ids) ,valform)) ,@body) `(multiple-value-bind ,ids ,valform ,@body)))))) (get-token) - (pushval (car (loop))))) + (pushval (car (loopy))))) ;;;-------------------------------------------------------------------------- ;;; Parsing function bodies and lambda lists. @@ -673,7 +673,7 @@ (cond ((delim '|(| nil) (prog1 (parse-infix) (delim '|)|))) (t (prog1 *token* (get-token))))) - + (defopfunc lambda operand (get-token) (pushval `(lambda ,(parse-lambda-list) ,@(strip-progn (parse-infix 0)))))