Merge branch '1.12.x'

abs-lang · Apr 3, 2020 · 1c3f206 · 1c3f206
2 parents 3ddbae2 + 02b4b4f
commit 1c3f206
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.12.0
+1.12.1
diff --git a/docs/abs.wasm b/docs/abs.wasm
diff --git a/evaluator/evaluator_test.go b/evaluator/evaluator_test.go
@@ -639,6 +639,7 @@ func TestAssignStatements(t *testing.T) {
 		expected interface{}
 	}{
 		{"a = 5; a;", 5},
+		{`a = {"b": {"c": {"d": ""}}}; a.b['c'].e = 123; a.b.c.d = 123; a.b.c.d`, 123},
 		{"a = 5 * 5; a;", 25},
 		{"a = 5; b = a; b;", 5},
 		{"a = 5; b = a; c = a + b + 5; c;", 15},

diff --git a/parser/parser.go b/parser/parser.go
@@ -530,6 +530,7 @@ func (p *Parser) parseDottedExpression(object ast.Expression) ast.Expression {
 		exp := &ast.PropertyExpression{Token: t, Object: object}
 		exp.Property = p.parseIdentifier()
 		p.prevPropertyExpression = exp
+		p.prevIndexExpression = nil
 		return exp
 	}
 }
@@ -950,6 +951,7 @@ func (p *Parser) parseIndexExpression(left ast.Expression) ast.Expression {
 	}
 	// support assignment to index expression: a[0] = 1
 	p.prevIndexExpression = exp
+	p.prevPropertyExpression = nil
 
 	return exp
 }