Skip to content

Commit 8c788f7

Browse files
gabordemooijgabordemooij
committed
Update dictionaries and tests.
1 parent 63f180a commit 8c788f7

18 files changed

+84
-84
lines changed

‎i18n/af/dictionary.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define CTR_DICT_PROGRAM "Program"
1818
#define CTR_DICT_FILE "Lêer"
1919
#define CTR_DICT_MOMENT "Oomblik"
20-
#define CTR_DICT_VAR_ICON "☞"
20+
#define CTR_DICT_VAR_ICON ">>"
2121
#define CTR_DICT_ME_ICON "⛏"
2222
#define CTR_DICT_MY_ICON "⚿"
2323
#define CTR_DICT_BULLET "•"
@@ -178,16 +178,16 @@
178178
#define CTR_DICT_CURRENT_TASK "hierdie kode blok"
179179
#define CTR_DICT_NUM_DEC_SEP ","
180180
#define CTR_DICT_NUM_THO_SEP "."
181-
#define CTR_DICT_QUOT_OPEN "‘"
182-
#define CTR_DICT_QUOT_CLOSE "’"
181+
#define CTR_DICT_QUOT_OPEN "['"
182+
#define CTR_DICT_QUOT_CLOSE "']"
183183
#define CTR_DICT_MESSAGE_CHAIN ","
184184
#define CTR_DICT_ASSIGN "≔"
185185
#define CTR_DICT_PAREN_OPEN "("
186186
#define CTR_DICT_PAREN_CLOSE ")"
187187
#define CTR_DICT_BLOCK_START "{"
188188
#define CTR_DICT_BLOCK_END "}"
189189
#define CTR_DICT_PARAMETER_PREFIX ":"
190-
#define CTR_DICT_RETURN "↲"
190+
#define CTR_DICT_RETURN "<-"
191191
#define CTR_DICT_CODE "code"
192192
#define CTR_DICT_PROCEDURE "prosedure"
193193
#define CTR_DICT_TOOBJECT "objek"

