X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/9ec578d9fe450b7e7f9030dc9d930185593aa991..b07535d86a625c99240d8fdc46d589f5cc03a29c:/src/parser/floc-proto.lisp

diff --git a/src/parser/floc-proto.lisp b/src/parser/floc-proto.lisp
index ca5aaee..484fce0 100644
--- a/src/parser/floc-proto.lisp
+++ b/src/parser/floc-proto.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -58,8 +58,8 @@
 
 (export '(enclosing-condition enclosed-condition))
 (define-condition enclosing-condition (condition)
-  ((enclosed-condition :initarg :condition :type condition
-		       :reader enclosed-condition))
+  ((%enclosed-condition :initarg :condition :type condition
+			:reader enclosed-condition))
   (:documentation
    "A condition which encloses another condition
 
@@ -165,7 +165,7 @@
     (etypecase datum
       (condition-with-location datum)
       (condition (wrap datum))
-      (symbol (apply #'make arguments))
+      (symbol (apply #'make datum arguments))
       ((or string function) (make default-type
 				  :format-control datum
 				  :format-arguments arguments)))))