Skip to content

Commit f02eb00

Browse files
committed
Merge remote-tracking branch 'origin/master' into release
2 parents bb587c3 + b07c939 commit f02eb00

File tree

4 files changed

+6
-33
lines changed

4 files changed

+6
-33
lines changed

booster/test/rpc-integration/test-collectiontest/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ while adding the numbers it counts down from to the `Collection`.
88

99
* `state-from-12.execute` request: starts from `State ( .Set, 12 )`
1010
- Expected response: `State( {1..12}, 0}`
11-
* `state-map-lookup.simplify` request for `{ 1 -> 111, 2 -> AVARIABLE }[1] orDefault 0`
11+
* `state-map-lookup.simplify` request for `{ 1 -> 111, 2 -> AVARIABLE }[1]`
1212
- Expected response: `111` (as a `KItem`)
1313
* `state-map-lookupOrDefault.simplify` request for `{ 1 -> 111, 2 -> AVARIABLE }[0] orDefault 0`
1414
- Expected response: `0` (as a `KItem`)

booster/test/rpc-integration/test-collectiontest/state-map-lookup.simplify

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": 1,
44
"term": {
55
"tag": "App",
6-
"name": "Lbl'UndsLSqBUndsRSqB'orDefault'UndsUnds'MAP'Unds'KItem'Unds'Map'Unds'KItem'Unds'KItem",
6+
"name": "LblMap'Coln'lookup",
77
"sorts": [],
88
"args": [
99
{
@@ -161,34 +161,7 @@
161161
"value": "1"
162162
}
163163
]
164-
},
165-
{
166-
"tag": "App",
167-
"name": "inj",
168-
"sorts": [
169-
{
170-
"tag": "SortApp",
171-
"name": "SortInt",
172-
"args": []
173-
},
174-
{
175-
"tag": "SortApp",
176-
"name": "SortKItem",
177-
"args": []
178-
}
179-
],
180-
"args": [
181-
{
182-
"tag": "DV",
183-
"sort": {
184-
"tag": "SortApp",
185-
"name": "SortInt",
186-
"args": []
187-
},
188-
"value": "0"
189-
}
190-
]
191164
}
192165
]
193166
}
194-
}
167+
}

booster/test/rpc-integration/test-collectiontest/state-map-lookupOrDefault.simplify

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": 1,
44
"term": {
55
"tag": "App",
6-
"name": "Lbl'UndsLSqBUndsRSqB'orDefault'UndsUnds'MAP'Unds'KItem'Unds'Map'Unds'KItem'Unds'KItem",
6+
"name": "LblMap'Coln'lookupOrDefault",
77
"sorts": [],
88
"args": [
99
{
@@ -191,4 +191,4 @@
191191
}
192192
]
193193
}
194-
}
194+
}

deps/k_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.33
1+
7.1.64

0 commit comments

Comments
 (0)