lib/keyword.c (kw_parseempty): Use correct variable scanning `kwval' list.

[sod] / src / codegen-impl.lisp

diff --git a/src/codegen-impl.lisp b/src/codegen-impl.lisp
index bc6f11d56b72c629d6284c934b27d701614a47a0..ccc66a10d2483b816a3a04dffc4c1bfbe858ce51 100644 (file)
--- a/src/codegen-impl.lisp
+++ b/src/codegen-impl.lisp
@@ -70,40 +70,6 @@ (defmethod print-object ((var temporary-name) stream)
        (prin1 (temp-tag var) stream))
       (format-temporary-name var stream)))
 
        (prin1 (temp-tag var) stream))
       (format-temporary-name var stream)))
 

-;;;--------------------------------------------------------------------------
-;;; Instruction types.
-
-;; Compound statements.
-
-;; HACK: use gensyms for the `condition' slots to avoid leaking the slot
-;; names, since the symbol `condition' actually comes from the `common-lisp'
-;; package.  The `definst' machinery will symbolicate the various associated
-;; methods correctly despite this subterfuge.
-
-(definst if (stream :export t) (#1=#:cond conseq alt)
-  (format-compound-statement (stream conseq alt)
-    (format stream "if (~A)" #1#))
-  (when alt
-    (format-compound-statement (stream alt)
-      (write-string "else" stream))))
-
-(definst while (stream :export t) (#1=#:cond body)
-  (format-compound-statement (stream body)
-    (format stream "while (~A)" #1#)))
-
-(definst do-while (stream :export t) (body #1=#:cond)
-  (format-compound-statement (stream body :space)
-    (write-string "do" stream))
-  (format stream "while (~A);" #1#))
-
-
-;; Expressions.
-
-;; HACK: use a gensym for the `func' slot to avoid leaking the slot name,
-;; since the symbol `func' is exported from our package.
-(definst call (stream :export t) (#1=#:func args)
-  (format stream "~A(~@<~{~A~^, ~_~}~:>)" #1# args))
-

 ;;;--------------------------------------------------------------------------
 ;;; Code generator objects.
 
 ;;;--------------------------------------------------------------------------
 ;;; Code generator objects.
 


@@ -146,12 +112,12 @@ (defmethod ensure-var ((codegen basic-codegen) name type &optional init)
           (setf (codegen-vars codegen)
                 (cons (make-var-inst name type init) vars)))
          ((not (c-type-equal-p type (inst-type var)))
           (setf (codegen-vars codegen)
                 (cons (make-var-inst name type init) vars)))
          ((not (c-type-equal-p type (inst-type var)))

-          (error "(Internal) Redefining type for variable ~A." name)))
+          (error "(Internal) Redefining type for variable ~A" name)))

     name))
 
 (export 'codegen)
 (defclass codegen (basic-codegen)
     name))
 
 (export 'codegen)
 (defclass codegen (basic-codegen)

-  ((functions :initform nil :type list :accessor codegen-functions)
+  ((functions :initform nil :type list :reader codegen-functions)

    (stack :initform nil :type list :accessor codegen-stack))
   (:documentation
    "A full-fat code generator which can generate and track functions.
    (stack :initform nil :type list :accessor codegen-stack))
   (:documentation
    "A full-fat code generator which can generate and track functions.


@@ -195,7 +161,7 @@ (defmethod temporary-var ((codegen basic-codegen) type)
                                    :in-use-p t
                                    :tag (prog1 temp-index
                                           (incf temp-index)))))
                                    :in-use-p t
                                    :tag (prog1 temp-index
                                           (incf temp-index)))))

-         (push (make-var-inst name type nil) vars)
+         (push (make-var-inst name type) vars)

          name))))
 
 ;;;----- That's all, folks --------------------------------------------------
          name))))
 
 ;;;----- That's all, folks --------------------------------------------------