Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-28 18:21:52 +00:00
Code Issues Projects Releases Wiki Activity

fix scoping for typedecl localvars in go impl

Browse source
This commit is contained in:
John Kerl 2020-11-23 17:03:35 -05:00
parent 93ac9f724c
commit 026ed48069
2 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
go/cases-to-do.txt
View file

@ -1,9 +1,6 @@
================================================================
BUG:
rrv ./reg-test/cases/case-c-dsl-localvar-scope-and-extent.sh
* !!
rrv ./reg-test/cases/case-c-dsl-empty-statements.sh
* mlr_expect_fail -n filter -v ''
C: "filter statement must not be empty"
@ -239,3 +236,4 @@ rrv ./reg-test/cases/case-c-uniq.sh
rrv ./reg-test/cases/case-c-utf8-bom.sh
================================================================
rrv ./reg-test/cases/case-c-dsl-localvar-scope-and-extent.sh

37
go/src/miller/dsl/cst/lvalues.go
View file

@ -461,6 +461,14 @@ func (this *FullOosvarLvalueNode) UnsetIndexed(
// ----------------------------------------------------------------
type LocalVariableLvalueNode struct {
typeGatedMlrvalName *types.TypeGatedMlrvalName
// a = 1;
// b = 1;
// if (true) {
// a = 3; <-- frameBind is false; updates outer a
// var b = 4; <-- frameBind is true; creates new inner b
// }
frameBind bool
}
func (this *RootNode) BuildLocalVariableLvalueNode(astNode *dsl.ASTNode) (IAssignable, error) {
@ -468,10 +476,12 @@ func (this *RootNode) BuildLocalVariableLvalueNode(astNode *dsl.ASTNode) (IAssig
variableName := string(astNode.Token.Lit)
typeName := "var"
frameBind := false
if astNode.Children != nil { // typed, like 'num x = 3'
typeNode := astNode.Children[0]
lib.InternalCodingErrorIf(typeNode.Type != dsl.NodeTypeTypedecl)
typeName = string(typeNode.Token.Lit)
frameBind = true
}
typeGatedMlrvalName, err := types.NewTypeGatedMlrvalName(
variableName,
@ -483,14 +493,17 @@ func (this *RootNode) BuildLocalVariableLvalueNode(astNode *dsl.ASTNode) (IAssig
// TODO: type-gated mlrval
return NewLocalVariableLvalueNode(
typeGatedMlrvalName,
frameBind,
), nil
}
func NewLocalVariableLvalueNode(
typeGatedMlrvalName *types.TypeGatedMlrvalName,
frameBind bool,
) *LocalVariableLvalueNode {
return &LocalVariableLvalueNode{
typeGatedMlrvalName: typeGatedMlrvalName,
frameBind: frameBind,
}
}
@ -514,23 +527,19 @@ func (this *LocalVariableLvalueNode) AssignIndexed(
return err
}
// TODO: Needs BindVariable if done with a type
//
// a = 1;
// if (true) {
// a = 2; <-- do reuse: SetVariable
// }
//
// a = 1;
// if (true) {
// var a = 2; <-- do not reuse: BindVariable
// }
state.stack.SetVariable(this.typeGatedMlrvalName.Name, rvalue)
if this.frameBind {
state.stack.BindVariable(this.typeGatedMlrvalName.Name, rvalue)
} else {
state.stack.SetVariable(this.typeGatedMlrvalName.Name, rvalue)
}
return nil
} else {
// TODO: propagate error return
state.stack.SetVariableIndexed(this.typeGatedMlrvalName.Name, indices, rvalue)
if this.frameBind {
state.stack.BindVariableIndexed(this.typeGatedMlrvalName.Name, indices, rvalue)
} else {
state.stack.SetVariableIndexed(this.typeGatedMlrvalName.Name, indices, rvalue)
}
return nil
}
}