Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-01-23 02:14:13 +00:00
Code Issues Projects Releases Wiki Activity

subr CST

Browse source
This commit is contained in:
John Kerl 2020-11-24 13:33:45 -05:00
parent ee2235b88b
commit 5a32c3ac95
7 changed files with 109 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
go/parser-experiments/two/temp.bnf
View file

@ -30,7 +30,7 @@ SubroutineCallsite
: "call" SubroutineName "(" ")"
<< dsl.NewASTNodeZary(
$0,
$1,
dsl.NodeTypeSubroutineCallsite,
) >>
@ -50,7 +50,7 @@ SubroutineCallsite
// * StringLiteral "b"
<< dsl.AdoptChildren(
dsl.NewASTNodeNestable(
$0,
$1,
dsl.NodeTypeSubroutineCallsite,
),
$3,

19
go/reg-test/cases/case-subr.sh
View file

@ -1,12 +1,14 @@
# Check for BNF/AST errors, with minimal CST involvement
run_mlr -n put -v 'call s()'
mlr_expect_fail -n put -v 'call s()'
mlr_expect_fail -n put -v 'call s'
run_mlr -n put -v 'call s(1,2,3)'
mlr_expect_fail -n put -v 'call s(1,2,3)'
run_mlr -n put -v 'subr s() {}'
run_mlr -n put -v 'subr s() {x=1}'
run_mlr -n put -v 'subr s() {return}'
mlr_expect_fail -n put -v 'subr s() {return 2}'
mlr_expect_fail -n put 'subr s()'
run_mlr -n put -v 'subr s() {}; call s()'
run_mlr -n put -v 'call s(); subr s() {}'
run_mlr -n put -v 'subr s(a) {print "HELLO, ".a."!"} call s("WORLD")'
@ -16,6 +18,13 @@ run_mlr --from $indir/2.dkvp put 'subr s() {return}'
mlr_expect_fail --from $indir/2.dkvp put 'call s()'
run_mlr --from $indir/2.dkvp put 'subr s(a) {print "HELLO, ".a."!"} call s("WORLD")'
#run_mlr --from $indir/2.dkvp put 'call s()'
run_mlr --from $indir/2.dkvp put -v -q '
func s(x) {
return x*2;
}
subr s(a) {
print "HELLO, ".a."!"
}
print s(NR);
call s("WORLD");
'

83
go/reg-test/expected/case-subr.sh.out
View file

@ -4,7 +4,7 @@ DSL EXPRESSION:
call s()
RAW AST:
* statement block
* subroutine callsite "call"
* subroutine callsite "s"
mlr -n put -v call s
@ -14,7 +14,7 @@ DSL EXPRESSION:
call s(1,2,3)
RAW AST:
* statement block
* subroutine callsite "call"
* subroutine callsite "s"
* int literal "1"
* int literal "2"
* int literal "3"
@ -68,6 +68,28 @@ RAW AST:
mlr -n put subr s()
mlr -n put -v subr s() {}; call s()
DSL EXPRESSION:
subr s() {}; call s()
RAW AST:
* statement block
* subroutine definition "s"
* parameter list
* statement block
* subroutine callsite "s"
mlr -n put -v call s(); subr s() {}
DSL EXPRESSION:
call s(); subr s() {}
RAW AST:
* statement block
* subroutine callsite "s"
* subroutine definition "s"
* parameter list
* statement block
mlr -n put -v subr s(a) {print "HELLO, ".a."!"} call s("WORLD")
DSL EXPRESSION:
subr s(a) {print "HELLO, ".a."!"} call s("WORLD")
@ -84,7 +106,7 @@ RAW AST:
* string literal "HELLO, "
* local variable "a"
* string literal "!"
* subroutine callsite "call"
* subroutine callsite "s"
* string literal "WORLD"
@ -98,6 +120,57 @@ a=eks,b=pan,i=2,x=0.7586799647899636,y=0.5221511083334797
mlr --from ./reg-test/input/2.dkvp put call s()
mlr --from ./reg-test/input/2.dkvp put subr s(a) {print "HELLO, ".a."!"} call s("WORLD")
Exit status was 1; expected 0.
mlr --from ./reg-test/input/2.dkvp put -v -q
func s(x) {
return x*2;
}
subr s(a) {
print "HELLO, ".a."!"
}
print s(NR);
call s("WORLD");
DSL EXPRESSION:
func s(x) {
return x*2;
}
subr s(a) {
print "HELLO, ".a."!"
}
print s(NR);
call s("WORLD");
RAW AST:
* statement block
* function definition "s"
* parameter list
* parameter
* parameter name "x"
* statement block
* return "return"
* operator "*"
* local variable "x"
* int literal "2"
* subroutine definition "s"
* parameter list
* parameter
* parameter name "a"
* statement block
* print statement "print"
* operator "."
* operator "."
* string literal "HELLO, "
* local variable "a"
* string literal "!"
* print statement "print"
* function callsite "s"
* context variable "NR"
* subroutine callsite "s"
* string literal "WORLD"
2
HELLO, WORLD!
4
HELLO, WORLD!

11
go/src/miller/dsl/cst/root.go
View file

@ -55,6 +55,11 @@ func Build(
return nil, err
}
err = cstRoot.resolveSubroutineCallsites()
if err != nil {
return nil, err
}
return cstRoot, nil
}
@ -185,16 +190,16 @@ func (this *RootNode) resolveSubroutineCallsites() error {
this.unresolvedSubroutineCallsites.Front(),
).(*UDSCallsite)
functionName := unresolvedSubroutineCallsite.uds.signature.funcOrSubrName
subroutineName := unresolvedSubroutineCallsite.uds.signature.funcOrSubrName
callsiteArity := unresolvedSubroutineCallsite.uds.signature.arity
uds, err := this.udsManager.LookUp(functionName, callsiteArity)
uds, err := this.udsManager.LookUp(subroutineName, callsiteArity)
if err != nil {
return err
}
if uds == nil {
return errors.New(
"Miller: function name not found: " + functionName,
"Miller: subroutine name not found: " + subroutineName,
)
}

