From dbb658bd7976c073a2bf314f194b36b30c45784b Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Thu, 26 Nov 2020 19:37:11 -0400 Subject: Allow name formatting for JVM imports, similar to Lux module imports. --- stdlib/source/program/aedifex/command/auto.lux | 40 +++++++++++++++---------- stdlib/source/program/aedifex/command/build.lux | 3 +- stdlib/source/program/aedifex/hash.lux | 5 ++-- stdlib/source/program/aedifex/repository.lux | 38 +++++++++++++---------- stdlib/source/program/aedifex/shell.lux | 23 ++++++++------ 5 files changed, 66 insertions(+), 43 deletions(-) (limited to 'stdlib/source/program/aedifex') diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index 8150fa1f6..0fc223376 100644 --- a/stdlib/source/program/aedifex/command/auto.lux +++ b/stdlib/source/program/aedifex/command/auto.lux @@ -22,20 +22,25 @@ ["#." command (#+ Command)]]]) (import: java/nio/file/WatchKey - (reset [] #io boolean)) + ["#::." + (reset [] #io boolean)]) (import: java/util/concurrent/TimeUnit - (#enum SECONDS)) + ["#::." + (#enum SECONDS)]) (import: java/nio/file/WatchService - (poll [long java/util/concurrent/TimeUnit] #io #try #? java/nio/file/WatchKey) - (poll #as fetch [] #io #try #? java/nio/file/WatchKey)) + ["#::." + (poll [long java/util/concurrent/TimeUnit] #io #try #? java/nio/file/WatchKey) + (poll #as fetch [] #io #try #? java/nio/file/WatchKey)]) (import: java/nio/file/FileSystem - (newWatchService [] #io #try java/nio/file/WatchService)) + ["#::." + (newWatchService [] #io #try java/nio/file/WatchService)]) (import: java/nio/file/FileSystems - (#static getDefault [] java/nio/file/FileSystem)) + ["#::." + (#static getDefault [] java/nio/file/FileSystem)]) (import: java/lang/Object) @@ -44,20 +49,23 @@ (import: (java/nio/file/WatchEvent$Kind a)) (import: java/nio/file/StandardWatchEventKinds - (#static ENTRY_CREATE (java/nio/file/WatchEvent$Kind java/nio/file/Path)) - (#static ENTRY_MODIFY (java/nio/file/WatchEvent$Kind java/nio/file/Path)) - (#static ENTRY_DELETE (java/nio/file/WatchEvent$Kind java/nio/file/Path))) + ["#::." + (#static ENTRY_CREATE (java/nio/file/WatchEvent$Kind java/nio/file/Path)) + (#static ENTRY_MODIFY (java/nio/file/WatchEvent$Kind java/nio/file/Path)) + (#static ENTRY_DELETE (java/nio/file/WatchEvent$Kind java/nio/file/Path))]) (import: java/nio/file/Path - (register [java/nio/file/WatchService [(java/nio/file/WatchEvent$Kind ?)]] #io #try java/nio/file/WatchKey)) + ["#::." + (register [java/nio/file/WatchService [(java/nio/file/WatchEvent$Kind ?)]] #io #try java/nio/file/WatchKey)]) (import: java/io/File - (new [java/lang/String]) - (exists [] #io #try boolean) - (isDirectory [] #io #try boolean) - (listFiles [] #io #try [java/io/File]) - (getAbsolutePath [] #io #try java/lang/String) - (toPath [] java/nio/file/Path)) + ["#::." + (new [java/lang/String]) + (exists [] #io #try boolean) + (isDirectory [] #io #try boolean) + (listFiles [] #io #try [java/io/File]) + (getAbsolutePath [] #io #try java/lang/String) + (toPath [] java/nio/file/Path)]) (def: (targets path) (-> Path (Action (List Path))) diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 623a20841..b3a096ea8 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -97,7 +97,8 @@ ## https://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html (import: java/lang/System - (#static getProperty [java/lang/String] #io #? java/lang/String)) + ["#::." + (#static getProperty [java/lang/String] #io #? java/lang/String)]) (def: #export working-directory (IO (Try Text)) diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index 35e3f17a8..a484b9a0d 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -25,8 +25,9 @@ (import: java/lang/String) (import: java/security/MessageDigest - (#static getInstance [java/lang/String] java/security/MessageDigest) - (digest [[byte]] [byte])) + ["#::." + (#static getInstance [java/lang/String] java/security/MessageDigest) + (digest [[byte]] [byte])]) (abstract: #export SHA-1 Any) (abstract: #export MD5 Any) diff --git a/stdlib/source/program/aedifex/repository.lux b/stdlib/source/program/aedifex/repository.lux index 5c622d84b..d2ba2c226 100644 --- a/stdlib/source/program/aedifex/repository.lux +++ b/stdlib/source/program/aedifex/repository.lux @@ -95,37 +95,45 @@ (import: java/lang/String) (import: java/lang/AutoCloseable - (close [] #io #try void)) + ["#::." + (close [] #io #try void)]) (import: java/io/OutputStream - (flush [] #io #try void) - (write [[byte]] #io #try void)) + ["#::." + (flush [] #io #try void) + (write [[byte]] #io #try void)]) (import: java/net/URLConnection - (setDoOutput [boolean] #io #try void) - (setRequestProperty [java/lang/String java/lang/String] #io #try void) - (getOutputStream [] #io #try java/io/OutputStream)) + ["#::." + (setDoOutput [boolean] #io #try void) + (setRequestProperty [java/lang/String java/lang/String] #io #try void) + (getOutputStream [] #io #try java/io/OutputStream)]) (import: java/net/HttpURLConnection - (setRequestMethod [java/lang/String] #io #try void) - (getResponseCode [] #io #try int)) + ["#::." + (setRequestMethod [java/lang/String] #io #try void) + (getResponseCode [] #io #try int)]) (import: java/net/URL - (new [java/lang/String]) - (openConnection [] #io #try java/net/URLConnection) - (openStream [] #io #try java/io/InputStream)) + ["#::." + (new [java/lang/String]) + (openConnection [] #io #try java/net/URLConnection) + (openStream [] #io #try java/io/InputStream)]) (import: java/util/Base64$Encoder - (encodeToString [[byte]] java/lang/String)) + ["#::." + (encodeToString [[byte]] java/lang/String)]) (import: java/util/Base64 - (#static getEncoder [] java/util/Base64$Encoder)) + ["#::." + (#static getEncoder [] java/util/Base64$Encoder)]) (import: java/io/InputStream) (import: java/io/BufferedInputStream - (new [java/io/InputStream]) - (read [[byte] int int] #io #try int)) + ["#::." + (new [java/io/InputStream]) + (read [[byte] int int] #io #try int)]) (exception: #export (failure {code Int}) (exception.report diff --git a/stdlib/source/program/aedifex/shell.lux b/stdlib/source/program/aedifex/shell.lux index 0215c08da..e70571667 100644 --- a/stdlib/source/program/aedifex/shell.lux +++ b/stdlib/source/program/aedifex/shell.lux @@ -26,23 +26,28 @@ (import: java/io/Reader) (import: java/io/InputStreamReader - (new [java/io/InputStream])) + ["#::." + (new [java/io/InputStream])]) (import: java/io/BufferedReader - (new [java/io/Reader]) - (readLine [] #io #try java/lang/String)) + ["#::." + (new [java/io/Reader]) + (readLine [] #io #try java/lang/String)]) (import: java/lang/Process - (getInputStream [] java/io/InputStream) - (getErrorStream [] java/io/InputStream) - (waitFor [] #io #try int)) + ["#::." + (getInputStream [] java/io/InputStream) + (getErrorStream [] java/io/InputStream) + (waitFor [] #io #try int)]) (import: java/io/File - (new [java/lang/String])) + ["#::." + (new [java/lang/String])]) (import: java/lang/Runtime - (#static getRuntime [] #io java/lang/Runtime) - (exec [java/lang/String #? [java/lang/String] java/io/File] #io #try java/lang/Process)) + ["#::." + (#static getRuntime [] #io java/lang/Runtime) + (exec [java/lang/String #? [java/lang/String] java/io/File] #io #try java/lang/Process)]) (template [] [(exception: #export ( {working-directory Text} {command Text} {error Text}) -- cgit v1.2.3