From 1137f61adeb416d89436a6849a07f28c8f329fc1 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 14 Jul 2018 03:23:38 -0400 Subject: Switched to using new bit syntax in new-luxc. --- .../source/luxc/lang/translation/common-lisp/case.jvm.lux | 2 +- .../source/luxc/lang/translation/common-lisp/eval.jvm.lux | 4 ++-- .../luxc/lang/translation/common-lisp/runtime.jvm.lux | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'new-luxc/source/luxc/lang/translation/common-lisp') diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/case.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/case.jvm.lux index 373d23ae4..78149471d 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/case.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/case.jvm.lux @@ -89,7 +89,7 @@ (def: (pm-catch handler) (-> Expression Handler) - [(_.bool true) $alt_error + [(_.bool #1) $alt_error (_.progn (list (_.setq! $alt_error (_.format/3 _.nil (_.string "~A") (@@ $alt_error))) diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux index c88e83ed5..54b77e60d 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux @@ -124,11 +124,11 @@ (#e.Success (DoubleFloat::doubleValue [] (:coerce DoubleFloat host-object))) (host.instance? org/armedbear/lisp/Nil host-object) - (#e.Success false) + (#e.Success #0) (host.instance? org/armedbear/lisp/Symbol host-object) (if (is? Symbol::T (:coerce Symbol host-object)) - (#e.Success true) + (#e.Success #1) (ex.throw Unknown-Kind-Of-Host-Object (:coerce Object host-object))) (host.instance? org/armedbear/lisp/SimpleString host-object) diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux index 43c1fd2a0..fe0a620d9 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux @@ -37,19 +37,19 @@ (def: #export none Expression - (variant +0 false unit)) + (variant +0 #0 unit)) (def: #export some (-> Expression Expression) - (variant +1 true)) + (variant +1 #1)) (def: #export left (-> Expression Expression) - (variant +0 false)) + (variant +0 #0)) (def: #export right (-> Expression Expression) - (variant +1 true)) + (variant +1 #1)) (type: Runtime Expression) @@ -105,7 +105,7 @@ (runtime: (lux//try op) (with-vars [error] (_.handler-case - (list [(_.bool true) error + (list [(_.bool #1) error (..left (_.format/3 _.nil (_.string "~A") (@@ error)))]) (..right (_.funcall (list ..unit) (@@ op)))))) @@ -272,8 +272,8 @@ (_.if (_.eq (@@ old) (@@ temp)) (_.progn (list (_.setf! (_.svref (@@ atom) (_.int 0)) (@@ new)) - (_.bool true))) - (_.bool false))))) + (_.bool #1))) + (_.bool #0))))) (def: runtime//atom Runtime -- cgit v1.2.3