Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion compiler.go
Original file line number Diff line number Diff line change
Expand Up @@ -692,12 +692,15 @@ func (c *Compiler) compileAssign(
return c.errorf(node, "operator ':=' not allowed with selector")
}

_, isFunc := rhs[0].(*parser.FuncLit)
symbol, depth, exists := c.symbolTable.Resolve(ident, false)
if op == token.Define {
if depth == 0 && exists {
return c.errorf(node, "'%s' redeclared in this block", ident)
}
symbol = c.symbolTable.Define(ident)
if isFunc {
symbol = c.symbolTable.Define(ident)
}
} else {
if !exists {
return c.errorf(node, "unresolved reference '%s'", ident)
Expand All @@ -718,6 +721,10 @@ func (c *Compiler) compileAssign(
}
}

if op == token.Define && !isFunc {
symbol = c.symbolTable.Define(ident)
}

switch op {
case token.AddAssign:
c.emit(node, parser.OpBinaryOp, int(token.Add))
Expand Down
2 changes: 2 additions & 0 deletions compiler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1023,6 +1023,8 @@ func TestCompilerErrorReport(t *testing.T) {

expectCompileError(t, `a = 1`,
"Compile Error: unresolved reference 'a'\n\tat test:1:1")
expectCompileError(t, `a := a`,
"Compile Error: unresolved reference 'a'\n\tat test:1:6")
expectCompileError(t, `a, b := 1, 2`,
"Compile Error: tuple assignment not allowed\n\tat test:1:1")
expectCompileError(t, `a.b := 1`,
Expand Down