extract declaration parameter and property helpers

Author: mgomes

docs/architecture.md

@@ -74,7 +74,8 @@ Key files:
 - `vibes/parser_block_literals.go` (block literals, block params, and typed union param parsing)
 - `vibes/parser_statements.go` (statement dispatch + return/raise/block parsing)
 - `vibes/parser_expression_statements.go` (expression/assert/assignment statement parsing)
-- `vibes/parser_declarations.go` (function/class/property declaration parsing)
+- `vibes/parser_declarations.go` (function/class declaration parsing)
+- `vibes/parser_declaration_helpers.go` (parameter list and property declaration parsing)
 - `vibes/parser_control.go` (if/loop/begin-rescue-ensure parsing)
 - `vibes/parser_precedence.go` (precedence table + assignable-expression helpers)
 - `vibes/parser_types.go` (type-expression parsing)

vibes/parser_declaration_helpers.go

@@ -0,0 +1,57 @@
+package vibes
+
+import "strings"
+
+func (p *parser) parseParams() []Param {
+	params := []Param{}
+	for {
+		if p.curToken.Type != tokenIdent && p.curToken.Type != tokenIvar {
+			p.errorExpected(p.curToken, "parameter name")
+			return params
+		}
+		param := Param{Name: p.curToken.Literal}
+		if p.curToken.Type == tokenIvar {
+			param.IsIvar = true
+			param.Name = strings.TrimPrefix(param.Name, "@")
+		}
+		if p.peekToken.Type == tokenColon {
+			p.nextToken()
+			p.nextToken()
+			param.Type = p.parseTypeExpr()
+			if param.Type == nil {
+				return params
+			}
+		}
+		if p.peekToken.Type == tokenAssign {
+			p.nextToken()
+			p.nextToken()
+			param.DefaultVal = p.parseExpression(lowestPrec)
+		}
+		params = append(params, param)
+		if p.peekToken.Type != tokenComma {
+			break
+		}
+		p.nextToken()
+		p.nextToken()
+	}
+	return params
+}
+
+func (p *parser) parsePropertyDecl(kind TokenType) PropertyDecl {
+	pos := p.curToken.Pos
+	names := []string{}
+	p.nextToken()
+	if p.curToken.Type == tokenIdent {
+		names = append(names, p.curToken.Literal)
+		for p.peekToken.Type == tokenComma {
+			p.nextToken()
+			p.nextToken()
+			if p.curToken.Type != tokenIdent {
+				p.errorExpected(p.curToken, "property name")
+				break
+			}
+			names = append(names, p.curToken.Literal)
+		}
+	}
+	return PropertyDecl{Names: names, Kind: strings.ToLower(string(kind)), position: pos}
+}

vibes/parser_declarations.go

@@ -1,7 +1,5 @@
 package vibes
 
-import "strings"
-
 func (p *parser) parseFunctionStatement() Statement {
 	pos := p.curToken.Pos
 	p.nextToken()
@@ -132,41 +130,6 @@ func (p *parser) parsePrivateStatement() Statement {
 	return fn
 }
 
-func (p *parser) parseParams() []Param {
-	params := []Param{}
-	for {
-		if p.curToken.Type != tokenIdent && p.curToken.Type != tokenIvar {
-			p.errorExpected(p.curToken, "parameter name")
-			return params
-		}
-		param := Param{Name: p.curToken.Literal}
-		if p.curToken.Type == tokenIvar {
-			param.IsIvar = true
-			param.Name = strings.TrimPrefix(param.Name, "@")
-		}
-		if p.peekToken.Type == tokenColon {
-			p.nextToken()
-			p.nextToken()
-			param.Type = p.parseTypeExpr()
-			if param.Type == nil {
-				return params
-			}
-		}
-		if p.peekToken.Type == tokenAssign {
-			p.nextToken()
-			p.nextToken()
-			param.DefaultVal = p.parseExpression(lowestPrec)
-		}
-		params = append(params, param)
-		if p.peekToken.Type != tokenComma {
-			break
-		}
-		p.nextToken()
-		p.nextToken()
-	}
-	return params
-}
-
 func (p *parser) parseClassStatement() Statement {
 	pos := p.curToken.Pos
 	if !p.expectPeek(tokenIdent) {
@@ -230,22 +193,3 @@ func (p *parser) parseClassStatement() Statement {
 
 	return stmt
 }
-
-func (p *parser) parsePropertyDecl(kind TokenType) PropertyDecl {
-	pos := p.curToken.Pos
-	names := []string{}
-	p.nextToken()
-	if p.curToken.Type == tokenIdent {
-		names = append(names, p.curToken.Literal)
-		for p.peekToken.Type == tokenComma {
-			p.nextToken()
-			p.nextToken()
-			if p.curToken.Type != tokenIdent {
-				p.errorExpected(p.curToken, "property name")
-				break
-			}
-			names = append(names, p.curToken.Literal)
-		}
-	}
-	return PropertyDecl{Names: names, Kind: strings.ToLower(string(kind)), position: pos}
-}