From 8685b0ee8bdff85807e20393242a8b088d9ddcc9 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 22 Jun 2019 02:22:33 -0400 Subject: Implemented several different bytecode instructions. --- documentation/research/math.md | 2 + stdlib/source/lux/data/format/binary.lux | 15 +- stdlib/source/lux/data/number/i64.lux | 4 +- stdlib/source/lux/target/jvm/attribute/code.lux | 17 +- .../lux/target/jvm/attribute/code/exception.lux | 21 +- .../source/lux/target/jvm/attribute/code/label.lux | 18 -- stdlib/source/lux/target/jvm/code.lux | 328 +++++++++++++++++++++ stdlib/source/lux/target/jvm/code/condition.lux | 75 +++++ stdlib/source/lux/target/jvm/code/label.lux | 20 ++ stdlib/source/lux/target/jvm/code/resources.lux | 51 ++++ stdlib/source/lux/target/jvm/constant.lux | 30 +- stdlib/source/lux/target/jvm/encoding/unsigned.lux | 27 +- stdlib/source/lux/target/jvm/method.lux | 14 +- 13 files changed, 545 insertions(+), 77 deletions(-) delete mode 100644 stdlib/source/lux/target/jvm/attribute/code/label.lux create mode 100644 stdlib/source/lux/target/jvm/code.lux create mode 100644 stdlib/source/lux/target/jvm/code/condition.lux create mode 100644 stdlib/source/lux/target/jvm/code/label.lux create mode 100644 stdlib/source/lux/target/jvm/code/resources.lux diff --git a/documentation/research/math.md b/documentation/research/math.md index 2db883058..2eec12c31 100644 --- a/documentation/research/math.md +++ b/documentation/research/math.md @@ -39,6 +39,7 @@ # Quaternions +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) 1. https://www.3dgep.com/understanding-quaternions/ 1. https://probablydance.com/2017/08/05/intuitive-quaternions/ @@ -80,6 +81,7 @@ # Linear Algebra +1. [Thirty-three Miniatures: Mathematical and Algorithmic Applications of Linear Algebra](https://kam.mff.cuni.cz/~matousek/stml-53-matousek-1.pdf) 1. [Covectors are Different than Vectors, Usually](http://infohost.nmt.edu/~parendt/Phys509/notes/2diracnot/node4.html) 1. [Introduction to Applied Linear Algebra: Vectors, Matrices, and Least Squares](https://web.stanford.edu/~boyd/vmls/vmls.pdf) 1. [Linear Algebra Done Wrong.](http://www.math.brown.edu/~treil/papers/LADW/LADW.html) diff --git a/stdlib/source/lux/data/format/binary.lux b/stdlib/source/lux/data/format/binary.lux index 67f36609e..b1f0d56cd 100644 --- a/stdlib/source/lux/data/format/binary.lux +++ b/stdlib/source/lux/data/format/binary.lux @@ -30,13 +30,16 @@ (|>> (n/* i64.bits-per-byte) i64.mask)) (type: #export Mutation + (-> [Offset Binary] [Offset Binary])) + +(type: #export Specification [Size (-> [Offset Binary] [Offset Binary])]) (def: #export no-op - Mutation + Specification [0 function.identity]) -(structure: #export monoid (Monoid Mutation) +(structure: #export monoid (Monoid Specification) (def: identity ..no-op) @@ -46,7 +49,7 @@ (|>> mutL mutR)])) (type: #export (Writer a) - (-> a Mutation)) + (-> a Specification)) (def: #export (run writer value) (All [a] (-> (Writer a) a Binary)) @@ -176,13 +179,13 @@ value (if (n/= original-count capped-count) value (|> value row.to-list (list.take capped-count) row.from-list)) - (^open "mutation@.") ..monoid + (^open "specification@.") ..monoid [size mutation] (|> value (row@map valueW) (:: row.fold fold (function (_ post pre) - (mutation@compose pre post)) - mutation@identity))] + (specification@compose pre post)) + specification@identity))] [(n/+ size) (function (_ [offset binary]) (error.assume diff --git a/stdlib/source/lux/data/number/i64.lux b/stdlib/source/lux/data/number/i64.lux index 31289c96a..9d431769b 100644 --- a/stdlib/source/lux/data/number/i64.lux +++ b/stdlib/source/lux/data/number/i64.lux @@ -34,8 +34,8 @@ (xor (:coerce I64 -1))) (def: #export (mask bits) - (-> Nat (I64 Any)) - (|> 1 (..left-shift (n/% ..width bits)) .dec)) + (-> Nat I64) + (|> 1 .i64 (..left-shift (n/% ..width bits)) .dec)) (def: (add-shift shift value) (-> Nat Nat Nat) diff --git a/stdlib/source/lux/target/jvm/attribute/code.lux b/stdlib/source/lux/target/jvm/attribute/code.lux index 88b4eb7c9..68c651ba5 100644 --- a/stdlib/source/lux/target/jvm/attribute/code.lux +++ b/stdlib/source/lux/target/jvm/attribute/code.lux @@ -13,14 +13,15 @@ [collection ["." row (#+ Row) ("#@." functor fold)]]]] ["." /// #_ + [code + ["#." resources (#+ Resources)]] [encoding ["#." unsigned (#+ U2)]]] ["." / #_ ["#." exception (#+ Exception)]]) (type: #export (Code Attribute) - {#max-stack U2 - #max-locals U2 + {#resources Resources #code Binary #exception-table (Row Exception) #attributes (Row Attribute)}) @@ -29,9 +30,8 @@ (All [Attribute] (-> (-> Attribute Nat) (Code Attribute) Nat)) ($_ n/+ ## u2 max_stack; - ///unsigned.u2-bytes ## u2 max_locals; - ///unsigned.u2-bytes + ///resources.length ## u4 code_length; ///unsigned.u4-bytes ## u1 code[code_length]; @@ -55,8 +55,7 @@ (All [attribute] (-> (Equivalence attribute) (Equivalence (Code attribute)))) ($_ equivalence.product - ///unsigned.equivalence - ///unsigned.equivalence + ///resources.equivalence binary.equivalence (row.equivalence /exception.equivalence) (row.equivalence attribute-equivalence) @@ -67,9 +66,8 @@ (All [Attribute] (-> (Parser Attribute) (Parser (Code Attribute)))) ($_ <>.and ## u2 max_stack; - ///unsigned.u2-parser ## u2 max_locals; - ///unsigned.u2-parser + ///resources.parser ## u4 code_length; ## u1 code[code_length]; <2>.binary/32 @@ -85,9 +83,8 @@ (All [Attribute] (-> (Writer Attribute) (Writer (Code Attribute)))) ($_ binaryF@compose ## u2 max_stack; - (///unsigned.u2-writer (get@ #max-stack code)) ## u2 max_locals; - (///unsigned.u2-writer (get@ #max-locals code)) + (///resources.writer (get@ #resources code)) ## u4 code_length; ## u1 code[code_length]; (binaryF.binary/32 (get@ #code code)) diff --git a/stdlib/source/lux/target/jvm/attribute/code/exception.lux b/stdlib/source/lux/target/jvm/attribute/code/exception.lux index 6f6b8a0be..14dd13d6e 100644 --- a/stdlib/source/lux/target/jvm/attribute/code/exception.lux +++ b/stdlib/source/lux/target/jvm/attribute/code/exception.lux @@ -9,10 +9,11 @@ [format [".F" binary (#+ Writer)]]]] ["." // #_ - ["#." label (#+ Label)] ["//#" /// #_ [constant (#+ Class)] ["#." index (#+ Index)] + [code + ["#." label (#+ Label)]] [encoding ["#." unsigned (#+ U2)]]]]) @@ -25,9 +26,9 @@ (def: #export equivalence (Equivalence Exception) ($_ equivalence.product - //label.equivalence - //label.equivalence - //label.equivalence + ////label.equivalence + ////label.equivalence + ////label.equivalence ////index.equivalence )) @@ -48,17 +49,17 @@ (def: #export parser (Parser Exception) ($_ <>.and - //label.parser - //label.parser - //label.parser + ////label.parser + ////label.parser + ////label.parser ////index.parser )) (def: #export writer (Writer Exception) ($_ binaryF.and - //label.writer - //label.writer - //label.writer + ////label.writer + ////label.writer + ////label.writer ////index.writer )) diff --git a/stdlib/source/lux/target/jvm/attribute/code/label.lux b/stdlib/source/lux/target/jvm/attribute/code/label.lux deleted file mode 100644 index 69a8d55c3..000000000 --- a/stdlib/source/lux/target/jvm/attribute/code/label.lux +++ /dev/null @@ -1,18 +0,0 @@ -(.module: - [lux #* - [abstract - [equivalence (#+ Equivalence)]]] - ["." //// #_ - [encoding - ["#." unsigned (#+ U2)]]]) - -(type: #export Label U2) - -(def: #export equivalence - ////unsigned.equivalence) - -(def: #export parser - ////unsigned.u2-parser) - -(def: #export writer - ////unsigned.u2-writer) diff --git a/stdlib/source/lux/target/jvm/code.lux b/stdlib/source/lux/target/jvm/code.lux new file mode 100644 index 000000000..6217a1c6c --- /dev/null +++ b/stdlib/source/lux/target/jvm/code.lux @@ -0,0 +1,328 @@ +(.module: + [lux #* + [abstract + [monad (#+ do)] + [monoid (#+ Monoid)]] + [control + ["." exception (#+ exception:)]] + [data + [number (#+ hex)] + ["." error (#+ Error)] + ["." binary] + [text + ["%" format (#+ format)]] + [format + [".F" binary (#+ Mutation Specification)]]] + [macro + ["." template]]] + ["." // #_ + ["#." index (#+ Index)] + [constant (#+ Class Field)] + [encoding + ["#." unsigned (#+ U1 U2 U4)]]] + ["." / #_ + ["#." resources (#+ Resources)] + ["#" condition (#+ Environment Condition Local) ("#@." monoid)] + ["#." label (#+ Label Wide-Label)]]) + +(type: #export Instruction + (-> [Environment Specification] (Error [Environment Specification]))) + +(def: (instruction condition transform) + (-> Condition (-> Specification Specification) Instruction) + (function (_ [environment specification]) + (do error.monad + [environment' (condition environment)] + (wrap [environment' + (transform specification)])))) + +(def: (nullary' code) + (-> Nat Mutation) + (function (_ [offset binary]) + [(n/+ 1 offset) + (error.assume + (binary.write/8 offset code binary))])) + +(def: (nullary code [size mutation]) + (-> Nat (-> Specification Specification)) + [(n/+ 1 size) + (|>> mutation ((nullary' code)))]) + +(def: (unary/1' code input0) + (-> Nat U1 Mutation) + (function (_ [offset binary]) + [(n/+ 2 offset) + (error.assume + (do error.monad + [_ (binary.write/8 offset code binary)] + (binary.write/8 (n/+ 1 offset) (//unsigned.nat input0) binary)))])) + +(def: (unary/1 code input0 [size mutation]) + (-> Nat U1 (-> Specification Specification)) + [(n/+ 2 size) + (|>> mutation ((unary/1' code input0)))]) + +(def: (unary/2' code input0) + (-> Nat U2 Mutation) + (function (_ [offset binary]) + [(n/+ 3 offset) + (error.assume + (do error.monad + [_ (binary.write/8 offset code binary)] + (binary.write/16 (n/+ 1 offset) (//unsigned.nat input0) binary)))])) + +(def: (unary/2 code input0 [size mutation]) + (-> Nat U2 (-> Specification Specification)) + [(n/+ 3 size) + (|>> mutation ((unary/2' code input0)))]) + +(def: (unary/4' code input0) + (-> Nat U4 Mutation) + (function (_ [offset binary]) + [(n/+ 5 offset) + (error.assume + (do error.monad + [_ (binary.write/8 offset code binary)] + (binary.write/16 (n/+ 1 offset) (//unsigned.nat input0) binary)))])) + +(def: (unary/4 code input0 [size mutation]) + (-> Nat U4 (-> Specification Specification)) + [(n/+ 5 size) + (|>> mutation ((unary/4' code input0)))]) + +## https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5 +(with-expansions [ (template [ ] + [[ [] [] 0 []]] + + ["01" aconst-null 1] + + ["02" iconst-m1 1] + ["03" iconst-0 1] + ["04" iconst-1 1] + ["05" iconst-2 1] + ["06" iconst-3 1] + ["07" iconst-4 1] + ["08" iconst-5 1] + + ["0B" fconst-0 1] + ["0C" fconst-1 1] + ["0D" fconst-2 1] + + ["0E" dconst-0 2] + ["0F" dconst-1 2]) + (template [ ] + [[ [[local Local]] [local] 0 [[local]]]] + + ["17" fload 1] + ["18" dload 2] + ["19" aload 1]) + (template [ ] + [[ [] [] 0 [[(//unsigned.u1 )]]]] + + ["22" fload-0 1 0] + ["23" fload-1 1 1] + ["24" fload-2 1 2] + ["25" fload-3 1 3] + + ["26" dload-0 2 1] + ["27" dload-1 2 2] + ["28" dload-2 2 3] + ["29" dload-3 2 4] + + ["2A" aload-0 1 0] + ["2B" aload-1 1 1] + ["2C" aload-2 1 2] + ["2D" aload-3 1 3]) + (template [ ] + [[ [[local Local]] [local] 0 [[local]]]] + + ["38" fstore 1] + ["39" dstore 2] + ["3A" astore 1]) + (template [ ] + [[ [] [] 0 [[(//unsigned.u1 )]]]] + + ["43" fstore-0 1 0] + ["44" fstore-1 1 1] + ["45" fstore-2 1 2] + ["46" fstore-3 1 3] + + ["47" dstore-0 2 1] + ["48" dstore-1 2 2] + ["49" dstore-2 2 3] + ["4A" dstore-3 2 4] + + ["4B" astore-0 1 0] + ["4C" astore-1 1 1] + ["4D" astore-2 1 2] + ["4E" astore-3 1 3]) + (template [ ] + [[ [] [] 2 []]] + + ["2e" iaload 1] + ["30" faload 1] + ["31" daload 2] + ["32" aaload 1] + ["33" baload 1] + ["34" caload 1]) + (template [ ] + [[ [] [] 0 []]] + + ["4f" iastore 3] + ["51" fastore 3] + ["52" dastore 4] + ["53" aastore 3] + ["54" bastore 3] + ["55" castore 3]) + (template [ ] + [[ [] [] []]] + + ["60" iadd 2 1] + ["6c" idiv 2 1] + ["7e" iand 2 1] + + ["62" fadd 2 1] + ["66" fsub 2 1] + ["6A" fmul 2 1] + ["6E" fdiv 2 1] + ["72" frem 2 1] + ["76" fneg 1 1] + + ["63" dadd 4 2] + ["67" dsub 4 2] + ["6B" dmul 4 2] + ["6F" ddiv 4 2] + ["73" drem 4 2] + ["77" dneg 2 2]) + (template [ ] + [[ [] [] []]] + + ["8B" f2i 1 1] + ["8C" f2l 1 2] + ["8D" f2d 1 2] + + ["8E" d2i 2 1] + ["8F" d2l 2 2] + ["90" d2f 2 1] + + ["85" i2l 1 2] + ["86" i2f 1 1] + ["87" i2d 1 2] + ["91" i2b 1 1] + ["92" i2c 1 1] + ["93" i2s 1 1]) + (template [ ] + [[ [] [] 1 []]] + + ["95" fcmpl 2] + ["96" fcmpg 2] + + ["97" dcmpl 4] + ["98" dcmpg 4]) + (template [ ] + [[ [] [] 0 []]] + + ["AE" freturn 1] + ["AF" dreturn 2] + ["B0" areturn 1] + ) + (template [ ] + [[ [[label Label]] [label] 0 []]] + + ["99" ifeq 2] + ["9A" ifne 2] + ["9B" iflt 2] + ["9C" ifge 2] + ["9D" ifgt 2] + ["9E" ifle 2] + + ["9F" if-icmpeq 2] + ["A0" if-icmpne 2] + ["A1" if-icmplt 2] + ["A2" if-icmpge 2] + ["A3" if-icmpgt 2] + ["A4" if-icmple 2] + + ["A5" if-acmpeq 2] + ["A6" if-acmpne 2] + + ["A7" goto 2] + + ["C6" ifnull 1] + ["C7" ifnonnull 1])] + (template [ ] + [(with-expansions [' (template.splice )] + (template [ ] + [(with-expansions [' (template.splice ) + (template [ ] + [] + + ') + (template [ ] + [] + + ') + ' (template.splice )] + (def: #export ( ) + (-> Instruction) + (..instruction + (`` ($_ /@compose + (/.consumes ) + (/.produces ) + (~~ (template [] + [(/.has-local )] + + ')))) + (`` ( (hex ) (~~ (template.splice )))))))] + + ' + ))] + + [..nullary + [["00" nop [] [] 0 0 []] + ["59" dup [] [] 1 2 []] + ["5A" dup-x1 [] [] 2 3 []] + ["5B" dup-x2 [] [] 3 4 []] + ["5C" dup2 [] [] 2 4 []] + ["5D" dup2-x1 [] [] 3 5 []] + ["5E" dup2-x2 [] [] 4 6 []] + + + + + + + + + + ["BE" arraylength [] [] 1 1 []] + ["BF" athrow [] [] 1 0 []]]] + + [..unary/1 + [["10" bipush [[byte U1]] [byte] 0 1 []] + + ]] + + [..unary/2 + [ + ["BD" anewarray [[index (Index Class)]] [(//index.number index)] 1 1 []] + ["C0" checkcast [[index (Index Class)]] [(//index.number index)] 1 1 []] + ["B2" getstatic/1 [[index (Index Field)]] [(//index.number index)] 0 1 []] + ["B2" getstatic/2 [[index (Index Field)]] [(//index.number index)] 0 2 []] + ["B4" getfield/1 [[index (Index Field)]] [(//index.number index)] 1 1 []] + ["B4" getfield/2 [[index (Index Field)]] [(//index.number index)] 1 2 []]]] + + [..unary/4 + [["C8" goto-w [[label Wide-Label]] [label] 0 0 []]]] + )) + +(structure: #export monoid + (Monoid Instruction) + + (def: identity ..nop) + + (def: (compose left right) + (function (_ input) + (do error.monad + [temp (left input)] + (right temp))))) diff --git a/stdlib/source/lux/target/jvm/code/condition.lux b/stdlib/source/lux/target/jvm/code/condition.lux new file mode 100644 index 000000000..5769efc79 --- /dev/null +++ b/stdlib/source/lux/target/jvm/code/condition.lux @@ -0,0 +1,75 @@ +(.module: + [lux #* + [abstract + [monad (#+ do)] + [monoid (#+ Monoid)]] + [control + ["." exception (#+ exception:)]] + [data + [number (#+ hex)] + ["." error (#+ Error)] + ["." binary] + [text + ["%" format (#+ format)]] + [format + [".F" binary (#+ Mutation Specification)]]]] + ["." // #_ + ["#." resources (#+ Resources)] + ["/#" // #_ + [encoding + ["#." unsigned (#+ U1 U2)]]]]) + +(type: #export Environment + {#resources Resources + #stack U2}) + +(type: #export Condition + (-> Environment (Error Environment))) + +(structure: #export monoid + (Monoid Condition) + + (def: identity (|>> #error.Success)) + + (def: (compose left right) + (function (_ environment) + (do error.monad + [environment (left environment)] + (right environment))))) + +(def: #export (produces amount env) + (-> Nat Condition) + (let [stack (n/+ amount + (///unsigned.nat (get@ #stack env))) + max-stack (n/max stack + (///unsigned.nat (get@ [#resources #//resources.max-stack] env)))] + (|> env + (set@ #stack (///unsigned.u2 stack)) + (set@ [#resources #//resources.max-stack] (///unsigned.u2 max-stack)) + #error.Success))) + +(exception: #export (cannot-pop-stack {stack-size Nat} + {wanted-pops Nat}) + (exception.report + ["Stack Size" (%.nat stack-size)] + ["Wanted Pops" (%.nat wanted-pops)])) + +(def: #export (consumes wanted-pops env) + (-> Nat Condition) + (let [stack-size (///unsigned.nat (get@ #stack env))] + (if (n/<= stack-size wanted-pops) + (#error.Success (update@ #stack + (|>> ///unsigned.nat (n/- wanted-pops) ///unsigned.u2) + env)) + (exception.throw ..cannot-pop-stack [stack-size wanted-pops])))) + +(type: #export Local U1) + +(def: #export (has-local local environment) + (-> Local Condition) + (let [max-locals (n/max (///unsigned.nat (get@ [#resources #//resources.max-locals] environment)) + (///unsigned.nat local))] + (|> environment + (set@ [#resources #//resources.max-locals] + (///unsigned.u2 max-locals)) + #error.Success))) diff --git a/stdlib/source/lux/target/jvm/code/label.lux b/stdlib/source/lux/target/jvm/code/label.lux new file mode 100644 index 000000000..7aaff5739 --- /dev/null +++ b/stdlib/source/lux/target/jvm/code/label.lux @@ -0,0 +1,20 @@ +(.module: + [lux #* + [abstract + [equivalence (#+ Equivalence)]]] + ["." /// #_ + [encoding + ["#." unsigned (#+ U2 U4)]]]) + +(type: #export Label U2) + +(def: #export equivalence + ///unsigned.equivalence) + +(def: #export parser + ///unsigned.u2-parser) + +(def: #export writer + ///unsigned.u2-writer) + +(type: #export Wide-Label U4) diff --git a/stdlib/source/lux/target/jvm/code/resources.lux b/stdlib/source/lux/target/jvm/code/resources.lux new file mode 100644 index 000000000..fed6d4ce7 --- /dev/null +++ b/stdlib/source/lux/target/jvm/code/resources.lux @@ -0,0 +1,51 @@ +(.module: + [lux #* + [abstract + ["." equivalence (#+ Equivalence)]] + [control + ["<>" parser + ["<2>" binary (#+ Parser)]]] + [data + [format + [".F" binary (#+ Writer) ("#@." monoid)]]]] + ["." /// #_ + [encoding + ["#." unsigned (#+ U2)]]]) + +(type: #export Resources + {#max-stack U2 + #max-locals U2}) + +(def: #export length + ($_ n/+ + ## u2 max_stack; + ///unsigned.u2-bytes + ## u2 max_locals; + ///unsigned.u2-bytes)) + +(def: #export equivalence + (Equivalence Resources) + ($_ equivalence.product + ## u2 max_stack; + ///unsigned.equivalence + ## u2 max_locals; + ///unsigned.equivalence + )) + +(def: #export parser + (Parser Resources) + ($_ <>.and + ## u2 max_stack; + ///unsigned.u2-parser + ## u2 max_locals; + ///unsigned.u2-parser + )) + +(def: #export (writer resources) + (Writer Resources) + ($_ binaryF@compose + ## u2 max_stack; + (///unsigned.u2-writer (get@ #max-stack resources)) + ## u2 max_locals; + (///unsigned.u2-writer (get@ #max-locals resources)) + )) diff --git a/stdlib/source/lux/target/jvm/constant.lux b/stdlib/source/lux/target/jvm/constant.lux index ee4dc5849..4dc021a3d 100644 --- a/stdlib/source/lux/target/jvm/constant.lux +++ b/stdlib/source/lux/target/jvm/constant.lux @@ -20,7 +20,7 @@ ["." / #_ ["#." tag ("#;." equivalence)] ["." // #_ - [descriptor (#+ Descriptor)] + ["#." descriptor (#+ Descriptor)] ["#." index (#+ Index)] [encoding [unsigned (#+ U4)]]]]) @@ -105,29 +105,29 @@ ) ) -(type: #export Name-And-Type +(type: #export (Name-And-Type of) {#name (Index UTF8) - #descriptor (Index (Descriptor Any))}) + #descriptor (Index (Descriptor of))}) -(type: #export Reference +(type: #export (Reference of) {#class (Index Class) - #name-and-type (Index Name-And-Type)}) + #name-and-type (Index (Name-And-Type of))}) (template [ ] - [(def: #export - (Equivalence ) + [(def: + (Equivalence ( Any)) ($_ equivalence.product //index.equivalence //index.equivalence)) - (def: #export + (def: (Parser ) ($_ <>.and //index.parser //index.parser)) - (def: #export - (Writer ) + (def: + (Writer ( Any)) ($_ binaryF.and //index.writer //index.writer))] @@ -136,16 +136,18 @@ [Reference reference-equivalence reference-parser reference-writer] ) +(type: #export Field (//descriptor.Value Any)) + (type: #export Constant (#UTF8 UTF8) (#Long Long) (#Double Double) (#Class Class) (#String String) - (#Field Reference) - (#Method Reference) - (#Interface-Method Reference) - (#Name-And-Type Name-And-Type)) + (#Field (Reference Field)) + (#Method (Reference //descriptor.Method)) + (#Interface-Method (Reference //descriptor.Method)) + (#Name-And-Type (Name-And-Type Any))) (def: #export equivalence (Equivalence Constant) diff --git a/stdlib/source/lux/target/jvm/encoding/unsigned.lux b/stdlib/source/lux/target/jvm/encoding/unsigned.lux index 15dd7a07e..86495f38e 100644 --- a/stdlib/source/lux/target/jvm/encoding/unsigned.lux +++ b/stdlib/source/lux/target/jvm/encoding/unsigned.lux @@ -17,18 +17,18 @@ (abstract: #export (Unsigned brand) {} - (I64 Any) + Nat (def: #export nat - (-> (Unsigned Any) (I64 Any)) + (-> (Unsigned Any) Nat) (|>> :representation)) (structure: #export equivalence (All [brand] (Equivalence (Unsigned brand))) (def: (= reference sample) - ("lux i64 =" (:representation reference) (:representation sample)))) + (n/= (:representation reference) (:representation sample)))) - (template [ ] + (template [ <+>] [(with-expansions [ (template.identifier [ "'"])] (abstract: #export {} Any) (type: #export (Unsigned ))) @@ -40,19 +40,26 @@ (|> (n/* i64.bits-per-byte) i64.mask :abstraction)) (def: #export - (-> (I64 Any) ) - (|>> (i64.and (:representation )) :abstraction))] + (-> Nat ) + (|>> (i64.and (:representation )) :abstraction)) - [1 U1 u1-bytes u1 max-u1] - [2 U2 u2-bytes u2 max-u2] - [4 U4 u4-bytes u4 max-u4] + (def: #export (<+> parameter subject) + (-> ) + (:abstraction + (i64.and (:representation ) + (n/+ (:representation parameter) + (:representation subject)))))] + + [1 U1 u1-bytes u1 max-u1 u1/+] + [2 U2 u2-bytes u2 max-u2 u2/+] + [4 U4 u4-bytes u4 max-u4 u4/+] ) ) (template [ ] [(def: #export (Parser ) - (<>@map )) + (<>@map (|>> .nat ) )) (def: #export (Writer ) diff --git a/stdlib/source/lux/target/jvm/method.lux b/stdlib/source/lux/target/jvm/method.lux index c59bf7d58..e6ee82617 100644 --- a/stdlib/source/lux/target/jvm/method.lux +++ b/stdlib/source/lux/target/jvm/method.lux @@ -18,12 +18,12 @@ [type [abstract (#+)]]] ["." // #_ - ["." modifier (#+ Modifier modifiers:)] - ["#." constant (#+ UTF8) - [pool (#+ Pool)]] + ["#." modifier (#+ Modifier modifiers:)] ["#." index (#+ Index)] ["#." attribute (#+ Attribute)] - ["#." descriptor (#+ Descriptor)]]) + ["#." descriptor (#+ Descriptor)] + ["#." constant (#+ UTF8) + [pool (#+ Pool)]]]) (type: #export #rec Method {#modifier (Modifier Method) @@ -49,7 +49,7 @@ (def: #export equivalence (Equivalence Method) ($_ equivalence.product - modifier.equivalence + //modifier.equivalence //index.equivalence //index.equivalence (row.equivalence //attribute.equivalence))) @@ -57,7 +57,7 @@ (def: #export (parser pool) (-> Pool (Parser Method)) ($_ <>.and - modifier.parser + //modifier.parser //index.parser //index.parser (<2>.row/16 (//attribute.parser pool)))) @@ -68,7 +68,7 @@ (~~ (template [ ] [( (get@ field))] - [modifier.writer #modifier] + [//modifier.writer #modifier] [//index.writer #name] [//index.writer #descriptor] [(binaryF.row/16 //attribute.writer) #attributes])) -- cgit v1.2.3