diff options
author | Eduardo Julian | 2019-04-16 18:47:13 -0400 |
---|---|---|
committer | Eduardo Julian | 2019-04-16 18:47:13 -0400 |
commit | 42248854f0cb5e3364e6aae25527cee65cbda3e8 (patch) | |
tree | c0a8c65fb8dc11d85cca22fe03182f39bf22ef1a /stdlib/source | |
parent | afddac31e065ae1df0c7c78cc2ce6d13b01896c6 (diff) |
The old compiler is now identified with "old" instead of "jvm". This should help to get old JVM code and new JVM code to coexist without forcing a major rewrite of old compiler code to get it to fit the style of the new JVM compiler code.
Diffstat (limited to 'stdlib/source')
-rw-r--r-- | stdlib/source/lux/control/cli.lux | 2 | ||||
-rw-r--r-- | stdlib/source/lux/control/concurrency/atom.lux | 8 | ||||
-rw-r--r-- | stdlib/source/lux/control/concurrency/process.lux | 48 | ||||
-rw-r--r-- | stdlib/source/lux/control/thread.lux | 2 | ||||
-rw-r--r-- | stdlib/source/lux/data/collection/array.lux | 10 | ||||
-rw-r--r-- | stdlib/source/lux/data/text.lux | 2 | ||||
-rw-r--r-- | stdlib/source/lux/data/text/buffer.lux | 12 | ||||
-rw-r--r-- | stdlib/source/lux/data/text/encoding.lux | 16 | ||||
-rw-r--r-- | stdlib/source/lux/host.old.lux (renamed from stdlib/source/lux/host.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/host/jvm/loader.old.lux (renamed from stdlib/source/lux/host/jvm/loader.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/default/init.lux | 1 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/host.lux | 3 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/meta/io/archive.lux | 1 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/meta/io/context.lux | 1 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/phase/extension/analysis/host.old.lux (renamed from stdlib/source/lux/tool/compiler/phase/extension/analysis/host.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux (renamed from stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/phase/generation/scheme/extension.lux (renamed from stdlib/source/lux/tool/compiler/phase/generation/scheme/extension.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux (renamed from stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux (renamed from stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux (renamed from stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/phase/generation/scheme/primitive.lux (renamed from stdlib/source/lux/tool/compiler/phase/generation/scheme/primitive.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.lux (renamed from stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux (renamed from stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.lux (renamed from stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/world/console.lux | 2 | ||||
-rw-r--r-- | stdlib/source/lux/world/db/jdbc.old.lux (renamed from stdlib/source/lux/world/db/jdbc.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/world/db/jdbc/input.old.lux (renamed from stdlib/source/lux/world/db/jdbc/input.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/world/db/jdbc/output.old.lux (renamed from stdlib/source/lux/world/db/jdbc/output.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/world/environment.old.lux (renamed from stdlib/source/lux/world/environment.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/lux/world/file.lux | 2 | ||||
-rw-r--r-- | stdlib/source/lux/world/net/http/client.lux | 4 | ||||
-rw-r--r-- | stdlib/source/lux/world/net/tcp.old.lux (renamed from stdlib/source/lux/world/net/tcp.jvm.lux) | 2 | ||||
-rw-r--r-- | stdlib/source/lux/world/net/udp.old.lux (renamed from stdlib/source/lux/world/net/udp.jvm.lux) | 2 | ||||
-rw-r--r-- | stdlib/source/lux/world/shell.lux | 4 | ||||
-rw-r--r-- | stdlib/source/test/lux/host.old.lux (renamed from stdlib/source/test/lux/host.jvm.lux) | 0 | ||||
-rw-r--r-- | stdlib/source/test/lux/host/jvm.old.lux (renamed from stdlib/source/test/lux/host/jvm.jvm.lux) | 0 |
36 files changed, 64 insertions, 58 deletions
diff --git a/stdlib/source/lux/control/cli.lux b/stdlib/source/lux/control/cli.lux index f8201ce87..ae712d644 100644 --- a/stdlib/source/lux/control/cli.lux +++ b/stdlib/source/lux/control/cli.lux @@ -160,7 +160,7 @@ (~ g!_) ..end] ((~' wrap) ((~! do) (~! io.monad) [(~ g!output) (~ body) - (~+ (`` (for {(~~ (static host.jvm)) + (~+ (`` (for {(~~ (static host.old)) (list)} (list g!_ (` process.run!)))))] diff --git a/stdlib/source/lux/control/concurrency/atom.lux b/stdlib/source/lux/control/concurrency/atom.lux index c93c224ce..0b5c4fc3f 100644 --- a/stdlib/source/lux/control/concurrency/atom.lux +++ b/stdlib/source/lux/control/concurrency/atom.lux @@ -12,7 +12,7 @@ ["." host]]] [host (#+ import:)]]) -(`` (for {(~~ (static host.jvm)) +(`` (for {(~~ (static host.old)) (import: #long (java/util/concurrent/atomic/AtomicReference a) (new [a]) (get [] a) @@ -21,17 +21,17 @@ (`` (abstract: #export (Atom a) {#.doc "Atomic references that are safe to mutate concurrently."} - (for {(~~ (static host.jvm)) + (for {(~~ (static host.old)) (java/util/concurrent/atomic/AtomicReference a)}) (def: #export (atom value) (All [a] (-> a (Atom a))) - (:abstraction (for {(~~ (static host.jvm)) + (:abstraction (for {(~~ (static host.old)) (java/util/concurrent/atomic/AtomicReference::new value)}))) (def: #export (read atom) (All [a] (-> (Atom a) (IO a))) - (io (for {(~~ (static host.jvm)) + (io (for {(~~ (static host.old)) (java/util/concurrent/atomic/AtomicReference::get (:representation atom))}))) (def: #export (compare-and-swap current new atom) diff --git a/stdlib/source/lux/control/concurrency/process.lux b/stdlib/source/lux/control/concurrency/process.lux index c7f9ae82e..322300a17 100644 --- a/stdlib/source/lux/control/concurrency/process.lux +++ b/stdlib/source/lux/control/concurrency/process.lux @@ -15,26 +15,26 @@ [// ["." atom (#+ Atom)]]) -(`` (for {(~~ (static host.jvm)) - (as-is (import: java/lang/Object) +(`` (for {(~~ (static host.old)) + (as-is (import: #long java/lang/Object) - (import: java/lang/Runtime - (#static getRuntime [] Runtime) + (import: #long java/lang/Runtime + (#static getRuntime [] java/lang/Runtime) (availableProcessors [] int)) - (import: java/lang/Runnable) + (import: #long java/lang/Runnable) - (import: java/util/concurrent/TimeUnit + (import: #long java/util/concurrent/TimeUnit (#enum MILLISECONDS)) - (import: java/util/concurrent/Executor - (execute [Runnable] #io void)) + (import: #long java/util/concurrent/Executor + (execute [java/lang/Runnable] #io void)) - (import: (java/util/concurrent/ScheduledFuture a)) + (import: #long (java/util/concurrent/ScheduledFuture a)) - (import: java/util/concurrent/ScheduledThreadPoolExecutor + (import: #long java/util/concurrent/ScheduledThreadPoolExecutor (new [int]) - (schedule [Runnable long TimeUnit] #io (ScheduledFuture Object))))} + (schedule [java/lang/Runnable long java/util/concurrent/TimeUnit] #io (java/util/concurrent/ScheduledFuture java/lang/Object))))} ## Default (type: Process @@ -45,17 +45,17 @@ (def: #export parallelism Nat - (`` (for {(~~ (static host.jvm)) - (|> (Runtime::getRuntime) - (Runtime::availableProcessors) + (`` (for {(~~ (static host.old)) + (|> (java/lang/Runtime::getRuntime) + (java/lang/Runtime::availableProcessors) .nat)} ## Default 1))) (def: runner - (`` (for {(~~ (static host.jvm)) - (ScheduledThreadPoolExecutor::new (.int ..parallelism))} + (`` (for {(~~ (static host.old)) + (java/util/concurrent/ScheduledThreadPoolExecutor::new (.int ..parallelism))} ## Default (: (Atom (List Process)) @@ -63,15 +63,15 @@ (def: #export (schedule milli-seconds action) (-> Nat (IO Any) (IO Any)) - (`` (for {(~~ (static host.jvm)) - (let [runnable (object [] [Runnable] + (`` (for {(~~ (static host.old)) + (let [runnable (object [] [java/lang/Runnable] [] - (Runnable [] (run) void - (io.run action)))] + (java/lang/Runnable [] (run) void + (io.run action)))] (case milli-seconds - 0 (Executor::execute runnable runner) - _ (ScheduledThreadPoolExecutor::schedule runnable (.int milli-seconds) TimeUnit::MILLISECONDS - runner)))} + 0 (java/util/concurrent/Executor::execute runnable runner) + _ (java/util/concurrent/ScheduledThreadPoolExecutor::schedule runnable (.int milli-seconds) java/util/concurrent/TimeUnit::MILLISECONDS + runner)))} ## Default (atom.update (|>> (#.Cons {#creation ("lux io current-time") @@ -79,7 +79,7 @@ #action action})) runner)))) -(`` (for {(~~ (static host.jvm)) +(`` (for {(~~ (static host.old)) (as-is)} ## Default diff --git a/stdlib/source/lux/control/thread.lux b/stdlib/source/lux/control/thread.lux index 2edaeb8b4..db351d87b 100644 --- a/stdlib/source/lux/control/thread.lux +++ b/stdlib/source/lux/control/thread.lux @@ -33,7 +33,7 @@ (def: #export (read box) (All [! a] (-> (Box ! a) (Thread ! a))) (function (_ !) - (`` (for {(~~ (static host.jvm)) + (`` (for {(~~ (static host.old)) ("jvm aaload" (:representation box) 0)})))) (def: #export (write value box) diff --git a/stdlib/source/lux/data/collection/array.lux b/stdlib/source/lux/data/collection/array.lux index 946b6a3b4..04b215cf8 100644 --- a/stdlib/source/lux/data/collection/array.lux +++ b/stdlib/source/lux/data/collection/array.lux @@ -23,19 +23,19 @@ (def: #export (new size) (All [a] (-> Nat (Array a))) - (`` (for {(~~ (static host.jvm)) + (`` (for {(~~ (static host.old)) (:assume ("jvm anewarray" "(java.lang.Object )" size))}))) (def: #export (size xs) (All [a] (-> (Array a) Nat)) - (`` (for {(~~ (static host.jvm)) + (`` (for {(~~ (static host.old)) ("jvm arraylength" xs)}))) (def: #export (read i xs) (All [a] (-> Nat (Array a) (Maybe a))) (if (n/< (size xs) i) - (`` (for {(~~ (static host.jvm)) + (`` (for {(~~ (static host.old)) (let [value ("jvm aaload" xs i)] (if ("jvm object null?" value) #.None @@ -55,7 +55,7 @@ (def: #export (write i x xs) (All [a] (-> Nat a (Array a) (Array a))) - (`` (for {(~~ (static host.jvm)) + (`` (for {(~~ (static host.old)) ("jvm aastore" xs i x)}))) (def: #export (update index transform array) @@ -79,7 +79,7 @@ (All [a] (-> Nat (Array a) (Array a))) (if (n/< (size xs) i) - (`` (for {(~~ (static host.jvm)) + (`` (for {(~~ (static host.old)) (write i (:assume ("jvm object null")) xs)})) xs)) diff --git a/stdlib/source/lux/data/text.lux b/stdlib/source/lux/data/text.lux index 720968ba9..da3f4cd36 100644 --- a/stdlib/source/lux/data/text.lux +++ b/stdlib/source/lux/data/text.lux @@ -202,7 +202,7 @@ (def: &equivalence ..equivalence) (def: (hash input) - (`` (for {(~~ (static host.jvm)) + (`` (for {(~~ (static host.old)) (|> input (: (primitive "java.lang.String" [])) "jvm invokevirtual:java.lang.String:hashCode:" diff --git a/stdlib/source/lux/data/text/buffer.lux b/stdlib/source/lux/data/text/buffer.lux index 6260894c6..7549b1be1 100644 --- a/stdlib/source/lux/data/text/buffer.lux +++ b/stdlib/source/lux/data/text/buffer.lux @@ -13,7 +13,7 @@ [host (#+ import:)]] ["." //]) -(`` (for {(~~ (static _.jvm)) +(`` (for {(~~ (static _.old)) (as-is (import: java/lang/CharSequence) (import: java/lang/Appendable @@ -26,21 +26,21 @@ (`` (abstract: #export Buffer {#.doc "Immutable text buffer for efficient text concatenation."} - (for {(~~ (static _.jvm)) + (for {(~~ (static _.old)) [Nat (-> StringBuilder StringBuilder)]} ## default (Row Text)) (def: #export empty Buffer - (:abstraction (for {(~~ (static _.jvm)) + (:abstraction (for {(~~ (static _.old)) [0 id]} ## default row.empty))) (def: #export (append chunk buffer) (-> Text Buffer Buffer) - (for {(~~ (static _.jvm)) + (for {(~~ (static _.old)) (let [[capacity transform] (:representation buffer) append! (: (-> Text StringBuilder StringBuilder) (function (_ chunk builder) @@ -54,7 +54,7 @@ (def: #export (size buffer) (-> Buffer Nat) - (for {(~~ (static _.jvm)) + (for {(~~ (static _.old)) (|> buffer :representation product.left)} ## default (row;fold (function (_ chunk total) @@ -64,7 +64,7 @@ (def: #export (text buffer) (-> Buffer Text) - (for {(~~ (static _.jvm)) + (for {(~~ (static _.old)) (let [[capacity transform] (:representation buffer)] (|> (StringBuilder::new (.int capacity)) transform diff --git a/stdlib/source/lux/data/text/encoding.lux b/stdlib/source/lux/data/text/encoding.lux index b4372471c..aae640382 100644 --- a/stdlib/source/lux/data/text/encoding.lux +++ b/stdlib/source/lux/data/text/encoding.lux @@ -173,20 +173,20 @@ (|>> :representation)) ) -(`` (for {(~~ (static _.jvm)) - (as-is (import: java/lang/String - (new [(Array byte) String]) - (getBytes [String] (Array byte))))})) +(`` (for {(~~ (static _.old)) + (as-is (import: #long java/lang/String + (new [(Array byte) java/lang/String]) + (getBytes [java/lang/String] (Array byte))))})) (def: #export (to-utf8 value) (-> Text Binary) - (`` (for {(~~ (static _.jvm)) - (String::getBytes (..name ..utf-8) (:coerce String value))}))) + (`` (for {(~~ (static _.old)) + (java/lang/String::getBytes (..name ..utf-8) (:coerce java/lang/String value))}))) (def: #export (from-utf8 value) (-> Binary (Error Text)) - (`` (for {(~~ (static _.jvm)) - (#error.Success (String::new value (..name ..utf-8)))}))) + (`` (for {(~~ (static _.old)) + (#error.Success (java/lang/String::new value (..name ..utf-8)))}))) (structure: #export UTF-8 (Codec Binary Text) (def: encode ..to-utf8) diff --git a/stdlib/source/lux/host.jvm.lux b/stdlib/source/lux/host.old.lux index 915cdc7bf..915cdc7bf 100644 --- a/stdlib/source/lux/host.jvm.lux +++ b/stdlib/source/lux/host.old.lux diff --git a/stdlib/source/lux/host/jvm/loader.jvm.lux b/stdlib/source/lux/host/jvm/loader.old.lux index 0ca92fa23..0ca92fa23 100644 --- a/stdlib/source/lux/host/jvm/loader.jvm.lux +++ b/stdlib/source/lux/host/jvm/loader.old.lux diff --git a/stdlib/source/lux/tool/compiler/default/init.lux b/stdlib/source/lux/tool/compiler/default/init.lux index 34ba2a1fd..fbd0aa772 100644 --- a/stdlib/source/lux/tool/compiler/default/init.lux +++ b/stdlib/source/lux/tool/compiler/default/init.lux @@ -47,6 +47,7 @@ Info {#.target (`` (for {(~~ (static ///host.common-lisp)) ///host.common-lisp (~~ (static ///host.js)) ///host.js + (~~ (static ///host.old)) ///host.jvm (~~ (static ///host.jvm)) ///host.jvm (~~ (static ///host.lua)) ///host.lua (~~ (static ///host.php)) ///host.php diff --git a/stdlib/source/lux/tool/compiler/host.lux b/stdlib/source/lux/tool/compiler/host.lux index 71158e724..06c4c7efe 100644 --- a/stdlib/source/lux/tool/compiler/host.lux +++ b/stdlib/source/lux/tool/compiler/host.lux @@ -6,6 +6,9 @@ (template [<name> <value>] [(def: #export <name> Host <value>)] + ## TODO: Delete ASAP + [old "{old}"] + [common-lisp "Common Lisp"] [js "JavaScript"] [jvm "JVM"] diff --git a/stdlib/source/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/lux/tool/compiler/meta/io/archive.lux index 354f84460..f9b01a682 100644 --- a/stdlib/source/lux/tool/compiler/meta/io/archive.lux +++ b/stdlib/source/lux/tool/compiler/meta/io/archive.lux @@ -25,6 +25,7 @@ (<| (format root (:: System<m> separator)) (`` (for {(~~ (static host.common-lisp)) host.common-lisp (~~ (static host.js)) host.js + (~~ (static host.old)) host.jvm (~~ (static host.jvm)) host.jvm (~~ (static host.lua)) host.lua (~~ (static host.php)) host.php diff --git a/stdlib/source/lux/tool/compiler/meta/io/context.lux b/stdlib/source/lux/tool/compiler/meta/io/context.lux index e64a5d7b8..b60616f03 100644 --- a/stdlib/source/lux/tool/compiler/meta/io/context.lux +++ b/stdlib/source/lux/tool/compiler/meta/io/context.lux @@ -40,6 +40,7 @@ Extension (`` (for {(~~ (static ////host.common-lisp)) ".cl" (~~ (static ////host.js)) ".js" + (~~ (static ////host.old)) ".jvm" (~~ (static ////host.jvm)) ".jvm" (~~ (static ////host.lua)) ".lua" (~~ (static ////host.php)) ".php" diff --git a/stdlib/source/lux/tool/compiler/phase/extension/analysis/host.jvm.lux b/stdlib/source/lux/tool/compiler/phase/extension/analysis/host.old.lux index 13762272e..13762272e 100644 --- a/stdlib/source/lux/tool/compiler/phase/extension/analysis/host.jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/extension/analysis/host.old.lux diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux index d68abbdd7..d68abbdd7 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension.lux index 3bc0a0887..3bc0a0887 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension.jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension.lux diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux index cb96a5718..cb96a5718 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux index 28bfd36ba..28bfd36ba 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux index 6922806e2..6922806e2 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/primitive.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/primitive.lux index 5405e4c55..5405e4c55 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/primitive.jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/primitive.lux diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.lux index b531c38f7..b531c38f7 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.lux diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux index b66b7abaf..b66b7abaf 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.lux index e44ab508b..e44ab508b 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.lux diff --git a/stdlib/source/lux/world/console.lux b/stdlib/source/lux/world/console.lux index a5a0c7b06..effcff8a3 100644 --- a/stdlib/source/lux/world/console.lux +++ b/stdlib/source/lux/world/console.lux @@ -57,7 +57,7 @@ [can-write ..can-write] [can-close ..can-close]))))) -(`` (for {(~~ (static host.jvm)) +(`` (for {(~~ (static host.old)) (as-is (import: java/lang/String) (import: #long java/io/Console diff --git a/stdlib/source/lux/world/db/jdbc.jvm.lux b/stdlib/source/lux/world/db/jdbc.old.lux index 8fd0ecf4c..8fd0ecf4c 100644 --- a/stdlib/source/lux/world/db/jdbc.jvm.lux +++ b/stdlib/source/lux/world/db/jdbc.old.lux diff --git a/stdlib/source/lux/world/db/jdbc/input.jvm.lux b/stdlib/source/lux/world/db/jdbc/input.old.lux index 68045b058..68045b058 100644 --- a/stdlib/source/lux/world/db/jdbc/input.jvm.lux +++ b/stdlib/source/lux/world/db/jdbc/input.old.lux diff --git a/stdlib/source/lux/world/db/jdbc/output.jvm.lux b/stdlib/source/lux/world/db/jdbc/output.old.lux index 39c4cb92b..39c4cb92b 100644 --- a/stdlib/source/lux/world/db/jdbc/output.jvm.lux +++ b/stdlib/source/lux/world/db/jdbc/output.old.lux diff --git a/stdlib/source/lux/world/environment.jvm.lux b/stdlib/source/lux/world/environment.old.lux index 8ad10f1f9..8ad10f1f9 100644 --- a/stdlib/source/lux/world/environment.jvm.lux +++ b/stdlib/source/lux/world/environment.old.lux diff --git a/stdlib/source/lux/world/file.lux b/stdlib/source/lux/world/file.lux index 1e201d898..ec3cee16f 100644 --- a/stdlib/source/lux/world/file.lux +++ b/stdlib/source/lux/world/file.lux @@ -194,7 +194,7 @@ _ (io.io (ex.throw exception [path]))))) -(`` (for {(~~ (static host.jvm)) +(`` (for {(~~ (static host.old)) (as-is (import: #long java/io/File (new [String]) (~~ (template [<name>] diff --git a/stdlib/source/lux/world/net/http/client.lux b/stdlib/source/lux/world/net/http/client.lux index f2cafb0e3..dfef02f3f 100644 --- a/stdlib/source/lux/world/net/http/client.lux +++ b/stdlib/source/lux/world/net/http/client.lux @@ -20,7 +20,7 @@ [// (#+ URL)]]) ## TODO: This is unfinished work. Things like headers and cookies are missing. -(`` (for {(~~ (static host.jvm)) +(`` (for {(~~ (static host.old)) (as-is (import: #long java/lang/String) (import: #long java/io/Flushable @@ -50,7 +50,7 @@ (def: #export (request [method url headers body]) Client - (`` (for {(~~ (static host.jvm)) + (`` (for {(~~ (static host.old)) (promise.future (do (error.with io.monad) [conn (java/net/URL::openConnection (java/net/URL::new url)) diff --git a/stdlib/source/lux/world/net/tcp.jvm.lux b/stdlib/source/lux/world/net/tcp.old.lux index 0b1d725e5..1b7a8af18 100644 --- a/stdlib/source/lux/world/net/tcp.jvm.lux +++ b/stdlib/source/lux/world/net/tcp.old.lux @@ -63,7 +63,7 @@ [write //.can-write] [close //.can-close]))))) -(`` (for {(~~ (static host.jvm)) +(`` (for {(~~ (static host.old)) (as-is (def: (tcp socket) (-> Socket (Error (TCP IO))) (do error.monad diff --git a/stdlib/source/lux/world/net/udp.jvm.lux b/stdlib/source/lux/world/net/udp.old.lux index 497ed6893..9c58404fb 100644 --- a/stdlib/source/lux/world/net/udp.jvm.lux +++ b/stdlib/source/lux/world/net/udp.old.lux @@ -74,7 +74,7 @@ [write //.can-write] [close //.can-close]))))) -(`` (for {(~~ (static host.jvm)) +(`` (for {(~~ (static host.old)) (as-is (def: (resolve address) (-> //.Address (IO (Error InetAddress))) (do (error.with io.monad) diff --git a/stdlib/source/lux/world/shell.lux b/stdlib/source/lux/world/shell.lux index 82541c5f3..d7fedc6d0 100644 --- a/stdlib/source/lux/world/shell.lux +++ b/stdlib/source/lux/world/shell.lux @@ -58,7 +58,7 @@ (|>> (text.replace-all "'" "\'") (text.enclose' "'")))) -(`` (for {(~~ (static host.jvm)) +(`` (for {(~~ (static host.old)) (as-is (import: #long java/lang/String (toLowerCase [] java/lang/String)) @@ -149,7 +149,7 @@ (def: #export (execute environment command arguments) (-> Context Text (List Text) (IO (Error (Console IO)))) - (`` (for {(~~ (static host.jvm)) + (`` (for {(~~ (static host.old)) (do (error.with io.monad) [windows? (:: @ map (|>> java/lang/String::toLowerCase ..windows?) (java/lang/System::getProperty "os.name")) diff --git a/stdlib/source/test/lux/host.jvm.lux b/stdlib/source/test/lux/host.old.lux index 04c149881..04c149881 100644 --- a/stdlib/source/test/lux/host.jvm.lux +++ b/stdlib/source/test/lux/host.old.lux diff --git a/stdlib/source/test/lux/host/jvm.jvm.lux b/stdlib/source/test/lux/host/jvm.old.lux index 47c6f35d9..47c6f35d9 100644 --- a/stdlib/source/test/lux/host/jvm.jvm.lux +++ b/stdlib/source/test/lux/host/jvm.old.lux |