‎i18n/en/dictionary.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#define CTR_DICT_CODEGEN_ARRAY_NEW_PUSH "Sequence ← "
66
#define CTR_DICT_END_OF_LINE "."
77
#define CTR_DICT_NIL "None"
8-
#define CTR_DICT_BOOLEAN "Decision"
8+
#define CTR_DICT_BOOLEAN "Boolean"
99
#define CTR_DICT_TRUE "Yes"
1010
#define CTR_DICT_FALSE "No"
1111
#define CTR_DICT_NUMBER "Number"
@@ -17,10 +17,10 @@
1717
#define CTR_DICT_PROGRAM "Program"
1818
#define CTR_DICT_FILE "File"
1919
#define CTR_DICT_MOMENT "Moment"
20-
#define CTR_DICT_VAR_ICON "☞"
20+
#define CTR_DICT_VAR_ICON ">>"
2121
#define CTR_DICT_ME_ICON "⛏"
2222
#define CTR_DICT_MY_ICON "⚿"
23-
#define CTR_DICT_BULLET "•"
23+
#define CTR_DICT_BULLET "~"
2424
#define CTR_DICT_SYMBOL_EQUALS "="
2525
#define CTR_DICT_PLUS "+"
2626
#define CTR_DICT_MINUS "-"
@@ -29,7 +29,7 @@
2929
#define CTR_DICT_GREATER ">"
3030
#define CTR_DICT_LESS "<"
3131
#define CTR_DICT_AT_SYMBOL "?"
32-
#define CTR_DICT_PEN_ICON "✎"
32+
#define CTR_DICT_PEN_ICON "Out"
3333
#define CTR_DICT_NEW_ARRAY_AND_PUSH_SYMBOL "←"
3434
#define CTR_DICT_GREATER_OR_EQUAL_SYMBOL "≥"
3535
#define CTR_DICT_LESS_OR_EQUAL_SYMBOL "≤"
@@ -48,7 +48,7 @@
4848
#define CTR_DICT_DONE "done"
4949
#define CTR_DICT_IFFALSE "no:"
5050
#define CTR_DICT_IFTRUE "yes:"
51-
#define CTR_DICT_WHILE "whilst:"
51+
#define CTR_DICT_WHILE "while:"
5252
#define CTR_DICT_MESSAGEARGS "message:arguments:"
5353
#define CTR_DICT_MESSAGE "message:"
5454
#define CTR_DICT_LEARN "learn:means:"
@@ -57,7 +57,7 @@
5757
#define CTR_DICT_ELSE "else:"
5858
#define CTR_DICT_NOT "not"
5959
#define CTR_DICT_TONUMBER "number"
60-
#define CTR_DICT_ITONUMBER "international number"
60+
#define CTR_DICT_ITONUMBER "inter-number"
6161
#define CTR_DICT_TOSTRING "text"
6262
#define CTR_DICT_CHAR_AT_SET "character:"
6363
#define CTR_DICT_EITHEROR "either:or:"
@@ -74,11 +74,11 @@
7474
#define CTR_DICT_EVEN "even?"
7575
#define CTR_DICT_POS "positive?"
7676
#define CTR_DICT_NEG "negative?"
77-
#define CTR_DICT_TOBOOL "decision"
77+
#define CTR_DICT_TOBOOL "bool"
7878
#define CTR_DICT_RANDOM_NUM_BETWEEN "between:and:"
7979
#define CTR_DICT_LENGTH "length"
8080
#define CTR_DICT_FROM_LENGTH "from:length:"
81-
#define CTR_DICT_TRIM "unspace"
81+
#define CTR_DICT_TRIM "trim"
8282
#define CTR_DICT_AT "at:"
8383
#define CTR_DICT_POSITION_SET "position:"
8484
#define CTR_DICT_INDEX_OF "find:"
@@ -114,7 +114,7 @@
114114
#define CTR_DICT_END "end"
115115
#define CTR_DICT_ARGUMENT "argument:"
116116
#define CTR_DICT_ARGUMENT_COUNT "arguments"
117-
#define CTR_DICT_WAIT_FOR_PASSW "ask password"
117+
#define CTR_DICT_WAIT_FOR_PASSW "ask-password"
118118
#define CTR_DICT_WAIT_FOR_INPUT "ask"
119119
#define CTR_DICT_INPUT "input"
120120
#define CTR_DICT_FLUSH "flush"
@@ -123,10 +123,10 @@
123123
#define CTR_DICT_RESPOND_TO "respond:"
124124
#define CTR_DICT_RESPOND_TO_AND "respond:and:"
125125
#define CTR_DICT_SHELL "os:"
126-
#define CTR_DICT_SWEEP "clean up"
126+
#define CTR_DICT_SWEEP "clean-up"
127127
#define CTR_DICT_MEMORY_LIMIT "memory:"
128128
#define CTR_DICT_MEMORY "memory"
129-
#define CTR_DICT_GC_MODE "memory management:"
129+
#define CTR_DICT_GC_MODE "memory-management:"
130130
#define CTR_DICT_HASH_WITH_KEY "hash:"
131131
#define CTR_DICT_CHARACTERS "characters"
132132
#define CTR_DICT_QUALIFIER_SET "qualify:"
@@ -153,8 +153,8 @@
153153
#define CTR_DICT_ZONE_SET "zone:"
154154
#define CTR_DICT_ADD_SET "add:"
155155
#define CTR_DICT_SUBTRACT_SET "subtract:"
156-
#define CTR_DICT_MULTIPLIER_SET "multiply by:"
157-
#define CTR_DICT_DIVIDER_SET "divide by:"
156+
#define CTR_DICT_MULTIPLIER_SET "multiply-by:"
157+
#define CTR_DICT_DIVIDER_SET "divide-by:"
158158
#define CTR_DICT_LAST "last"
159159
#define CTR_DICT_FIRST "first"
160160
#define CTR_DICT_SECOND_LAST "penultimate"
@@ -175,19 +175,19 @@
175175
#define CTR_DICT_SET_ENVIRONMENT_VARIABLE "setting:value:"
176176
#define CTR_DICT_RESPOND_TO_AND_AND "respond:and:and:"
177177
#define CTR_DICT_RESPOND_TO_AND_AND_AND "respond:and:and:and:"
178-
#define CTR_DICT_CURRENT_TASK "this task"
178+
#define CTR_DICT_CURRENT_TASK "this-task"
179179
#define CTR_DICT_NUM_DEC_SEP "."
180180
#define CTR_DICT_NUM_THO_SEP ","
181-
#define CTR_DICT_QUOT_OPEN "‘"
182-
#define CTR_DICT_QUOT_CLOSE "’"
181+
#define CTR_DICT_QUOT_OPEN "['"
182+
#define CTR_DICT_QUOT_CLOSE "']"
183183
#define CTR_DICT_MESSAGE_CHAIN ","
184184
#define CTR_DICT_ASSIGN "≔"
185185
#define CTR_DICT_PAREN_OPEN "("
186186
#define CTR_DICT_PAREN_CLOSE ")"
187187
#define CTR_DICT_BLOCK_START "{"
188188
#define CTR_DICT_BLOCK_END "}"
189189
#define CTR_DICT_PARAMETER_PREFIX ":"
190-
#define CTR_DICT_RETURN "↲"
190+
#define CTR_DICT_RETURN "<-"
191191
#define CTR_DICT_CODE "code"
192192
#define CTR_DICT_PROCEDURE "procedure"
193193
#define CTR_DICT_TOOBJECT "object"

