fix: tok error

Author: tiyee

cmd/v5.go

@@ -32,13 +32,14 @@ func main() {
 
 		f, err := os.OpenFile(*out, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
 		if err != nil {
-			fmt.Println(err.Error())
+			fmt.Println("openFile err: ", err.Error())
 		}
 		defer f.Close()
 		wr = f
 	}
 
 	creator := v5.ParseSql(string(bs))
+
 	if err := creator.Save(wr); err != nil {
 		fmt.Println(err.Error())
 	}

models/shop_order.go

@@ -111,6 +111,7 @@ type StmtNode interface {
 	node
 	Receive(nod node, lexer yyLexer)
 }
+
 type CreateTableStmt struct {
 	NameNode
 	ColumnsStmt        *ColumnsStmt
@@ -131,6 +132,7 @@ func (c *CreateTableStmt) Receive(nod node, s yyLexer) {
 	default:
 		unexpectedNode(nod, s)
 	}
+
 }
 func (c *CreateTableStmt) Type() NodeType {
 	return ndCreateTableStmt

v5/ast.go

@@ -52,12 +52,13 @@ func (c *Creator) StructName() string {
 	return exportName(c.NameNode.s)
 }
 func (c *Creator) Create() *ast.GenDecl {
+
 	fields := make([]*ast.Field, 0, len(*c.ColumnsStmt))
 	for _, field := range *c.ColumnsStmt {
 		fields = append(fields, &ast.Field{
 			Names: []*ast.Ident{
 				&ast.Ident{
-					Name: field.NameNode.s,
+					Name: exportName(field.NameNode.s),
 				},
 			},
 			Type: &ast.Ident{
@@ -164,28 +165,32 @@ func (c *Creator) Save(wr io.Writer) error {
 			Name:    "models",
 			NamePos: token.Pos(len("Package") + 2),
 		}}
-	fn := func(col *ColumnStmt) bool {
-		return col.t == "timestamp"
-	}
-	if c.ColumnsStmt.ExistF(fn) {
-		ff.Decls = append(ff.Decls, &ast.GenDecl{
-			Tok: token.IMPORT,
-			Specs: []ast.Spec{
-				&ast.ImportSpec{
-					Path: &ast.BasicLit{
-						Kind:  token.STRING,
-						Value: fmt.Sprintf("\"%s\"", "time"),
+
+	if c.ColumnsStmt != nil {
+		fn := func(col *ColumnStmt) bool {
+			return col.t == "timestamp"
+		}
+		if c.ColumnsStmt.ExistF(fn) {
+			ff.Decls = append(ff.Decls, &ast.GenDecl{
+				Tok: token.IMPORT,
+				Specs: []ast.Spec{
+					&ast.ImportSpec{
+						Path: &ast.BasicLit{
+							Kind:  token.STRING,
+							Value: fmt.Sprintf("\"%s\"", "time"),
+						},
 					},
 				},
-			},
-		})
+			})
+		}
 	}
+
 	ff.Decls = append(ff.Decls,
 		c.Create(),
 		c.PkFunc(),
 		c.TableFunc(),
 	)
-	fmt.Println("len:", len(ff.Decls))
+	//fmt.Println("len:", len(ff.Decls))
 	if _, err := wr.Write([]byte(cm)); err != nil {
 		return err
 	}

v5/gen.go

@@ -13,11 +13,11 @@ type lex struct {
 	size  int
 	pos   int
 	err   error
-	Stmt  CreateTableStmt
+	Stmt  *CreateTableStmt
 	prev  *yySymType
 }
 
-func (l *lex) SetStmt(st CreateTableStmt) {
+func (l *lex) SetStmt(st *CreateTableStmt) {
 	l.Stmt = st
 }
 func (l *lex) Reduced(rule, state int, lval *yySymType) bool {
@@ -50,8 +50,8 @@ func (l *lex) Lex(lval *yySymType) int {
 	lval.pos = l.pos
 	defer func() {
 		l.prev = lval
+		//fmt.Printf("lval: %+v \n", lval)
 	}()
-	fmt.Println(string(ch), ch)
 	switch ch {
 	case '`':
 		return TILDE
@@ -74,8 +74,9 @@ func (l *lex) Lex(lval *yySymType) int {
 	if isLetter(ch) {
 		str := l.readString()
 		tok := findKeyword(str)
+
 		if tok > 0 {
-			return tok + 1
+			return tok
 		}
 		lval.s = str
 		return tString

v5/lexer.go

@@ -29,6 +29,7 @@ func ParseSql(sql string) *Creator {
 		pos:   0,
 	}
 	yyParse(&l)
-	c := Creator(l.Stmt)
+	//fmt.Printf("stmt: %+v \n", l.Stmt)
+	c := Creator(*l.Stmt)
 	return &c
 }

v5/out.go

@@ -1,6 +1,5 @@
 %{
 package v5
-
 var ftm map[string]int //field type map
 func init() {
     ftm = map[string]int{
@@ -39,13 +38,13 @@ func init() {
                   ColumnStmt TableIndexListStmt TableIndexStmt   NameListStmt
 
 
-%token LPAREN '('
+%token LPAREN "("
 	LBRACK "["
 	LBRACE "{"
 	COMMA  ","
 	PERIOD "."
 
-	RPAREN    ')'
+	RPAREN    ")"
 	RBRACK    "]"
 	RBRACE    "}"
 	SEMICOLON ";"
@@ -87,9 +86,13 @@ func init() {
        	tpDate
        	tpDatetime
        	tpTimestamp
+
+%start main
+
 %%
+
 main: CreateTableStmt {
-    yylex.(*lex).Stmt=*$1.(*CreateTableStmt)
+    yylex.(*lex).Stmt=$1.( *CreateTableStmt)
 }
 
 CreateTableStmt: