Remove the literal string by replacing with the const variable (AfterShip#116)

Author: git-hulk

parser/lexer.go

@@ -9,21 +9,21 @@ import (
 )
 
 const (
-	TokenKindEOF      TokenKind = "<eof>"
-	TokenKindIdent    TokenKind = "<ident>"
-	TokenKindKeyword  TokenKind = "<keyword>"
-	TokenKindInt      TokenKind = "<int>"
-	TokenKindFloat    TokenKind = "<float>"
-	TokenKindString   TokenKind = "<string>"
-	TokenKindDot                = "."
-	TokenKindSingleEQ TokenKind = "="
-	TokenKindDoubleEQ TokenKind = "=="
-	TokenKindNE       TokenKind = "!="
-	TokenKindLT       TokenKind = "<"
-	TokenKindLE       TokenKind = "<="
-	TokenKindGT       TokenKind = ">"
-	TokenKindGE       TokenKind = ">="
-	TokenKindQuery              = "?"
+	TokenKindEOF          TokenKind = "<eof>"
+	TokenKindIdent        TokenKind = "<ident>"
+	TokenKindKeyword      TokenKind = "<keyword>"
+	TokenKindInt          TokenKind = "<int>"
+	TokenKindFloat        TokenKind = "<float>"
+	TokenKindString       TokenKind = "<string>"
+	TokenKindDot                    = "."
+	TokenKindSingleEQ     TokenKind = "="
+	TokenKindDoubleEQ     TokenKind = "=="
+	TokenKindNE           TokenKind = "!="
+	TokenKindLT           TokenKind = "<"
+	TokenKindLE           TokenKind = "<="
+	TokenKindGT           TokenKind = ">"
+	TokenKindGE           TokenKind = ">="
+	TokenKindQuestionMark TokenKind = "?"
 
 	TokenKindPlus  TokenKind = "+"
 	TokenKindMinus TokenKind = "-"
@@ -33,6 +33,17 @@ const (
 
 	TokenKindArrow TokenKind = "->"
 	TokenKindDash  TokenKind = "::"
+
+	TokenKindLParen   TokenKind = "("
+	TokenKindRParen   TokenKind = ")"
+	TokenKindLBrace   TokenKind = "{"
+	TokenKindRBrace   TokenKind = "}"
+	TokenKindLBracket TokenKind = "["
+	TokenKindRBracket TokenKind = "]"
+
+	TokenKindComma  TokenKind = ","
+	TokenKindColon  TokenKind = ":"
+	TokenKindAtSign TokenKind = "@"
 )
 
 const (

parser/parse_system.go

@@ -349,7 +349,7 @@ func (p *Parser) parseRoleName(_ Pos) (*RoleName, error) {
 			return nil, err
 		}
 		var scope *StringLiteral
-		if p.tryConsumeTokenKind("@") != nil {
+		if p.tryConsumeTokenKind(TokenKindAtSign) != nil {
 			scope, err = p.parseString(p.Pos())
 			if err != nil {
 				return nil, err
@@ -447,7 +447,7 @@ func (p *Parser) parseRoleSettings(_ Pos) ([]*RoleSetting, error) {
 			return nil, err
 		}
 		settings = append(settings, setting)
-		if p.tryConsumeTokenKind(",") == nil {
+		if p.tryConsumeTokenKind(TokenKindComma) == nil {
 			break
 		}
 	}
@@ -485,7 +485,7 @@ func (p *Parser) parseCreateRole(pos Pos) (*CreateRole, error) {
 		return nil, err
 	}
 	roleNames = append(roleNames, roleName)
-	for p.tryConsumeTokenKind(",") != nil {
+	for p.tryConsumeTokenKind(TokenKindComma) != nil {
 		roleName, err := p.parseRoleName(p.Pos())
 		if err != nil {
 			return nil, err
@@ -543,7 +543,7 @@ func (p *Parser) parserDropUserOrRole(pos Pos) (*DropUserOrRole, error) {
 		return nil, err
 	}
 	names = append(names, name)
-	for p.tryConsumeTokenKind(",") != nil {
+	for p.tryConsumeTokenKind(TokenKindComma) != nil {
 		name, err := p.parseRoleName(p.Pos())
 		if err != nil {
 			return nil, err
@@ -590,7 +590,7 @@ func (p *Parser) parsePrivilegeSelectOrInsert(pos Pos) (*PrivilegeClause, error)
 
 	var err error
 	var params *ParamExprList
-	if p.matchTokenKind("(") {
+	if p.matchTokenKind(TokenKindLParen) {
 		params, err = p.parseFunctionParams(p.Pos())
 		if err != nil {
 			return nil, err
@@ -879,7 +879,7 @@ func (p *Parser) parsePrivilegeRoles(_ Pos) ([]*Ident, error) {
 		return nil, err
 	}
 	roles = append(roles, role)
-	for p.tryConsumeTokenKind(",") != nil {
+	for p.tryConsumeTokenKind(TokenKindComma) != nil {
 		role, err := p.parseIdent()
 		if err != nil {
 			return nil, err
@@ -950,7 +950,7 @@ func (p *Parser) parseGrantPrivilegeStmt(pos Pos) (*GrantPrivilegeStmt, error) {
 		return nil, err
 	}
 	privileges = append(privileges, privilege)
-	for p.tryConsumeTokenKind(",") != nil {
+	for p.tryConsumeTokenKind(TokenKindComma) != nil {
 		privilege, err := p.parsePrivilegeClause(p.Pos())
 		if err != nil {
 			return nil, err
@@ -1012,7 +1012,7 @@ func (p *Parser) parseAlterRole(pos Pos) (*AlterRole, error) {
 		return nil, err
 	}
 	roleRenamePairs = append(roleRenamePairs, roleRenamePair)
-	for p.tryConsumeTokenKind(",") != nil {
+	for p.tryConsumeTokenKind(TokenKindComma) != nil {
 		roleRenamePair, err := p.parseRoleRenamePair(p.Pos())
 		if err != nil {
 			return nil, err

parser/parser_alter.go

@@ -58,7 +58,7 @@ func (p *Parser) parseAlterTable(pos Pos) (*AlterTable, error) {
 			return nil, err
 		}
 		alterTable.AlterExprs = append(alterTable.AlterExprs, alter)
-		if p.tryConsumeTokenKind(",") == nil {
+		if p.tryConsumeTokenKind(TokenKindComma) == nil {
 			break
 		}
 	}
@@ -169,7 +169,7 @@ func (p *Parser) parseProjectionOrderBy(pos Pos) (*ProjectionOrderByClause, erro
 }
 
 func (p *Parser) parseProjectionSelect(pos Pos) (*ProjectionSelectStmt, error) {
-	if _, err := p.consumeTokenKind("("); err != nil {
+	if _, err := p.consumeTokenKind(TokenKindLParen); err != nil {
 		return nil, err
 	}
 	with, err := p.tryParseWithClause(p.Pos())
@@ -191,7 +191,7 @@ func (p *Parser) parseProjectionSelect(pos Pos) (*ProjectionSelectStmt, error) {
 	if err != nil {
 		return nil, err
 	}
-	rightParen, err := p.consumeTokenKind(")")
+	rightParen, err := p.consumeTokenKind(TokenKindRParen)
 	if err != nil {
 		return nil, err
 	}