Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor refactor the column type interface #110

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Minor refactor the column type interface #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 73 additions & 44 deletions parser/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2971,7 +2971,7 @@ type QueryParam struct {
LBracePos Pos
RBracePos Pos
Name *Ident
Type Expr
Type ColumnType
}

func (q *QueryParam) Pos() Pos {
Expand Down Expand Up @@ -3182,7 +3182,7 @@ type ColumnDef struct {
NamePos Pos
ColumnEnd Pos
Name *NestedIdentifier
Type Expr
Type ColumnType
NotNull *NotNullLiteral
Nullable *NullLiteral

Expand Down Expand Up @@ -3298,72 +3298,85 @@ func (c *ColumnDef) Accept(visitor ASTVisitor) error {
return visitor.VisitColumnDef(c)
}

type ScalarTypeExpr struct {
type ColumnType interface {
Expr
Type() string
}

type ScalarType struct {
Name *Ident
}

func (s *ScalarTypeExpr) Pos() Pos {
func (s *ScalarType) Pos() Pos {
return s.Name.NamePos
}

func (s *ScalarTypeExpr) End() Pos {
func (s *ScalarType) End() Pos {
return s.Name.NameEnd
}

func (s *ScalarTypeExpr) String() string {
func (s *ScalarType) String() string {
return s.Name.String()
}

func (s *ScalarTypeExpr) Accept(visitor ASTVisitor) error {
func (s *ScalarType) Accept(visitor ASTVisitor) error {
visitor.enter(s)
defer visitor.leave(s)
if err := s.Name.Accept(visitor); err != nil {
return err
}
return visitor.VisitScalarTypeExpr(s)
return visitor.VisitScalarType(s)
}

type PropertyTypeExpr struct {
func (s *ScalarType) Type() string {
return s.Name.Name
}

type PropertyType struct {
Name *Ident
}

func (c *PropertyTypeExpr) Pos() Pos {
func (c *PropertyType) Pos() Pos {
return c.Name.NamePos
}

func (c *PropertyTypeExpr) End() Pos {
func (c *PropertyType) End() Pos {
return c.Name.NameEnd
}

func (c *PropertyTypeExpr) String() string {
func (c *PropertyType) String() string {
return c.Name.String()
}

func (c *PropertyTypeExpr) Accept(visitor ASTVisitor) error {
func (c *PropertyType) Accept(visitor ASTVisitor) error {
visitor.enter(c)
defer visitor.leave(c)
if err := c.Name.Accept(visitor); err != nil {
return err
}
return visitor.VisitPropertyTypeExpr(c)
return visitor.VisitPropertyType(c)
}

func (c *PropertyType) Type() string {
return c.Name.Name
}

type TypeWithParamsExpr struct {
type TypeWithParams struct {
LeftParenPos Pos
RightParenPos Pos
Name *Ident
Params []Literal
}

func (s *TypeWithParamsExpr) Pos() Pos {
func (s *TypeWithParams) Pos() Pos {
return s.Name.NamePos
}

func (s *TypeWithParamsExpr) End() Pos {
func (s *TypeWithParams) End() Pos {
return s.RightParenPos
}

func (s *TypeWithParamsExpr) String() string {
func (s *TypeWithParams) String() string {
var builder strings.Builder
builder.WriteString(s.Name.String())
builder.WriteByte('(')
Expand All @@ -3377,7 +3390,7 @@ func (s *TypeWithParamsExpr) String() string {
return builder.String()
}

func (s *TypeWithParamsExpr) Accept(visitor ASTVisitor) error {
func (s *TypeWithParams) Accept(visitor ASTVisitor) error {
visitor.enter(s)
defer visitor.leave(s)
if err := s.Name.Accept(visitor); err != nil {
Expand All @@ -3388,25 +3401,29 @@ func (s *TypeWithParamsExpr) Accept(visitor ASTVisitor) error {
return err
}
}
return visitor.VisitTypeWithParamsExpr(s)
return visitor.VisitTypeWithParams(s)
}

type ComplexTypeExpr struct {
func (s *TypeWithParams) Type() string {
return s.Name.Name
}

type ComplexType struct {
LeftParenPos Pos
RightParenPos Pos
Name *Ident
Params []Expr
Params []ColumnType
}

func (c *ComplexTypeExpr) Pos() Pos {
func (c *ComplexType) Pos() Pos {
return c.Name.NamePos
}

func (c *ComplexTypeExpr) End() Pos {
func (c *ComplexType) End() Pos {
return c.RightParenPos
}

func (c *ComplexTypeExpr) String() string {
func (c *ComplexType) String() string {
var builder strings.Builder
builder.WriteString(c.Name.String())
builder.WriteByte('(')
Expand All @@ -3420,7 +3437,7 @@ func (c *ComplexTypeExpr) String() string {
return builder.String()
}

func (c *ComplexTypeExpr) Accept(visitor ASTVisitor) error {
func (c *ComplexType) Accept(visitor ASTVisitor) error {
visitor.enter(c)
defer visitor.leave(c)
if err := c.Name.Accept(visitor); err != nil {
Expand All @@ -3431,25 +3448,29 @@ func (c *ComplexTypeExpr) Accept(visitor ASTVisitor) error {
return err
}
}
return visitor.VisitComplexTypeExpr(c)
return visitor.VisitComplexType(c)
}

func (c *ComplexType) Type() string {
return c.Name.Name
}

type NestedTypeExpr struct {
type NestedType struct {
LeftParenPos Pos
RightParenPos Pos
Name *Ident
Columns []Expr
}

func (n *NestedTypeExpr) Pos() Pos {
func (n *NestedType) Pos() Pos {
return n.Name.NamePos
}

func (n *NestedTypeExpr) End() Pos {
func (n *NestedType) End() Pos {
return n.RightParenPos
}

func (n *NestedTypeExpr) String() string {
func (n *NestedType) String() string {
var builder strings.Builder
// on the same level as the column type
builder.WriteString(n.Name.String())
Expand All @@ -3465,7 +3486,7 @@ func (n *NestedTypeExpr) String() string {
return builder.String()
}

func (n *NestedTypeExpr) Accept(visitor ASTVisitor) error {
func (n *NestedType) Accept(visitor ASTVisitor) error {
visitor.enter(n)
defer visitor.leave(n)
if err := n.Name.Accept(visitor); err != nil {
Expand All @@ -3476,7 +3497,11 @@ func (n *NestedTypeExpr) Accept(visitor ASTVisitor) error {
return err
}
}
return visitor.VisitNestedTypeExpr(n)
return visitor.VisitNestedType(n)
}

func (n *NestedType) Type() string {
return n.Name.Name
}

type CompressionCodec struct {
Expand Down Expand Up @@ -3689,29 +3714,29 @@ func (e *EnumValue) Accept(visitor ASTVisitor) error {
if err := e.Value.Accept(visitor); err != nil {
return err
}
return visitor.VisitEnumValueExpr(e)
return visitor.VisitEnumValue(e)
}

type EnumValueList struct {
type EnumType struct {
Name *Ident
ListPos Pos
ListEnd Pos
Enums []EnumValue
Values []EnumValue
}

func (e *EnumValueList) Pos() Pos {
func (e *EnumType) Pos() Pos {
return e.ListPos
}

func (e *EnumValueList) End() Pos {
func (e *EnumType) End() Pos {
return e.ListEnd
}

func (e *EnumValueList) String() string {
func (e *EnumType) String() string {
var builder strings.Builder
builder.WriteString(e.Name.String())
builder.WriteByte('(')
for i, enum := range e.Enums {
for i, enum := range e.Values {
if i > 0 {
builder.WriteString(", ")
}
Expand All @@ -3721,18 +3746,22 @@ func (e *EnumValueList) String() string {
return builder.String()
}

func (e *EnumValueList) Accept(visitor ASTVisitor) error {
func (e *EnumType) Accept(visitor ASTVisitor) error {
visitor.enter(e)
defer visitor.leave(e)
if err := e.Name.Accept(visitor); err != nil {
return err
}
for i := range e.Enums {
if err := e.Enums[i].Accept(visitor); err != nil {
for i := range e.Values {
if err := e.Values[i].Accept(visitor); err != nil {
return err
}
}
return visitor.VisitEnumValueExprList(e)
return visitor.VisitEnumType(e)
}

func (e *EnumType) Type() string {
return e.Name.Name
}

type IntervalExpr struct {
Expand Down
28 changes: 14 additions & 14 deletions parser/ast_visitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ type ASTVisitor interface {
VisitWindowFunctionExpr(expr *WindowFunctionExpr) error
VisitColumnDef(expr *ColumnDef) error
VisitColumnExpr(expr *ColumnExpr) error
VisitScalarTypeExpr(expr *ScalarTypeExpr) error
VisitPropertyTypeExpr(expr *PropertyTypeExpr) error
VisitTypeWithParamsExpr(expr *TypeWithParamsExpr) error
VisitComplexTypeExpr(expr *ComplexTypeExpr) error
VisitNestedTypeExpr(expr *NestedTypeExpr) error
VisitScalarType(expr *ScalarType) error
VisitPropertyType(expr *PropertyType) error
VisitTypeWithParams(expr *TypeWithParams) error
VisitComplexType(expr *ComplexType) error
VisitNestedType(expr *NestedType) error
VisitCompressionCodec(expr *CompressionCodec) error
VisitNumberLiteral(expr *NumberLiteral) error
VisitStringLiteral(expr *StringLiteral) error
VisitRatioExpr(expr *RatioExpr) error
VisitEnumValueExpr(expr *EnumValue) error
VisitEnumValueExprList(expr *EnumValueList) error
VisitEnumValue(expr *EnumValue) error
VisitEnumType(expr *EnumType) error
VisitIntervalExpr(expr *IntervalExpr) error
VisitEngineExpr(expr *EngineExpr) error
VisitColumnTypeExpr(expr *ColumnTypeExpr) error
Expand Down Expand Up @@ -678,35 +678,35 @@ func (v *DefaultASTVisitor) VisitColumnExpr(expr *ColumnExpr) error {
return nil
}

func (v *DefaultASTVisitor) VisitScalarTypeExpr(expr *ScalarTypeExpr) error {
func (v *DefaultASTVisitor) VisitScalarType(expr *ScalarType) error {
if v.Visit != nil {
return v.Visit(expr)
}
return nil
}

func (v *DefaultASTVisitor) VisitPropertyTypeExpr(expr *PropertyTypeExpr) error {
func (v *DefaultASTVisitor) VisitPropertyType(expr *PropertyType) error {
if v.Visit != nil {
return v.Visit(expr)
}
return nil
}

func (v *DefaultASTVisitor) VisitTypeWithParamsExpr(expr *TypeWithParamsExpr) error {
func (v *DefaultASTVisitor) VisitTypeWithParams(expr *TypeWithParams) error {
if v.Visit != nil {
return v.Visit(expr)
}
return nil
}

func (v *DefaultASTVisitor) VisitComplexTypeExpr(expr *ComplexTypeExpr) error {
func (v *DefaultASTVisitor) VisitComplexType(expr *ComplexType) error {
if v.Visit != nil {
return v.Visit(expr)
}
return nil
}

func (v *DefaultASTVisitor) VisitNestedTypeExpr(expr *NestedTypeExpr) error {
func (v *DefaultASTVisitor) VisitNestedType(expr *NestedType) error {
if v.Visit != nil {
return v.Visit(expr)
}
Expand Down Expand Up @@ -741,14 +741,14 @@ func (v *DefaultASTVisitor) VisitRatioExpr(expr *RatioExpr) error {
return nil
}

func (v *DefaultASTVisitor) VisitEnumValueExpr(expr *EnumValue) error {
func (v *DefaultASTVisitor) VisitEnumValue(expr *EnumValue) error {
if v.Visit != nil {
return v.Visit(expr)
}
return nil
}

func (v *DefaultASTVisitor) VisitEnumValueExprList(expr *EnumValueList) error {
func (v *DefaultASTVisitor) VisitEnumType(expr *EnumType) error {
if v.Visit != nil {
return v.Visit(expr)
}
Expand Down
Loading
Loading