‎tests/exp/af/test0313af.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ The garden is Leeg meters long.
66
Luckily, this day, there are Leeg wasps in the garden.
77
The dog named Leeg sleeps under the tree.
88
a\"bb\"ccc\"
9-
(Lys nuwe) sit:((Lys nuwe) sit:Leeg by:‘dog’, sit:Leeg by:‘insects’, sit:((Lys nuwe) sit:15 by:‘length’, sit:8 by:‘width’) by:‘size’, sit:(Reeks ← ‘tulips’ ; ‘roses’ ; ‘lillies’) by:‘flower’, sit:Nee by:‘shed’, sit:Ja by:‘pool’, sit:2 by:‘chairs’) by:‘garden’
9+
(Lys nuwe) sit:((Lys nuwe) sit:Leeg by:['dog'], sit:Leeg by:['insects'], sit:((Lys nuwe) sit:15 by:['length'], sit:8 by:['width']) by:['size'], sit:(Reeks ← ['tulips'] ; ['roses'] ; ['lillies']) by:['flower'], sit:Nee by:['shed'], sit:Ja by:['pool'], sit:2 by:['chairs']) by:['garden']
1010
{"garden":{"dog":null, "insects":null, "size":{"length":15, "width":8}, "flower":["tulips","roses","lillies"], "shed":false, "pool":true, "chairs":2}}

‎tests/exp/af/test0315af.exp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
(Lys nuwe) sit:‘a"b’ by:‘test’
1+
(Lys nuwe) sit:['a"b'] by:['test']
22
Invalid JSON.
3-
(Lys nuwe) sit:(Reeks ← 1 ; 2 ; (Reeks ← 3 ; 4) ; ((Lys nuwe) sit:(Reeks ← 3 ; 4) by:‘bar’, sit:1 by:‘foo’)) by:‘nested’, sit:Nee by:‘legend’, sit:27 by:‘age’, sit:‘Jack’ by:‘name’
3+
(Lys nuwe) sit:(Reeks ← 1 ; 2 ; (Reeks ← 3 ; 4) ; ((Lys nuwe) sit:(Reeks ← 3 ; 4) by:['bar'], sit:1 by:['foo'])) by:['nested'], sit:Nee by:['legend'], sit:27 by:['age'], sit:['Jack'] by:['name']
44
a b
55
{"test":"a\t\tb"}
66
{"test":"a\nb"}

‎tests/exp/af/test0325af.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# 0: 1
22
# 1: 4
3-
# 2: Reeks ← ‘A’ ; ‘B’
3+
# 2: Reeks ← ['A'] ; ['B']

‎tests/exp/af/test0332af.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
(Lys nuwe) sit:‘’ by:‘box’
1+
(Lys nuwe) sit:[''] by:['box']

‎tests/exp/af/test0349af.exp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ Reeks ← 1 ; (Reeks ← 2)
2121
Reeks
2222
Reeks ← 1 ; (Reeks ← 2) ; 3
2323
Reeks
24-
Reeks ← 1 ; ((Lys nuwe) sit:‘a’ by:‘b’) ; 3
24+
Reeks ← 1 ; ((Lys nuwe) sit:['a'] by:['b']) ; 3
2525
Reeks
26-
Reeks ← 1 ; ((Lys nuwe) sit:(Reeks ← 9) by:‘b’) ; 3
26+
Reeks ← 1 ; ((Lys nuwe) sit:(Reeks ← 9) by:['b']) ; 3
2727
Lys
28-
(Lys nuwe) sit:2 by:‘1’
28+
(Lys nuwe) sit:2 by:['1']
2929
Lys
30-
(Lys nuwe) sit:2 by:‘x’
30+
(Lys nuwe) sit:2 by:['x']
3131
Lys
32-
(Lys nuwe) sit:(Reeks ← 1 ; 2) by:‘x’
32+
(Lys nuwe) sit:(Reeks ← 1 ; 2) by:['x']
3333
Lys
34-
(Lys nuwe) sit:(Reeks ← ((Lys nuwe) sit:‘q’ by:‘y’) ; 2) by:‘x’
34+
(Lys nuwe) sit:(Reeks ← ((Lys nuwe) sit:['q'] by:['y']) ; 2) by:['x']
3535
Leeg
3636
Leeg

