aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/lux/target/jvm/type
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--stdlib/source/lux/target/jvm/type.lux12
-rw-r--r--stdlib/source/lux/target/jvm/type/alias.lux2
-rw-r--r--stdlib/source/lux/target/jvm/type/descriptor.lux8
-rw-r--r--stdlib/source/lux/target/jvm/type/lux.lux56
-rw-r--r--stdlib/source/lux/target/jvm/type/parser.lux10
-rw-r--r--stdlib/source/lux/target/jvm/type/reflection.lux4
-rw-r--r--stdlib/source/lux/target/jvm/type/signature.lux16
7 files changed, 54 insertions, 54 deletions
diff --git a/stdlib/source/lux/target/jvm/type.lux b/stdlib/source/lux/target/jvm/type.lux
index 613c8f5c3..9dbcb12c2 100644
--- a/stdlib/source/lux/target/jvm/type.lux
+++ b/stdlib/source/lux/target/jvm/type.lux
@@ -10,7 +10,7 @@
[number
["n" nat]]
[collection
- ["." list ("#@." functor)]]]
+ ["." list ("#//." functor)]]]
[type
abstract]]
["." // #_
@@ -79,14 +79,14 @@
(def: #export (class name parameters)
(-> External (List (Type Parameter)) (Type Class))
(:abstraction
- [(/signature.class name (list@map ..signature parameters))
+ [(/signature.class name (list//map ..signature parameters))
(/descriptor.class name)
(/reflection.class name)]))
(def: #export (declaration name variables)
(-> External (List (Type Var)) (Type Declaration))
(:abstraction
- [(/signature.declaration name (list@map ..signature variables))
+ [(/signature.declaration name (list//map ..signature variables))
(/descriptor.declaration name)
(/reflection.declaration name)]))
@@ -134,10 +134,10 @@
(List (Type Class))]
(Type Method))
(:abstraction
- [(/signature.method [(list@map ..signature inputs)
+ [(/signature.method [(list//map ..signature inputs)
(..signature output)
- (list@map ..signature exceptions)])
- (/descriptor.method [(list@map ..descriptor inputs)
+ (list//map ..signature exceptions)])
+ (/descriptor.method [(list//map ..descriptor inputs)
(..descriptor output)])
(:assume ..void)]))
diff --git a/stdlib/source/lux/target/jvm/type/alias.lux b/stdlib/source/lux/target/jvm/type/alias.lux
index d21cbc1c2..f384a0ea1 100644
--- a/stdlib/source/lux/target/jvm/type/alias.lux
+++ b/stdlib/source/lux/target/jvm/type/alias.lux
@@ -5,7 +5,7 @@
[control
["." try]
["." exception (#+ exception:)]
- ["<>" parser ("#@." monad)
+ ["<>" parser
["<t>" text (#+ Parser)]]]
[data
["." maybe]
diff --git a/stdlib/source/lux/target/jvm/type/descriptor.lux b/stdlib/source/lux/target/jvm/type/descriptor.lux
index abcbfbbb9..27e44ec7f 100644
--- a/stdlib/source/lux/target/jvm/type/descriptor.lux
+++ b/stdlib/source/lux/target/jvm/type/descriptor.lux
@@ -6,10 +6,10 @@
["." maybe]
[number
["n" nat]]
- ["." text ("#@." equivalence)
+ ["." text ("#//." equivalence)
["%" format (#+ format)]]
[collection
- ["." list ("#@." functor)]]]
+ ["." list ("#//." functor)]]]
[type
abstract]]
["." // #_
@@ -92,7 +92,7 @@
(Descriptor Method))
(:abstraction
(format (|> inputs
- (list@map ..descriptor)
+ (list//map ..descriptor)
(text.join-with "")
(text.enclose ["(" ")"]))
(:representation output))))
@@ -101,7 +101,7 @@
(All [category] (Equivalence (Descriptor category)))
(def: (= parameter subject)
- (text@= (:representation parameter) (:representation subject))))
+ (text//= (:representation parameter) (:representation subject))))
(def: #export class-name
(-> (Descriptor Object) Internal)
diff --git a/stdlib/source/lux/target/jvm/type/lux.lux b/stdlib/source/lux/target/jvm/type/lux.lux
index 83a61de01..cbaf50a99 100644
--- a/stdlib/source/lux/target/jvm/type/lux.lux
+++ b/stdlib/source/lux/target/jvm/type/lux.lux
@@ -5,18 +5,18 @@
[control
["." try]
["." exception (#+ exception:)]
- ["<>" parser ("#@." monad)
+ ["<>" parser ("#//." monad)
["<t>" text (#+ Parser)]]]
[data
["." product]
- ["." text ("#@." equivalence)
+ ["." text ("#//." equivalence)
["%" format (#+ format)]]
[collection
["." array]
["." dictionary (#+ Dictionary)]]]
[type
abstract
- ["." check (#+ Check) ("#@." monad)]]]
+ ["." check (#+ Check) ("#//." monad)]]]
["." //
[category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
["#." descriptor]
@@ -47,13 +47,13 @@
(def: void
(Parser (Check Type))
(<>.after //parser.void
- (<>@wrap (check@wrap .Any))))
+ (<>//wrap (check//wrap .Any))))
(template [<name> <parser> <reflection>]
[(def: <name>
(Parser (Check Type))
(<>.after <parser>
- (<>@wrap (check@wrap (#.Primitive (//reflection.reflection <reflection>) #.Nil)))))]
+ (<>//wrap (check//wrap (#.Primitive (//reflection.reflection <reflection>) #.Nil)))))]
[boolean //parser.boolean //reflection.boolean]
[byte //parser.byte //reflection.byte]
@@ -81,8 +81,8 @@
(def: wildcard
(Parser (Check Type))
(<>.after //parser.wildcard
- (<>@wrap (check@map product.right
- check.existential))))
+ (<>//wrap (check//map product.right
+ check.existential))))
(def: (var mapping)
(-> Mapping (Parser (Check Type)))
@@ -93,7 +93,7 @@
(check.throw ..unknown-var [var])
(#.Some type)
- (check@wrap type)))))
+ (check//wrap type)))))
(def: (class' parameter)
(-> (Parser (Check Type)) (Parser (Check Type)))
@@ -114,7 +114,7 @@
(-> (Parser (Check Type)) (Parser (Check Type)))
(|> (<>.after (<t>.this <prefix>))
## TODO: Re-enable Lower and Upper, instead of using the simplified limit.
- ## (<>@map (check@map (|>> <ctor> .type)))
+ ## (<>//map (check//map (|>> <ctor> .type)))
))]
[lower //signature.lower-prefix ..Lower]
@@ -140,25 +140,25 @@
(def: array
(-> (Parser (Check Type)) (Parser (Check Type)))
- (|>> (<>@map (check@map (function (_ elementT)
- (case elementT
- (#.Primitive name #.Nil)
- (if (`` (or (~~ (template [<reflection>]
- [(text@= (//reflection.reflection <reflection>) name)]
-
- [//reflection.boolean]
- [//reflection.byte]
- [//reflection.short]
- [//reflection.int]
- [//reflection.long]
- [//reflection.float]
- [//reflection.double]
- [//reflection.char]))))
- (#.Primitive (|> name //reflection.class //reflection.array //reflection.reflection) #.Nil)
- (|> elementT array.Array .type))
-
- _
- (|> elementT array.Array .type)))))
+ (|>> (<>//map (check//map (function (_ elementT)
+ (case elementT
+ (#.Primitive name #.Nil)
+ (if (`` (or (~~ (template [<reflection>]
+ [(text//= (//reflection.reflection <reflection>) name)]
+
+ [//reflection.boolean]
+ [//reflection.byte]
+ [//reflection.short]
+ [//reflection.int]
+ [//reflection.long]
+ [//reflection.float]
+ [//reflection.double]
+ [//reflection.char]))))
+ (#.Primitive (|> name //reflection.class //reflection.array //reflection.reflection) #.Nil)
+ (|> elementT array.Array .type))
+
+ _
+ (|> elementT array.Array .type)))))
(<>.after (<t>.this //descriptor.array-prefix))))
(def: #export (type mapping)
diff --git a/stdlib/source/lux/target/jvm/type/parser.lux b/stdlib/source/lux/target/jvm/type/parser.lux
index 499776376..d57bd41a3 100644
--- a/stdlib/source/lux/target/jvm/type/parser.lux
+++ b/stdlib/source/lux/target/jvm/type/parser.lux
@@ -5,7 +5,7 @@
[control
["." try]
["." function]
- ["<>" parser ("#@." monad)
+ ["<>" parser ("#//." monad)
["<t>" text (#+ Parser)]]]
[data
["." product]
@@ -25,7 +25,7 @@
[(def: #export <name>
(Parser (Type <category>))
(<>.after (<t>.this (//signature.signature <signature>))
- (<>@wrap <type>)))]
+ (<>//wrap <type>)))]
[Void void //signature.void //.void]
[Primitive boolean //signature.boolean //.boolean]
@@ -86,7 +86,7 @@
(def: #export var
(Parser (Type Var))
- (<>@map //.var ..var'))
+ (<>//map //.var ..var'))
(def: #export var?
(-> (Type Value) (Maybe Text))
@@ -106,7 +106,7 @@
[(def: <name>
(-> (Parser (Type Class)) (Parser (Type Parameter)))
(|>> (<>.after (<t>.this <prefix>))
- (<>@map <constructor>)))]
+ (<>//map <constructor>)))]
[lower //signature.lower-prefix //.lower]
[upper //signature.upper-prefix //.upper]
@@ -145,7 +145,7 @@
(def: #export array'
(-> (Parser (Type Value)) (Parser (Type Array)))
(|>> (<>.after (<t>.this //descriptor.array-prefix))
- (<>@map //.array)))
+ (<>//map //.array)))
(def: #export class
(Parser (Type Class))
diff --git a/stdlib/source/lux/target/jvm/type/reflection.lux b/stdlib/source/lux/target/jvm/type/reflection.lux
index 4ad2caf70..a0e0b0f5e 100644
--- a/stdlib/source/lux/target/jvm/type/reflection.lux
+++ b/stdlib/source/lux/target/jvm/type/reflection.lux
@@ -3,7 +3,7 @@
[abstract
[equivalence (#+ Equivalence)]]
[data
- ["." text ("#@." equivalence)
+ ["." text ("#//." equivalence)
["%" format (#+ format)]]]
[type
abstract]]
@@ -25,7 +25,7 @@
(All [category] (Equivalence (Reflection category)))
(def: (= parameter subject)
- (text@= (:representation parameter) (:representation subject))))
+ (text//= (:representation parameter) (:representation subject))))
(template [<category> <name> <reflection>]
[(def: #export <name>
diff --git a/stdlib/source/lux/target/jvm/type/signature.lux b/stdlib/source/lux/target/jvm/type/signature.lux
index 5fd3c3487..2fc8aa7c7 100644
--- a/stdlib/source/lux/target/jvm/type/signature.lux
+++ b/stdlib/source/lux/target/jvm/type/signature.lux
@@ -4,10 +4,10 @@
[equivalence (#+ Equivalence)]
[hash (#+ Hash)]]
[data
- ["." text ("#@." hash)
+ ["." text ("#//." hash)
["%" format (#+ format)]]
[collection
- ["." list ("#@." functor)]]]
+ ["." list ("#//." functor)]]]
[type
abstract]]
["." // #_
@@ -84,7 +84,7 @@
_
(format ..parameters-start
(|> parameters
- (list@map ..signature)
+ (list//map ..signature)
(text.join-with ""))
..parameters-end))
//descriptor.class-suffix)))
@@ -109,25 +109,25 @@
(Signature Method))
(:abstraction
(format (|> inputs
- (list@map ..signature)
+ (list//map ..signature)
(text.join-with "")
(text.enclose [..arguments-start
..arguments-end]))
(:representation output)
(|> exceptions
- (list@map (|>> :representation (format ..exception-prefix)))
+ (list//map (|>> :representation (format ..exception-prefix)))
(text.join-with "")))))
(structure: #export equivalence
(All [category] (Equivalence (Signature category)))
(def: (= parameter subject)
- (text@= (:representation parameter)
- (:representation subject))))
+ (text//= (:representation parameter)
+ (:representation subject))))
(structure: #export hash
(All [category] (Hash (Signature category)))
(def: &equivalence ..equivalence)
- (def: hash (|>> :representation text@hash)))
+ (def: hash (|>> :representation text//hash)))
)
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 17:48:49 +0000