Some renamings.

LuxLang · Dec 3, 2024 · 1836ae4 · 1836ae4
1 parent 9dace60
commit 1836ae4
Show file tree

Hide file tree

Showing 79 changed files with 2,284 additions and 2,278 deletions.
diff --git a/aedifex/source/program/aedifex/command/build.lux b/aedifex/source/program/aedifex/command/build.lux
@@ -255,9 +255,9 @@
   [[log_output! read]
    [log_error! fail]])
 
-(ffi.import java/lang/System
-            "[1]::[0]"
-            ("static" getProperty [java/lang/String] "io" "try" java/lang/String))
+(ffi.the java/lang/System
+  "[1]::[0]"
+  ("static" getProperty [java/lang/String] "io" "try" java/lang/String))
 
 (the windows?
   Bit
@@ -295,29 +295,29 @@
                                         "--add-opens" "java.base/java.lang=ALL-UNNAMED")))
              runtime)))
 
-(ffi.import java/io/InputStream
-            "[1]::[0]")
+(ffi.the java/io/InputStream
+  "[1]::[0]")
 
-(ffi.import java/io/FileInputStream
-            "[1]::[0]"
-            (new [java/lang/String]))
+(ffi.the java/io/FileInputStream
+  "[1]::[0]"
+  (new [java/lang/String]))
 
-(ffi.import java/util/jar/Attributes$Name
-            "[1]::[0]"
-            ("static" MAIN_CLASS java/util/jar/Attributes$Name))
+(ffi.the java/util/jar/Attributes$Name
+  "[1]::[0]"
+  ("static" MAIN_CLASS java/util/jar/Attributes$Name))
 
-(ffi.import java/util/jar/Attributes
-            "[1]::[0]"
-            (getValue [java/util/jar/Attributes$Name] java/lang/String))
+(ffi.the java/util/jar/Attributes
+  "[1]::[0]"
+  (getValue [java/util/jar/Attributes$Name] java/lang/String))
 
-(ffi.import java/util/jar/Manifest
-            "[1]::[0]"
-            (getMainAttributes [] java/util/jar/Attributes))
+(ffi.the java/util/jar/Manifest
+  "[1]::[0]"
+  (getMainAttributes [] java/util/jar/Attributes))
 
