From befa21cea76282f8cd3509e0a7da1bdffd353101 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Fri, 9 Oct 2020 23:11:38 -0400 Subject: Mandatory long names for JVM imports, instead of having "long" be optional and short be default. --- stdlib/source/program/aedifex/command/auto.lux | 22 +++++++++++----------- stdlib/source/program/aedifex/command/build.lux | 4 ++-- stdlib/source/program/aedifex/dependency.lux | 10 +++++----- stdlib/source/program/aedifex/hash.lux | 4 ++-- stdlib/source/program/aedifex/shell.lux | 16 ++++++++-------- stdlib/source/program/aedifex/upload.lux | 16 ++++++++-------- stdlib/source/program/licentia.lux | 4 ++-- 7 files changed, 38 insertions(+), 38 deletions(-) (limited to 'stdlib/source/program') diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index cbb76edbb..738cae467 100644 --- a/stdlib/source/program/aedifex/command/auto.lux +++ b/stdlib/source/program/aedifex/command/auto.lux @@ -21,37 +21,37 @@ ["#." action (#+ Action)] ["#." command (#+ Command)]]]) -(import: #long java/nio/file/WatchKey +(import: java/nio/file/WatchKey (reset [] #io boolean)) -(import: #long java/util/concurrent/TimeUnit +(import: java/util/concurrent/TimeUnit (#enum SECONDS)) -(import: #long java/nio/file/WatchService +(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)) -(import: #long java/nio/file/FileSystem +(import: java/nio/file/FileSystem (newWatchService [] #io #try java/nio/file/WatchService)) -(import: #long java/nio/file/FileSystems +(import: java/nio/file/FileSystems (#static getDefault [] java/nio/file/FileSystem)) -(import: #long java/lang/Object) +(import: java/lang/Object) -(import: #long java/lang/String) +(import: java/lang/String) -(import: #long (java/nio/file/WatchEvent$Kind a)) +(import: (java/nio/file/WatchEvent$Kind a)) -(import: #long java/nio/file/StandardWatchEventKinds +(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))) -(import: #long 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)) -(import: #long java/io/File +(import: java/io/File (new [java/lang/String]) (exists [] #io #try boolean) (isDirectory [] #io #try boolean) diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index f505f1d0a..eb7842e45 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -89,10 +89,10 @@ (list.filter (|>> (get@ #///dependency.type) (text@= ///dependency.lux-library))) (list@map (|>> (get@ #///dependency.artifact) (///local.path file.system))))) -(import: #long java/lang/String) +(import: java/lang/String) ## https://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html -(import: #long java/lang/System +(import: java/lang/System (#static getProperty [java/lang/String] #io #? java/lang/String)) (def: #export working-directory diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index 18b6719ed..2086a4d06 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -68,18 +68,18 @@ ["pom" pom] ) -(import: #long java/lang/String) +(import: java/lang/String) -(import: #long java/lang/AutoCloseable +(import: java/lang/AutoCloseable (close [] #io #try void)) -(import: #long java/io/InputStream) +(import: java/io/InputStream) -(import: #long java/net/URL +(import: java/net/URL (new [java/lang/String]) (openStream [] #io #try java/io/InputStream)) -(import: #long java/io/BufferedInputStream +(import: java/io/BufferedInputStream (new [java/io/InputStream]) (read [[byte] int int] #io #try int)) diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index 63511a74d..86fe4319d 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -11,9 +11,9 @@ ## TODO: Replace with pure-Lux implementations of these algorithms ## https://en.wikipedia.org/wiki/SHA-1#SHA-1_pseudocode ## https://en.wikipedia.org/wiki/MD5#Algorithm -(import: #long java/lang/String) +(import: java/lang/String) -(import: #long java/security/MessageDigest +(import: java/security/MessageDigest (#static getInstance [java/lang/String] java/security/MessageDigest) (digest [[byte]] [byte])) diff --git a/stdlib/source/program/aedifex/shell.lux b/stdlib/source/program/aedifex/shell.lux index 373f9b739..72150a016 100644 --- a/stdlib/source/program/aedifex/shell.lux +++ b/stdlib/source/program/aedifex/shell.lux @@ -19,28 +19,28 @@ ["." // #_ ["#." action (#+ Action)]]) -(import: #long java/lang/String) +(import: java/lang/String) -(import: #long java/io/InputStream) +(import: java/io/InputStream) -(import: #long java/io/Reader) +(import: java/io/Reader) -(import: #long java/io/InputStreamReader +(import: java/io/InputStreamReader (new [java/io/InputStream])) -(import: #long java/io/BufferedReader +(import: java/io/BufferedReader (new [java/io/Reader]) (readLine [] #io #try java/lang/String)) -(import: #long java/lang/Process +(import: java/lang/Process (getInputStream [] java/io/InputStream) (getErrorStream [] java/io/InputStream) (waitFor [] #io #try int)) -(import: #long java/io/File +(import: java/io/File (new [java/lang/String])) -(import: #long java/lang/Runtime +(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)) diff --git a/stdlib/source/program/aedifex/upload.lux b/stdlib/source/program/aedifex/upload.lux index 8b849ed10..c4572de9d 100644 --- a/stdlib/source/program/aedifex/upload.lux +++ b/stdlib/source/program/aedifex/upload.lux @@ -42,32 +42,32 @@ "." (get@ #//dependency.type dependency))) -(import: #long java/lang/AutoCloseable +(import: java/lang/AutoCloseable (close [] #io #try void)) -(import: #long java/io/OutputStream +(import: java/io/OutputStream (flush [] #io #try void) (write [[byte]] #io #try void)) -(import: #long java/lang/String) +(import: java/lang/String) -(import: #long java/net/URLConnection +(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)) -(import: #long java/net/HttpURLConnection +(import: java/net/HttpURLConnection (setRequestMethod [java/lang/String] #io #try void) (getResponseCode [] #io #try int)) -(import: #long java/net/URL +(import: java/net/URL (new [java/lang/String]) (openConnection [] #io #try java/net/URLConnection)) -(import: #long java/util/Base64$Encoder +(import: java/util/Base64$Encoder (encodeToString [[byte]] java/lang/String)) -(import: #long java/util/Base64 +(import: java/util/Base64 (#static getEncoder [] java/util/Base64$Encoder)) (exception: #export (failure {code Int}) diff --git a/stdlib/source/program/licentia.lux b/stdlib/source/program/licentia.lux index b3765916f..7eab5b444 100644 --- a/stdlib/source/program/licentia.lux +++ b/stdlib/source/program/licentia.lux @@ -41,8 +41,8 @@ (to-do "Replace _.work with _.covered-work or _.licensed-work") (to-do "Create a short notice to add as a comment to each file in the _.work")) -(import: #long java/lang/String - (trim [] String)) +(import: java/lang/String + (trim [] java/lang/String)) (def: default-output-file "LICENSE") -- cgit v1.2.3