Skip to content

Commit 8592ae8

Browse files
rv-auditorrv-auditor
committed
Merge remote-tracking branch 'origin/develop'
2 parents 6671fe4 + a9393d3 commit 8592ae8

File tree

61 files changed

+95
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+95
-95
lines changed

‎runtime/collections/rangemaps.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ static struct blockheader range_header() {
1717
static struct blockheader hdr = {(uint64_t)-1};
1818
if (hdr.hdr == -1) {
1919
hdr = get_block_header_for_symbol(
20-
(uint64_t)get_tag_for_symbol_name("LblRangemap'Coln'Range{}"));
20+
(uint64_t)get_tag_for_symbol_name("LblRangeMap'Coln'Range{}"));
2121
}
2222
return hdr;
2323
}
@@ -275,7 +275,7 @@ void print_range_map(
275275

276276
sfprintf(file, "%s(", element);
277277
auto entry = *iter;
278-
sfprintf(file, "LblRangemap'Coln'Range{}(");
278+
sfprintf(file, "LblRangeMap'Coln'Range{}(");
279279
print_configuration_internal(
280280
file, entry.first.start(), "SortKItem{}", false, state);
281281
sfprintf(file, ",");

‎runtime/util/ConfigurationSerializer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ void serialize_range_map(
198198
file, iter->first.start(), "SortKItem{}", false, state);
199199
serialize_configuration_internal(
200200
file, iter->first.end(), "SortKItem{}", false, state);
201-
emit_symbol(instance, "LblRangemap'Coln'Range{}", 2);
201+
emit_symbol(instance, "LblRangeMap'Coln'Range{}", 2);
202202
serialize_configuration_internal(
203203
file, iter->second, arg_sorts[1], false, state);
204204
emit_symbol(instance, element, 2);
@@ -222,7 +222,7 @@ void serialize_range_map_v2(
222222

223223
auto *arg_sorts = get_argument_sorts_for_tag_v2(element);
224224
const static auto range_tag
225-
= get_tag_for_symbol_name("LblRangemap'Coln'Range{}");
225+
= get_tag_for_symbol_name("LblRangeMap'Coln'Range{}");
226226
const static auto *range_sorts = get_argument_sorts_for_tag_v2(range_tag);
227227

228228
for (size_t i = 0; i < size - 1; ++i) {

‎test/defn/imp-with-rangemaps.kore

Lines changed: 10 additions & 10 deletions
Large diffs are not rendered by default.

‎test/defn/rangemap-simple.kore

Lines changed: 24 additions & 24 deletions
Large diffs are not rendered by default.

‎test/input/rangemap-simple/rangemap-simple-15.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(Lbl'Unds'r'Pipe'-'-GT-Unds'{}(LblRangemap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("0")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("1"))),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("40")))))))
1+
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(Lbl'Unds'r'Pipe'-'-GT-Unds'{}(LblRangeMap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("0")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("1"))),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("40")))))))

‎test/input/rangemap-simple/rangemap-simple-69.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(Lbl'Unds'r'LSqBUnds-LT-'-undef'RSqB'{}(Lblrangemap'LParUndsRParUnds'RANGEMAP-SIMPLE-SYNTAX'Unds'RangeMap'Unds'Int{}(\dv{SortInt{}}("0")),LblRangemap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("1")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("2"))))))))
1+
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(Lbl'Unds'r'LSqBUnds-LT-'-undef'RSqB'{}(Lblrangemap'LParUndsRParUnds'RANGEMAP-SIMPLE-SYNTAX'Unds'RangeMap'Unds'Int{}(\dv{SortInt{}}("0")),LblRangeMap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("1")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("2"))))))))

‎test/input/rangemap-simple/rangemap-simple-70.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(Lbl'Unds'r'LSqBUnds-LT-'-undef'RSqB'{}(Lblrangemap'LParUndsRParUnds'RANGEMAP-SIMPLE-SYNTAX'Unds'RangeMap'Unds'Int{}(\dv{SortInt{}}("1")),LblRangemap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("1")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("4"))))))))
1+
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(Lbl'Unds'r'LSqBUnds-LT-'-undef'RSqB'{}(Lblrangemap'LParUndsRParUnds'RANGEMAP-SIMPLE-SYNTAX'Unds'RangeMap'Unds'Int{}(\dv{SortInt{}}("1")),LblRangeMap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("1")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("4"))))))))

‎test/input/rangemap-simple/rangemap-simple-71.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(Lbl'Unds'r'LSqBUnds-LT-'-undef'RSqB'{}(Lblrangemap'LParUndsRParUnds'RANGEMAP-SIMPLE-SYNTAX'Unds'RangeMap'Unds'Int{}(\dv{SortInt{}}("4")),LblRangemap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("1")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("5"))))))))
1+
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(Lbl'Unds'r'LSqBUnds-LT-'-undef'RSqB'{}(Lblrangemap'LParUndsRParUnds'RANGEMAP-SIMPLE-SYNTAX'Unds'RangeMap'Unds'Int{}(\dv{SortInt{}}("4")),LblRangeMap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("1")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("5"))))))))

‎test/input/rangemap-simple/rangemap-simple-72.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(Lbl'Unds'r'LSqBUnds-LT-'-undef'RSqB'{}(Lblrangemap'LParUndsRParUnds'RANGEMAP-SIMPLE-SYNTAX'Unds'RangeMap'Unds'Int{}(\dv{SortInt{}}("8")),LblRangemap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("1")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("5"))))))))
1+
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(Lbl'Unds'r'LSqBUnds-LT-'-undef'RSqB'{}(Lblrangemap'LParUndsRParUnds'RANGEMAP-SIMPLE-SYNTAX'Unds'RangeMap'Unds'Int{}(\dv{SortInt{}}("8")),LblRangeMap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("1")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("5"))))))))

‎test/input/rangemap-simple/rangemap-simple-74.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(LblremoveAll'LParUndsCommUndsRParUnds'RANGEMAP'Unds'RangeMap'Unds'RangeMap'Unds'Set{}(Lblrangemap'LParUndsRParUnds'RANGEMAP-SIMPLE-SYNTAX'Unds'RangeMap'Unds'Int{}(\dv{SortInt{}}("0")),LblSetItem{}(inj{SortRange{}, SortKItem{}}(LblRangemap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("0")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("2"))))))))))
1+
LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\dv{SortKConfigVar{}}("$PGM")),inj{SortRangeMap{}, SortKItem{}}(LblremoveAll'LParUndsCommUndsRParUnds'RANGEMAP'Unds'RangeMap'Unds'RangeMap'Unds'Set{}(Lblrangemap'LParUndsRParUnds'RANGEMAP-SIMPLE-SYNTAX'Unds'RangeMap'Unds'Int{}(\dv{SortInt{}}("0")),LblSetItem{}(inj{SortRange{}, SortKItem{}}(LblRangeMap'Coln'Range{}(inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("0")),inj{SortInt{}, SortKItem{}}(\dv{SortInt{}}("2"))))))))))

0 commit comments

Comments
 (0)