From 41209693d29843be34645ede4acad9081c586aaf Mon Sep 17 00:00:00 2001 From: qiuyesuifeng Date: Thu, 31 Dec 2015 18:22:03 +0800 Subject: [PATCH] ast: rename newNod to newNode. --- ast/ddl.go | 90 ++++++++++++++--------------- ast/dml.go | 120 +++++++++++++++++++-------------------- ast/expressions.go | 138 ++++++++++++++++++++++----------------------- ast/functions.go | 60 ++++++++++---------- ast/misc.go | 102 ++++++++++++++++----------------- 5 files changed, 255 insertions(+), 255 deletions(-) diff --git a/ast/ddl.go b/ast/ddl.go index 5bb658f172..6e1f930b6c 100644 --- a/ast/ddl.go +++ b/ast/ddl.go @@ -71,11 +71,11 @@ type CreateDatabaseStmt struct { // Accept implements Node Accept interface. func (n *CreateDatabaseStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*CreateDatabaseStmt) + n = newNode.(*CreateDatabaseStmt) return v.Leave(n) } @@ -90,11 +90,11 @@ type DropDatabaseStmt struct { // Accept implements Node Accept interface. func (n *DropDatabaseStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*DropDatabaseStmt) + n = newNode.(*DropDatabaseStmt) return v.Leave(n) } @@ -108,11 +108,11 @@ type IndexColName struct { // Accept implements Node Accept interface. func (n *IndexColName) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*IndexColName) + n = newNode.(*IndexColName) node, ok := n.Column.Accept(v) if !ok { return n, false @@ -132,11 +132,11 @@ type ReferenceDef struct { // Accept implements Node Accept interface. func (n *ReferenceDef) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ReferenceDef) + n = newNode.(*ReferenceDef) node, ok := n.Table.Accept(v) if !ok { return n, false @@ -184,11 +184,11 @@ type ColumnOption struct { // Accept implements Node Accept interface. func (n *ColumnOption) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ColumnOption) + n = newNode.(*ColumnOption) if n.Expr != nil { node, ok := n.Expr.Accept(v) if !ok { @@ -231,11 +231,11 @@ type Constraint struct { // Accept implements Node Accept interface. func (n *Constraint) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*Constraint) + n = newNode.(*Constraint) for i, val := range n.Keys { node, ok := val.Accept(v) if !ok { @@ -264,11 +264,11 @@ type ColumnDef struct { // Accept implements Node Accept interface. func (n *ColumnDef) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ColumnDef) + n = newNode.(*ColumnDef) node, ok := n.Name.Accept(v) if !ok { return n, false @@ -298,11 +298,11 @@ type CreateTableStmt struct { // Accept implements Node Accept interface. func (n *CreateTableStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*CreateTableStmt) + n = newNode.(*CreateTableStmt) node, ok := n.Table.Accept(v) if !ok { return n, false @@ -336,11 +336,11 @@ type DropTableStmt struct { // Accept implements Node Accept interface. func (n *DropTableStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*DropTableStmt) + n = newNode.(*DropTableStmt) for i, val := range n.Tables { node, ok := val.Accept(v) if !ok { @@ -364,11 +364,11 @@ type CreateIndexStmt struct { // Accept implements Node Accept interface. func (n *CreateIndexStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*CreateIndexStmt) + n = newNode.(*CreateIndexStmt) node, ok := n.Table.Accept(v) if !ok { return n, false @@ -396,11 +396,11 @@ type DropIndexStmt struct { // Accept implements Node Accept interface. func (n *DropIndexStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*DropIndexStmt) + n = newNode.(*DropIndexStmt) node, ok := n.Table.Accept(v) if !ok { return n, false @@ -459,11 +459,11 @@ type ColumnPosition struct { // Accept implements Node Accept interface. func (n *ColumnPosition) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ColumnPosition) + n = newNode.(*ColumnPosition) if n.RelativeColumn != nil { node, ok := n.RelativeColumn.Accept(v) if !ok { @@ -505,11 +505,11 @@ type AlterTableSpec struct { // Accept implements Node Accept interface. func (n *AlterTableSpec) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*AlterTableSpec) + n = newNode.(*AlterTableSpec) if n.Constraint != nil { node, ok := n.Constraint.Accept(v) if !ok { @@ -552,11 +552,11 @@ type AlterTableStmt struct { // Accept implements Node Accept interface. func (n *AlterTableStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*AlterTableStmt) + n = newNode.(*AlterTableStmt) node, ok := n.Table.Accept(v) if !ok { return n, false @@ -582,11 +582,11 @@ type TruncateTableStmt struct { // Accept implements Node Accept interface. func (n *TruncateTableStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*TruncateTableStmt) + n = newNode.(*TruncateTableStmt) node, ok := n.Table.Accept(v) if !ok { return n, false diff --git a/ast/dml.go b/ast/dml.go index e15b5f83bb..6b4a0d6dd7 100644 --- a/ast/dml.go +++ b/ast/dml.go @@ -61,11 +61,11 @@ type Join struct { // Accept implements Node Accept interface. func (n *Join) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*Join) + n = newNode.(*Join) node, ok := n.Left.Accept(v) if !ok { return n, false @@ -102,11 +102,11 @@ type TableName struct { // Accept implements Node Accept interface. func (n *TableName) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*TableName) + n = newNode.(*TableName) return v.Leave(n) } @@ -124,11 +124,11 @@ type TableSource struct { // Accept implements Node Accept interface. func (n *TableSource) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*TableSource) + n = newNode.(*TableSource) node, ok := n.Source.Accept(v) if !ok { return n, false @@ -146,11 +146,11 @@ type OnCondition struct { // Accept implements Node Accept interface. func (n *OnCondition) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*OnCondition) + n = newNode.(*OnCondition) node, ok := n.Expr.Accept(v) if !ok { return n, false @@ -189,11 +189,11 @@ type WildCardField struct { // Accept implements Node Accept interface. func (n *WildCardField) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*WildCardField) + n = newNode.(*WildCardField) return v.Leave(n) } @@ -215,11 +215,11 @@ type SelectField struct { // Accept implements Node Accept interface. func (n *SelectField) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*SelectField) + n = newNode.(*SelectField) if n.Expr != nil { node, ok := n.Expr.Accept(v) if !ok { @@ -239,11 +239,11 @@ type FieldList struct { // Accept implements Node Accept interface. func (n *FieldList) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*FieldList) + n = newNode.(*FieldList) for i, val := range n.Fields { node, ok := val.Accept(v) if !ok { @@ -263,11 +263,11 @@ type TableRefsClause struct { // Accept implements Node Accept interface. func (n *TableRefsClause) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*TableRefsClause) + n = newNode.(*TableRefsClause) node, ok := n.TableRefs.Accept(v) if !ok { return n, false @@ -286,11 +286,11 @@ type ByItem struct { // Accept implements Node Accept interface. func (n *ByItem) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ByItem) + n = newNode.(*ByItem) node, ok := n.Expr.Accept(v) if !ok { return n, false @@ -307,11 +307,11 @@ type GroupByClause struct { // Accept implements Node Accept interface. func (n *GroupByClause) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*GroupByClause) + n = newNode.(*GroupByClause) for i, val := range n.Items { node, ok := val.Accept(v) if !ok { @@ -330,11 +330,11 @@ type HavingClause struct { // Accept implements Node Accept interface. func (n *HavingClause) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*HavingClause) + n = newNode.(*HavingClause) node, ok := n.Expr.Accept(v) if !ok { return n, false @@ -352,11 +352,11 @@ type OrderByClause struct { // Accept implements Node Accept interface. func (n *OrderByClause) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*OrderByClause) + n = newNode.(*OrderByClause) for i, val := range n.Items { node, ok := val.Accept(v) if !ok { @@ -395,11 +395,11 @@ type SelectStmt struct { // Accept implements Node Accept interface. func (n *SelectStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*SelectStmt) + n = newNode.(*SelectStmt) if n.From != nil { node, ok := n.From.Accept(v) @@ -469,11 +469,11 @@ type UnionClause struct { // Accept implements Node Accept interface. func (n *UnionClause) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*UnionClause) + n = newNode.(*UnionClause) node, ok := n.Select.Accept(v) if !ok { return n, false @@ -496,11 +496,11 @@ type UnionStmt struct { // Accept implements Node Accept interface. func (n *UnionStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*UnionStmt) + n = newNode.(*UnionStmt) for i, val := range n.Selects { node, ok := val.Accept(v) if !ok { @@ -536,11 +536,11 @@ type Assignment struct { // Accept implements Node Accept interface. func (n *Assignment) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*Assignment) + n = newNode.(*Assignment) node, ok := n.Column.Accept(v) if !ok { return n, false @@ -580,11 +580,11 @@ type InsertStmt struct { // Accept implements Node Accept interface. func (n *InsertStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*InsertStmt) + n = newNode.(*InsertStmt) if n.Select != nil { node, ok := n.Select.Accept(v) @@ -653,11 +653,11 @@ type DeleteStmt struct { // Accept implements Node Accept interface. func (n *DeleteStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*DeleteStmt) + n = newNode.(*DeleteStmt) node, ok := n.TableRefs.Accept(v) if !ok { @@ -714,11 +714,11 @@ type UpdateStmt struct { // Accept implements Node Accept interface. func (n *UpdateStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*UpdateStmt) + n = newNode.(*UpdateStmt) node, ok := n.TableRefs.Accept(v) if !ok { return n, false @@ -765,10 +765,10 @@ type Limit struct { // Accept implements Node Accept interface. func (n *Limit) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*Limit) + n = newNode.(*Limit) return v.Leave(n) } diff --git a/ast/expressions.go b/ast/expressions.go index adc0ac74e9..63b141e8ad 100644 --- a/ast/expressions.go +++ b/ast/expressions.go @@ -69,11 +69,11 @@ func NewValueExpr(value interface{}) *ValueExpr { // Accept implements Node interface. func (n *ValueExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ValueExpr) + n = newNode.(*ValueExpr) return v.Leave(n) } @@ -92,11 +92,11 @@ type BetweenExpr struct { // Accept implements Node interface. func (n *BetweenExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*BetweenExpr) + n = newNode.(*BetweenExpr) node, ok := n.Expr.Accept(v) if !ok { @@ -132,11 +132,11 @@ type BinaryOperationExpr struct { // Accept implements Node interface. func (n *BinaryOperationExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*BinaryOperationExpr) + n = newNode.(*BinaryOperationExpr) node, ok := n.L.Accept(v) if !ok { @@ -164,11 +164,11 @@ type WhenClause struct { // Accept implements Node Accept interface. func (n *WhenClause) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*WhenClause) + n = newNode.(*WhenClause) node, ok := n.Expr.Accept(v) if !ok { return n, false @@ -196,11 +196,11 @@ type CaseExpr struct { // Accept implements Node Accept interface. func (n *CaseExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*CaseExpr) + n = newNode.(*CaseExpr) if n.Value != nil { node, ok := n.Value.Accept(v) if !ok { @@ -234,11 +234,11 @@ type SubqueryExpr struct { // Accept implements Node Accept interface. func (n *SubqueryExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*SubqueryExpr) + n = newNode.(*SubqueryExpr) node, ok := n.Query.Accept(v) if !ok { return n, false @@ -275,11 +275,11 @@ type CompareSubqueryExpr struct { // Accept implements Node Accept interface. func (n *CompareSubqueryExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*CompareSubqueryExpr) + n = newNode.(*CompareSubqueryExpr) node, ok := n.L.Accept(v) if !ok { return n, false @@ -303,11 +303,11 @@ type ColumnName struct { // Accept implements Node Accept interface. func (n *ColumnName) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ColumnName) + n = newNode.(*ColumnName) return v.Leave(n) } @@ -325,11 +325,11 @@ type ColumnNameExpr struct { // Accept implements Node Accept interface. func (n *ColumnNameExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ColumnNameExpr) + n = newNode.(*ColumnNameExpr) node, ok := n.Name.Accept(v) if !ok { return n, false @@ -347,11 +347,11 @@ type DefaultExpr struct { // Accept implements Node Accept interface. func (n *DefaultExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*DefaultExpr) + n = newNode.(*DefaultExpr) if n.Name != nil { node, ok := n.Name.Accept(v) if !ok { @@ -372,11 +372,11 @@ type ExistsSubqueryExpr struct { // Accept implements Node Accept interface. func (n *ExistsSubqueryExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ExistsSubqueryExpr) + n = newNode.(*ExistsSubqueryExpr) node, ok := n.Sel.Accept(v) if !ok { return n, false @@ -400,11 +400,11 @@ type PatternInExpr struct { // Accept implements Node Accept interface. func (n *PatternInExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*PatternInExpr) + n = newNode.(*PatternInExpr) node, ok := n.Expr.Accept(v) if !ok { return n, false @@ -438,11 +438,11 @@ type IsNullExpr struct { // Accept implements Node Accept interface. func (n *IsNullExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*IsNullExpr) + n = newNode.(*IsNullExpr) node, ok := n.Expr.Accept(v) if !ok { return n, false @@ -464,11 +464,11 @@ type IsTruthExpr struct { // Accept implements Node Accept interface. func (n *IsTruthExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*IsTruthExpr) + n = newNode.(*IsTruthExpr) node, ok := n.Expr.Accept(v) if !ok { return n, false @@ -495,11 +495,11 @@ type PatternLikeExpr struct { // Accept implements Node Accept interface. func (n *PatternLikeExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*PatternLikeExpr) + n = newNode.(*PatternLikeExpr) if n.Expr != nil { node, ok := n.Expr.Accept(v) if !ok { @@ -526,11 +526,11 @@ type ParamMarkerExpr struct { // Accept implements Node Accept interface. func (n *ParamMarkerExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ParamMarkerExpr) + n = newNode.(*ParamMarkerExpr) return v.Leave(n) } @@ -543,11 +543,11 @@ type ParenthesesExpr struct { // Accept implements Node Accept interface. func (n *ParenthesesExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ParenthesesExpr) + n = newNode.(*ParenthesesExpr) if n.Expr != nil { node, ok := n.Expr.Accept(v) if !ok { @@ -571,11 +571,11 @@ type PositionExpr struct { // Accept implements Node Accept interface. func (n *PositionExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*PositionExpr) + n = newNode.(*PositionExpr) return v.Leave(n) } @@ -597,11 +597,11 @@ type PatternRegexpExpr struct { // Accept implements Node Accept interface. func (n *PatternRegexpExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*PatternRegexpExpr) + n = newNode.(*PatternRegexpExpr) node, ok := n.Expr.Accept(v) if !ok { return n, false @@ -625,11 +625,11 @@ type RowExpr struct { // Accept implements Node Accept interface. func (n *RowExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*RowExpr) + n = newNode.(*RowExpr) for i, val := range n.Values { node, ok := val.Accept(v) if !ok { @@ -651,11 +651,11 @@ type UnaryOperationExpr struct { // Accept implements Node Accept interface. func (n *UnaryOperationExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*UnaryOperationExpr) + n = newNode.(*UnaryOperationExpr) node, ok := n.V.Accept(v) if !ok { return n, false @@ -673,11 +673,11 @@ type ValuesExpr struct { // Accept implements Node Accept interface. func (n *ValuesExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ValuesExpr) + n = newNode.(*ValuesExpr) node, ok := n.Column.Accept(v) if !ok { return n, false @@ -699,10 +699,10 @@ type VariableExpr struct { // Accept implements Node Accept interface. func (n *VariableExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*VariableExpr) + n = newNode.(*VariableExpr) return v.Leave(n) } diff --git a/ast/functions.go b/ast/functions.go index 0a96398382..0ca1f0168e 100644 --- a/ast/functions.go +++ b/ast/functions.go @@ -44,11 +44,11 @@ type FuncCallExpr struct { // Accept implements Node interface. func (n *FuncCallExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*FuncCallExpr) + n = newNode.(*FuncCallExpr) for i, val := range n.Args { node, ok := val.Accept(v) if !ok { @@ -70,11 +70,11 @@ type FuncExtractExpr struct { // Accept implements Node Accept interface. func (n *FuncExtractExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*FuncExtractExpr) + n = newNode.(*FuncExtractExpr) node, ok := n.Date.Accept(v) if !ok { return n, false @@ -95,11 +95,11 @@ type FuncConvertExpr struct { // Accept implements Node Accept interface. func (n *FuncConvertExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*FuncConvertExpr) + n = newNode.(*FuncConvertExpr) node, ok := n.Expr.Accept(v) if !ok { return n, false @@ -132,11 +132,11 @@ type FuncCastExpr struct { // Accept implements Node Accept interface. func (n *FuncCastExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*FuncCastExpr) + n = newNode.(*FuncCastExpr) node, ok := n.Expr.Accept(v) if !ok { return n, false @@ -157,11 +157,11 @@ type FuncSubstringExpr struct { // Accept implements Node Accept interface. func (n *FuncSubstringExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*FuncSubstringExpr) + n = newNode.(*FuncSubstringExpr) node, ok := n.StrExpr.Accept(v) if !ok { return n, false @@ -194,11 +194,11 @@ type FuncSubstringIndexExpr struct { // Accept implements Node Accept interface. func (n *FuncSubstringIndexExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*FuncSubstringIndexExpr) + n = newNode.(*FuncSubstringIndexExpr) node, ok := n.StrExpr.Accept(v) if !ok { return n, false @@ -229,11 +229,11 @@ type FuncLocateExpr struct { // Accept implements Node Accept interface. func (n *FuncLocateExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*FuncLocateExpr) + n = newNode.(*FuncLocateExpr) node, ok := n.Str.Accept(v) if !ok { return n, false @@ -278,11 +278,11 @@ type FuncTrimExpr struct { // Accept implements Node Accept interface. func (n *FuncTrimExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*FuncTrimExpr) + n = newNode.(*FuncTrimExpr) node, ok := n.Str.Accept(v) if !ok { return n, false @@ -330,11 +330,11 @@ type FuncDateArithExpr struct { // Accept implements Node Accept interface. func (n *FuncDateArithExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*FuncDateArithExpr) + n = newNode.(*FuncDateArithExpr) if n.Date != nil { node, ok := n.Date.Accept(v) if !ok { @@ -367,11 +367,11 @@ type AggregateFuncExpr struct { // Accept implements Node Accept interface. func (n *AggregateFuncExpr) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*AggregateFuncExpr) + n = newNode.(*AggregateFuncExpr) for i, val := range n.Args { node, ok := val.Accept(v) if !ok { diff --git a/ast/misc.go b/ast/misc.go index 69e67c62c3..0264681d71 100644 --- a/ast/misc.go +++ b/ast/misc.go @@ -62,11 +62,11 @@ type ExplainStmt struct { // Accept implements Node Accept interface. func (n *ExplainStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ExplainStmt) + n = newNode.(*ExplainStmt) node, ok := n.Stmt.Accept(v) if !ok { return n, false @@ -88,11 +88,11 @@ type PrepareStmt struct { // Accept implements Node Accept interface. func (n *PrepareStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*PrepareStmt) + n = newNode.(*PrepareStmt) if n.SQLVar != nil { node, ok := n.SQLVar.Accept(v) if !ok { @@ -113,11 +113,11 @@ type DeallocateStmt struct { // Accept implements Node Accept interface. func (n *DeallocateStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*DeallocateStmt) + n = newNode.(*DeallocateStmt) return v.Leave(n) } @@ -132,11 +132,11 @@ type ExecuteStmt struct { // Accept implements Node Accept interface. func (n *ExecuteStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ExecuteStmt) + n = newNode.(*ExecuteStmt) for i, val := range n.UsingVars { node, ok := val.Accept(v) if !ok { @@ -191,11 +191,11 @@ type ShowStmt struct { // Accept implements Node Accept interface. func (n *ShowStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*ShowStmt) + n = newNode.(*ShowStmt) if n.Table != nil { node, ok := n.Table.Accept(v) if !ok { @@ -235,11 +235,11 @@ type BeginStmt struct { // Accept implements Node Accept interface. func (n *BeginStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*BeginStmt) + n = newNode.(*BeginStmt) return v.Leave(n) } @@ -251,11 +251,11 @@ type CommitStmt struct { // Accept implements Node Accept interface. func (n *CommitStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*CommitStmt) + n = newNode.(*CommitStmt) return v.Leave(n) } @@ -267,11 +267,11 @@ type RollbackStmt struct { // Accept implements Node Accept interface. func (n *RollbackStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*RollbackStmt) + n = newNode.(*RollbackStmt) return v.Leave(n) } @@ -285,11 +285,11 @@ type UseStmt struct { // Accept implements Node Accept interface. func (n *UseStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*UseStmt) + n = newNode.(*UseStmt) return v.Leave(n) } @@ -304,11 +304,11 @@ type VariableAssignment struct { // Accept implements Node interface. func (n *VariableAssignment) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*VariableAssignment) + n = newNode.(*VariableAssignment) node, ok := n.Value.Accept(v) if !ok { return n, false @@ -326,11 +326,11 @@ type SetStmt struct { // Accept implements Node Accept interface. func (n *SetStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*SetStmt) + n = newNode.(*SetStmt) for i, val := range n.Variables { node, ok := val.Accept(v) if !ok { @@ -352,11 +352,11 @@ type SetCharsetStmt struct { // Accept implements Node Accept interface. func (n *SetCharsetStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*SetCharsetStmt) + n = newNode.(*SetCharsetStmt) return v.Leave(n) } @@ -371,11 +371,11 @@ type SetPwdStmt struct { // Accept implements Node Accept interface. func (n *SetPwdStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*SetPwdStmt) + n = newNode.(*SetPwdStmt) return v.Leave(n) } @@ -396,11 +396,11 @@ type CreateUserStmt struct { // Accept implements Node Accept interface. func (n *CreateUserStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*CreateUserStmt) + n = newNode.(*CreateUserStmt) return v.Leave(n) } @@ -413,11 +413,11 @@ type DoStmt struct { // Accept implements Node Accept interface. func (n *DoStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*DoStmt) + n = newNode.(*DoStmt) for i, val := range n.Exprs { node, ok := val.Accept(v) if !ok { @@ -437,11 +437,11 @@ type PrivElem struct { // Accept implements Node Accept interface. func (n *PrivElem) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*PrivElem) + n = newNode.(*PrivElem) for i, val := range n.Cols { node, ok := val.Accept(v) if !ok { @@ -495,11 +495,11 @@ type GrantStmt struct { // Accept implements Node Accept interface. func (n *GrantStmt) Accept(v Visitor) (Node, bool) { - newNod, skipChildren := v.Enter(n) + newNode, skipChildren := v.Enter(n) if skipChildren { - return v.Leave(newNod) + return v.Leave(newNode) } - n = newNod.(*GrantStmt) + n = newNode.(*GrantStmt) for i, val := range n.Privs { node, ok := val.Accept(v) if !ok {