X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/06339d58e80cfb04604f00016f1c1e6921e87928..6e21a5d25bca57a78f052d6a24b97b88e83cc6fb:/src/codegen-impl.lisp?ds=inline diff --git a/src/codegen-impl.lisp b/src/codegen-impl.lisp index c4f83e1..6842b00 100644 --- a/src/codegen-impl.lisp +++ b/src/codegen-impl.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 @@ -80,18 +80,18 @@ (defmethod print-object ((var temporary-name) stream) ;; package. The `definst' machinery will symbolicate the various associated ;; methods correctly despite this subterfuge. -(definst if (stream :export t) (#1=#:condition consequent alternative) - (format-compound-statement (stream consequent alternative) +(definst if (stream :export t) (#1=#:cond conseq alt) + (format-compound-statement (stream conseq alt) (format stream "if (~A)" #1#)) - (when alternative - (format-compound-statement (stream alternative) + (when alt + (format-compound-statement (stream alt) (write-string "else" stream)))) -(definst while (stream :export t) (#1=#:condition body) +(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=#:condition) +(definst do-while (stream :export t) (body #1=#:cond) (format-compound-statement (stream body :space) (write-string "do" stream)) (format stream "while (~A);" #1#))