Skip to content

Commit

Permalink
Merge pull request #145 from pingcap/qiuyesuifeng/cleanup-parse-error
Browse files Browse the repository at this point in the history 
parser: cleanup parser/scanner error.
  • Loading branch information
@zimulala
zimulala committed Sep 15, 2015
2 parents 3bf5e14 + 7c56124 commit f651e32
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 50 deletions.
80 changes: 40 additions & 40 deletions parser/parser.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,12 +890,12 @@ CreateIndexStmt:
{
indexName, tableIdent, colNameList := $4.(string), $6.(table.Ident), $8.([]*coldef.IndexColName)
if strings.EqualFold(indexName, tableIdent.Name.O) {
yylex.(*lexer).err("", "index name collision: %s", indexName)
yylex.(*lexer).errf("index name collision: %s", indexName)
return 1
}
for _, colName := range colNameList {
if indexName == colName.ColumnName {
yylex.(*lexer).err("", "index name collision: %s", indexName)
yylex.(*lexer).errf("index name collision: %s", indexName)
return 1
}
}
Expand Down Expand Up @@ -967,7 +967,7 @@ CreateDatabaseStmt:

ok := charset.ValidCharsetAndCollation(cs, co)
if !ok {
yylex.(*lexer).err("", "Unknown character set %s or collate %s ", cs, co)
yylex.(*lexer).errf("Unknown character set %s or collate %s ", cs, co)
}
dbopt := &coldef.CharsetOpt{Chs: cs, Col: co}

Expand Down Expand Up @@ -1009,7 +1009,7 @@ CharsetName:
if charset.ValidCharsetAndCollation(c, "") {
$$ = c
} else {
yylex.(*lexer).err("", fmt.Sprintf("Unknown character set: '%s'", $1.(string)))
yylex.(*lexer).errf("Unknown character set: '%s'", $1.(string))
return 1
}
}
Expand All @@ -1019,7 +1019,7 @@ CharsetName:
if charset.ValidCharsetAndCollation(c, "") {
$$ = c
} else {
yylex.(*lexer).err("", fmt.Sprintf("Unknown character set: '%s'", $1.(string)))
yylex.(*lexer).errf("Unknown character set: '%s'", $1.(string))
return 1
}
}
Expand Down Expand Up @@ -1073,7 +1073,7 @@ CreateTableStmt:
}
}
if len(columnDefs) == 0 {
yylex.(*lexer).err("", "Column Definition List can't be empty.")
yylex.(*lexer).err("Column Definition List can't be empty.")
return 1
}

Expand Down Expand Up @@ -1427,7 +1427,7 @@ Factor1:
var err error
$$, err = expressions.NewBetween($1.(expression.Expression), $4.(expression.Expression), $6.(expression.Expression), $2.(bool))
if err != nil {
yylex.(*lexer).err("", "%v", err)
yylex.(*lexer).err(err)
return 1
}
}
Expand Down Expand Up @@ -1738,7 +1738,7 @@ Operand:
{
l := yylex.(*lexer)
if !l.prepare {
l.err("", "Can not accept placeholder when not parsing prepare sql")
l.err("Can not accept placeholder when not parsing prepare sql")
}
pm := &expressions.ParamMarker{}
l.ParamList = append(l.ParamList, pm)
Expand Down Expand Up @@ -1838,7 +1838,7 @@ FunctionCallConflict:
var err error
$$, err = expressions.NewCall($1.(string), $3.([]expression.Expression), false)
if err != nil {
x.err("", "%v", err)
x.err(err)
return 1
}
}
Expand Down Expand Up @@ -1867,7 +1867,7 @@ FunctionCallKeyword:
$$, err = expressions.NewCall($1.(string), $4.([]expression.Expression), $3.(bool))
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand Down Expand Up @@ -1914,7 +1914,7 @@ FunctionCallKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -1929,7 +1929,7 @@ FunctionCallKeyword:
$$, err = expressions.NewCall($1.(string), $3.([]expression.Expression), false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -1940,7 +1940,7 @@ FunctionCallKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -1952,7 +1952,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), $3.([]expression.Expression), false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -1963,7 +1963,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -1973,7 +1973,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), $3.([]expression.Expression), false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -1983,7 +1983,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), $3.([]expression.Expression), false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -1994,7 +1994,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2005,7 +2005,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2016,7 +2016,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2027,7 +2027,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2038,7 +2038,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2049,7 +2049,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2059,7 +2059,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), $3.([]expression.Expression), false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2070,7 +2070,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2081,7 +2081,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2092,7 +2092,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2103,7 +2103,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2113,7 +2113,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), $3.([]expression.Expression),false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2123,7 +2123,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), $3.([]expression.Expression), false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2134,7 +2134,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand Down Expand Up @@ -2175,7 +2175,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2186,7 +2186,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), args, false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2196,7 +2196,7 @@ FunctionCallNonKeyword:
$$, err = expressions.NewCall($1.(string), $3.([]expression.Expression),false)
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2208,7 +2208,7 @@ FunctionCallAgg:
$$, err = expressions.NewCall($1.(string), $4.([]expression.Expression), $3.(bool))
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2219,7 +2219,7 @@ FunctionCallAgg:
$$, err = expressions.NewCall($1.(string), args, $3.(bool))
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2229,7 +2229,7 @@ FunctionCallAgg:
$$, err = expressions.NewCall($1.(string), $4.([]expression.Expression),$3.(bool))
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2240,7 +2240,7 @@ FunctionCallAgg:
$$, err = expressions.NewCall($1.(string), args, $3.(bool))
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2251,7 +2251,7 @@ FunctionCallAgg:
$$, err = expressions.NewCall($1.(string), args, $3.(bool))
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand All @@ -2262,7 +2262,7 @@ FunctionCallAgg:
$$, err = expressions.NewCall($1.(string), args, $3.(bool))
if err != nil {
l := yylex.(*lexer)
l.err("", "%v", err)
l.err(err)
return 1
}
}
Expand Down
Loading

0 comments on commit f651e32

Please sign in to comment.