sigmasternchen/macrofuck
1
0
Fork 0
mirror of https://github.com/sigmasternchen/macrofuck synced 2025-03-15 07:08:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Cleanup map/rmap syntax

Browse source
This commit is contained in:
overflowerror 2024-05-17 15:27:27 +02:00
parent 2884890abc
commit 481eafda5d
11 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
compiler/src/parser.y
View file

@ -144,17 +144,18 @@ while: WHILE expr block
}
;
map: MAP OPENING_BRACKETS ID COMMA ID IN ID CLOSING_BRACKETS block
map: MAP ID COMMA ID IN ID block
{
$$ = map_statement_new($3, $5, $7, $9, false);
$$ = map_statement_new($2, $4, $6, $7, false);
}
| RMAP OPENING_BRACKETS ID COMMA ID IN ID CLOSING_BRACKETS block
| RMAP ID COMMA ID IN ID block
{
$$ = map_statement_new($3, $5, $7, $9, true);
$$ = map_statement_new($2, $4, $6, $7, true);
}
;
block: OPENING_BRACES stats CLOSING_BRACES
{
$$ = $2;

2
compiler/test/cases/021a-map-array-print.in
View file

@ -1,6 +1,6 @@
var list = []{'f', 'o', 'o', 'b', 'a', 'r'};
map(_, value in list) {
map _, value in list {
print(value);
print('\n');
}

2
compiler/test/cases/021b-map-array-index-print.in
View file

@ -1,5 +1,5 @@
var list = []{0, 0, 0, 0};
map(index, _ in list) {
map index, _ in list {
print(to_str(index), '\n');
}

2
compiler/test/cases/021c-map-array-modify-ref.in
View file

@ -1,6 +1,6 @@
var list = []{'e', 'n', 'n'};
map(_, value in list) {
map _, value in list {
value = (value + 1);
}

2
compiler/test/cases/021d-map-str-print.in
View file

@ -1,6 +1,6 @@
var s = "hello, world!\n";
map(_, c in s) {
map _, c in s {
if ((c >= 'a') && (c <= 'z')) {
c = ((c - 'a') + 'A');
}

2
compiler/test/cases/021e-map-extract-value.in
View file

@ -2,7 +2,7 @@ var a = []{'a', 'b', 'c'};
var extract = 0;
map(i, v in a) {
map i, v in a {
if (i == 1) {
extract = v;
}

2
compiler/test/cases/023a-rmap-array-print.in
View file

@ -1,6 +1,6 @@
var list = []{'f', 'o', 'o', 'b', 'a', 'r'};
rmap(_, value in list) {
rmap _, value in list {
print(value);
print('\n');
}

2
compiler/test/cases/023b-rmap-array-index-print.in
View file

@ -1,5 +1,5 @@
var list = []{0, 0, 0, 0};
rmap(index, _ in list) {
rmap index, _ in list {
print(to_str(index), '\n');
}

2
compiler/test/cases/023c-rmap-array-modify-ref.in
View file

@ -1,6 +1,6 @@
var list = []{'e', 'n', 'n'};
rmap(_, value in list) {
rmap _, value in list {
value = (value + 1);
}

2
compiler/test/cases/023d-rmap-str-print.in
View file

@ -1,6 +1,6 @@
var s = "hello, world!\n";
rmap(_, c in s) {
rmap _, c in s {
if ((c >= 'a') && (c <= 'z')) {
c = ((c - 'a') + 'A');
}

2
compiler/test/cases/023e-rmap-extract-value.in
View file

@ -2,7 +2,7 @@ var a = []{'a', 'b', 'c'};
var extract = 0;
rmap(i, v in a) {
rmap i, v in a {
if (i == 1) {
extract = v;
}