13
go/src/miller/dsl/cst/uds.go
View file

@ -233,17 +233,6 @@ func (this *RootNode) BuildAndInstallUDS(astNode *dsl.ASTNode) error {
parameterListASTNode := astNode.Children[0]
subroutineBodyASTNode := astNode.Children[1]
returnValueTypeName := "any"
if len(astNode.Children) == 3 {
typeNode := astNode.Children[2]
lib.InternalCodingErrorIf(typeNode.Type != dsl.NodeTypeTypedecl)
returnValueTypeName = string(typeNode.Token.Lit)
}
typeGatedReturnValue, err := types.NewTypeGatedMlrvalName(
"subroutine return value",
returnValueTypeName,
)
lib.InternalCodingErrorIf(parameterListASTNode.Type != dsl.NodeTypeParameterList)
lib.InternalCodingErrorIf(parameterListASTNode.Children == nil)
arity := len(parameterListASTNode.Children)
@ -274,7 +263,7 @@ func (this *RootNode) BuildAndInstallUDS(astNode *dsl.ASTNode) error {
typeGatedParameterNames[i] = typeGatedParameterName
}
signature := NewSignature(functionName, arity, typeGatedParameterNames, typeGatedReturnValue)
signature := NewSignature(functionName, arity, typeGatedParameterNames, nil)
subroutineBody, err := this.BuildStatementBlockNode(subroutineBodyASTNode)
if err != nil {

4
go/src/miller/parsing/mlr.bnf
View file

@ -1329,7 +1329,7 @@ FcnArgs
SubroutineCallsite
: call SubroutineName "(" ")"
<< dsl.NewASTNodeZary(
$0,
$1,
dsl.NodeTypeSubroutineCallsite,
) >>
@ -1349,7 +1349,7 @@ SubroutineCallsite
// * StringLiteral "b"
<< dsl.AdoptChildren(
dsl.NewASTNodeNestable(
$0,
$1,
dsl.NodeTypeSubroutineCallsite,
),
$3,

8
go/src/miller/parsing/parser/productionstable.go
View file

@ -2532,7 +2532,7 @@ var productionsTable = ProdTab{
},
ProdTabEntry{
String: `SubroutineCallsite : call SubroutineName "(" ")" << dsl.NewASTNodeZary(
X[0],
X[1],
dsl.NodeTypeSubroutineCallsite,
) >>`,
Id: "SubroutineCallsite",
@ -2541,7 +2541,7 @@ var productionsTable = ProdTab{
NumSymbols: 4,
ReduceFunc: func(X []Attrib) (Attrib, error) {
return dsl.NewASTNodeZary(
X[0],
X[1],
dsl.NodeTypeSubroutineCallsite,
)
},
@ -2549,7 +2549,7 @@ var productionsTable = ProdTab{
ProdTabEntry{
String: `SubroutineCallsite : call SubroutineName "(" FcnArgs ")" << dsl.AdoptChildren(
dsl.NewASTNodeNestable(
X[0],
X[1],
dsl.NodeTypeSubroutineCallsite,
),
X[3],
@ -2561,7 +2561,7 @@ var productionsTable = ProdTab{
ReduceFunc: func(X []Attrib) (Attrib, error) {
return dsl.AdoptChildren(
dsl.NewASTNodeNestable(
X[0],
X[1],
dsl.NodeTypeSubroutineCallsite,
),
X[3],