Merge pull request #1395 from visualfc/classfile_var

parser: check token var
goplus · Jul 24, 2023 · 013d54e · 013d54e
2 parents 74fdb39 + e6a4ad9
commit 013d54e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/parser/parser.go b/parser/parser.go
@@ -3356,7 +3356,7 @@ func (p *parser) parseValueSpec(doc *ast.CommentGroup, keyword token.Token, iota
 	var typ ast.Expr
 	var tag *ast.BasicLit
 	var values []ast.Expr
-	if p.mode&ParseGoPlusClass != 0 && p.topScope == p.pkgScope && p.varDeclCnt == 1 {
+	if p.mode&ParseGoPlusClass != 0 && p.topScope == p.pkgScope && keyword == token.VAR && p.varDeclCnt == 1 {
 		var starPos token.Pos
 		if p.tok == token.MUL {
 			starPos = p.pos

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -419,6 +419,12 @@ func TestClassErrCode(t *testing.T) {
 	v = 10
 )
 `, `/foo/bar.gopx:2:4: syntax error: cannot assign value to field in class file`, ``)
+	testClassErrCode(t, `
+var (
+)
+const c = 100
+const d
+`, `/foo/bar.gopx:5:7: missing constant value`, ``)
 }
 
 // -----------------------------------------------------------------------------