diff options
22 files changed, 161 insertions, 104 deletions
diff --git a/documentation/research/browser.md b/documentation/research/browser.md index 8401cb621..47acd66e8 100644 --- a/documentation/research/browser.md +++ b/documentation/research/browser.md @@ -34,6 +34,7 @@ # Reference +1. https://www.opera.com/gx 1. https://evertpot.com/tabs-are-the-wrong-abstraction/ 1. http://news.mit.edu/2018/system-patches-private-browsing-0223 1. https://vivaldi.com/blog/vivaldi-makes-history/?hl=en-us&version=1.8.770.56&os=W10.0.14393 diff --git a/documentation/research/distributed_programming.md b/documentation/research/distributed_programming.md index eb8869b45..ae96c46e3 100644 --- a/documentation/research/distributed_programming.md +++ b/documentation/research/distributed_programming.md @@ -66,6 +66,7 @@ # Logical clock +1. [The Bloom Clock](https://arxiv.org/pdf/1905.13064.pdf) 1. [Why Logical Clocks are Easy: Sometimes all you need is the right language.](https://queue.acm.org/detail.cfm?id=2917756) # Consensus protocol diff --git a/documentation/research/math.md b/documentation/research/math.md index 6b9b81bd4..458d4d1f1 100644 --- a/documentation/research/math.md +++ b/documentation/research/math.md @@ -232,6 +232,7 @@ # Combinatorics +1. http://andy.kitchen/combinations.html 1. [Combinatorial Algorithms](http://www2.denizyuret.com/bib/kreher/donald1999combinatorial/combinatorialA.pdf) # Vector diff --git a/documentation/research/text_editor & ide.md b/documentation/research/text_editor & ide.md index b78dec81d..c1cdde62b 100644 --- a/documentation/research/text_editor & ide.md +++ b/documentation/research/text_editor & ide.md @@ -42,6 +42,7 @@ # Reference +1. [Broot: A better way to navigate directories](https://github.com/Canop/broot) 1. https://www.simplethread.com/editor-plugins-belong-in-lock-file/ 1. [How to Design an IDE-Friendly Language with Peter Gromov @donnerpeter](https://www.youtube.com/watch?v=lubc8udiP_8) 1. https://shaunlebron.github.io/parinfer/ diff --git a/documentation/research/web_framework.md b/documentation/research/web_framework.md index 5dd11d8c2..4abba9b5e 100644 --- a/documentation/research/web_framework.md +++ b/documentation/research/web_framework.md @@ -1,5 +1,7 @@ # Reference +1. https://github.com/daybrush/scenejs +1. https://blog.ionicframework.com/announcing-capacitor-1-0/ 1. http://joneisen.me/talk-frelp-ui/#/ 1. http://meiosis.js.org/ 1. https://medium.com/samsung-internet-dev/disappearing-frameworks-ed921f411c38 diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux index 30ab46ced..00bdd2ef8 100644 --- a/lux-js/source/program.lux +++ b/lux-js/source/program.lux @@ -1,33 +1,35 @@ (.module: [lux #* + ["." host (#+ import: interface: do-to object)] + ["." debug] [abstract [monad (#+ do)]] [control ["." exception (#+ exception:)] - [cli (#+ program:)] - ["." io (#+ IO io)]] + ["." io (#+ IO io)] + [parser + [cli (#+ program:)]]] [data ["." maybe] ["." error (#+ Error)] [number ["." i64]] - ["." text ("#/." hash) + ["." text ("#@." hash) format] [collection - ["." array (#+ Array)] - ["." list ("#/." functor)]]] + ["." array (#+ Array)]]] [macro ["." template]] [world ["." file]] - ["." debug] - ["." host (#+ import: interface: do-to object) + ["@" target ["_" js]] [tool [compiler ["." name] [phase [macro (#+ Expander)] + ["." extension/bundle] ["." generation ["." js ["." runtime] @@ -109,10 +111,10 @@ [] ## Methods (program/IntValue - (getValue) java/lang/Object + [] (getValue self) java/lang/Object (:coerce java/lang/Object value)) (jdk/nashorn/api/scripting/AbstractJSObject - (getMember {member java/lang/String}) java/lang/Object + [] (getMember self {member java/lang/String}) java/lang/Object (case member (^ (static runtime.i64-high-field)) (|> value .nat runtime.high jvm-int) @@ -129,10 +131,10 @@ (object [] jdk/nashorn/api/scripting/AbstractJSObject [] [] (jdk/nashorn/api/scripting/AbstractJSObject - (isFunction) boolean + [] (isFunction self) boolean #1) (jdk/nashorn/api/scripting/AbstractJSObject - (call {this java/lang/Object} {args [java/lang/Object]}) java/lang/Object + [] (call self {this java/lang/Object} {args [java/lang/Object]}) java/lang/Object (debug.inspect js-object)) )) @@ -141,10 +143,10 @@ (object [] jdk/nashorn/api/scripting/AbstractJSObject [] [] (jdk/nashorn/api/scripting/AbstractJSObject - (isFunction) boolean + [] (isFunction self) boolean #1) (jdk/nashorn/api/scripting/AbstractJSObject - (call {this java/lang/Object} {args [java/lang/Object]}) java/lang/Object + [] (call self {this java/lang/Object} {args [java/lang/Object]}) java/lang/Object (|> (java/util/Arrays::copyOfRange value (|> args (array.read 0) maybe.assume (:coerce Int)) (.int (array.size value))) @@ -170,13 +172,13 @@ [] ## Methods (program/StructureValue - (getValue) java/lang/Object + [] (getValue self) java/lang/Object (:coerce (Array java/lang/Object) value)) (jdk/nashorn/api/scripting/AbstractJSObject - (isArray) boolean + [] (isArray self) boolean #1) (jdk/nashorn/api/scripting/AbstractJSObject - (getMember {member java/lang/String}) java/lang/Object + [] (getMember self {member java/lang/String}) java/lang/Object (case member "toString" (:coerce java/lang/Object @@ -207,7 +209,7 @@ (error! (exception.construct unknown-member [(:coerce Text member) (:coerce java/lang/Object value)]))) ) (jdk/nashorn/api/scripting/AbstractJSObject - (getSlot {idx int}) java/lang/Object + [] (getSlot self {idx int}) java/lang/Object (|> value (array.read (|> idx java/lang/Integer::longValue (:coerce Nat))) maybe.assume @@ -402,7 +404,7 @@ (-> javax/script/ScriptEngine Name _.Expression (Error [Text Any _.Statement])) (let [global (format (text.replace-all .module-separator ..separator module) ..separator (name.normalize name) - "___" (%n (text/hash name))) + "___" (%n (text@hash name))) @global (_.var global)] (do error.monad [#let [definition (_.define @global input)] @@ -446,8 +448,10 @@ _.null)))) (program: [{service /cli.service}] - (/.compiler ..expander + (/.compiler @.js + ..expander ..platform extension.bundle + extension/bundle.empty ..program service)) diff --git a/new-luxc/source/luxc/lang/translation/jvm/case.lux b/new-luxc/source/luxc/lang/translation/jvm/case.lux index 63d440c72..898c211f4 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/case.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/case.lux @@ -150,6 +150,40 @@ #0) pushI)) + ## Extra optimization + (^ (synthesis.path/seq + (synthesis.member/left 0) + (synthesis.!bind-top register thenP))) + (do phase.monad + [then! (path' phase stack-depth @else @end thenP)] + (wrap (|>> peekI + (_.CHECKCAST ($t.descriptor runtime.$Tuple)) + (_.int +0) + _.AALOAD + (_.ASTORE register) + then!))) + + ## Extra optimization + (^template [<pm> <getter>] + (^ (synthesis.path/seq + (<pm> lefts) + (synthesis.!bind-top register thenP))) + (do phase.monad + [then! (path' phase stack-depth @else @end thenP)] + (wrap (|>> peekI + (_.CHECKCAST ($t.descriptor runtime.$Tuple)) + (_.int (.int lefts)) + (_.INVOKESTATIC //.runtime-class + <getter> + ($t.method (list runtime.$Tuple $t.int) + (#.Some $Object) + (list)) + #0) + (_.ASTORE register) + then!)))) + ([synthesis.member/left "tuple_left"] + [synthesis.member/right "tuple_right"]) + (#synthesis.Alt leftP rightP) (do phase.monad [@alt-else _.make-label diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux index 9f5627ee3..4d6d63835 100644 --- a/new-luxc/source/program.lux +++ b/new-luxc/source/program.lux @@ -1,6 +1,7 @@ (.module: [lux #* - ["@" host (#+ import:)] + ["@" target] + ["." host (#+ import:)] [abstract [monad (#+ do)]] [control @@ -39,8 +40,8 @@ ["." runtime] ["." expression] [procedure - ["." common] - ["." host]]]]]]) + [".E" common] + [".E" host]]]]]]) (import: #long java/lang/reflect/Method (invoke [java/lang/Object [java/lang/Object]] #try java/lang/Object)) @@ -53,13 +54,13 @@ (def: _object-class (java/lang/Class java/lang/Object) - (@.class-for java/lang/Object)) + (host.class-for java/lang/Object)) (def: _apply-args (Array (java/lang/Class java/lang/Object)) - (|> (@.array (java/lang/Class java/lang/Object) 2) - (@.array-write 0 _object-class) - (@.array-write 1 _object-class))) + (|> (host.array (java/lang/Class java/lang/Object) 2) + (host.array-write 0 _object-class) + (host.array-write 1 _object-class))) (def: #export (expander macro inputs lux) Expander @@ -71,9 +72,9 @@ (:coerce (Error (Error [Lux (List Code)])) (java/lang/reflect/Method::invoke (:coerce java/lang/Object macro) - (|> (@.array java/lang/Object 2) - (@.array-write 0 (:coerce java/lang/Object inputs)) - (@.array-write 1 (:coerce java/lang/Object lux))) + (|> (host.array java/lang/Object 2) + (host.array-write 0 (:coerce java/lang/Object inputs)) + (host.array-write 1 (:coerce java/lang/Object lux))) apply-method)))) (def: #export jvm @@ -153,11 +154,12 @@ (def: #export bundle _.Bundle - (dictionary.merge common.bundle - host.bundle)) + (dictionary.merge commonE.bundle + hostE.bundle)) (program: [{service /cli.service}] - (/.compiler ..expander + (/.compiler @.jvm + ..expander ..jvm ..bundle jvmS.bundle diff --git a/stdlib/source/lux/target/js.lux b/stdlib/source/lux/target/js.lux index 756530817..c34f806f8 100644 --- a/stdlib/source/lux/target/js.lux +++ b/stdlib/source/lux/target/js.lux @@ -45,7 +45,7 @@ ) (template [<name> <literal>] - [(def: #export <name> Computation (|> <literal> ..argument :abstraction))] + [(def: #export <name> Computation (:abstraction <literal>))] [null "null"] [undefined "undefined"] @@ -106,9 +106,7 @@ (def: #export (at index array-or-object) (-> Expression Expression Access) - (|> (format (:representation array-or-object) (..element (:representation index))) - ..argument - :abstraction)) + (:abstraction (format (:representation array-or-object) (..element (:representation index))))) (def: #export (the field object) (-> Text Expression Access) @@ -138,7 +136,7 @@ (def: #export (, pre post) (-> Expression Expression Computation) - (|> (format (:representation pre) ", " (:representation post)) + (|> (format (:representation pre) ..argument-separator (:representation post)) ..argument :abstraction)) @@ -282,6 +280,10 @@ (-> Location Expression Statement) (:abstraction (format (:representation name) " = " (:representation value) ..statement-suffix))) + (def: #export (set' name value) + (-> Location Expression Expression) + (:abstraction (..argument (format (:representation name) " = " (:representation value))))) + (def: #export (throw message) (-> Expression Statement) (:abstraction (format "throw " (:representation message) ..statement-suffix))) diff --git a/stdlib/source/lux/tool/compiler/default/init.lux b/stdlib/source/lux/tool/compiler/default/init.lux index 28c0efb76..1f650634f 100644 --- a/stdlib/source/lux/tool/compiler/default/init.lux +++ b/stdlib/source/lux/tool/compiler/default/init.lux @@ -1,7 +1,5 @@ (.module: [lux (#- Module) - ["@" target] - [type (#+ :share)] [abstract ["." monad (#+ do)]] [control @@ -44,24 +42,16 @@ ["." descriptor (#+ Module)] ["." document]]]]]) -(def: #export info - Info - {#.target (`` (for {(~~ (static @.common-lisp)) @.common-lisp - (~~ (static @.js)) @.js - (~~ (static @.old)) @.jvm - (~~ (static @.jvm)) @.jvm - (~~ (static @.lua)) @.lua - (~~ (static @.php)) @.php - (~~ (static @.python)) @.python - (~~ (static @.r)) @.r - (~~ (static @.ruby)) @.ruby - (~~ (static @.scheme)) @.scheme})) +(def: #export (info target) + (-> Text Info) + {#.target target #.version //.version #.mode #.Build}) -(def: #export (state expander host generate generation-bundle host-statement-bundle program) +(def: #export (state target expander host generate generation-bundle host-statement-bundle program) (All [anchor expression statement] - (-> Expander + (-> Text + Expander (generation.Host expression statement) (generation.Phase anchor expression statement) (generation.Bundle anchor expression statement) @@ -71,7 +61,7 @@ (let [synthesis-state [synthesisE.bundle ///synthesis.init] generation-state [generation-bundle (generation.state host)] eval (//evaluation.evaluator expander synthesis-state generation-state generate) - analysis-state [(analysisE.bundle eval) (///analysis.state ..info host)]] + analysis-state [(analysisE.bundle eval) (///analysis.state (..info target) host)]] [(dictionary.merge (luxS.bundle expander program) host-statement-bundle) {#///statement.analysis {#///statement.state analysis-state diff --git a/stdlib/source/lux/tool/compiler/default/platform.lux b/stdlib/source/lux/tool/compiler/default/platform.lux index 10a27403e..5dc5105f2 100644 --- a/stdlib/source/lux/tool/compiler/default/platform.lux +++ b/stdlib/source/lux/tool/compiler/default/platform.lux @@ -56,9 +56,10 @@ <State+> (as-is (///statement.State+ anchor expression statement)) <Bundle> (as-is (generation.Bundle anchor expression statement))] - (def: #export (initialize expander platform generation-bundle host-statement-bundle program) + (def: #export (initialize target expander platform generation-bundle host-statement-bundle program) (All <type-vars> - (-> Expander + (-> Text + Expander <Platform> <Bundle> (///statement.Bundle anchor expression statement) @@ -67,7 +68,8 @@ (|> platform (get@ #runtime) ///statement.lift-generation - (///phase.run' (//init.state expander + (///phase.run' (//init.state target + expander (get@ #host platform) (get@ #phase platform) generation-bundle diff --git a/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/runtime.lux index 774844bdf..843db713d 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/runtime.lux @@ -171,9 +171,9 @@ (with-vars [last-index-right right-index] (_.let (list [last-index-right (..last-index tuple)] [right-index (_.+ (_.int +1) lefts)]) - (_.cond (list [(_.= right-index last-index-right) + (_.cond (list [(_.= last-index-right right-index) (_.elt/2 [tuple right-index])] - [(_.> right-index last-index-right) + [(_.> last-index-right right-index) ## Needs recursion. (!recur tuple//right)]) (_.subseq/3 [tuple right-index (_.length/1 tuple)])) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux index e1182c4b5..c2e0f667e 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux @@ -170,9 +170,29 @@ (^ (/////synthesis.member/left 0)) (////@wrap (push-cursor! (_.at (_.i32 +0) ..peek-cursor))) + ## Extra optimization + (^ (/////synthesis.path/seq + (/////synthesis.member/left 0) + (/////synthesis.!bind-top register thenP))) + (do ////.monad + [then! (pattern-matching' generate thenP)] + (////@wrap ($_ _.then + (_.define (..register register) (_.at (_.i32 +0) ..peek-cursor)) + then!))) + (^template [<pm> <getter>] (^ (<pm> lefts)) - (////@wrap (push-cursor! (<getter> (_.i32 (.int lefts)) ..peek-cursor)))) + (////@wrap (push-cursor! (<getter> (_.i32 (.int lefts)) ..peek-cursor))) + + ## Extra optimization + (^ (/////synthesis.path/seq + (<pm> lefts) + (/////synthesis.!bind-top register thenP))) + (do ////.monad + [then! (pattern-matching' generate thenP)] + (////@wrap ($_ _.then + (_.define (..register register) (<getter> (_.i32 (.int lefts)) ..peek-cursor)) + then!)))) ([/////synthesis.member/left //runtime.tuple//left] [/////synthesis.member/right //runtime.tuple//right]) @@ -200,20 +220,21 @@ ([/////synthesis.path/seq _.then] [/////synthesis.path/alt alternation]))) -(def: (pattern-matching generate pathP) - (-> Phase Path (Operation Statement)) +(def: (pattern-matching stack-init generate pathP) + (-> Expression Phase Path (Operation Statement)) (do ////.monad [pattern-matching! (pattern-matching' generate pathP)] (wrap ($_ _.then (_.do-while _.false pattern-matching!) + (_.statement (//runtime.io//log stack-init)) (_.throw (_.string case.pattern-matching-error)))))) (def: #export (case generate [valueS pathP]) (-> Phase [Synthesis Path] (Operation Computation)) (do ////.monad [stack-init (generate valueS) - path! (pattern-matching generate pathP) + path! (pattern-matching stack-init generate pathP) #let [closure (<| (_.closure (list)) ($_ _.then (_.declare @temp) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux index 5253ffe19..c9dc64547 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux @@ -41,12 +41,12 @@ (Nullary Expression) (///primitive.f64 <const>))] - [frac//smallest (java/lang/Double::MIN_VALUE)] - [frac//min (f/* -1.0 (java/lang/Double::MAX_VALUE))] - [frac//max (java/lang/Double::MAX_VALUE)] + [f64//smallest (java/lang/Double::MIN_VALUE)] + [f64//min (f/* -1.0 (java/lang/Double::MAX_VALUE))] + [f64//max (java/lang/Double::MAX_VALUE)] ) -(def: frac//decode +(def: f64//decode (Unary Expression) (|>> list (_.apply/* (_.var "parseFloat")) @@ -54,7 +54,7 @@ (_.closure (list)) ///runtime.lux//try)) -(def: int//char +(def: i64//char (Unary Expression) (|>> ///runtime.i64//to-number (list) @@ -117,24 +117,19 @@ (bundle.install "logical-right-shift" (binary i64//logical-right-shift)) (bundle.install "arithmetic-right-shift" (binary i64//arithmetic-right-shift)) (bundle.install "=" (binary (product.uncurry ///runtime.i64//=))) + (bundle.install "<" (binary (product.uncurry ///runtime.i64//<))) (bundle.install "+" (binary (product.uncurry ///runtime.i64//+))) (bundle.install "-" (binary (product.uncurry ///runtime.i64//-))) - ))) - -(def: int-procs - Bundle - (<| (bundle.prefix "int") - (|> bundle.empty - (bundle.install "<" (binary (product.uncurry ///runtime.i64//<))) (bundle.install "*" (binary (product.uncurry ///runtime.i64//*))) (bundle.install "/" (binary (product.uncurry ///runtime.i64///))) (bundle.install "%" (binary (product.uncurry ///runtime.i64//%))) - (bundle.install "frac" (unary ///runtime.i64//to-number)) - (bundle.install "char" (unary int//char))))) + (bundle.install "f64" (unary ///runtime.i64//to-number)) + (bundle.install "char" (unary i64//char)) + ))) -(def: frac-procs +(def: f64-procs Bundle - (<| (bundle.prefix "frac") + (<| (bundle.prefix "f64") (|> bundle.empty (bundle.install "+" (binary (product.uncurry _.+))) (bundle.install "-" (binary (product.uncurry _.-))) @@ -143,12 +138,12 @@ (bundle.install "%" (binary (product.uncurry _.%))) (bundle.install "=" (binary (product.uncurry _.=))) (bundle.install "<" (binary (product.uncurry _.<))) - (bundle.install "smallest" (nullary frac//smallest)) - (bundle.install "min" (nullary frac//min)) - (bundle.install "max" (nullary frac//max)) - (bundle.install "int" (unary ///runtime.i64//from-number)) + (bundle.install "smallest" (nullary f64//smallest)) + (bundle.install "min" (nullary f64//min)) + (bundle.install "max" (nullary f64//max)) + (bundle.install "i64" (unary ///runtime.i64//from-number)) (bundle.install "encode" (unary (_.do "toString" (list)))) - (bundle.install "decode" (unary frac//decode))))) + (bundle.install "decode" (unary f64//decode))))) (def: text-procs Bundle @@ -177,8 +172,7 @@ (<| (bundle.prefix "lux") (|> lux-procs (dictionary.merge i64-procs) - (dictionary.merge int-procs) - (dictionary.merge frac-procs) + (dictionary.merge f64-procs) (dictionary.merge text-procs) (dictionary.merge io-procs) ))) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux index ea42f44e2..6892879b8 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux @@ -198,9 +198,9 @@ ($_ _.then (_.define last-index-right (..last-index tuple)) (_.define right-index (_.+ (_.i32 +1) lefts)) - (_.cond (list [(_.= right-index last-index-right) + (_.cond (list [(_.= last-index-right right-index) (_.return (_.at right-index tuple))] - [(_.> right-index last-index-right) + [(_.> last-index-right right-index) ## Needs recursion. <recur>]) (_.return (_.do "slice" (list right-index) tuple))) @@ -634,8 +634,8 @@ ($_ _.then (_.define result (|> text (_.do "charCodeAt" (list (_.the ..i64-low-field idx))))) (_.if (_.not-a-number? result) - (_.return ..none) - (_.return (..some (i64//from-number result))))))) + (_.throw (_.string "[Lux Error] Cannot get char from text.")) + (_.return (i64//from-number result)))))) (def: runtime//text Statement diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux index 602897f1b..e5ce5a201 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux @@ -167,9 +167,9 @@ ($_ _.then (_.let (list last-right) (..last-index tuple)) (_.let (list right-index) (_.+ (_.int +1) lefts)) - (_.cond (list [(_.= right-index last-right) + (_.cond (list [(_.= last-right right-index) (_.return (..nth right-index tuple))] - [(_.> right-index last-right) + [(_.> last-right right-index) ## Needs recursion. (_.return (tuple//right (_.- last-right lefts) (..nth last-right tuple)))]) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux index b67f4d20a..a5a22917e 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux @@ -199,9 +199,9 @@ ($_ _.then (_.; (_.set last-index-right (..last-index tuple))) (_.; (_.set right-index (_.+ (_.int +1) lefts))) - (_.cond (list [(_.= right-index last-index-right) + (_.cond (list [(_.= last-index-right right-index) (_.return (_.nth right-index tuple))] - [(_.> right-index last-index-right) + [(_.> last-index-right right-index) ## Needs recursion. <recur>]) (_.return (_.array-slice/2 [tuple right-index]))) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux index e04befc25..3fd58ef1b 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux @@ -204,9 +204,9 @@ ($_ _.then (_.set (list last-index-right) (..last-index tuple)) (_.set (list right-index) (_.+ (_.int +1) lefts)) - (_.cond (list [(_.= right-index last-index-right) + (_.cond (list [(_.= last-index-right right-index) (_.return (_.nth right-index tuple))] - [(_.> right-index last-index-right) + [(_.> last-index-right right-index) ## Needs recursion. <recur>]) (_.return (_.slice-from right-index tuple))) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux index 99c6ef38a..f0d88923e 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux @@ -156,9 +156,9 @@ ($_ _.then (_.set (list last-index-right) (..last-index tuple)) (_.set (list right-index) (_.+ (_.int +1) lefts)) - (_.cond (list [(_.= right-index last-index-right) + (_.cond (list [(_.= last-index-right right-index) (_.return (_.nth right-index tuple))] - [(_.> right-index last-index-right) + [(_.> last-index-right right-index) ## Needs recursion. <recur>]) (_.return (_.array-range right-index (..tuple-size tuple) tuple))) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux index 94269b4aa..7d55f0faf 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux @@ -173,9 +173,9 @@ (_.begin (list (_.define-constant last-index-right (..last-index tuple)) (_.define-constant right-index (_.+/2 (_.int +1) lefts)) - (_.cond (list [(_.=/2 right-index last-index-right) + (_.cond (list [(_.=/2 last-index-right right-index) (_.vector-ref/2 tuple right-index)] - [(_.>/2 right-index last-index-right) + [(_.>/2 last-index-right right-index) ## Needs recursion. (tuple//right (_.-/2 last-index-right lefts) (_.vector-ref/2 tuple last-index-right))]) diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index 7d058ec0e..7db076162 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -78,9 +78,10 @@ (#error.Failure error) (:: io.monad wrap (#error.Failure error))))) -(def: #export (compiler expander platform generation-bundle host-statement-bundle program service) +(def: #export (compiler target expander platform generation-bundle host-statement-bundle program service) (All [anchor expression statement] - (-> Expander + (-> Text + Expander (IO (Platform IO anchor expression statement)) (generation.Bundle anchor expression statement) (statement.Bundle anchor expression statement) @@ -98,7 +99,7 @@ {(Platform IO anchor expression statement) platform} {(IO (Error (statement.State+ anchor expression statement))) - (platform.initialize expander platform generation-bundle host-statement-bundle program)}) + (platform.initialize target expander platform generation-bundle host-statement-bundle program)}) [archive state] (:share [anchor expression statement] {(Platform IO anchor expression statement) platform} diff --git a/stdlib/source/test/lux/tool/compiler/phase/analysis/primitive.lux b/stdlib/source/test/lux/tool/compiler/phase/analysis/primitive.lux index 2ed135058..8291794d5 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/analysis/primitive.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/analysis/primitive.lux @@ -1,5 +1,6 @@ (.module: [lux (#- primitive) + ["@" target] [abstract ["." monad (#+ do)]] [data text/format @@ -43,7 +44,7 @@ (def: #export state ////analysis.State+ - [(///analysis.bundle ..eval) (////analysis.state init.info [])]) + [(///analysis.bundle ..eval) (////analysis.state (init.info @.jvm) [])]) (def: #export primitive (Random [Type Code]) |