‎tests/exp/af/test0355af.exp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
1.001
22
1.024
3-
Reeks ← ‘1’ ; ‘2’ ; ‘3’
4-
Reeks ← ‘1’ ; ‘2’ ; ‘3’
5-
Reeks ← ‘1’ ; ‘’ ; ‘3’
6-
Reeks ← ‘1’ ; ‘’ ; ‘3’
7-
Reeks ← ‘’ ; ‘’ ; ‘’ ; ‘’
8-
Reeks ← ‘’ ; ‘’ ; ‘’ ; ‘’
9-
Reeks ← ‘’ ; ‘’
10-
Reeks ← ‘’ ; ‘’
11-
Reeks ← ‘x’
12-
Reeks ← ‘x’
13-
Reeks ← ‘’
14-
Reeks ← ‘’
15-
Reeks ← ‘1,2,3’
3+
Reeks ← ['1'] ; ['2'] ; ['3']
4+
Reeks ← ['1'] ; ['2'] ; ['3']
5+
Reeks ← ['1'] ; [''] ; ['3']
6+
Reeks ← ['1'] ; [''] ; ['3']
7+
Reeks ← [''] ; [''] ; [''] ; ['']
8+
Reeks ← [''] ; [''] ; [''] ; ['']
9+
Reeks ← [''] ; ['']
10+
Reeks ← [''] ; ['']
11+
Reeks ← ['x']
12+
Reeks ← ['x']
13+
Reeks ← ['']
14+
Reeks ← ['']
15+
Reeks ← ['1,2,3']

‎tests/exp/en/test0077en.exp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Text,Number
2-
Text,Decision
2+
Text,Boolean
33
Number,Text
4-
Number,Decision
5-
Decision,Number
6-
Decision,Number
7-
Decision,Text
8-
Decision,Text
4+
Number,Boolean
5+
Boolean,Number
6+
Boolean,Number
7+
Boolean,Text
8+
Boolean,Text
99
=== String test ===
1010
123
1111
No

‎tests/exp/en/test0103en.exp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
9
22
a Object ‘Object’ is NOT Nil.
3-
a Decision ‘Yes’ is NOT Nil.
4-
a Decision ‘No’ is NOT Nil.
5-
a Decision ‘No’ is NOT Nil.
3+
a Boolean ‘Yes’ is NOT Nil.
4+
a Boolean ‘No’ is NOT Nil.
5+
a Boolean ‘No’ is NOT Nil.
66
a Number ‘1’ is NOT Nil.
77
a Number ‘0’ is NOT Nil.
88
a Text ‘Str’ is NOT Nil.

‎tests/exp/en/test0182en.exp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
1.6
22
Yes
33
Number
4-
Decision
4+
Boolean
55
1.6
66
Yes
77
Number
8-
Decision
8+
Boolean
99
1.6
1010
Yes
1111
Number
12-
Decision
12+
Boolean
1313
No memory leaks here

‎tests/exp/en/test0260en.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Decision
1+
Boolean

‎tests/exp/en/test0313en.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ The garden is 15 meters long.
66
Luckily, this day, there are None wasps in the garden.
77
The dog named None sleeps under the tree.
88
a\"bb\"ccc\"
9-
(List new) put:((List new) put:None at:‘dog’, put:None at:‘insects’, put:((List new) put:15 at:‘length’, put:8 at:‘width’) at:‘size’, put:(Sequence ← ‘tulips’ ; ‘roses’ ; ‘lillies’) at:‘flower’, put:No at:‘shed’, put:Yes at:‘pool’, put:2 at:‘chairs’) at:‘garden’
9+
(List new) put:((List new) put:None at:['dog'], put:None at:['insects'], put:((List new) put:15 at:['length'], put:8 at:['width']) at:['size'], put:(Sequence ← ['tulips'] ; ['roses'] ; ['lillies']) at:['flower'], put:No at:['shed'], put:Yes at:['pool'], put:2 at:['chairs']) at:['garden']
1010
{"garden":{"dog":null, "insects":null, "size":{"length":15, "width":8}, "flower":["tulips","roses","lillies"], "shed":false, "pool":true, "chairs":2}}

