コミット: 40bc805045a363253ecd91cf7e74dae5e1fcb3a7 - ikemen_go (git)

Go で書き直した Ikemen

コミットメタ情報

• リビジョン: 40bc805045a363253ecd91cf7e74dae5e1fcb3a7 (tree)
• 日時: 2019-04-23 22:50:45
• 作者: neatunsou <sisiy4excite@gmai...>
• コミッター: neatunsou

ログメッセージ

Map(連想配列)機能を追加

変更サマリ

• modified: src/bytecode.go
• modified: src/char.go
• modified: src/compiler.go

差分

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -359,6 +359,7 @@ const (
 	OC_ex_timemod
 	OC_ex_majorversion
 	OC_ex_drawpalno
+	OC_ex_maparray
 	OC_ex_gethitvar_animtype
 	OC_ex_gethitvar_airtype
 	OC_ex_gethitvar_groundtype
@@ -1557,6 +1558,9 @@ func (be BytecodeExp) run_ex(c *Char, i *int, oc *Char) {
 		sys.bcStack.PushI(int32(c.gi().ver[0]))
 	case OC_ex_drawpalno:
 		sys.bcStack.PushI(c.gi().drawpalno)
+	case OC_ex_maparray:
+		sys.bcStack.PushI(c.gi().mapArray[sys.stringPool[sys.workingState.playerNo].List[*(*int32)(unsafe.Pointer(&be[*i]))]])
+		*i += 4
 	default:
 		sys.errLog.Printf("%v\n", be[*i-1])
 		c.panic()
@@ -5700,6 +5704,37 @@ func (sc zoom) Run(c *Char, _ []int32) bool {
 	return false
 }
 
+type mapSet StateControllerBase
+
+const (
+	mapSet_mapArray byte = iota
+	mapSet_value
+	mapSet_redirectid
+)
+
+func (sc mapSet) Run(c *Char, _ []int32) bool {
+	crun := c
+	var s string
+	var value int32
+	StateControllerBase(sc).run(c, func(id byte, exp []BytecodeExp) bool {
+		switch id {
+		case mapSet_mapArray:
+			s = string(*(*[]byte)(unsafe.Pointer(&exp[0])))
+		case mapSet_value:
+			value = exp[0].evalI(c)
+		case mapSet_redirectid:
+			if rid := sys.playerID(exp[0].evalI(c)); rid != nil {
+				crun = rid
+			} else {
+				return false
+			}
+		}
+		return true
+	})
+	crun.mapSet(s, value)
+	return false
+}
+
 type StateBytecode struct {
 	stateType StateType
 	moveType  MoveType

--- a/src/char.go
+++ b/src/char.go
@@ -1369,6 +1369,7 @@ type CharGlobalInfo struct {
 	unhittable       int32
 	quotes           [MaxQuotes]string
 	portraitscale    float32
+	mapArray         map[string]int32
 }
 
 func (cgi *CharGlobalInfo) clearPCTime() {
@@ -1636,13 +1637,14 @@ func (c *Char) load(def string) error {
 	for i := range gi.palkeymap {
 		gi.palkeymap[i] = int32(i)
 	}
+	gi.mapArray = make(map[string]int32)
 	str, err := LoadText(def)
 	if err != nil {
 		return err
 	}
 	lines, i := SplitAndTrim(str, "\n"), 0
 	cns, sprite, anim, sound := "", "", "", ""
-	info, files, keymap := true, true, true
+	info, files, keymap, mapArray := true, true, true, true
 	c.localcoord = 320
 	c.localscl = 1
 	for i < len(lines) {
@@ -1689,6 +1691,15 @@ func (c *Char) load(def string) error {
 					}
 				}
 			}
+		case "map":
+			if mapArray {
+				mapArray = false
+				for key, value := range is {
+					keylow := strings.ToLower(key)
+					intValue := Atoi(value)
+					gi.mapArray[keylow] = intValue
+				}
+			}
 		}
 	}
 	if err := LoadFile(&cns, def, func(filename string) error {
@@ -3812,6 +3823,13 @@ func (c *Char) forceRemapPal(pfx *PalFX, dst [2]int32) {
 		pfx.remap[i] = di
 	}
 }
+func (c *Char) mapSet(s string, Value int32) {
+	if s == "" {
+		return
+	}
+	key := strings.ToLower(s)
+	c.gi().mapArray[key] = Value
+}
 func (c *Char) inGuardState() bool {
 	return c.ss.no == 120 || (c.ss.no >= 130 && c.ss.no <= 132) ||
 		c.ss.no == 140 || (c.ss.no >= 150 && c.ss.no <= 155)

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -124,6 +124,7 @@ func newCompiler() *Compiler {
 		"offset":             c.offset,
 		"victoryquote":       c.victoryQuote,
 		"zoom":               c.zoom,
+		"mapset":             c.mapSet,
 		"forcefeedback":      c.null,
 		"null":               c.null,
 	}
@@ -2022,6 +2023,17 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 		out.append(OC_ex_, OC_ex_majorversion)
 	case "drawpalno":
 		out.append(OC_ex_, OC_ex_drawpalno)
+	case "map":
+		if err := c.kakkohiraku(in); err != nil {
+			return bvNone(), err
+		}
+		out.append(OC_ex_)
+		out.appendI32Op(OC_ex_maparray, int32(sys.stringPool[c.playerNo].Add(
+			strings.ToLower(c.token))))
+		c.token = c.tokenizer(in)
+		if err := c.kakkotojiru(); err != nil {
+			return bvNone(), err
+		}
 	case "=", "!=", ">", ">=", "<", "<=", "&", "&&", "^", "^^", "|", "||",
 		"+", "*", "**", "/", "%":
 		if !sys.ignoreMostErrors || len(c.maeOp) > 0 {
@@ -6204,6 +6216,32 @@ func (c *Compiler) zoom(is IniSection, sc *StateControllerBase,
 	})
 	return *ret, err
 }
+
+func (c *Compiler) mapSet(is IniSection, sc *StateControllerBase,
+	_ int8) (StateController, error) {
+	ret, err := (*mapSet)(sc), c.stateSec(is, func() error {
+		if err := c.paramValue(is, sc, "redirectid",
+			mapSet_redirectid, VT_Int, 1, false); err != nil {
+			return err
+		}
+		if err := c.stateParam(is, "map", func(data string) error {
+			if len(data) < 2 || data[0] != '"' || data[len(data)-1] != '"' {
+				return Error("\"で囲まれていません")
+			}
+			sc.add(mapSet_mapArray, sc.beToExp(BytecodeExp(data[1:len(data)-1])))
+			return nil
+		}); err != nil {
+			return err
+		}
+		if err := c.paramValue(is, sc, "value",
+			mapSet_value, VT_Int, 1, false); err != nil {
+			return err
+		}
+		return nil
+	})
+	return *ret, err
+}
+
 func (c *Compiler) null(is IniSection, sc *StateControllerBase,
 	_ int8) (StateController, error) {
 	return nullStateController, nil