fix: 修正不允许注释夹空行的问题

.github/workflows/test_and_lint.yml

@@ -37,7 +37,8 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: stable
+          go-version: '1.18'
+
       - run: go install github.com/pointlander/[email protected]
       - run: peg -switch -inline roll.peg
       - run: go mod tidy
@@ -51,7 +52,7 @@ jobs:
         if: github.event.name == 'pull_request'
         with:
           go-version: '1.18'
-          version: 'v1.51.2'
+          version: 'v1.57.2'
           args: '--timeout 9999s'
           only-new-issues: true
           skip-pkg-cache: true

jsport/main.go

@@ -4,10 +4,10 @@
 package main
 
 import (
-	"github.com/gopherjs/gopherjs/js"
 	"regexp"
 	"strconv"
 
+	"github.com/gopherjs/gopherjs/js"
 	ds "github.com/sealdice/dicescript"
 )
 

jsport/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dicescript",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Simple script language for TRPG dice engine.",
   "module": "./dist/main.mjs",
   "type": "module",

roll.peg

@@ -28,7 +28,7 @@ stmtRoot <- stmtLines sp // stmtLines
 
 stmtLines <- &{!p.Config.DisableStmts} stmtWithBlock stmtLines?
            / flagsSwitch stmtLines?
-           / comment stmtLines?
+           / comment sp stmtLines?
            / stmtWithSemicolon nextLine?
            / (';' sp)+ stmtLines?
 

rollvm_test.go

@@ -1093,6 +1093,20 @@ func TestComment(t *testing.T) {
 	}
 }
 
+func TestComment2(t *testing.T) {
+	// 发现注释间无法空行，予以修复
+	vm := NewVM()
+	err := vm.Run(`
+//c1
+
+   
+//c2
+a = 1; a`)
+	assert.NoError(t, err)
+	assert.Equal(t, vm.RestInput, "")
+	assert.True(t, valueEqual(vm.Ret, ni(1)))
+}
+
 func TestDiceAndSpaceBug(t *testing.T) {
 	// 一个错误的代码逻辑: 部分算符后需要跟sp1，导致f +1可以工作，但f+1不行
 	// 但也不能让 f1 被解析为f，剩余文本1