deploy: a0c5b36

main.go

@@ -4,8 +4,8 @@
 package main
 
 import (
-	"regexp"
-	"strconv"
+	//"regexp"
+	//"strconv"
 
 	"github.com/gopherjs/gopherjs/js"
 	ds "github.com/sealdice/dicescript"
@@ -14,34 +14,34 @@ import (
 var scope = map[string]*ds.VMValue{}
 
 func newVM(name string) *js.Object {
-	player := ds.VMValueNewDict(nil)
-	player.Store("力量", ds.VMValueNewInt(50))
-	player.Store("敏捷", ds.VMValueNewInt(60))
-	player.Store("智力", ds.VMValueNewInt(70))
+	player := ds.NewDictVal(nil)
+	player.Store("力量", ds.NewIntVal(50))
+	player.Store("敏捷", ds.NewIntVal(60))
+	player.Store("智力", ds.NewIntVal(70))
 	scope["player"] = player.V()
 
 	vm := ds.NewVM()
 	//vm.GlobalValueStoreFunc = func(name string, v *ds.VMValue) {
 	//	scope[name] = v
 	//}
 
-	re := regexp.MustCompile(`^_(\D+)(\d+)$`)
-	vm.GlobalValueLoadFunc = func(name string) *ds.VMValue {
-		m := re.FindStringSubmatch(name)
-		if len(m) > 1 {
-			val, _ := strconv.ParseInt(m[2], 10, 64)
-			return ds.VMValueNewInt(ds.IntType(val))
-		}
-
-		if v, exists := player.Load(name); exists {
-			return v
-		}
-
-		if val, ok := scope[name]; ok {
-			return val
-		}
-		return nil
-	}
+	//re := regexp.MustCompile(`^_(\D+)(\d+)$`)
+	//vm.GlobalValueLoadFunc = func(name string) *ds.VMValue {
+	//	m := re.FindStringSubmatch(name)
+	//	if len(m) > 1 {
+	//		val, _ := strconv.ParseInt(m[2], 10, 64)
+	//		return ds.VMValueNewInt(ds.IntType(val))
+	//	}
+	//
+	//	if v, exists := player.Load(name); exists {
+	//		return v
+	//	}
+	//
+	//	if val, ok := scope[name]; ok {
+	//		return val
+	//	}
+	//	return nil
+	//}
 
 	return js.MakeFullWrapper(vm)
 }
@@ -60,17 +60,17 @@ func main() {
 			return js.MakeFullWrapper(&ds.ValueMap{})
 		},
 		"vmNewInt": func(i ds.IntType) *js.Object {
-			return js.MakeFullWrapper(ds.VMValueNewInt(i))
+			return js.MakeFullWrapper(ds.NewIntVal(i))
 		},
 		"vmNewFloat": func(i float64) *js.Object {
-			return js.MakeFullWrapper(ds.VMValueNewFloat(i))
+			return js.MakeFullWrapper(ds.NewFloatVal(i))
 		},
 		"vmNewStr": func(s string) *js.Object {
-			return js.MakeFullWrapper(ds.VMValueNewStr(s))
+			return js.MakeFullWrapper(ds.NewStrVal(s))
 		},
 		//"vmNewArray":    js.MakeWrapper(newArray),
 		"vmNewDict": func() *js.Object {
-			return js.MakeFullWrapper(ds.VMValueNewDict(nil))
+			return js.MakeFullWrapper(ds.NewDictVal(nil))
 		},
 		"help": "此项目的js绑定: https://github.com/sealdice/dice",
 	}