| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | data/tests/collections.fate | 20 | ||||
| -rw-r--r-- | data/unit-testing/add_element.fate | 34 | ||||
| -rw-r--r-- | data/unit-testing/merge.fate | 381 | ||||
| -rw-r--r-- | src/core/src/tonkadur/fate/v1/parser/FateParser.g4 | 56 | ||||
| -rw-r--r-- | src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/InstructionCompiler.java | 10 |
5 files changed, 437 insertions, 64 deletions
diff --git a/data/tests/collections.fate b/data/tests/collections.fate index 3734e5d..32d5641 100644 --- a/data/tests/collections.fate +++ b/data/tests/collections.fate @@ -38,9 +38,7 @@ (add 1 int_list_a) (add 2 int_list_a) -(add 3 int_list_a) -(add 4 int_list_a) -(add 5 int_list_a) +(add 3 4 5 int_list_a) (add 6 int_list_a) (add 7 int_list_a) (add 8 int_list_a) @@ -48,9 +46,7 @@ (add 10 int_list_a) (add 3 int_set_a) -(add 5 int_set_a) -(add 2 int_set_a) -(add 8 int_set_a) +(add 5 2 8 int_set_a) (add 4 int_set_a) (add 6 int_set_a) (add 10 int_set_a) @@ -62,9 +58,7 @@ (add 5 int_set_a) (add 2 int_set_a) (add 8 int_set_a) -(add 4 int_set_a) -(add 6 int_set_a) -(add 10 int_set_a) +(add 4 6 10 int_set_a) (add 1 int_set_a) (add 9 int_set_a) (add 7 int_set_a) @@ -77,9 +71,7 @@ (add 3 int_list_a) (add 4 int_list_a) (add 5 int_list_a) -(add 6 int_list_a) -(add 7 int_list_a) -(add 8 int_list_a) +(add 6 7 8 int_list_a) (add 9 int_list_a) (add 10 int_list_a) @@ -114,9 +106,7 @@ (add 9 int_list_a) (add 8 int_list_a) (add 7 int_list_a) -(add 6 int_list_a) -(add 5 int_list_a) -(add 4 int_list_a) +(add 6 5 4 int_list_a) (add 3 int_list_a) (add 2 int_list_a) (add 1 int_list_a) diff --git a/data/unit-testing/add_element.fate b/data/unit-testing/add_element.fate index 9e37a6a..ccec148 100644 --- a/data/unit-testing/add_element.fate +++ b/data/unit-testing/add_element.fate @@ -11,17 +11,13 @@ (set li0 (add_element 0 li0)) (set li0 (add_element 1 li0)) (set li0 (add_element 2 li0)) -(set li0 (add_element 3 li0)) -(set li0 (add_element 4 li0)) -(set li0 (add_element 5 li0)) +(set li0 (add_element 3 4 5 li0)) (set li0 (add_element 6 li0)) (add_element! -1 li1) (add_element! 0 li1) (add_element! 1 li1) -(add_element! 2 li1) -(add_element! 3 li1) -(add_element! 4 li1) +(add_element! 2 3 4 li1) (add_element! 5 li1) (add_element! 6 li1) @@ -44,13 +40,9 @@ (add_element 6 (add_element 5 (add_element 4 - (add_element 3 - (add_element 2 - (add_element 1 - (add_element 0 - (add_element -1 ali1) - ) - ) + (add_element 1 2 3 + (add_element 0 + (add_element -1 ali1) ) ) ) @@ -68,18 +60,14 @@ (set si0 (add_element 6 si0)) (set si0 (add_element 0 si0)) -(set si0 (add_element 1 si0)) -(set si0 (add_element 4 si0)) -(set si0 (add_element -1 si0)) +(set si0 (add_element 1 4 -1 si0)) (set si0 (add_element 5 si0)) (set si0 (add_element 3 si0)) (set si0 (add_element 2 si0)) (add_element! 4 si1) (add_element! 0 (at (ptr si1))) -(add_element! 3 si1) -(add_element! -1 si1) -(add_element! 2 si1) +(add_element! 3 -1 2 si1) (add_element! 6 si1) (add_element! 1 (at si_ptr)) (add_element! 5 si1) @@ -88,17 +76,13 @@ (set si0 (add_element 0 si0)) (set si0 (add_element 4 si0)) -(set si0 (add_element 6 si0)) -(set si0 (add_element 5 si0)) -(set si0 (add_element 3 si0)) +(set si0 (add_element 6 5 3 si0)) (set si0 (add_element -1 si0)) (set si0 (add_element 2 si0)) (set si0 (add_element 1 si0)) (add_element! 4 si1) -(add_element! 1 si1) -(add_element! 0 si1) -(add_element! 6 si1) +(add_element! 1 0 6 si1) (add_element! -1 si1) (add_element! 3 si1) (add_element! 2 si1) diff --git a/data/unit-testing/merge.fate b/data/unit-testing/merge.fate index e173ac2..cdf2204 100644 --- a/data/unit-testing/merge.fate +++ b/data/unit-testing/merge.fate @@ -391,7 +391,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; INDEXED TEST 0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; TODO (global (list int) ili0) (global (list int) ili0oa) (global (list int) ili0ob) @@ -399,29 +398,124 @@ (global (list int) ili1oa) (global (list int) ili1ob) - -;; Why have the index twice? It's not useful when you don't have the possibility -;; of these indices being different. (set ili0 (indexed_merge_to_list (lambda ( - (int i_a) + (int i) (int a) - (int i_b) (int b) ) - (- a b) + (* (- a b) i) ) (range 10 40 1) (range 0 60 2) ) ) +(set ili0oa + (indexed_merge_to_list + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) i) + ) + (range 10 70 1) + (range 0 60 2) + ) +) + +(set ili0ob + (indexed_merge_to_list + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) i) + ) + (range 10 40 1) + (range 0 80 2) + ) +) + +(set ili1 (range 10 40 1)) +(set ili1oa (range 10 60 1)) +(set ili1ob (range 10 40 1)) + +(indexed_merge! + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) i) + ) + ili1 + (range 0 60 2) +) + +(indexed_merge! + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) i) + ) + ili1oa + (range 0 60 2) +) + +(indexed_merge! + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) i) + ) + ili1ob + (range 0 160 2) +) + +(assert + (= (var ili1) (var ili0) (var ili0oa) (var ili0ob) (var ili1oa) (var ili1ob)) + [FAILED] (var test_name) Equality test indexed 0. +) + +(for (set i 0) (=< i 30) (set i (+ i 1)) + (assert + (= + (* (- (+ 10 i) (* 2 i)) i) + (access ili0 i) + (access ili0oa i) + (access ili0ob i) + (access ili1 i) + (access ili1oa i) + (access ili1ob i) + ) + [FAILED] (var test_name) Indexed test 0, index (var i), values: + Expected: (* (- (+ 10 i) (* 2 i)) i); + ili0: (access ili0 i); + ili0oa: (access ili0oa i); + ili0ob: (access ili0ob i); + ili1: (access ili1 i); + ili1oa: (access ili1oa i); + ili1ob: (access ili1ob i) + ) +) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; INDEXED TEST 1 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; INDEXED TEST 1 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; TODO (global (set int) isi0) (global (set int) isi0oa) (global (set int) isi0ob) @@ -429,6 +523,275 @@ (global (set int) isi1oa) (global (set int) isi1ob) +(set isi0 + (indexed_merge_to_set + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) (+ i 1)) + ) + (range 10 40 1) + (range 0 60 2) + ) +) + +(set isi0oa + (indexed_merge_to_set + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) (+ i 1)) + ) + (range 10 70 1) + (range 0 60 2) + ) +) + +(set isi0ob + (indexed_merge_to_set + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) (+ i 1)) + ) + (range 10 40 1) + (range 0 80 2) + ) +) + +(add_all! (range 10 40 1) isi1) +(add_all! (range 10 60 1) isi1oa) +(add_all! (range 10 40 1) isi1ob) + +(indexed_merge! + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) (+ i 1)) + ) + isi1 + (range 0 60 2) +) + +(indexed_merge! + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) (+ i 1)) + ) + isi1oa + (range 0 60 2) +) + +(indexed_merge! + (lambda + ( + (int i) + (int a) + (int b) + ) + (* (- a b) (+ i 1)) + ) + isi1ob + (range 0 80 2) +) + +(assert + (= (var isi0) (var isi0oa) (var isi0ob) (var isi1) (var isi1oa) (var isi1ob)) + [FAILED] (var test_name) Equality test indexed 1. +) + +For reference, the values found in the sets are: +(for (set i 0) (=< i 30) (set i (+ i 1)) + (* (- (+ 10 i) (* 2 i)) (+ j i)) (newline) +) + +(for + ( + (set i 0) + (set j 25) + ) + (=< i 25) + ( + (set i (+ i 1)) + (set j (- j 1)) + ) + (assert + (= + (* (- (+ 10 j) (* 2 j)) (+ j 1)) + (access isi0 i) + (access isi0oa i) + (access isi0ob i) + (access isi1 i) + (access isi1oa i) + (access isi1ob i) + ) + [FAILED] (var test_name) Indexed test 1, index (var i), values: + Expected: (* (- (+ 10 j) (* 2 j)) (+ j 1)); + isi0: (access isi0 i); + isi0oa: (access isi0oa i); + isi0ob: (access isi0ob i); + isi1: (access isi1 i); + isi1oa: (access isi1oa i); + isi1ob: (access isi1ob i); + ) +) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; INDEXED TEST 2 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(global (set int) isi2) +(global (set int) isi2oa) +(global (set int) isi2ob) +(global (set int) isi3) +(global (set int) isi3oa) +(global (set int) isi3ob) + +(set isi2 + (indexed_merge_to_set + (lambda + ( + (int i) + (int a) + (int b) + (int mod) + ) + (* (* (- a b) mod) (+ i 1)) + ) + (range 10 40 1) + (range 0 60 2) + -1 + ) +) + +(set isi2oa + (indexed_merge_to_set + (lambda + ( + (int i) + (int a) + (int b) + (int mod) + ) + (* (* (- a b) mod) (+ i 1)) + ) + (range 10 80 1) + (range 0 60 2) + -1 + ) +) + +(set isi2ob + (indexed_merge_to_set + (lambda + ( + (int i) + (int a) + (int b) + (int mod) + ) + (* (- a b) mod (+ i 1)) + ) + (range 10 40 1) + (range 0 80 2) + -1 + ) +) + +(add_all! (range 10 40 1) isi3) +(add_all! (range 10 80 1) isi3oa) +(add_all! (range 10 40 1) isi3ob) + +(indexed_merge! + (lambda + ( + (int i) + (int a) + (int b) + (int mod) + ) + (* (- a b) mod (+ i 1)) + ) + isi3 + (range 0 60 2) + -1 +) + +(indexed_merge! + (lambda + ( + (int i) + (int a) + (int b) + (int mod) + ) + (* (- a b) mod (+ i 1)) + ) + isi3oa + (range 0 60 2) + -1 +) + +(indexed_merge! + (lambda + ( + (int i) + (int a) + (int b) + (int mod) + ) + (* (- a b) mod (+ i 1)) + ) + isi3ob + (range 0 90 2) + -1 +) + +(assert + (= (var isi2) (var isi2oa) (var isi2ob) (var isi3) (var isi3oa) (var isi3ob)) + [FAILED] (var test_name) Equality test indexed 2. +) + +(for + (set i 0) + (=< i 25) + (set i (+ i 1)) + (assert + (= + (* (* (- (+ 10 i) (* 2 i)) -1) (+ i 1)) + (access isi2 i) + (access isi2oa i) + (access isi2ob i) + (access isi3 i) + (access isi3oa i) + (access isi3ob i) + ) + [FAILED] (var test_name) Indexed test 2, index (var i), values: + Expected: (* (* (- (+ 10 i) (* 2 i)) -1) (+ i 1)); + isi2: (access isi2 i); + isi2oa: (access isi2oa i); + isi2ob: (access isi2ob i); + isi3: (access isi3 i); + isi3oa: (access isi3oa i); + isi3ob: (access isi3ob i) + ) +) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; DEFAULT_VALUES TEST 0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/src/core/src/tonkadur/fate/v1/parser/FateParser.g4 b/src/core/src/tonkadur/fate/v1/parser/FateParser.g4 index 6f84490..d16dfb2 100644 --- a/src/core/src/tonkadur/fate/v1/parser/FateParser.g4 +++ b/src/core/src/tonkadur/fate/v1/parser/FateParser.g4 @@ -655,18 +655,39 @@ returns [Instruction result] ); } - | IMP_ADD_KW value WS+ value_reference WS* R_PAREN + | IMP_ADD_KW value_list WS+ value_reference WS* R_PAREN { + final List<Instruction> add_instrs; + + add_instrs = new ArrayList<Instruction>(); + + + for (final Computation value: ($value_list.result)) + { + add_instrs.add + ( + AddElement.build + ( + CONTEXT.get_origin_at + ( + ($IMP_ADD_KW.getLine()), + ($IMP_ADD_KW.getCharPositionInLine()) + ), + value, + ($value_reference.result) + ) + ); + } + $result = - AddElement.build + new InstructionList ( CONTEXT.get_origin_at ( ($IMP_ADD_KW.getLine()), ($IMP_ADD_KW.getCharPositionInLine()) ), - ($value.result), - ($value_reference.result) + add_instrs ); } @@ -4111,19 +4132,24 @@ returns [Computation result] ); } - | ADD_KW val=value WS+ coll=non_text_value WS* R_PAREN + | ADD_KW vall=value_list WS+ coll=non_text_value WS* R_PAREN { - $result = - AddElementComputation.build - ( - CONTEXT.get_origin_at + $result = ($coll.result); + + for (final Computation value: ($vall.result)) + { + $result = + AddElementComputation.build ( - ($ADD_KW.getLine()), - ($ADD_KW.getCharPositionInLine()) - ), - ($val.result), - ($coll.result) - ); + CONTEXT.get_origin_at + ( + ($ADD_KW.getLine()), + ($ADD_KW.getCharPositionInLine()) + ), + value, + $result + ); + } } | ADD_AT_KW diff --git a/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/InstructionCompiler.java b/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/InstructionCompiler.java index 36e7b66..19baae7 100644 --- a/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/InstructionCompiler.java +++ b/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/InstructionCompiler.java @@ -1204,6 +1204,16 @@ implements tonkadur.fate.v1.lang.meta.InstructionVisitor new SetValue(holder.get_address(), collection_cc.get_computation()) ); + result.add + ( + Clear.generate + ( + compiler.registers(), + compiler.assembler(), + collection_cc.get_address() + ) + ); + in_collection_b_cc = new ComputationCompiler(compiler); n.get_collection_in_b().get_visited_by(in_collection_b_cc); |