From e4d40be6344d2d6dcf81e7234fb691bb6e70282b Mon Sep 17 00:00:00 2001
From: fy <fy0748@gmail.com>
Date: Sat, 7 Sep 2024 15:48:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=A7=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E9=AA=B0=E9=9D=A2=E6=A6=82=E7=8E=87=E5=81=8F=E7=A7=BB?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98;=20imp:=20=E8=AE=A1=E7=AE=97=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=8E=B0=E5=9C=A8=E8=83=BD=E8=8E=B7=E5=8F=96=E5=88=B0?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E7=9A=84=E4=B8=AD=E9=97=B4=E8=BF=87=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parser.go      | 39 ++++++++++++++++++++++++++++-----------
 roll.peg       |  8 ++++----
 roll.peg.go    |  8 ++++----
 roll_func.go   | 27 ++++++++++++++++++++++-----
 rollvm.go      |  4 +++-
 rollvm_test.go |  6 ++++--
 types.go       | 16 ++++++++++++++--
 7 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/parser.go b/parser.go
index 21174aca..f79ff1f0 100644
--- a/parser.go
+++ b/parser.go
@@ -22,8 +22,9 @@ type ParserData struct {
 	}
 	loopLayer int // 当前loop层数
 	codeStack []struct {
-		code  []ByteCode
-		index int
+		code    []ByteCode
+		index   int
+		textPos int
 	}
 }
 
@@ -286,8 +287,21 @@ func (e *ParserData) AddInvoke(paramsNum IntType) {
 	e.WriteCode(typeInvoke, paramsNum)
 }
 
