From e85df3ff84611b7c790f9ffb46dfca77e2a717c0 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Wed, 16 Dec 2015 05:25:51 +0000 Subject: [PATCH] src/: Style cleanup: use constant names for types where available. For example, say `c-type-int' rather than `(c-type int)'. --- src/class-make-impl.lisp | 3 ++- src/class-utilities.lisp | 2 +- src/codegen-test.lisp | 12 ++++++------ src/method-impl.lisp | 14 ++++++-------- src/method-proto.lisp | 5 ++--- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/class-make-impl.lisp b/src/class-make-impl.lisp index 906519b..8aacd40 100644 --- a/src/class-make-impl.lisp +++ b/src/class-make-impl.lisp @@ -226,7 +226,8 @@ (every (lambda (arg) (or (eq arg :ellipsis) (argument-name arg) - (eq (argument-type arg) (c-type void)))) + (c-type-equal-p (argument-type arg) + c-type-void))) (c-function-arguments type))) (error "Abstract declarators not permitted in method definitions"))) diff --git a/src/class-utilities.lisp b/src/class-utilities.lisp index d57d07d..573c677 100644 --- a/src/class-utilities.lisp +++ b/src/class-utilities.lisp @@ -161,7 +161,7 @@ (every (lambda (message-arg method-arg) (if (eq message-arg :ellipsis) (c-type-equal-p (argument-type method-arg) - (c-type va-list)) + c-type-va-list) (c-type-equal-p (argument-type message-arg) (argument-type method-arg)))) message-args method-args))) diff --git a/src/codegen-test.lisp b/src/codegen-test.lisp index c01dc8c..81fa3e0 100644 --- a/src/codegen-test.lisp +++ b/src/codegen-test.lisp @@ -35,13 +35,13 @@ (codegen-push codegen) (loop for (name init) in '(("aa" 1) ("bb" 0)) - do (ensure-var codegen name (c-type int) init)) + do (ensure-var codegen name c-type-int init)) (codegen-push codegen) - (with-temporary-var (codegen r (c-type int)) + (with-temporary-var (codegen r c-type-int) (emit-inst codegen(make-set-inst r "u%v")) - (with-temporary-var (codegen q (c-type int)) + (with-temporary-var (codegen q c-type-int) (emit-inst codegen (make-set-inst q "u/v")) - (with-temporary-var (codegen a (c-type int)) + (with-temporary-var (codegen a c-type-int) (emit-insts codegen (list (make-set-inst a "aa") (make-set-inst "aa" "bb") @@ -62,8 +62,8 @@ (loop for (name init) in '(("u" "atoi(argv[1])") ("v" "atoi(argv[2])") ("a")) - do (ensure-var codegen name (c-type int) init)) - (ensure-var codegen "g" (c-type int) + do (ensure-var codegen name c-type-int init)) + (ensure-var codegen "g" c-type-int (make-call-inst "gcd" (list "u" "v" "&a"))) (emit-inst codegen (make-expr-inst (make-call-inst "printf" diff --git a/src/method-impl.lisp b/src/method-impl.lisp index 6f22a14..725a0ec 100644 --- a/src/method-impl.lisp +++ b/src/method-impl.lisp @@ -55,7 +55,7 @@ (define-on-demand-slot basic-message no-varargs-tail (message) (mapcar (lambda (arg) (if (eq arg :ellipsis) - (make-argument *sod-ap* (c-type va-list)) + (make-argument *sod-ap* c-type-va-list) arg)) (sod-message-argument-tail message))) @@ -147,7 +147,7 @@ (message sod-message) (type c-function-type)) (with-slots ((msgtype %type)) message - (unless (c-type-equal-p (c-type-subtype type) (c-type void)) + (unless (c-type-equal-p (c-type-subtype type) c-type-void) (error "Method return type ~A must be `void'" (c-type-subtype type))) (unless (argument-lists-compatible-p (c-function-arguments msgtype) (c-function-arguments type)) @@ -178,8 +178,7 @@ (return-type (c-type-subtype (sod-message-type message))) (msgargs (sod-message-argument-tail message)) (arguments (if (varargs-message-p message) - (cons (make-argument *sod-master-ap* - (c-type va-list)) + (cons (make-argument *sod-master-ap* c-type-va-list) (butlast msgargs)) msgargs))) (c-type (fun (lisp return-type) @@ -197,8 +196,7 @@ method))))) . (if (varargs-message-p message) - (cons (make-argument *sod-master-ap* - (c-type va-list)) + (cons (make-argument *sod-master-ap* c-type-va-list) method-args) method-args))))) @@ -275,7 +273,7 @@ (declare (ignore slot-names)) (with-slots (message target) codegen (setf target - (if (eq (c-type-subtype (sod-message-type message)) (c-type void)) + (if (eq (c-type-subtype (sod-message-type message)) c-type-void) :void :return)))) @@ -454,7 +452,7 @@ ("me" (* (class tail))) . raw-entry-args)))) (codegen-push codegen) - (ensure-var codegen *sod-ap* (c-type va-list)) + (ensure-var codegen *sod-ap* c-type-va-list) (convert-stmts codegen entry-target return-type (lambda (target) (emit-inst codegen diff --git a/src/method-proto.lisp b/src/method-proto.lisp index 6a1b640..12cefc8 100644 --- a/src/method-proto.lisp +++ b/src/method-proto.lisp @@ -292,7 +292,7 @@ (convert-stmts codegen target (c-type-subtype (sod-method-type direct-method)) (lambda (var) - (ensure-var codegen *sod-tmp-ap* (c-type va-list)) + (ensure-var codegen *sod-tmp-ap* c-type-va-list) (emit-inst codegen (make-va-copy-inst *sod-tmp-ap* *sod-ap*)) @@ -338,8 +338,7 @@ (return-type (c-type-subtype message-type)) (raw-args (sod-message-argument-tail message)) (arguments (if (varargs-message-p message) - (cons (make-argument *sod-ap* - (c-type va-list)) + (cons (make-argument *sod-ap* c-type-va-list) (butlast raw-args)) raw-args))) (codegen-push codegen) -- 2.11.0