Fix #315

_glua-tests/issues.lua

@@ -404,3 +404,44 @@ function test()
     assert(2 % 2 == 0)
 end
 test()
+
+-- issue #355
+function test()
+  local x = "valid"
+  assert(x == "valid")
+  assert(zzz == nil)
+  x = zzz and "not-valid" or x
+  assert(x == "valid")
+end
+test()
+
+function test()
+  local x = "valid"
+  local z = nil
+  assert(x == "valid")
+  assert(z == nil)
+  x = z and "not-valid" or x
+  assert(x == "valid")
+end
+test()
+
+function test()
+  local x = "valid"
+  assert(x == "valid")
+  assert(zzz == nil)
+  x = zzz and "not-valid" or "still " .. x
+  assert(x == "still valid")
+end
+test()
+
+-- issue #315
+function test()
+  local a = {}
+  local d = 'e'
+  local f = 1
+
+  f, a.d = f, d
+
+  assert(f..", "..a.d == "1, e")
+end
+test()

compile.go

@@ -526,8 +526,7 @@ func compileStmt(context *funcContext, stmt ast.Stmt) { // {{{
 func compileAssignStmtLeft(context *funcContext, stmt *ast.AssignStmt) (int, []*assigncontext) { // {{{
 	reg := context.RegTop()
 	acs := make([]*assigncontext, 0, len(stmt.Lhs))
-	for i, lhs := range stmt.Lhs {
-		islast := i == len(stmt.Lhs)-1
+	for _, lhs := range stmt.Lhs {
 		switch st := lhs.(type) {
 		case *ast.IdentExpr:
 			identtype := getIdentRefType(context, context, st)
@@ -538,9 +537,7 @@ func compileAssignStmtLeft(context *funcContext, stmt *ast.AssignStmt) (int, []*
 			case ecUpvalue:
 				context.Upvalues.RegisterUnique(st.Value)
 			case ecLocal:
-				if islast {
-					ec.reg = context.FindLocalVar(st.Value)
-				}
+				ec.reg = context.FindLocalVar(st.Value)
 			}
 			acs = append(acs, &assigncontext{ec, 0, 0, false, false})
 		case *ast.AttrGetExpr: