diff options
| author | Eduardo Julian | 2021-06-29 00:54:13 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2021-06-29 00:54:13 -0400 |
| commit | 6633cd42f2892ea71530ddeeb93a7e7c0b59faa3 (patch) | |
| tree | aef31dba019fe7bc5141084ab8c25369bd7e83ca /lux-lua | |
| parent | db3e864ae66da7f7d1034ae95967605144d5ec47 (diff) | |
Some updates for the new compilers.
Diffstat (limited to 'lux-lua')
| -rw-r--r-- | lux-lua/commands.md | 5 | ||||
| -rw-r--r-- | lux-lua/source/program.lux | 26 |
2 files changed, 15 insertions, 16 deletions
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 <hex>) - [(_.int (.int (hex <hex>)))] - - (!&| <or> <and> <raw>) - [(|> <raw> - (_.bit_and (!int <and>)) - (_.bit_or (!int <or>)))] - - (!&|< <or> <and> <shift> <raw>) - [(|> <raw> - (_.bit_shr (_.int <shift>)) - (_.bit_and (!int <and>)) - (_.bit_or (!int <or>)))]] + (template.let [(!int <hex>) + [(_.int (.int (hex <hex>)))] + + (!&| <or> <and> <raw>) + [(|> <raw> + (_.bit_and (!int <and>)) + (_.bit_or (!int <or>)))] + + (!&|< <or> <and> <shift> <raw>) + [(|> <raw> + (_.bit_shr (_.int <shift>)) + (_.bit_and (!int <and>)) + (_.bit_or (!int <or>)))]] (as_is (def: rembulan//char (let [$buffer (_.var "buffer") $k (_.var "k") |