From 76b47564f89bac5eb6604da7bbb94aabb83d6d84 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Mon, 30 Jul 2018 22:27:36 -0400 Subject: Updating new-luxc to latest Lux changes [Part 2]. --- stdlib/source/lux/compiler/default/phase/synthesis/case.lux | 2 +- .../lux/compiler/default/phase/translation/scheme/case.jvm.lux | 8 ++++---- .../test/test/lux/compiler/default/phase/synthesis/primitive.lux | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stdlib/source/lux/compiler/default/phase/synthesis/case.lux b/stdlib/source/lux/compiler/default/phase/synthesis/case.lux index eaa7621f6..3e59637a8 100644 --- a/stdlib/source/lux/compiler/default/phase/synthesis/case.lux +++ b/stdlib/source/lux/compiler/default/phase/synthesis/case.lux @@ -103,7 +103,7 @@ rightP )) ([#//.Bit bit/=] - [#//.I64 (:coerce (Equivalence I64) i/=)] + [#//.I64 "lux i64 ="] [#//.F64 frac/=] [#//.Text text/=]) diff --git a/stdlib/source/lux/compiler/default/phase/translation/scheme/case.jvm.lux b/stdlib/source/lux/compiler/default/phase/translation/scheme/case.jvm.lux index 5ab0c56dd..1d9415a99 100644 --- a/stdlib/source/lux/compiler/default/phase/translation/scheme/case.jvm.lux +++ b/stdlib/source/lux/compiler/default/phase/translation/scheme/case.jvm.lux @@ -121,10 +121,10 @@ (^ ( value)) (operation/wrap (_.when (|> value (<=> cursor-top) _.not/1) fail-pm!))) - ([synthesis.path/bit _.bool _.eqv?/2] - [synthesis.path/i64 _.int _.=/2] - [synthesis.path/f64 _.float _.=/2] - [synthesis.path/text _.string _.eqv?/2]) + ([synthesis.path/bit _.bool _.eqv?/2] + [synthesis.path/i64 (<| _.int .int) _.=/2] + [synthesis.path/f64 _.float _.=/2] + [synthesis.path/text _.string _.eqv?/2]) (^template [ ] (^ ( idx)) diff --git a/stdlib/test/test/lux/compiler/default/phase/synthesis/primitive.lux b/stdlib/test/test/lux/compiler/default/phase/synthesis/primitive.lux index 9587919a2..fbe190a93 100644 --- a/stdlib/test/test/lux/compiler/default/phase/synthesis/primitive.lux +++ b/stdlib/test/test/lux/compiler/default/phase/synthesis/primitive.lux @@ -46,15 +46,15 @@ [(#//.Primitive (#//.I64 valueS)) (#analysis.Primitive (#analysis.Nat valueA))] - (is? valueS (.i64 valueA)) + (is? (.i64 valueS) (.i64 valueA)) [(#//.Primitive (#//.I64 valueS)) (#analysis.Primitive (#analysis.Int valueA))] - (is? valueS (.i64 valueA)) + (is? (.i64 valueS) (.i64 valueA)) [(#//.Primitive (#//.I64 valueS)) (#analysis.Primitive (#analysis.Rev valueA))] - (is? valueS (.i64 valueA)) + (is? (.i64 valueS) (.i64 valueA)) [(#//.Primitive (#//.F64 valueS)) (#analysis.Primitive (#analysis.Frac valueA))] -- cgit v1.2.3