+func fixCodeByOffset(code []ByteCode, offset int) {
+	for index, i := range code {
+		switch i.T {
+		case typeDetailMark:
+			v := i.Value.(BufferSpan)
+			v.Begin -= IntType(offset)
+			v.End -= IntType(offset)
+			code[index].Value = v
+		}
+	}
+}
+
 func (p *ParserData) AddStoreComputed(name string, text string) {
-	code, length := p.CodePop()
+	code, length, offset := p.CodePop()
+	fixCodeByOffset(code, offset)
 	val := NewComputedValRaw(&ComputedData{
 		Expr:      text,
 		code:      code,
@@ -299,7 +313,8 @@ func (p *ParserData) AddStoreComputed(name string, text string) {
 }
 
 func (p *ParserData) AddStoreComputedOnStack(text string) {
-	code, length := p.CodePop()
+	code, length, offset := p.CodePop()
+	fixCodeByOffset(code, offset)
 	val := NewComputedValRaw(&ComputedData{
 		Expr:      text,
 		code:      code,
@@ -310,7 +325,8 @@ func (p *ParserData) AddStoreComputedOnStack(text string) {
 }
 
 func (p *ParserData) AddStoreFunction(name string, paramsReversed []string, text string) {
-	code, length := p.CodePop()
+	code, length, offset := p.CodePop()
+	fixCodeByOffset(code, offset)
 
 	// 翻转一次
 	for i, j := 0, len(paramsReversed)-1; i < j; i, j = i+1, j-1 {
@@ -340,16 +356,17 @@ func (p *ParserData) AddAttrSet(objName string, attr string, isRaw bool) {
 	p.WriteCode(typeAttrSet, attr)
 }
 
-func (p *ParserData) CodePush() {
+func (p *ParserData) CodePush(textPos int) {
 	p.codeStack = append(p.codeStack, struct {
-		code  []ByteCode
-		index int
-	}{code: p.code, index: p.codeIndex})
+		code    []ByteCode
+		index   int
+		textPos int
+	}{code: p.code, index: p.codeIndex, textPos: textPos})
 	p.code = make([]ByteCode, 256)
 	p.codeIndex = 0
 }
 
-func (p *ParserData) CodePop() ([]ByteCode, int) {
+func (p *ParserData) CodePop() ([]ByteCode, int, int) {
 	lastCode, lastIndex := p.code, p.codeIndex
 
 	last := len(p.codeStack) - 1
@@ -357,5 +374,5 @@ func (p *ParserData) CodePop() ([]ByteCode, int) {
 	p.codeStack = p.codeStack[:last]
 	p.code = info.code
 	p.codeIndex = info.index
-	return lastCode, lastIndex
+	return lastCode, lastIndex, info.textPos
 }
diff --git a/roll.peg b/roll.peg
index 1434fe38..7ba12cb6 100644
--- a/roll.peg
+++ b/roll.peg
@@ -120,12 +120,12 @@ stmtIf <- "if" sp1x (exprRoot sp { c.data.AddOp(typeBlockPush); c.data.AddOp(typ
 func_def_params <- '(' sp ')' sp { c.data.CounterPush() }
                  / '(' sp { c.data.CounterPush(); c.data.CounterAdd(1) } id:identifier sp { c.data.NamePush(id.(string)) } (',' sp id2:identifier sp { c.data.NamePush(id2.(string)) } {c.data.CounterAdd(1)} )* ')' sp
 
-stmtFunc <- "func" sp1x id:identifier sp { c.data.NamePush(id.(string)) } func_def_params '{' sp { c.data.CodePush() } exprText:< stmtRoot? > '}' sp
+stmtFunc <- "func" sp1x id:identifier sp { c.data.NamePush(id.(string)) } func_def_params '{' sp { c.data.CodePush(p.pt.offset) } exprText:< stmtRoot? > '}' sp
             {  num := c.data.CounterPop(); arr := []string{}; for i:=IntType(0); i<num; i++ { arr = append(arr, c.data.NamePop()) }; c.data.AddStoreFunction(c.data.NamePop(), arr, exprText.(string)) }
 
 // 赋值
 stmtAssignType1 <- id:identifier sp { c.data.NamePush(id.(string)) } '=' sp exprRoot { c.data.AddStore(c.data.NamePop()) }
-stmtAssignType2 <- '&' id:identifier sp { c.data.NamePush(id.(string)) } '=' sp { c.data.CodePush() } expr:<exprRoot> { c.data.AddStoreComputed(c.data.NamePop(), expr.(string)) }
+stmtAssignType2 <- '&' id:identifier sp { c.data.NamePush(id.(string)) } '=' sp { c.data.CodePush(p.pt.offset) } expr:<exprRoot> { c.data.AddStoreComputed(c.data.NamePop(), expr.(string)) }
 stmtAssignType3 <- '&' id:identifier sp { c.data.NamePush(id.(string)) } '.' id2:identifier sp { c.data.NamePush(id2.(string)) } sp '=' sp exprRoot { attr, objName := c.data.NamePop(), c.data.NamePop(); c.data.AddAttrSet(objName, attr, true) }
 stmtAssignType4 <- "this" sp '.' sp id:identifier sp { c.data.NamePush(id.(string)) } '=' sp exprRoot { c.data.AddStoreLocal(c.data.NamePop()) }
 stmtAssignType5 <- id:identifier sp { c.data.NamePush(id.(string)) } '.' sp id2:identifier sp { c.data.NamePush(id2.(string)) } '=' sp exprRoot { attr, objName := c.data.NamePop(), c.data.NamePop(); c.data.AddAttrSet(objName, attr, false) }
@@ -475,8 +475,8 @@ st_assign <- &(st_name2 sp (':' / '=') sp est) st_name2 sp (':' / '=') sp est {
            / &(st_name2r sp '*' sp (':' / '=') sp est) st_name2r sp '*' sp (':' / '=') sp est { c.data.AddOp(typeStX0) } // 属性*: 4
            / &(st_name2r sp (':' / '=') sp est) st_name2r sp (':' / '=') sp est { c.data.AddStName() } // 属性2: 70
            / &(st_name1r est) st_name1r est { c.data.AddStName() } // 力量60
-           / &('&' st_name2 sp (':' / '=') est) '&' st_name2 sp (':' / '=') sp { c.data.CodePush(); } text:< est > { c.data.AddStoreComputedOnStack(text.(string)); c.data.AddStName() } // &手枪 = 1d4
-           / &('&' st_name2r sp (':' / '=') est) '&' st_name2r sp (':' / '=') sp {c.data.CodePush(); } text:< est > { c.data.AddStoreComputedOnStack(text.(string)); c.data.AddStName() } // &手枪 = 1d4
+           / &('&' st_name2 sp (':' / '=') est) '&' st_name2 sp (':' / '=') sp { c.data.CodePush(p.pt.offset); } text:< est > { c.data.AddStoreComputedOnStack(text.(string)); c.data.AddStName() } // &手枪 = 1d4
+           / &('&' st_name2r sp (':' / '=') est) '&' st_name2r sp (':' / '=') sp { c.data.CodePush(p.pt.offset); } text:< est > { c.data.AddStoreComputedOnStack(text.(string)); c.data.AddStName() } // &手枪 = 1d4
 
 // 第一类:
 // 力量+1d3
diff --git a/roll.peg.go b/roll.peg.go
index 72d5b349..171f3646 100644
--- a/roll.peg.go
+++ b/roll.peg.go
@@ -4401,7 +4401,7 @@ func (p *parser) call_onstmtFunc_2() any {
 func (p *parser) call_onstmtFunc_9() any {
 	stack := p.vstack[len(p.vstack)-1]
 	return (func(c *current, id any) any {
-		c.data.CodePush()
+		c.data.CodePush(p.pt.offset)
 		return nil
 	})(&p.cur, stack["id"])
 }
@@ -4446,7 +4446,7 @@ func (p *parser) call_onstmtAssignType2_2() any {
 func (p *parser) call_onstmtAssignType2_8() any {
 	stack := p.vstack[len(p.vstack)-1]
 	return (func(c *current, id any) any {
-		c.data.CodePush()
+		c.data.CodePush(p.pt.offset)
 		return nil
 	})(&p.cur, stack["id"])
 }
@@ -5689,7 +5689,7 @@ func (p *parser) call_onst_assign_90() any {
 
 func (p *parser) call_onst_assign_99() any {
 	return (func(c *current) any {
-		c.data.CodePush()
+		c.data.CodePush(p.pt.offset)
 		return nil
 	})(&p.cur)
 }
@@ -5705,7 +5705,7 @@ func (p *parser) call_onst_assign_117() any {
 
 func (p *parser) call_onst_assign_121() any {
 	return (func(c *current) any {
-		c.data.CodePush()
+		c.data.CodePush(p.pt.offset)
 		return nil
 	})(&p.cur)
 }
diff --git a/roll_func.go b/roll_func.go
index d2700b5c..379896b1 100644
--- a/roll_func.go
+++ b/roll_func.go
@@ -24,6 +24,14 @@ func Roll(src *rand.PCGSource, dicePoints IntType, mod int) IntType {
 	if dicePoints == 0 {
 		return 0
 	}
+	// 这里判断不了IntType的长度，但编译器会自动优化掉没用的分支
+	if IntTypeSize == 8 && dicePoints > math.MaxInt64-1 {
+		return 0
+	}
+	if IntTypeSize == 4 && dicePoints > math.MaxInt32-1 {
+		return 0
+	}
+
 	if mod == -1 {
 		return 1
 	}
@@ -33,11 +41,20 @@ func Roll(src *rand.PCGSource, dicePoints IntType, mod int) IntType {
 	if src == nil {
 		src = randSource
 	}
-	// js端有bug，如果当前IntType为32位，Int63会得到负数
-	// val := IntType(rand.Int31())%dicePoints + 1
-	// 同样问题也存在于这里，所以需要 &math.MaxInt32
-	val := IntType(src.Uint64()&math.MaxInt32)%dicePoints + 1
-	return val
+
+	v := src.Uint64() // 如果弄32位版本，可以写成 uint32(src.Uint64() >> 32)
+	n := uint64(dicePoints)
+	// 下面这段取整代码来自 golang 的 exp/rand
+	if n&(n-1) == 0 { // n is power of two, can mask
+		return IntType(v&(n-1) + 1)
+	}
+	if v > math.MaxUint64-n { // Fast check.
+		ceiling := math.MaxUint64 - math.MaxUint64%n
+		for v >= ceiling {
+			v = src.Uint64()
+		}
+	}
+	return IntType(v%n + 1)
 }
 
 func wodCheck(e *Context, addLine IntType, pool IntType, points IntType, threshold IntType) bool {
diff --git a/rollvm.go b/rollvm.go
index e34ecf14..21cbdb51 100644
--- a/rollvm.go
+++ b/rollvm.go
@@ -365,7 +365,7 @@ func (ctx *Context) evaluate() {
 	}
 
 	solveDetail := func() {
-		if ctx.subThreadDepth != 0 {
+		if !ctx.forceSolveDetail && ctx.subThreadDepth != 0 {
 			return
 		}
 		sort.Sort(spanByBegin(details))
@@ -1059,6 +1059,8 @@ func (ctx *Context) evaluate() {
 			}
 		}
 	}
+
+	solveDetail()
 }
 
 func (ctx *Context) GetAsmText() string {
diff --git a/rollvm_test.go b/rollvm_test.go
index fc55a21f..b141fae3 100644
--- a/rollvm_test.go
+++ b/rollvm_test.go
@@ -1764,7 +1764,8 @@ func TestDetailTextComputed(t *testing.T) {
 	vm.Attrs.Store("a", NewComputedVal("4d1"))
 	err := vm.Run("a")
 	if assert.NoError(t, err) {
-		assert.Equal(t, "4[a=4d1=4]", vm.GetDetailText())
+		assert.Equal(t, "4[a=4[4d1=1+1+1+1]=4]", vm.GetDetailText())
+		// assert.Equal(t, "4[a=4d1=4]", vm.GetDetailText())
 	}
 }
 
@@ -1773,7 +1774,8 @@ func TestDetailTextComputed2(t *testing.T) {
 	vm.Attrs.Store("a", NewComputedVal("4d(1d1)"))
 	err := vm.Run("a")
 	if assert.NoError(t, err) {
-		assert.Equal(t, "4[a=4d(1d1)=4]", vm.GetDetailText())
+		assert.Equal(t, "4[a=4[4d(1d1)=1+1+1+1,1d1=1]=4]", vm.GetDetailText())
+		// assert.Equal(t, "4[a=4d(1d1)=4]", vm.GetDetailText())
 	}
 }
 
diff --git a/types.go b/types.go
index 1b840e74..41d60745 100644
--- a/types.go
+++ b/types.go
@@ -28,7 +28,8 @@ import (
 )
 
 type VMValueType int
-type IntType int // :IntType
+type IntType int      // :IntType
+const IntTypeSize = 4 // 只能为 4 或 8(32位/64位)
 
 const (
 	VMTypeInt            VMValueType = 0
@@ -159,6 +160,8 @@ type Context struct {
 	IsRunning      bool // 是否正在运行，Run时会置为true，halt时会置为false
 	CustomDiceInfo []*customDiceItem
 
+	forceSolveDetail bool // 一个辅助属性，用于computed时强制获取计算过程
+
 	/** 全局变量 */
 	globalNames *ValueMap
 
@@ -1406,6 +1409,7 @@ func (v *VMValue) ComputedExecute(ctx *Context, detail *BufferSpan) *VMValue {
 	vm.NumOpCount = ctx.NumOpCount + 100
 	ctx.NumOpCount = vm.NumOpCount // 防止无限递归
 	vm.RandSrc = ctx.RandSrc
+	vm.forceSolveDetail = true
 	if ctx.Config.OpCountLimit > 0 && vm.NumOpCount > vm.Config.OpCountLimit {
 		vm.Error = errors.New("允许算力上限")
 		ctx.Error = vm.Error
@@ -1428,8 +1432,15 @@ func (v *VMValue) ComputedExecute(ctx *Context, detail *BufferSpan) *VMValue {
 	}
 
 	var ret *VMValue
+	var detailText string
 	if vm.top != 0 {
 		ret = vm.stack[vm.top-1].Clone()
+		if vm.parser == nil {
+			// 兼容: 如果没有parser填充一个避免报错，不过会占用一些额外的内存
+			vm.parser = &parser{data: []byte(cd.Expr)}
+			vm.parser.pt.offset = len(vm.parser.data)
+		}
+		detailText = vm.makeDetailStr(vm.DetailSpans)
 	} else {
 		ret = NewNullVal()
 	}
@@ -1438,8 +1449,9 @@ func (v *VMValue) ComputedExecute(ctx *Context, detail *BufferSpan) *VMValue {
 	ctx.IsComputedLoaded = true
 
 	if detail != nil {
+		// detail.Expr = cd.Expr
 		detail.Tag = "load.computed"
-		detail.Text = cd.Expr
+		detail.Text = detailText
 	}
 	return ret
 }