chore(extgen): remove useless constructors

alexandre-daubois · dunglas · commit 34fbfd467b26 · 2025-07-16T12:06:23.000+02:00
diff --git a/internal/extgen/constparser.go b/internal/extgen/constparser.go
@@ -13,19 +13,7 @@ var constRegex = regexp.MustCompile(`//\s*export_php:const$`)
 var classConstRegex = regexp.MustCompile(`//\s*export_php:classconst\s+(\w+)$`)
 var constDeclRegex = regexp.MustCompile(`const\s+(\w+)\s*=\s*(.+)`)
 
-type ConstantParser struct {
-	constRegex      *regexp.Regexp
-	classConstRegex *regexp.Regexp
-	constDeclRegex  *regexp.Regexp
-}
-
-func NewConstantParserWithDefRegex() *ConstantParser {
-	return &ConstantParser{
-		constRegex:      constRegex,
-		classConstRegex: classConstRegex,
-		constDeclRegex:  constDeclRegex,
-	}
-}
+type ConstantParser struct{}
 
 func (cp *ConstantParser) parse(filename string) (constants []phpConstant, err error) {
 	file, err := os.Open(filename)
@@ -51,15 +39,15 @@ func (cp *ConstantParser) parse(filename string) (constants []phpConstant, err e
 		lineNumber++
 		line := strings.TrimSpace(scanner.Text())
 
-		if cp.constRegex.MatchString(line) {
+		if constRegex.MatchString(line) {
 			expectConstDecl = true
 			expectClassConstDecl = false
 			currentClassName = ""
 
 			continue
 		}
 
-		if matches := cp.classConstRegex.FindStringSubmatch(line); len(matches) == 2 {
+		if matches := classConstRegex.FindStringSubmatch(line); len(matches) == 2 {
 			expectClassConstDecl = true
 			expectConstDecl = false
 			currentClassName = matches[1]
@@ -68,7 +56,7 @@ func (cp *ConstantParser) parse(filename string) (constants []phpConstant, err e
 		}
 
 		if (expectConstDecl || expectClassConstDecl) && strings.HasPrefix(line, "const ") {
-			matches := cp.constDeclRegex.FindStringSubmatch(line)
+			matches := constDeclRegex.FindStringSubmatch(line)
 			if len(matches) == 3 {
 				name := matches[1]
 				value := strings.TrimSpace(matches[2])
diff --git a/internal/extgen/constparser_test.go b/internal/extgen/constparser_test.go
@@ -134,7 +134,7 @@ const FalseConstant = false`,
 			tmpFile := filepath.Join(tmpDir, tt.name+".go")
 			require.NoError(t, os.WriteFile(tmpFile, []byte(tt.input), 0644))
 
-			parser := NewConstantParserWithDefRegex()
+			parser := &ConstantParser{}
 			constants, err := parser.parse(tmpFile)
 			assert.NoError(t, err, "parse() error")
 
@@ -200,7 +200,7 @@ const InvalidSyntax`,
 			tmpFile := filepath.Join(tmpDir, tt.name+".go")
 			require.NoError(t, os.WriteFile(tmpFile, []byte(tt.input), 0644))
 
-			parser := NewConstantParserWithDefRegex()
+			parser := &ConstantParser{}
 			_, err := parser.parse(tmpFile)
 			require.NotNil(t, err)
 
@@ -231,7 +231,7 @@ const ThirdIota = iota`
 	fileName := filepath.Join(tmpDir, "test.go")
 	require.NoError(t, os.WriteFile(fileName, []byte(input), 0644))
 
-	parser := NewConstantParserWithDefRegex()
+	parser := &ConstantParser{}
 	constants, err := parser.parse(fileName)
 	assert.NoError(t, err, "parse() error")
 
@@ -343,7 +343,7 @@ const INVALID = "missing class name"`,
 			tmpFile := filepath.Join(tmpDir, tt.name+".go")
 			require.NoError(t, os.WriteFile(tmpFile, []byte(tt.input), 0644))
 
-			parser := NewConstantParserWithDefRegex()
+			parser := &ConstantParser{}
 			constants, err := parser.parse(tmpFile)
 			assert.NoError(t, err, "parse() error")
 
@@ -379,8 +379,6 @@ const INVALID = "missing class name"`,
 }
 
 func TestConstantParserRegexMatch(t *testing.T) {
-	parser := NewConstantParserWithDefRegex()
-
 	testCases := []struct {
 		line     string
 		expected bool
@@ -397,15 +395,13 @@ func TestConstantParserRegexMatch(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.line, func(t *testing.T) {
-			matches := parser.constRegex.MatchString(tc.line)
+			matches := constRegex.MatchString(tc.line)
 			assert.Equal(t, tc.expected, matches, "Expected regex match for line '%s'", tc.line)
 		})
 	}
 }
 
 func TestConstantParserClassConstRegex(t *testing.T) {
-	parser := NewConstantParserWithDefRegex()
-
 	testCases := []struct {
 		line        string
 		shouldMatch bool
@@ -425,7 +421,7 @@ func TestConstantParserClassConstRegex(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.line, func(t *testing.T) {
-			matches := parser.classConstRegex.FindStringSubmatch(tc.line)
+			matches := classConstRegex.FindStringSubmatch(tc.line)
 
 			if tc.shouldMatch {
 				assert.Len(t, matches, 2, "Expected 2 matches for line '%s'", tc.line)
@@ -441,8 +437,6 @@ func TestConstantParserClassConstRegex(t *testing.T) {
 }
 
 func TestConstantParserDeclRegex(t *testing.T) {
-	parser := NewConstantParserWithDefRegex()
-
 	testCases := []struct {
 		line        string
 		shouldMatch bool
@@ -462,7 +456,7 @@ func TestConstantParserDeclRegex(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.line, func(t *testing.T) {
-			matches := parser.constDeclRegex.FindStringSubmatch(tc.line)
+			matches := constDeclRegex.FindStringSubmatch(tc.line)
 
 			if tc.shouldMatch {
 				assert.Len(t, matches, 3, "Expected 3 matches for line '%s'", tc.line)
diff --git a/internal/extgen/funcparser.go b/internal/extgen/funcparser.go
@@ -12,15 +12,7 @@ var phpFuncRegex = regexp.MustCompile(`//\s*export_php:function\s+([^{}\n]+)(?:\
 var signatureRegex = regexp.MustCompile(`(\w+)\s*\(([^)]*)\)\s*:\s*(\??[\w|]+)`)
 var typeNameRegex = regexp.MustCompile(`(\??[\w|]+)\s+\$?(\w+)`)
 
-type FuncParser struct {
-	phpFuncRegex *regexp.Regexp
-}
-
-func NewFuncParserDefRegex() *FuncParser {
-	return &FuncParser{
-		phpFuncRegex: phpFuncRegex,
-	}
-}
+type FuncParser struct{}
 
 func (fp *FuncParser) parse(filename string) (functions []phpFunction, err error) {
 	file, err := os.Open(filename)
@@ -43,7 +35,7 @@ func (fp *FuncParser) parse(filename string) (functions []phpFunction, err error
 		lineNumber++
 		line := strings.TrimSpace(scanner.Text())
 
-		if matches := fp.phpFuncRegex.FindStringSubmatch(line); matches != nil {
+		if matches := phpFuncRegex.FindStringSubmatch(line); matches != nil {
 			signature := strings.TrimSpace(matches[1])
 			phpFunc, err := fp.parseSignature(signature)
 			if err != nil {
diff --git a/internal/extgen/funcparser_test.go b/internal/extgen/funcparser_test.go
@@ -101,7 +101,7 @@ func someOtherGoName(num int64) int64 {
 			fileName := filepath.Join(tmpDir, tt.name+".go")
 			require.NoError(t, os.WriteFile(fileName, []byte(tt.input), 0644))
 
-			parser := NewFuncParserDefRegex()
+			parser := &FuncParser{}
 			functions, err := parser.parse(fileName)
 			require.NoError(t, err)
 			assert.Len(t, functions, tt.expected, "parse() got wrong number of functions")
@@ -188,7 +188,7 @@ func TestSignatureParsing(t *testing.T) {
 		},
 	}
 
-	parser := NewFuncParserDefRegex()
+	parser := &FuncParser{}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			fn, err := parser.parseSignature(tt.signature)
@@ -270,7 +270,7 @@ func TestParameterParsing(t *testing.T) {
 		},
 	}
 
-	parser := NewFuncParserDefRegex()
+	parser := &FuncParser{}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			param, err := parser.parseParameter(tt.paramStr)
@@ -386,7 +386,7 @@ func voidFunc(message *C.zend_string) {
 			tmpFile := filepath.Join(tmpDir, tt.name+".go")
 			require.NoError(t, os.WriteFile(tmpFile, []byte(tt.input), 0644))
 
-			parser := NewFuncParserDefRegex()
+			parser := &FuncParser{}
 			functions, err := parser.parse(tmpFile)
 			require.NoError(t, err)
 
@@ -476,7 +476,7 @@ func validFloat(value float64) float64 {
 			fileName := filepath.Join(tmpDir, tt.name+".go")
 			require.NoError(t, os.WriteFile(fileName, []byte(tt.input), 0644))
 
-			parser := NewFuncParserDefRegex()
+			parser := &FuncParser{}
 			functions, err := parser.parse(fileName)
 			require.NoError(t, err)
 
diff --git a/internal/extgen/parser.go b/internal/extgen/parser.go
@@ -4,7 +4,7 @@ type SourceParser struct{}
 
 // EXPERIMENTAL
 func (p *SourceParser) ParseFunctions(filename string) ([]phpFunction, error) {
-	functionParser := NewFuncParserDefRegex()
+	functionParser := &FuncParser{}
 	return functionParser.parse(filename)
 }
 
@@ -16,7 +16,7 @@ func (p *SourceParser) ParseClasses(filename string) ([]phpClass, error) {
 
 // EXPERIMENTAL
 func (p *SourceParser) ParseConstants(filename string) ([]phpConstant, error) {
-	constantParser := NewConstantParserWithDefRegex()
+	constantParser := &ConstantParser{}
 	return constantParser.parse(filename)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ type SourceParser struct{}`
`4`	`4`
`5`	`5`	`// EXPERIMENTAL`
`6`	`6`	`func (p *SourceParser) ParseFunctions(filename string) ([]phpFunction, error) {`
`7`		`- functionParser := NewFuncParserDefRegex()`
	`7`	`+ functionParser := &FuncParser{}`
`8`	`8`	`return functionParser.parse(filename)`
`9`	`9`	`}`
`10`	`10`
`@@ -16,7 +16,7 @@ func (p *SourceParser) ParseClasses(filename string) ([]phpClass, error) {`
`16`	`16`
`17`	`17`	`// EXPERIMENTAL`
`18`	`18`	`func (p *SourceParser) ParseConstants(filename string) ([]phpConstant, error) {`
`19`		`- constantParser := NewConstantParserWithDefRegex()`
	`19`	`+ constantParser := &ConstantParser{}`
`20`	`20`	`return constantParser.parse(filename)`
`21`	`21`	`}`
`22`	`22`