aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--documentation/research/math.md1
-rw-r--r--documentation/research/text_editor & ide.md1
-rw-r--r--documentation/research/web_framework.md5
-rw-r--r--stdlib/source/lux/control/function.lux5
-rw-r--r--stdlib/source/lux/target/jvm/instruction.lux66
-rw-r--r--stdlib/source/lux/target/jvm/instruction/bytecode.lux178
-rw-r--r--stdlib/source/lux/target/jvm/instruction/jump.lux4
7 files changed, 223 insertions, 37 deletions
diff --git a/documentation/research/math.md b/documentation/research/math.md
index 0299293b3..6e72785c7 100644
--- a/documentation/research/math.md
+++ b/documentation/research/math.md
@@ -48,6 +48,7 @@
# Quaternions
+1. [Dual Quaternions for Mere Mortals](https://www.jeremyong.com/math/2019/08/05/dual-quaternions-for-mere-mortals/)
1. [Stepping into a New Dimension: Using Quaternions to See the Invisible](https://medium.com/@vieyrasoftware/stepping-into-a-new-dimension-using-quaternions-to-see-the-invisible-478087c9ebbf)
1. [How Quaternions Produce 3D Rotation](https://penguinmaths.blogspot.com/2019/06/how-quaternions-produce-3d-rotation.html)
1. [APPLICATION OF DUAL QUATERNIONS ON SELECTED PROBLEMS](https://otik.uk.zcu.cz/bitstream/11025/28563/1/phd_Application%20of%20dual%20quaternions%20on%20selected%20problems.pdf)
diff --git a/documentation/research/text_editor & ide.md b/documentation/research/text_editor & ide.md
index 4fc5ad04a..473310b97 100644
--- a/documentation/research/text_editor & ide.md
+++ b/documentation/research/text_editor & ide.md
@@ -188,6 +188,7 @@
## Structured editing
+1. [豆腐 (Tofu): meaningful code editing](https://gregoor.github.io/tofu/)
1. [Tiled Text](http://www.tiledtext.com/projects/tiledtext)
1. [Deuce: A Lightweight User Interface for Structured Editing](https://arxiv.org/abs/1707.00015)
1. ["Structured Editing for Elm* in Elm" by Ravi Chugh](https://www.youtube.com/watch?v=-TFL6E1uSHE)
diff --git a/documentation/research/web_framework.md b/documentation/research/web_framework.md
index c0fc7c9b5..3c7d0220d 100644
--- a/documentation/research/web_framework.md
+++ b/documentation/research/web_framework.md
@@ -1,3 +1,7 @@
+# Input
+
+1. [High-performance input handling on the web](https://nolanlawson.com/2019/08/11/high-performance-input-handling-on-the-web/)
+
# Reference
1. https://github.com/daybrush/scenejs
@@ -101,6 +105,7 @@
# Styling
+1. [The importance of the CSS user-select property](https://www.malgol.com/the-importance-of-the-css-user-select-property/)
1. [Index fun](https://psuter.net/2019/07/07/z-index)
1. [Constraint layouts](https://blog.gtk.org/2019/07/02/constraint-layouts/)
1. https://every-layout.dev/
diff --git a/stdlib/source/lux/control/function.lux b/stdlib/source/lux/control/function.lux
index 5a33a2aae..ce999eb39 100644
--- a/stdlib/source/lux/control/function.lux
+++ b/stdlib/source/lux/control/function.lux
@@ -35,6 +35,11 @@
(-> (-> a b c) (-> b a c)))
(function (_ x y) (f y x)))
+(def: #export (apply input function)
+ (All [i o]
+ (-> i (-> i o) o))
+ (function input))
+
(structure: #export monoid (All [a] (Monoid (-> a a)))
(def: identity ..identity)
(def: compose ..compose))
diff --git a/stdlib/source/lux/target/jvm/instruction.lux b/stdlib/source/lux/target/jvm/instruction.lux
index 25b10cc9e..628079110 100644
--- a/stdlib/source/lux/target/jvm/instruction.lux
+++ b/stdlib/source/lux/target/jvm/instruction.lux
@@ -2,7 +2,7 @@
[lux #*
[abstract
[monoid (#+ Monoid)]
- [monad (#+ Monad do)]]
+ ["." monad (#+ Monad do)]]
[control
["." state (#+ State)]
["." writer (#+ Writer)]
@@ -10,6 +10,8 @@
["." try (#+ Try)]
["." exception (#+ exception:)]]
[data
+ ["." product]
+ ["." maybe]
[text
["%" format (#+ format)]]
[number
@@ -28,7 +30,7 @@
[encoding
["#." name (#+ External)]
["#." unsigned (#+ U1 U2)]
- ["#." signed]]
+ ["#." signed (#+ S4)]]
["#." constant (#+ UTF8)
["#/."pool (#+ Pool)]]]])
@@ -440,6 +442,66 @@
[jsr /bytecode.jsr /bytecode.jsr-w]
)
+(def: (big-jump jump)
+ (-> (Either Jump Big-Jump) Big-Jump)
+ (case jump
+ (#.Left small)
+ (/jump.lift small)
+
+ (#.Right big)
+ big))
+
+(exception: #export invalid-tableswitch)
+
+(def: #export (tableswitch minimum default cases)
+ (-> S4 Label (List Label) (Instruction Any))
+ (function (_ [pool tracker])
+ (let [@from (get@ #program-counter tracker)]
+ [[pool tracker]
+ [(function (_ resolver)
+ (let [get (: (-> Label (Maybe Address))
+ (function (_ label)
+ (dictionary.get label resolver)))]
+ (case (do maybe.monad
+ [@default (get default)
+ @cases (monad.map @ get cases)
+ #let [>default (big-jump (jump @from @default))
+ >cases (list@map (|>> (jump @from) big-jump)
+ @cases)]]
+ (wrap (/bytecode.tableswitch minimum >default >cases)))
+ (#.Some bytecode)
+ (#try.Success bytecode)
+
+ #.None
+ (exception.throw ..invalid-tableswitch []))))
+ []]])))
+
+(exception: #export invalid-lookupswitch)
+
+(def: #export (lookupswitch default cases)
+ (-> Label (List [S4 Label]) (Instruction Any))
+ (function (_ [pool tracker])
+ (let [@from (get@ #program-counter tracker)]
+ [[pool tracker]
+ [(function (_ resolver)
+ (let [get (: (-> Label (Maybe Address))
+ (function (_ label)
+ (dictionary.get label resolver)))]
+ (case (do maybe.monad
+ [@default (get default)
+ @cases (monad.map @ (|>> product.right get) cases)
+ #let [>default (big-jump (jump @from @default))
+ >cases (|> @cases
+ (list@map (|>> (jump @from) big-jump))
+ (list.zip2 (list@map product.left cases)))]]
+ (wrap (/bytecode.lookupswitch >default >cases)))
+ (#.Some bytecode)
+ (#try.Success bytecode)
+
+ #.None
+ (exception.throw ..invalid-lookupswitch []))))
+ []]])))
+
(template [<name> <bytecode>]
[(def: #export (<name> class)
(-> External (Instruction Any))
diff --git a/stdlib/source/lux/target/jvm/instruction/bytecode.lux b/stdlib/source/lux/target/jvm/instruction/bytecode.lux
index 8a51097b7..4f4d594d7 100644
--- a/stdlib/source/lux/target/jvm/instruction/bytecode.lux
+++ b/stdlib/source/lux/target/jvm/instruction/bytecode.lux
@@ -5,7 +5,8 @@
[monoid (#+ Monoid)]]
[control
["." try (#+ Try)]
- ["." exception (#+ exception:)]]
+ ["." exception (#+ exception:)]
+ ["." function]]
[data
["." binary]
[number (#+ hex)
@@ -13,7 +14,9 @@
[text
["%" format (#+ format)]]
[format
- [".F" binary (#+ Mutation Specification)]]]
+ [".F" binary (#+ Mutation Specification)]]
+ [collection
+ ["." list]]]
[macro
["." template]]
[type
@@ -30,37 +33,38 @@
["#." unsigned (#+ U1 U2 U4)]
["#." signed (#+ S2 S4)]]]])
-(type: #export Size Nat)
-
(type: #export Bytecode
- [Size (-> [Environment Specification] (Try [Environment Specification]))])
+ (-> [Environment Specification]
+ (Try [Environment Specification])))
-(def: #export (run bytecode)
+(def: #export run
(-> Bytecode (Try [Environment Specification]))
- (let [[_ bytecode'] bytecode]
- (bytecode' [/.start binaryF.no-op])))
-
-(def: (bytecode size condition transform)
- (-> Size Condition (-> Specification Specification) Bytecode)
- [size
- (function (_ [environment specification])
- (do try.monad
- [environment' (condition environment)]
- (wrap [environment'
- (transform specification)])))])
+ (function.apply [/.start binaryF.no-op]))
+
+(def: (bytecode condition transform)
+ (-> Condition (-> Specification Specification) Bytecode)
+ (function (_ [environment specification])
+ (do try.monad
+ [environment' (condition environment)]
+ (wrap [environment'
+ (transform specification)]))))
(type: Code Nat)
+(def: code-size 1)
+(def: big-jump-size 4)
+(def: integer-size 4)
+
(def: (nullary' code)
(-> Code Mutation)
(function (_ [offset binary])
- [(n.+ 1 offset)
+ [(n.+ ..code-size offset)
(try.assume
(binary.write/8 offset code binary))]))
(def: (nullary code [size mutation])
(-> Code (-> Specification Specification))
- [(n.+ 1 size)
+ [(n.+ ..code-size size)
(|>> mutation ((nullary' code)))])
(template [<shift> <name> <inputT> <writer> <unwrap>]
@@ -380,7 +384,7 @@
["B3" putstatic/1 1 1] ["B3" putstatic/2 1 2]
["B4" getfield/1 1 1] ["B4" getfield/2 1 2]
["B5" putfield/1 2 1] ["B5" putfield/2 2 2])]
- (template [<arity> <size> <definitions>]
+ (template [<arity> <definitions>]
[(with-expansions [<definitions>' (template.splice <definitions>)]
(template [<code> <name> <bytecode-inputs> <arity-inputs> <consumes> <produces> <locals>]
[(with-expansions [<inputs>' (template.splice <bytecode-inputs>)
@@ -396,7 +400,6 @@
(def: #export (<name> <input-names>)
(-> <input-types> Bytecode)
(..bytecode
- <size>
(`` ($_ /@compose
(/.consumes <consumes>)
(/.produces <produces>)
@@ -409,7 +412,7 @@
<definitions>'
))]
- [..nullary 1
+ [..nullary
[["00" nop [] [] 0 0 []]
<constants>
["57" pop [] [] 1 0 []]
@@ -437,7 +440,7 @@
["C2" monitorenter [] [] 1 0 []]
["C3" monitorexit [] [] 1 0 []]]]
- [..unary/1 2
+ [..unary/1
[["10" bipush [[byte U1]] [byte] 0 1 []]
["12" ldc [[index U1]] [index] 0 1 []]
<local-loads>
@@ -445,7 +448,7 @@
["A9" ret [[local Local]] [local] 0 0 [[local]]]
["BC" newarray [[type Primitive-Array-Type]] [(..code type)] 1 1 []]]]
- [..unary/2 3
+ [..unary/2
[["11" sipush [[short U2]] [short] 0 1 []]
["13" ldc-w/integer [[index (Index ///constant.Integer)]] [(///index.number index)] 0 1 []]
["13" ldc-w/float [[index (Index ///constant.Float)]] [(///index.number index)] 0 1 []]
@@ -461,31 +464,136 @@
["B7" invokespecial [[index (Index (Reference Method))] [count U1] [output-count U1]] [(///index.number index)] (///unsigned.nat count) (///unsigned.nat output-count) []]
["B8" invokestatic [[index (Index (Reference Method))] [count U1] [output-count U1]] [(///index.number index)] (///unsigned.nat count) (///unsigned.nat output-count) []]]]
- [..jump/2 3
+ [..jump/2
[<jumps>]]
- [..jump/4 5
+ [..jump/4
[["C8" goto-w [[jump Big-Jump]] [jump] 0 0 []]
["C9" jsr-w [[jump Big-Jump]] [jump] 0 1 []]]]
- [..binary/11 3
+ [..binary/11
[["84" iinc [[local Local] [byte U1]] [local byte] 0 0 [[local]]]]]
- [..binary/21 4
+ [..binary/21
[["C5" multianewarray [[index (Index Class)] [count U1]] [(///index.number index) count] (///unsigned.nat count) 1 []]]]
- [..trinary/211 5
+ [..trinary/211
[["B9" invokeinterface [[index (Index (Reference Method))] [count U1] [output-count U1]] [(///index.number index) count (///unsigned.u1 0)] (///unsigned.nat count) (///unsigned.nat output-count) []]]]
))
+(def: #export (tableswitch minimum default cases)
+ (-> S4 Big-Jump (List Big-Jump) Bytecode)
+ (let [append (: (-> Specification Specification)
+ (function (_ [size mutation])
+ (let [default-offset (n.+ ..code-size size)
+ padding (n.% 4
+ (n.- (n.% 4 default-offset)
+ 4))
+ amount-of-cases (list.size cases)
+ maximum (|> amount-of-cases .int ///signed.s4 (///signed.s4/+ minimum))
+ tableswitch-size ($_ n.+
+ ..code-size
+ padding
+ ..big-jump-size
+ ..integer-size
+ ..integer-size
+ (n.* amount-of-cases ..big-jump-size))
+ tableswitch-mutation (: Mutation
+ (function (_ [offset binary])
+ [(n.+ tableswitch-size offset)
+ (try.assume
+ (do try.monad
+ [_ (binary.write/8 offset (hex "AA") binary)
+ #let [offset (n.+ ..code-size offset)]
+ _ (case padding
+ 3 (do @
+ [_ (binary.write/8 offset 0 binary)]
+ (binary.write/16 (inc offset) 0 binary))
+ 2 (binary.write/16 offset 0 binary)
+ 1 (binary.write/8 offset 0 binary)
+ _ (wrap binary))
+ #let [offset (n.+ padding offset)]
+ _ (binary.write/32 offset (///signed.int default) binary)
+ #let [offset (n.+ ..big-jump-size offset)]
+ _ (binary.write/32 offset (///signed.int minimum) binary)
+ #let [offset (n.+ ..integer-size offset)]
+ _ (binary.write/32 offset (///signed.int maximum) binary)]
+ (loop [offset (n.+ ..integer-size offset)
+ cases cases]
+ (case cases
+ #.Nil
+ (wrap binary)
+
+ (#.Cons head tail)
+ (do @
+ [_ (binary.write/32 offset (///signed.int head) binary)]
+ (recur (n.+ ..big-jump-size offset)
+ tail))))))]))]
+ [(n.+ tableswitch-size
+ size)
+ (|>> mutation tableswitch-mutation)])))]
+ (..bytecode (/.consumes 1)
+ append)))
+
+(def: #export (lookupswitch default cases)
+ (-> Big-Jump (List [S4 Big-Jump]) Bytecode)
+ (let [append (: (-> Specification Specification)
+ (function (_ [size mutation])
+ (let [default-offset (n.+ ..code-size size)
+ padding (n.% 4
+ (n.- (n.% 4 default-offset)
+ 4))
+ amount-of-cases (list.size cases)
+ case-size (n.+ ..integer-size ..big-jump-size)
+ lookupswitch-size ($_ n.+
+ ..code-size
+ padding
+ ..big-jump-size
+ ..integer-size
+ (n.* amount-of-cases case-size))
+ lookupswitch-mutation (: Mutation
+ (function (_ [offset binary])
+ [(n.+ lookupswitch-size offset)
+ (try.assume
+ (do try.monad
+ [_ (binary.write/8 offset (hex "AB") binary)
+ #let [offset (n.+ ..code-size offset)]
+ _ (case padding
+ 3 (do @
+ [_ (binary.write/8 offset 0 binary)]
+ (binary.write/16 (inc offset) 0 binary))
+ 2 (binary.write/16 offset 0 binary)
+ 1 (binary.write/8 offset 0 binary)
+ _ (wrap binary))
+ #let [offset (n.+ padding offset)]
+ _ (binary.write/32 offset (///signed.int default) binary)
+ #let [offset (n.+ ..big-jump-size offset)]
+ _ (binary.write/32 offset amount-of-cases binary)]
+ (loop [offset (n.+ ..integer-size offset)
+ cases cases]
+ (case cases
+ #.Nil
+ (wrap binary)
+
+ (#.Cons [value jump] tail)
+ (do @
+ [_ (binary.write/32 offset (///signed.int value) binary)
+ _ (binary.write/32 (n.+ ..integer-size offset) (///signed.int jump) binary)]
+ (recur (n.+ case-size offset)
+ tail))))))]))]
+ [(n.+ lookupswitch-size
+ size)
+ (|>> mutation lookupswitch-mutation)])))]
+ (..bytecode (/.consumes 1)
+ append)))
+
(structure: #export monoid
(Monoid Bytecode)
(def: identity ..nop)
- (def: (compose [left-size left] [right-size right])
- [(n.+ left-size right-size)
- (function (_ input)
- (do try.monad
- [temp (left input)]
- (right temp)))]))
+ (def: (compose left right)
+ (function (_ input)
+ (do try.monad
+ [temp (left input)]
+ (right temp)))))
diff --git a/stdlib/source/lux/target/jvm/instruction/jump.lux b/stdlib/source/lux/target/jvm/instruction/jump.lux
index 19f667cfe..fcda92bd1 100644
--- a/stdlib/source/lux/target/jvm/instruction/jump.lux
+++ b/stdlib/source/lux/target/jvm/instruction/jump.lux
@@ -15,3 +15,7 @@
///signed.s2-writer)
(type: #export Big-Jump S4)
+
+(def: #export lift
+ (-> Jump Big-Jump)
+ (|>> ///signed.int ///signed.s4))
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 06:22:03 +0000