Elara6331
/
scpt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add ability to define functions with dashes in name

This commit is contained in:
Elara 2021-04-29 23:14:52 -07:00
parent 836149ffc2
commit 31c3a2f3a9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ast.go
View File

@ -400,7 +400,7 @@ type MapKVPair struct {
// FuncDef stores any function definitions encountered while parsing a script // FuncDef stores any function definitions encountered while parsing a script
type FuncDef struct { type FuncDef struct {
Pos lexer.Position Pos lexer.Position
Name *string `"define" @Ident "{"` Name *string `"define" @Ident @("-" Ident)* "{"`
InnerCmds []*Command `@@* "}"` InnerCmds []*Command `@@* "}"`
} }

6
test.scpt
View File

@ -65,12 +65,12 @@ repeat 6 times { i in
print {"brktest: " + (str $i) + " (2)"} print {"brktest: " + (str $i) + " (2)"}
} }
define hi { define hello-x {
print {"Hello, " + $_args[""]} print {"Hello, " + $_args[""]}
return {"Hello, " + $_args[""]} return {"Hello, " + $_args[""]}
print "Something isn't right" print "Something isn't right"
} }
hi "Function" hello-x "Function"
set f to (hi "World") set f to (hello-x "World")
print {"Returned: " + $f} print {"Returned: " + $f}