Sorting tokens and keywords.

diff --git a/src/slonik/parser.y b/src/slonik/parser.y
index bea85ac666c430a67367c628d0836a8ba305bfc6..bc191dadb992d4856b4702ab6a163774207c10ae 100644 (file)
--- a/src/slonik/parser.y
+++ b/src/slonik/parser.y
@@ -136,16 +136,16 @@ static int        assign_options(statement_option *so, option_list *ol);
 %token K_CLUSTER
 %token K_CLUSTERNAME
 %token K_COMMENT
-%token K_CONFIRMED
 %token K_CONFIG
+%token K_CONFIRMED
 %token K_CONNINFO
 %token K_CONNRETRY
 %token K_COPY
 %token K_CREATE
-%token K_DROP
-%token K_ECHO
 %token K_DATE
 %token K_DFORMAT
+%token K_DROP
+%token K_ECHO
 %token K_ERROR
 %token K_EVENT
 %token K_EXECUTE
@@ -172,7 +172,6 @@ static int  assign_options(statement_option *so, option_list *ol);
 %token K_NODE
 %token K_OFF
 %token K_OLD
-%token  K_OMIT
 %token K_ON
 %token K_ONLY
 %token K_ORIGIN
@@ -181,21 +180,18 @@ static int        assign_options(statement_option *so, option_list *ol);
 %token K_PROVIDER
 %token K_QUALIFIED
 %token K_RECEIVER
-%token  K_REPAIR
 %token K_RESTART
-%token  K_RESUBSCRIBE
 %token K_SCRIPT
-%token  K_SECONDS
 %token K_SEQUENCE
 %token K_SERVER
 %token K_SET
+%token K_SLEEP
 %token K_STORE
 %token K_SUBSCRIBE
 %token K_SUCCESS
 %token K_SWITCH
+%token K_SYNC
 %token K_TABLE
-%token  K_TABLES
-%token  K_SEQUENCES
 %token K_TIMEOUT
 %token K_TRUE
 %token K_TRY
@@ -203,10 +199,14 @@ static int        assign_options(statement_option *so, option_list *ol);
 %token K_UNLOCK
 %token K_UNSUBSCRIBE
 %token K_UPDATE
-%token K_YES
 %token K_WAIT
-%token K_SYNC
-%token K_SLEEP
+%token K_YES
+%token  K_OMIT
+%token  K_REPAIR
+%token  K_RESUBSCRIBE
+%token  K_SECONDS
+%token  K_SEQUENCES
+%token  K_TABLES
 
 /*
  * Other scanner tokens

diff --git a/src/slonik/scan.l b/src/slonik/scan.l
index e96cfe7a4b356583b1b603d8f06896644da32dc9..d62aec2fc280750d8b8fab0ee70a3a1d5dcc8237 100644 (file)
--- a/src/slonik/scan.l
+++ b/src/slonik/scan.l
@@ -80,7 +80,6 @@ admin                 { return K_ADMIN;                       }
 all                            { return K_ALL;                         }
 backup                 { return K_BACKUP;                      }
 client                 { return K_CLIENT;                      }
-copy                   { return K_COPY;                        }
 clone                  { return K_CLONE;                       }
 cluster                        { return K_CLUSTER;                     }
 comment                        { return K_COMMENT;                     }
@@ -88,6 +87,7 @@ config                        { return K_CONFIG;                      }
 confirmed              { return K_CONFIRMED;           }
 conninfo               { return K_CONNINFO;            }
 connretry              { return K_CONNRETRY;           }
+copy                   { return K_COPY;                        }
 create                 { return K_CREATE;                      }
 date                   { return K_DATE;                        }
 drop                   { return K_DROP;                        }
@@ -100,8 +100,8 @@ failover            { return K_FAILOVER;            }
 false                  { return K_FALSE;                       }
 filename               { return K_FILENAME;            }
 finish                 { return K_FINISH;                      }
-format                 { return K_DFORMAT;                     }
 for                            { return K_FOR;                         }
+format                 { return K_DFORMAT;                     }
 forward                        { return K_FORWARD;                     }
 full                   { return K_FULL;                        }
 fully                  { return K_FULL;                        }
@@ -120,7 +120,7 @@ no                          { return K_NO;                          }
 node                   { return K_NODE;                        }
 off                            { return K_OFF;                         }
 old                            { return K_OLD;                         }
-omit                           { return K_OMIT;                                }
+omit                   { return K_OMIT;                        }
 on                             { return K_ON;                          }
 only                   { return K_ONLY;                        }
 origin                 { return K_ORIGIN;                      }
@@ -131,6 +131,7 @@ qualified           { return K_QUALIFIED;           }
 receiver               { return K_RECEIVER;            }
 repair                 { return K_REPAIR;                      }
 restart                        { return K_RESTART;                     }
+resubscribe     { return K_RESUBSCRIBE;                }
 script                 { return K_SCRIPT;                      }
 seconds         { return K_SECONDS;         }
 sequence               { return K_SEQUENCE;            }
@@ -152,9 +153,8 @@ uninstall           { return K_UNINSTALL;           }
 unlock                 { return K_UNLOCK;                      }
 unsubscribe            { return K_UNSUBSCRIBE;         }
 update                 { return K_UPDATE;                      }
-yes                            { return K_YES;                         }
 wait                   { return K_WAIT;                        }
-resubscribe     { return K_RESUBSCRIBE;                }
+yes                            { return K_YES;                         }
 {digit}+               { return T_NUMBER;                      }
 {identifier}   { return T_IDENT;                       }