‎tests/exp/en/test0315en.exp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
(List new) put:‘a"b’ at:‘test’
1+
(List new) put:['a"b'] at:['test']
22
Invalid JSON.
3-
(List new) put:(Sequence ← 1 ; 2 ; (Sequence ← 3 ; 4) ; ((List new) put:(Sequence ← 3 ; 4) at:‘bar’, put:1 at:‘foo’)) at:‘nested’, put:No at:‘legend’, put:27 at:‘age’, put:‘Jack’ at:‘name’
3+
(List new) put:(Sequence ← 1 ; 2 ; (Sequence ← 3 ; 4) ; ((List new) put:(Sequence ← 3 ; 4) at:['bar'], put:1 at:['foo'])) at:['nested'], put:No at:['legend'], put:27 at:['age'], put:['Jack'] at:['name']
44
a b
55
{"test":"a\t\tb"}
66
{"test":"a\nb"}

‎tests/exp/en/test0325en.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# 0: 1
22
# 1: 4
3-
# 2: Sequence ← ‘A’ ; ‘B’
3+
# 2: Sequence ← ['A'] ; ['B']

‎tests/exp/en/test0332en.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
(List new) put:‘’ at:‘box’
1+
(List new) put:[''] at:['box']

‎tests/exp/en/test0349en.exp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
None
22
None
3-
Decision
3+
Boolean
44
Yes
5-
Decision
5+
Boolean
66
No
77
Number
88
1
@@ -21,16 +21,16 @@ Sequence ← 1 ; (Sequence ← 2)
2121
Sequence
2222
Sequence ← 1 ; (Sequence ← 2) ; 3
2323
Sequence
24-
Sequence ← 1 ; ((List new) put:‘a’ at:‘b’) ; 3
24+
Sequence ← 1 ; ((List new) put:['a'] at:['b']) ; 3
2525
Sequence
26-
Sequence ← 1 ; ((List new) put:(Sequence ← 9) at:‘b’) ; 3
26+
Sequence ← 1 ; ((List new) put:(Sequence ← 9) at:['b']) ; 3
2727
List
28-
(List new) put:2 at:‘1’
28+
(List new) put:2 at:['1']
2929
List
30-
(List new) put:2 at:‘x’
30+
(List new) put:2 at:['x']
3131
List
32-
(List new) put:(Sequence ← 1 ; 2) at:‘x’
32+
(List new) put:(Sequence ← 1 ; 2) at:['x']
3333
List
34-
(List new) put:(Sequence ← ((List new) put:‘q’ at:‘y’) ; 2) at:‘x’
34+
(List new) put:(Sequence ← ((List new) put:['q'] at:['y']) ; 2) at:['x']
3535
None
3636
None

‎tests/exp/en/test0355en.exp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
1,001
22
1,024
3-
Sequence ← ‘1’ ; ‘2’ ; ‘3’
4-
Sequence ← ‘1’ ; ‘2’ ; ‘3’
5-
Sequence ← ‘1’ ; ‘’ ; ‘3’
6-
Sequence ← ‘1’ ; ‘’ ; ‘3’
7-
Sequence ← ‘’ ; ‘’ ; ‘’ ; ‘’
8-
Sequence ← ‘’ ; ‘’ ; ‘’ ; ‘’
9-
Sequence ← ‘’ ; ‘’
10-
Sequence ← ‘’ ; ‘’
11-
Sequence ← ‘x’
12-
Sequence ← ‘x’
13-
Sequence ← ‘’
14-
Sequence ← ‘’
15-
Sequence ← ‘1,2,3’
3+
Sequence ← ['1'] ; ['2'] ; ['3']
4+
Sequence ← ['1'] ; ['2'] ; ['3']
5+
Sequence ← ['1'] ; [''] ; ['3']
6+
Sequence ← ['1'] ; [''] ; ['3']
7+
Sequence ← [''] ; [''] ; [''] ; ['']
8+
Sequence ← [''] ; [''] ; [''] ; ['']
9+
Sequence ← [''] ; ['']
10+
Sequence ← [''] ; ['']
11+
Sequence ← ['x']
12+
Sequence ← ['x']
13+
Sequence ← ['']
14+
Sequence ← ['']
15+
Sequence ← ['1,2,3']

0 commit comments

Comments
 (0)