Fixed extended setindex (AplaProject#126)

evelynEdison · Jan 19, 2018 · 4f255ca · 4f255ca
1 parent 450bb84
commit 4f255ca
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/packages/api/read_test.go b/packages/api/read_test.go
@@ -91,7 +91,7 @@ func TestRead(t *testing.T) {
 			row = $data[i]
 			if i == 1 || i == 3 {
 				row["my"] = "No name"
-				//$data[i] = row
+				$data[i] = row
 			}
 			i = i+ 1
 		}

diff --git a/packages/script/compile.go b/packages/script/compile.go
@@ -1057,7 +1057,7 @@ main:
 			if !call {
 				cmd = &ByteCode{cmdExtend, lexem.Value.(string)}
 				if i < len(*lexems)-1 && (*lexems)[i+1].Type == isLBrack {
-					buffer = append(buffer, &ByteCode{cmdIndex, 0})
+					buffer = append(buffer, &ByteCode{cmdIndex, &IndexInfo{Extend: lexem.Value.(string)}})
 				}
 			}
 		case lexIdent:
@@ -1122,7 +1122,7 @@ main:
 						logger.WithFields(log.Fields{"lex_value": lexem.Value.(string), "type": consts.ParseError}).Error("unknown variable")
 						return fmt.Errorf(`unknown variable %s`, lexem.Value.(string))
 					}
-					buffer = append(buffer, &ByteCode{cmdIndex, &IndexInfo{objInfo.Value.(int), tobj}})
+					buffer = append(buffer, &ByteCode{cmdIndex, &IndexInfo{objInfo.Value.(int), tobj, ``}})
 				}
 			}
 			if !call {

diff --git a/packages/script/compile_test.go b/packages/script/compile_test.go
@@ -381,6 +381,10 @@ func TestVMCompile(t *testing.T) {
 			}
 			return m["id"] + "=" + GetData().WhereId(100).One("name")
 		}`, `result`, `123=Test value 100`},
+		{`func mapbug() string {
+			$data[10] = "extend ok"
+			return $data[10]
+			}`, `mapbug`, `extend ok`},
 	}
 	vm := NewVM()
 	vm.Extern = true
@@ -397,8 +401,8 @@ func TestVMCompile(t *testing.T) {
 			}
 		} else {
 			if out, err := vm.Call(item.Func, nil, &map[string]interface{}{
-				`rt_state`: uint32(ikey) + 22,
-				`test1`:    101, `test2`: `test 2`,
+				`rt_state`: uint32(ikey) + 22, `data`: make([]interface{}, 0),
+				`test1`: 101, `test2`: `test 2`,
 				"glob": map[string]interface{}{`test`: `String value`, `number`: 1001},
 				`test3`: func(param int64) string {
 					return fmt.Sprintf("test=%d=test", param)

diff --git a/packages/script/vm.go b/packages/script/vm.go
@@ -567,10 +567,14 @@ func (rt *RunTime) RunCode(block *Block) (status int, err error) {
 					if int(ind) >= len(slice) {
 						slice = append(slice, make([]interface{}, int(ind)-len(slice)+1)...)
 						indexInfo := cmd.Value.(*IndexInfo)
-						for i := len(rt.blocks) - 1; i >= 0; i-- {
-							if indexInfo.Owner == rt.blocks[i].Block {
-								rt.vars[rt.blocks[i].Offset+indexInfo.VarOffset] = slice
-								break
+						if indexInfo.Owner == nil { // Extend variable $varname
+							(*rt.extend)[indexInfo.Extend] = slice
+						} else {
+							for i := len(rt.blocks) - 1; i >= 0; i-- {
+								if indexInfo.Owner == rt.blocks[i].Block {
+									rt.vars[rt.blocks[i].Offset+indexInfo.VarOffset] = slice
+									break
+								}
 							}
 						}
 						rt.stack[size-3] = slice

diff --git a/packages/script/vminit.go b/packages/script/vminit.go
@@ -130,6 +130,7 @@ type VarInfo struct {
 type IndexInfo struct {
 	VarOffset int
 	Owner     *Block
+	Extend    string
 }
 
 // ObjInfo is the common object type