From 6633cd42f2892ea71530ddeeb93a7e7c0b59faa3 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Tue, 29 Jun 2021 00:54:13 -0400 Subject: Some updates for the new compilers. --- lux-lua/commands.md | 5 ++--- lux-lua/source/program.lux | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 16 deletions(-) (limited to 'lux-lua') diff --git a/lux-lua/commands.md b/lux-lua/commands.md index 3693fecec..f78634aec 100644 --- a/lux-lua/commands.md +++ b/lux-lua/commands.md @@ -29,8 +29,7 @@ cd ~/lux/lux-lua/ \ ## Compile Lux's Standard Library's tests using a JVM-based compiler. cd ~/lux/stdlib/ \ && lein clean \ -&& time java -jar ~/lux/lux-lua/jvm_based_compiler.jar build --source ~/lux/stdlib/source --target ~/lux/stdlib/target --module test/lux - -~/lua-5.4.2/install/bin/lua ~/lux/stdlib/target/program.lua +&& java -jar ~/lux/lux-lua/jvm_based_compiler.jar build --source ~/lux/stdlib/source --target ~/lux/stdlib/target --module test/lux \ +&& ~/lua-5.4.2/install/bin/lua ~/lux/stdlib/target/program.lua ``` diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux index d41447879..b581ce7bd 100644 --- a/lux-lua/source/program.lux +++ b/lux-lua/source/program.lux @@ -333,19 +333,19 @@ (for {@.old (as_is (with_expansions [$var_args (_.var "...") $str_rel_to_abs (_.var "_utf8_str_rel_to_abs") $decode (_.var "_utf8_decode")] - (template.with [(!int ) - [(_.int (.int (hex )))] - - (!&| ) - [(|> - (_.bit_and (!int )) - (_.bit_or (!int )))] - - (!&|< ) - [(|> - (_.bit_shr (_.int )) - (_.bit_and (!int )) - (_.bit_or (!int )))]] + (template.let [(!int ) + [(_.int (.int (hex )))] + + (!&| ) + [(|> + (_.bit_and (!int )) + (_.bit_or (!int )))] + + (!&|< ) + [(|> + (_.bit_shr (_.int )) + (_.bit_and (!int )) + (_.bit_or (!int )))]] (as_is (def: rembulan//char (let [$buffer (_.var "buffer") $k (_.var "k") -- cgit v1.2.3