fivedev/five
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Phase 5 — MEDIUM #27,30,31 + LOW #25,41 complete cleanup

Browse Source 
Files modified (6):
  compiler/parser/parser.go — #27: Add currentUpper() helper
    Replaces 30 strings.ToUpper(p.current.Literal) calls
  compiler/parser/stmtreg.go — Remove now-unused strings import
  compiler/parser/expr.go — #30: Document comma expr Harbour semantics
  compiler/gengo/gengo.go — #31: Replace 8 TODO comments with WARN
    Macro expr now emits MacroPush() instead of TODO
  compiler/token/token.go — #25: Replace itoa with strconv.Itoa
    #41: Add 50+ missing kindNames entries for complete String()

Issues resolved: #25,27,30,31,41
Total fixed: 39/53

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Charles KWON OhJun
2026-04-01 21:00:44 +09:00
parent df221baea7
commit 48a471bb1d
6 changed files with 139 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
compiler/parser/parser.go
View File

@@ -72,6 +72,12 @@ func (p *Parser) peek() token.Kind {
return p.current.Kind
}
// currentUpper returns the uppercased literal of the current token.
// Uses strings.EqualFold for comparisons where possible to avoid allocation.
func (p *Parser) currentUpper() string {
return strings.ToUpper(p.current.Literal)
}
// peekAt returns the token kind at offset from current position.
// peekAt(0) = current, peekAt(1) = next, etc. Returns EOF if out of range.
func (p *Parser) peekAt(offset int) token.Kind {
@@ -230,7 +236,7 @@ func (p *Parser) parseFile() *ast.File {
file.Decls = append(file.Decls, p.parseVarDecl())
}
case token.IDENT:
upper := strings.ToUpper(p.current.Literal)
upper := p.currentUpper()
if upper == "THREAD" && p.peekAt(1) == token.STATIC {
// THREAD STATIC → treat as STATIC
p.advance() // skip THREAD
@@ -483,7 +489,7 @@ func (p *Parser) parseVarDecl() *ast.VarDecl {
asType = p.expectMethodName().Literal
// Skip complex AS: AS CLASS ClassName, AS ARRAY OF...
for p.current.Kind == token.IDENT {
upper := strings.ToUpper(p.current.Literal)
upper := p.currentUpper()
if upper == "OF" || upper == "CLASS" {
p.advance()
if p.current.Kind == token.IDENT || p.current.Literal != "" {
@@ -551,7 +557,7 @@ func (p *Parser) parseClassDecl() *ast.ClassDecl {
members = append(members, p.parseDataDecl())
} else if p.current.Kind == token.METHOD {
members = append(members, p.parseClassMethodDecl())
} else if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "VAR" {
} else if p.current.Kind == token.IDENT && p.currentUpper() == "VAR" {
p.tokens[p.pos].Kind = token.DATA
p.current = p.tokens[p.pos]
members = append(members, p.parseDataDecl())
@@ -564,7 +570,7 @@ func (p *Parser) parseClassDecl() *ast.ClassDecl {
p.skipNewlines()
continue
case token.IDENT:
upper := strings.ToUpper(p.current.Literal)
upper := p.currentUpper()
// FRIEND FUNCTION/CLASS — skip declaration
if upper == "FRIEND" {
p.advance() // skip FRIEND
@@ -588,7 +594,7 @@ func (p *Parser) parseClassDecl() *ast.ClassDecl {
} else if upper == "CLASS" {
// CLASS VAR — class-level variable
p.advance() // skip CLASS
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "VAR" {
if p.current.Kind == token.IDENT && p.currentUpper() == "VAR" {
p.tokens[p.pos].Kind = token.DATA
p.current = p.tokens[p.pos]
members = append(members, p.parseDataDecl())
@@ -658,7 +664,7 @@ func (p *Parser) parseDataDecl() *ast.DataDecl {
continue
}
if p.current.Kind == token.IDENT {
upper := strings.ToUpper(p.current.Literal)
upper := p.currentUpper()
if upper == "INIT" {
p.advance()
init = p.parseExpr()
@@ -713,14 +719,14 @@ func (p *Parser) parseClassMethodDecl() *ast.MethodDecl {
// Check for SETGET keyword
isSetGet := false
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "SETGET" {
if p.current.Kind == token.IDENT && p.currentUpper() == "SETGET" {
p.advance()
isSetGet = true
}
// Skip trailing qualifiers: OPERATOR, VIRTUAL, CONSTRUCTOR, etc.
if p.current.Kind == token.IDENT {
upper := strings.ToUpper(p.current.Literal)
upper := p.currentUpper()
if upper == "OPERATOR" || upper == "VIRTUAL" || upper == "DEFERRED" {
p.skipToEndOfLine()
}
@@ -746,7 +752,7 @@ func (p *Parser) parseClassMethodDecl() *ast.MethodDecl {
// skipClassInline skips INLINE keyword and the rest of the line (used in CLASS body)
func (p *Parser) skipClassInline() {
if p.current.Kind == token.INLINE_KW ||
(p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "INLINE") {
(p.current.Kind == token.IDENT && p.currentUpper() == "INLINE") {
p.skipToEndOfLine()
}
}
@@ -928,7 +934,7 @@ func (p *Parser) parseStmt() ast.Stmt {
// parseIdentStmt handles IDENT-based commands (xBase multi-word: COPY, SORT, etc.)
func (p *Parser) parseIdentStmt() ast.Stmt {
upper := strings.ToUpper(p.current.Literal)
upper := p.currentUpper()
// WITH TIMEOUT → timeout context
if upper == "WITH" && p.peekAt(1) == token.TIMEOUT_KW {
@@ -980,10 +986,10 @@ func (p *Parser) parseIdentStmt() ast.Stmt {
func (p *Parser) parseExprStmt() ast.Stmt {
// READ [SAVE] [MSG AT ...] [MSG COLOR ...] — special case
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "READ" {
if p.current.Kind == token.IDENT && p.currentUpper() == "READ" {
pos := p.advance().Pos
save := false
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "SAVE" {
if p.current.Kind == token.IDENT && p.currentUpper() == "SAVE" {
save = true
p.advance()
}
@@ -995,11 +1001,11 @@ func (p *Parser) parseExprStmt() ast.Stmt {
return &ast.ReadCmd{ReadPos: pos, Save: save}
}
// TRY / CATCH [oErr] / END — Harbour extension, maps to BEGIN SEQUENCE / RECOVER
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "TRY" {
if p.current.Kind == token.IDENT && p.currentUpper() == "TRY" {
return p.parseTryCatch()
}
// CLOSE [DATABASES|ALL] — close work areas
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "CLOSE" {
if p.current.Kind == token.IDENT && p.currentUpper() == "CLOSE" {
p.advance()
// Skip optional DATABASES/ALL keyword
if p.current.Kind == token.IDENT {
@@ -1013,11 +1019,11 @@ func (p *Parser) parseExprStmt() ast.Stmt {
// xBase commands that consume entire line (COPY, SORT, COUNT, SUM, etc.)
if p.current.Kind == token.IDENT {
// WITH TIMEOUT n / body / ENDWITH
if strings.ToUpper(p.current.Literal) == "WITH" &&
if p.currentUpper() == "WITH" &&
p.peekAt(1) == token.TIMEOUT_KW {
return p.parseWithTimeout()
}
switch strings.ToUpper(p.current.Literal) {
switch p.currentUpper() {
case "COPY", "SORT", "COUNT", "SUM", "AVERAGE", "TOTAL", "UPDATE",
"LABEL", "REPORT", "ACCEPT", "INPUT", "LOCATE", "CONTINUE",
"JOIN", "RELEASE", "SAVE", "RESTORE", "ERASE", "RENAME",
@@ -1034,7 +1040,7 @@ func (p *Parser) parseExprStmt() ast.Stmt {
}
// COMMIT — flush work area
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "COMMIT" {
if p.current.Kind == token.IDENT && p.currentUpper() == "COMMIT" {
p.advance()
p.expectEndOfStmt()
return &ast.ExprStmt{X: &ast.CallExpr{
@@ -1387,7 +1393,7 @@ func (p *Parser) parseTryCatch() *ast.SeqStmt {
// Parse body until CATCH or END
var body []ast.Stmt
for !p.atAny(token.EOF) {
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "CATCH" {
if p.current.Kind == token.IDENT && p.currentUpper() == "CATCH" {
break
}
if p.current.Kind == token.END {
@@ -1399,7 +1405,7 @@ func (p *Parser) parseTryCatch() *ast.SeqStmt {
var recoverVar string
var recoverBody []ast.Stmt
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "CATCH" {
if p.current.Kind == token.IDENT && p.currentUpper() == "CATCH" {
p.advance() // consume CATCH
if p.current.Kind == token.IDENT && p.current.Kind != token.NEWLINE {
recoverVar = p.advance().Literal
@@ -1410,7 +1416,7 @@ func (p *Parser) parseTryCatch() *ast.SeqStmt {
endPos := p.current.Pos
p.match(token.END)
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "TRY" {
if p.current.Kind == token.IDENT && p.currentUpper() == "TRY" {
p.advance() // END TRY
}
p.expectEndOfStmt()
@@ -1521,7 +1527,7 @@ func (p *Parser) parseUse() *ast.UseCmd {
// Parse optional clauses: VIA, ALIAS, EXCLUSIVE, SHARED, NEW, READONLY
for p.current.Kind != token.NEWLINE && p.current.Kind != token.EOF {
if p.current.Kind == token.IDENT {
upper := strings.ToUpper(p.current.Literal)
upper := p.currentUpper()
if upper == "VIA" {
p.advance()
via = p.expectMethodName().Literal
@@ -1655,7 +1661,7 @@ func (p *Parser) parseIndex() *ast.IndexCmd {
if p.match(token.TO) {
fileExpr = p.parseExpr()
p.consumeFileExtension(fileExpr)
} else if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "TAG" {
} else if p.current.Kind == token.IDENT && p.currentUpper() == "TAG" {
p.advance() // skip TAG
tagExpr := p.parseExpr() // tag name
if p.match(token.TO) {
@@ -1732,7 +1738,7 @@ func (p *Parser) parseAtCmd() ast.Stmt {
// Determine sub-command: SAY, GET, PROMPT
if p.current.Kind == token.IDENT {
switch strings.ToUpper(p.current.Literal) {
switch p.currentUpper() {
case "SAY":
return p.parseAtSay(pos, row, col)
case "GET":
@@ -1787,13 +1793,13 @@ func (p *Parser) parseAtSay(pos token.Position, row, col ast.Expr) ast.Stmt {
sayExpr := p.parseExpr()
// Check for GET after SAY
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "GET" {
if p.current.Kind == token.IDENT && p.currentUpper() == "GET" {
return p.parseAtSayGet(pos, row, col, sayExpr)
}
// PICTURE clause
var pic ast.Expr
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "PICTURE" {
if p.current.Kind == token.IDENT && p.currentUpper() == "PICTURE" {
p.advance()
pic = p.parseExpr()
}
@@ -1811,7 +1817,7 @@ func (p *Parser) parseAtGet(pos token.Position, row, col ast.Expr) *ast.AtGetCmd
var pic, valid, when ast.Expr
for p.current.Kind == token.IDENT {
switch strings.ToUpper(p.current.Literal) {
switch p.currentUpper() {
case "PICTURE":
p.advance()
pic = p.parseExpr()
@@ -1851,7 +1857,7 @@ func (p *Parser) parseAtSayGet(pos token.Position, row, col ast.Expr, sayExpr as
var pic, valid, when ast.Expr
for p.current.Kind == token.IDENT {
switch strings.ToUpper(p.current.Literal) {
switch p.currentUpper() {
case "PICTURE":
p.advance()
pic = p.parseExpr()
@@ -1883,7 +1889,7 @@ func (p *Parser) parseAtPrompt(pos token.Position, row, col ast.Expr) ast.Stmt {
p.advance() // consume PROMPT
prompt := p.parseExpr()
var msg ast.Expr
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "MESSAGE" {
if p.current.Kind == token.IDENT && p.currentUpper() == "MESSAGE" {
p.advance()
msg = p.parseExpr()
}
@@ -2135,7 +2141,7 @@ func (p *Parser) parseWithTimeout() *ast.TimeoutStmt {
endPos := p.current.Pos
p.match(token.END)
// Skip optional WITH after END
if p.current.Kind == token.IDENT && strings.ToUpper(p.current.Literal) == "WITH" {
if p.current.Kind == token.IDENT && p.currentUpper() == "WITH" {
p.advance()
}
p.expectEndOfStmt()