Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🪲 Add curly braces around add ... to command #5625

Merged
merged 7 commits into from
Jun 25, 2024
Merged

🪲 Add curly braces around add ... to command #5625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8fff212
change toList to to_list
jpelay Jun 21, 2024
c6df9dc
delete unwanted console log
jpelay Jun 21, 2024
47147d5
add test
jpelay Jun 21, 2024
e4c4c75
🤖 Automatically update generated files
jpelay Jun 21, 2024
244c389
unwanted console log
jpelay Jun 21, 2024
e8e0403
🤖 Automatically update generated files
jpelay Jun 21, 2024
28272e0
Merge branch 'main' into fix_to_list
mergify[bot] Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level10.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AssignList { Text (is+ | Op<"=">) (Text+ | Int ) ~ambig (Comma (Text+ | Int ))+
Assign { Text (is+ | Op<"=">) (Expression ~ambig | ListAccess)+ }
Sleep { sleep+ (Expression | ListAccess )? }
ListAccess { Text at+ (random+ | Text | Int) }
Add { add+ Text+ toList+ Text }
Add { add+ Text+ to_list+ Text }
Remove { remove+ Text+ from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Expression) }
Expand Down Expand Up @@ -94,7 +94,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level11.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AssignList { Text (is+ | Op<"=">) (Text+ | Int ) ~ambig (Comma (Text+ | Int ))+
Assign { Text (is+ | Op<"=">) (Expression ~ambig | ListAccess)+ }
Sleep { sleep+ (Expression | ListAccess )? }
ListAccess { Text at+ (random+ | Text | Int) }
Add { add+ Text+ toList+ Text }
Add { add+ Text+ to_list+ Text }
Remove { remove+ Text+ from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Expression) }
Expand Down Expand Up @@ -94,7 +94,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level12.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AssignList { Text (is+ | Op<"=">) (Text+ | Number ) ~ambig (Comma (Text+ | Numb
Assign { (Text | ListAccess) (is+ | Op<"=">) (Expression ~ambig | ListAccess)+ }
Sleep { sleep+ (Expression | ListAccess)? }
ListAccess { Text at+ (random+ | Text | Number) }
Add { add+ (Expression ) toList+ Text }
Add { add+ (Expression ) to_list+ Text }
Remove { remove+ (Expression ) from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Expression) }
Expand Down Expand Up @@ -108,7 +108,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level13.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AssignList { Text (is+ | Op<"=">) (Text+ | Number ) ~ambig (Comma (Text+ | Numb
Assign { (Text | ListAccess) (is+ | Op<"=">) (Expression ~ambig | ListAccess)+ }
Sleep { sleep+ (Expression | ListAccess )? }
ListAccess { Text at+ (random+ | Text | Number) }
Add { add+ (Expression ) toList+ Text }
Add { add+ (Expression ) to_list+ Text }
Remove { remove+ (Expression ) from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Expression) }
Expand Down Expand Up @@ -110,7 +110,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level14.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AssignList { Text (is+ | Op<"=">) (Text+ | Number ) ~ambig (Comma (Text+ | Numb
Assign { (Text | ListAccess) (is+ | Op<"=">) (Expression ~ambig | ListAccess)+ }
Sleep { sleep+ (Expression | ListAccess )? }
ListAccess { Text at+ (random+ | Text | Number) }
Add { add+ (Expression ) toList+ Text }
Add { add+ (Expression ) to_list+ Text }
Remove { remove+ (Expression ) from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Expression) }
Expand Down Expand Up @@ -113,7 +113,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level15.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AssignList { Text (is+ | Op<"=">) (boolean | Text+ | Number ) ~ambig (Comma (bo
Assign { (Text | ListAccess) (is+ | Op<"=">) (Expression ~ambig | ListAccess)+ }
Sleep { sleep+ (Expression | ListAccess )? }
ListAccess { Text at+ (random+ | Text | Number) }
Add { add+ (Expression ) toList+ Text }
Add { add+ (Expression ) to_list+ Text }
Remove { remove+ (Expression ) from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Expression) }
Expand Down Expand Up @@ -123,7 +123,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level16.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AssignList { Text (is+ | Op<"=">) Op<"["> ((boolean | String | Text | Number) ~a
Assign { (Text | ListAccess) (is+ | Op<"=">) (Expression ~ambig )+ }
Sleep { sleep+ (Expression )? }
ListAccess { Text Op<"["> (random+ | Text | Number) Op<"]"> }
Add { add+ (Expression ) toList+ Text }
Add { add+ (Expression ) to_list+ Text }
Remove { remove+ (Expression ) from+ Text }
Clear { clear+ }
Play { play+ Expression }
Expand Down Expand Up @@ -123,7 +123,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level17.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AssignList { Text (is+ | Op<"=">) Op<"["> ((boolean | String | Text | Number) ~a
Assign { (Text | ListAccess) (is+ | Op<"=">) (Expression ~ambig )+ }
Sleep { sleep+ (Expression )? }
ListAccess { Text Op<"["> (random+ | Text | Number) Op<"]"> }
Add { add+ (Expression ) toList+ Text }
Add { add+ (Expression ) to_list+ Text }
Remove { remove+ (Expression ) from+ Text }
Clear { clear+ }
Play { play+ Expression }
Expand Down Expand Up @@ -124,7 +124,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level18.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Turtle[@isGroup=turtle] {
Color { color+ (Expression ) }
}

Add { add+ (Expression ) toList+ Text }
Add { add+ (Expression ) to_list+ Text }
Remove { remove+ (Expression ) from+ Text }
Clear { clear+ }
ErrorInvalid[@dynamicPrecedence=-10] { Text+ }
Expand Down Expand Up @@ -122,7 +122,7 @@ Expression {
def[@name="def"],
returns[@name="return"],
fors[@name="for"],
toList[@name="toList"],
to_list[@name="to_list"],
elif[@name="elif"],
low_true[@name="true"],
low_false[@name="false"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level3.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Assign { Text is+ (Text+ | ListAccess) }
Ask { Text is+ ask+ (Text)+ }
Sleep { sleep+ (Text | ListAccess)? }
ListAccess { Text at+ (random+ | Text) }
Add { add+ Text+ toList+ Text }
Add { add+ Text+ to_list+ Text }
Remove { remove+ Text+ from+ Text }
Play { play+ (ListAccess | Text+) }

Expand Down Expand Up @@ -38,7 +38,7 @@ ErrorInvalid[@dynamicPrecedence=-10] { Text+ }
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"]
to_list[@name="to_list"]
}

@tokens {
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level4.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AssignList { Text is+ Text+ (Comma Text+)+ }
Assign { Text is+ (Text+ | ListAccess) }
Sleep { sleep+ (Text | ListAccess)? }
ListAccess { Text at+ (random+ | Text) }
Add { add+ Text+ toList+ Text }
Add { add+ Text+ to_list+ Text }
Remove { remove+ Text+ from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Text+) }
Expand Down Expand Up @@ -60,7 +60,7 @@ ErrorInvalid[@dynamicPrecedence=-10] { Text+ }
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"]
}

Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level5.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ AssignList { Text is+ Text+ (Comma Text+)+ }
Assign { Text is+ (Text+ | ListAccess) }
Sleep { sleep+ (Text | ListAccess)? }
ListAccess { Text at+ (random+ | Text) }
Add { add+ Text+ toList+ Text }
Add { add+ Text+ to_list+ Text }
Remove { remove+ Text+ from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Text+) }
Expand Down Expand Up @@ -83,7 +83,7 @@ ErrorInvalid[@dynamicPrecedence=-10] { Text+ }
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"]
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level6.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ AssignList { Text (is+ | Op<"=">) (Text+ | Int ) ~ambig (Comma (Text+ | Int ))+
Assign { Text (is+ | Op<"=">) (Expression ~ambig | ListAccess)+ }
Sleep { sleep+ (Expression | ListAccess )? }
ListAccess { Text at+ (random+ | Text | Int) }
Add { add+ Text+ toList+ Text }
Add { add+ Text+ to_list+ Text }
Remove { remove+ Text+ from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Expression) }
Expand Down Expand Up @@ -96,7 +96,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"]
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level7.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ AssignList { Text (is+ | Op<"=">) (Text+ | Int ) ~ambig (Comma (Text+ | Int ))+
Assign { Text (is+ | Op<"=">) (Expression ~ambig | ListAccess)+ }
Sleep { sleep+ (Expression | ListAccess )? }
ListAccess { Text at+ (random+ | Text | Int) }
Add { add+ Text+ toList+ Text }
Add { add+ Text+ to_list+ Text }
Remove { remove+ Text+ from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Expression) }
Expand Down Expand Up @@ -98,7 +98,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level8.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AssignList { Text (is+ | Op<"=">) (Text+ | Int ) ~ambig (Comma (Text+ | Int ))+
Assign { Text (is+ | Op<"=">) (Expression ~ambig | ListAccess)+ }
Sleep { sleep+ (Expression | ListAccess )? }
ListAccess { Text at+ (random+ | Text | Int) }
Add { add+ Text+ toList+ Text }
Add { add+ Text+ to_list+ Text }
Remove { remove+ Text+ from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Expression) }
Expand Down Expand Up @@ -92,7 +92,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
4 changes: 2 additions & 2 deletions highlighting/lezer-grammars/level9.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ AssignList { Text (is+ | Op<"=">) (Text+ | Int ) ~ambig (Comma (Text+ | Int ))+
Assign { Text (is+ | Op<"=">) (Expression ~ambig | ListAccess)+ }
Sleep { sleep+ (Expression | ListAccess )? }
ListAccess { Text at+ (random+ | Text | Int) }
Add { add+ Text+ toList+ Text }
Add { add+ Text+ to_list+ Text }
Remove { remove+ Text+ from+ Text }
Clear { clear+ }
Play { play+ (ListAccess | Expression) }
Expand Down Expand Up @@ -93,7 +93,7 @@ Expression {
add[@name="add"],
from[@name="from"],
remove[@name="remove"],
toList[@name="toList"],
to_list[@name="to_list"],
clear[@name="clear"],
ins[@name="in"],
not_in[@name="not_in"],
Expand Down
1 change: 0 additions & 1 deletion static/js/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,6 @@ export async function runit(level: number, lang: string, raw: boolean, disabled_
let response = await postJsonWithAchievements('/parse', data);
program_data = response;
console.log('Response', response);

if (response.Warning && $('#editor').is(":visible")) {
//storeFixedCode(response, level);
error.showWarning(ClientMessages['Transpile_warning'], response.Warning);
Expand Down
Loading
Loading