-(ffi.import java/util/jar/JarInputStream
-            "[1]::[0]"
-            (new [java/io/InputStream])
-            (getManifest [] java/util/jar/Manifest))
+(ffi.the java/util/jar/JarInputStream
+  "[1]::[0]"
+  (new [java/io/InputStream])
+  (getManifest [] java/util/jar/Manifest))
 
 (the jvm_main
   (-> Path

diff --git a/aedifex/source/program/aedifex/command/deploy/release.lux b/aedifex/source/program/aedifex/command/deploy/release.lux
@@ -4,7 +4,7 @@
 (.using
  [library
   [lux (.except)
-   ["[0]" ffi (.only import)]
+   ["[0]" ffi]
    [abstract
     ["[0]" monad]]
    [concurrency
@@ -66,13 +66,13 @@
      ["[1]/[0]" type]
      ["[1]/[0]" extension (.only Extension)]]]]])
 
-(import java/lang/String
-        "[1]::[0]"
-        (toLowerCase [] java/lang/String))
+(ffi.the java/lang/String
+  "[1]::[0]"
+  (toLowerCase [] java/lang/String))
 
-(import java/lang/System
-        "[1]::[0]"
-        ("static" getProperty [java/lang/String] "io" "try" java/lang/String))
+(ffi.the java/lang/System
+  "[1]::[0]"
+  ("static" getProperty [java/lang/String] "io" "try" java/lang/String))
 
 (the windows?
   (IO (Try Bit))

diff --git a/aedifex/source/program/aedifex/dependency/resolution.lux b/aedifex/source/program/aedifex/dependency/resolution.lux
@@ -6,7 +6,7 @@
   [lux (.except Tag
                 all)
    ["[0]" debug]
-   ["[0]" ffi (.only import)]
+   ["[0]" ffi]
    [abstract
     [format (.only Format)]
     [equivalence (.only Equivalence)]
@@ -73,9 +73,9 @@
   [[sha1_does_not_match]
    [md5_does_not_match]])
 
-(import java/lang/String
-        "[1]::[0]"
-        (trim [] java/lang/String))
+(ffi.the java/lang/String
+  "[1]::[0]"
+  (trim [] java/lang/String))
 
 (the (verified_hash library repository version_template artifact extension hash format exception)
   (for_any (_ h)

diff --git a/aedifex/source/program/aedifex/hash.lux b/aedifex/source/program/aedifex/hash.lux
@@ -4,7 +4,7 @@
 (.using
  [library
   [lux (.except)
-   ["[0]" ffi (.only import)]
+   ["[0]" ffi]
    [abstract
     [format (.only Format)]
     [equivalence (.only Equivalence)]
@@ -29,13 +29,13 @@
 ... 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 java/lang/String
-        "[1]::[0]")
+(ffi.the java/lang/String
+  "[1]::[0]")
 
-(import java/security/MessageDigest
-        "[1]::[0]"
-        ("static" getInstance [java/lang/String] java/security/MessageDigest)
-        (digest [[byte]] [byte]))
+(ffi.the java/security/MessageDigest
+  "[1]::[0]"
+  ("static" getInstance [java/lang/String] java/security/MessageDigest)
+  (digest [[byte]] [byte]))
 
 (nominal.every .public SHA1 Any)
 (nominal.every .public MD5 Any)

diff --git a/lux-c++/source/program.lux b/lux-c++/source/program.lux
@@ -6,7 +6,7 @@
  [library
   [lux (.except tuple)
    [program (.only program)]
-   ["[0]" ffi (.only import)]
+   ["[0]" ffi]
    [abstract
     ["[0]" monad]]
    [concurrency
@@ -77,17 +77,17 @@
 (every Globals
   Any)
 
-(import cppyy
-        "[1]::[0]"
-        ("static" cppdef [Text] "io" "try" Bit)
-        ("static" cppexec [Text] "io" "try" Bit)
-        ("static" gbl Globals))
+(ffi.the cppyy
+  "[1]::[0]"
+  ("static" cppdef [Text] "io" "try" Bit)
+  ("static" cppexec [Text] "io" "try" Bit)
+  ("static" gbl Globals))
 
-(ffi.import (getattr [Any Text] Any))
+(ffi.the (getattr [Any Text] Any))
 
-(ffi.import (tuple [(Array Any)] Any))
+(ffi.the (tuple [(Array Any)] Any))
 
-(ffi.import (str [Any] Text))
+(ffi.the (str [Any] Text))
 
 (the nested
   (-> Text

diff --git a/lux-cl/source/program.lux b/lux-cl/source/program.lux
@@ -67,94 +67,94 @@
    ["[1][0]" cli]
    ["[1][0]" static]]])
 
-(ffi.import java/lang/String
-            "[1]::[0]")
-
-(ffi.import (java/lang/Class a)
-            "[1]::[0]"
-            ("static" forName [java/lang/String] "try" (java/lang/Class java/lang/Object)))
-
-(ffi.import java/lang/Object
-            "[1]::[0]"
-            (toString [] java/lang/String)
-            (getClass [] (java/lang/Class java/lang/Object)))
-
-(ffi.import java/lang/Long
-            "[1]::[0]"
-            (intValue [] java/lang/Integer))
-
-(ffi.import java/lang/Integer
-            "[1]::[0]"
-            (longValue [] long))
-
-(ffi.import java/lang/Number
-            "[1]::[0]"
-            (intValue [] java/lang/Integer)
-            (longValue [] long)
-            (doubleValue [] double))
-
-(ffi.import org/armedbear/lisp/LispObject
-            "[1]::[0]"
-            (length [] int)
-            (NTH [int] org/armedbear/lisp/LispObject)
-            (SVREF [int] org/armedbear/lisp/LispObject)
-            (elt [int] org/armedbear/lisp/LispObject)
-            (execute [org/armedbear/lisp/LispObject org/armedbear/lisp/LispObject] "try" org/armedbear/lisp/LispObject))
+(ffi.the java/lang/String
+  "[1]::[0]")
+
+(ffi.the (java/lang/Class a)
+  "[1]::[0]"
+  ("static" forName [java/lang/String] "try" (java/lang/Class java/lang/Object)))
+
+(ffi.the java/lang/Object
+  "[1]::[0]"
+  (toString [] java/lang/String)
+  (getClass [] (java/lang/Class java/lang/Object)))
+
+(ffi.the java/lang/Long
+  "[1]::[0]"
+  (intValue [] java/lang/Integer))
+
+(ffi.the java/lang/Integer
+  "[1]::[0]"
+  (longValue [] long))
+
+(ffi.the java/lang/Number
+  "[1]::[0]"
+  (intValue [] java/lang/Integer)
+  (longValue [] long)
+  (doubleValue [] double))
+
+(ffi.the org/armedbear/lisp/LispObject
+  "[1]::[0]"
+  (length [] int)
+  (NTH [int] org/armedbear/lisp/LispObject)
+  (SVREF [int] org/armedbear/lisp/LispObject)
+  (elt [int] org/armedbear/lisp/LispObject)
+  (execute [org/armedbear/lisp/LispObject org/armedbear/lisp/LispObject] "try" org/armedbear/lisp/LispObject))
 
 ... The org/armedbear/lisp/Interpreter must be imported before the
 ... other ones, because there is an order dependency in their static initialization.
-(ffi.import org/armedbear/lisp/Interpreter
-            "[1]::[0]"
-            ("static" getInstance [] org/armedbear/lisp/Interpreter)
-            ("static" createInstance [] "?" org/armedbear/lisp/Interpreter)
-            (eval [java/lang/String] "try" org/armedbear/lisp/LispObject))
+(ffi.the org/armedbear/lisp/Interpreter
+  "[1]::[0]"
+  ("static" getInstance [] org/armedbear/lisp/Interpreter)
+  ("static" createInstance [] "?" org/armedbear/lisp/Interpreter)
+  (eval [java/lang/String] "try" org/armedbear/lisp/LispObject))
 
-(ffi.import org/armedbear/lisp/Symbol
-            "[1]::[0]"
-            ("static" T org/armedbear/lisp/Symbol))
+(ffi.the org/armedbear/lisp/Symbol
+  "[1]::[0]"
+  ("static" T org/armedbear/lisp/Symbol))
 
-(ffi.import org/armedbear/lisp/DoubleFloat
-            "[1]::[0]"
-            (new [double])
-            (doubleValue [] double))
+(ffi.the org/armedbear/lisp/DoubleFloat
+  "[1]::[0]"
+  (new [double])
+  (doubleValue [] double))
 
-(ffi.import org/armedbear/lisp/SimpleString
-            "[1]::[0]"
-            (new [java/lang/String])
-            (getStringValue [] java/lang/String))
+(ffi.the org/armedbear/lisp/SimpleString
+  "[1]::[0]"
+  (new [java/lang/String])
+  (getStringValue [] java/lang/String))
 
-(ffi.import org/armedbear/lisp/LispInteger
-            "[1]::[0]")
+(ffi.the org/armedbear/lisp/LispInteger
+  "[1]::[0]")
 
-(ffi.import org/armedbear/lisp/Bignum
-            "[1]::[0]"
-            (longValue [] long)
-            ("static" getInstance [long] org/armedbear/lisp/LispInteger))
+(ffi.the org/armedbear/lisp/Bignum
+  "[1]::[0]"
+  (longValue [] long)
+  ("static" getInstance [long] org/armedbear/lisp/LispInteger))
 
-(ffi.import org/armedbear/lisp/Fixnum
-            "[1]::[0]"
-            (longValue [] long)
-            ("static" getInstance [int] org/armedbear/lisp/Fixnum))
+(ffi.the org/armedbear/lisp/Fixnum
+  "[1]::[0]"
+  (longValue [] long)
+  ("static" getInstance [int] org/armedbear/lisp/Fixnum))
 
-(ffi.import org/armedbear/lisp/Nil
-            "[1]::[0]"
-            ("static" NIL org/armedbear/lisp/Symbol))
+(ffi.the org/armedbear/lisp/Nil
+  "[1]::[0]"
+  ("static" NIL org/armedbear/lisp/Symbol))
 
-(ffi.import org/armedbear/lisp/SimpleVector
-            "[1]::[0]")
+(ffi.the org/armedbear/lisp/SimpleVector
+  "[1]::[0]")
 
-(ffi.import org/armedbear/lisp/Cons
-            "[1]::[0]")
+(ffi.the org/armedbear/lisp/Cons
+  "[1]::[0]")
 
-(ffi.import org/armedbear/lisp/Closure
-            "[1]::[0]")
+(ffi.the org/armedbear/lisp/Closure
+  "[1]::[0]")
 
 (ffi.interface LuxADT
                (getValue [] java/lang/Object))
 
-(ffi.import program/LuxADT
-            "[1]::[0]"
-            (getValue [] java/lang/Object))
+(ffi.the program/LuxADT
+  "[1]::[0]"
+  (getValue [] java/lang/Object))
 
 (template.with [<name>]
   [(exception.the (<name> object)