More nil removal

Author: steveyen

sql.pegjs

@@ -1,5 +1,6 @@
-// originally generated pegjs, from tmp/rules.rb and bubble-to-pegjs_ex.rb
-
+// originally generated by pegjs, from tmp/rules.rb and bubble-to-pegjs_ex.rb
+// and manually edited for pegjs suitability.
+//
 start = sql_stmt_list
 
 sql_stmt_list =
@@ -9,15 +10,19 @@ sql_stmt =
 ( ( EXPLAIN ( QUERY PLAN )? )? (
 //  alter_table_stmt
 //  / analyze_stmt
-//  / attach_stmt / begin_stmt / commit_stmt
-//  / create_index_stmt / create_table_stmt / create_trigger_stmt
-//  / create_view_stmt / create_virtual_table_stmt
-//  / delete_stmt / delete_stmt_limited
+//  / attach_stmt
+//  / begin_stmt / commit_stmt
+//  / create_index_stmt
+    create_table_stmt
+//  / create_trigger_stmt
+//  / create_view_stmt
+//  / create_virtual_table_stmt
+    / delete_stmt / delete_stmt_limited
 //  / detach_stmt / drop_index_stmt / drop_table_stmt / drop_trigger_stmt / drop_view_stmt
-//  / insert_stmt
+    / insert_stmt
 //  / pragma_stmt / reindex_stmt / release_stmt / rollback_stmt / savepoint_stmt
-    select_stmt
-//  / update_stmt / update_stmt_limited
+    / select_stmt
+    / update_stmt / update_stmt_limited
 //  / vacuum_stmt
 ) )
 
@@ -53,7 +58,9 @@ indexed_column =
 
 create_table_stmt =
   ( ( CREATE ( TEMP / TEMPORARY )? TABLE ( IF NOT EXISTS )? )
-    ( ( database_name dot )? table_name ( lparen ( column_def comma )+ ( nil ( comma table_constraint ) )+ rparen ) ( AS select_stmt ) ) )
+    ( ( database_name dot )? table_name
+      ( lparen ( column_def comma )+ ( comma table_constraint )+ rparen )
+      ( AS select_stmt ) ) )
 
 column_def =
   ( column_name ( type_name )? ( column_constraint )+ )
@@ -78,7 +85,15 @@ table_constraint =
 ( ( CONSTRAINT name )? ( ( ( ( PRIMARY KEY ) / UNIQUE ) lparen ( indexed_column comma )+ rparen conflict_clause ) / ( CHECK lparen expr rparen ) / ( FOREIGN KEY lparen ( column_name comma )+ rparen foreign_key_clause ) ) )
 
 foreign_key_clause =
-( ( REFERENCES foreign_table ( lparen ( column_name comma )+ rparen )? ) ( ( ( ( ON ( DELETE / UPDATE ) ( ( SET NULL ) / ( SET DEFAULT ) / CASCADE / RESTRICT / ( NO ACTION ) ) ) / ( MATCH name ) ) nil )+ )? ( ( ( NOT )? DEFERRABLE ( ( INITIALLY DEFERRED ) / ( INITIALLY IMMEDIATE ) / nil ) ) nil )? )
+  ( ( REFERENCES foreign_table ( lparen ( column_name comma )+ rparen )? )
+    ( ( ( ON ( DELETE / UPDATE )
+             ( ( SET NULL )
+             / ( SET DEFAULT )
+             / CASCADE
+             / RESTRICT
+             / ( NO ACTION ) ) )
+         / ( MATCH name ) )+ )?
+    ( ( NOT )? DEFERRABLE ( ( INITIALLY DEFERRED ) / ( INITIALLY IMMEDIATE ) )? )? )
 
 conflict_clause =
 ( ( ON CONFLICT ( ROLLBACK / ABORT / FAIL / IGNORE / REPLACE ) ) )?
@@ -88,7 +103,7 @@ create_trigger_stmt =
     ( ( database_name dot )? trigger_name ( BEFORE / AFTER / ( INSTEAD OF ) )? )
     ( ( DELETE / INSERT / ( UPDATE ( OF ( column_name comma )+ )? ) ) ON table_name )
     ( ( FOR EACH ROW )? ( WHEN expr )? )
-    ( BEGIN ( ( ( update_stmt / insert_stmt / delete_stmt / select_stmt ) semicolon ) nil )+ END ) )
+    ( BEGIN ( ( update_stmt / insert_stmt / delete_stmt / select_stmt ) semicolon )+ END ) )
 
 create_view_stmt =
   ( ( CREATE ( TEMP / TEMPORARY )? VIEW ( IF NOT EXISTS )? )
@@ -145,19 +160,20 @@ literal_value =
 ( numeric_literal / string_literal / blob_literal / NULL / CURRENT_TIME / CURRENT_DATE / CURRENT_TIMESTAMP )
 
 numeric_literal =
-( ( ( ( digit nil )+ ( decimal_point ( nil digit )+ )? ) / ( decimal_point ( digit nil )+ ) ) ( E ( nil / plus / minus ) ( digit nil )+ )? )
+  ( ( ( ( digit )+ ( decimal_point ( digit )+ )? )
+      / ( decimal_point ( digit )+ ) ) ( E ( plus / minus )? ( digit )+ )? )
 
 insert_stmt =
 ( ( ( ( INSERT ( OR ( ROLLBACK / ABORT / REPLACE / FAIL / IGNORE ) )? ) / REPLACE ) INTO ( database_name dot )? table_name ) ( ( lparen ( column_name comma )+ rparen )? ( VALUES lparen ( expr comma )+ rparen ) select_stmt ) ( DEFAULT VALUES ) )
 
 pragma_stmt =
-( PRAGMA ( database_name dot )? pragma_name ( nil / ( equal pragma_value ) / ( lparen pragma_value rparen ) ) )
+  ( PRAGMA ( database_name dot )? pragma_name ( ( equal pragma_value ) / ( lparen pragma_value rparen ) )? )
 
 pragma_value =
 ( signed_number / name / string_literal )
 
 reindex_stmt =
-( REINDEX nil collation_name ( ( database_name dot )? table_name index_name ) )
+  ( REINDEX collation_name ( ( database_name dot )? table_name index_name ) )
 
 select_stmt =
   ( select_core compound_operator )+
@@ -199,7 +215,7 @@ join_constraint =
   / ( USING lparen ( column_name comma )+ rparen ) )?
 
 ordering_term =
-( expr ( COLLATE collation_name )? ( nil / ASC / DESC ) )
+  ( expr ( COLLATE collation_name )? ( ASC / DESC )? )
 
 compound_operator =
 ( ( UNION ( ALL )? ) / INTERSECT / EXCEPT )
@@ -211,13 +227,14 @@ update_stmt_limited =
 ( ( UPDATE ( OR ( ROLLBACK / ABORT / REPLACE / FAIL / IGNORE ) )? qualified_table_name ) ( SET ( ( column_name equal expr ) comma )+ ( WHERE expr )? ) ( ( ( ORDER BY ( ordering_term comma )+ )? ( LIMIT expr ( ( OFFSET / comma ) expr )? ) ) )? )
 
 qualified_table_name =
-( ( database_name dot )? table_name ( nil / ( INDEXED BY index_name ) / ( NOT INDEXED ) ) )
+  ( ( database_name dot )? table_name ( ( INDEXED BY index_name ) / ( NOT INDEXED ) )? )
 
 vacuum_stmt =
 VACUUM
 
 comment_syntax =
-( ( minusminus ( nil anything_except_newline )+ ( newline / end_of_input ) ) / ( comment_beg ( nil anything_except_comment_end )+ ( comment_end / end_of_input ) ) )
+  ( ( minusminus ( anything_except_newline )+ ( newline / end_of_input ) )
+  / ( comment_beg ( anything_except_comment_end )+ ( comment_end / end_of_input ) ) )
 
 dot = '.'
 comma = ','
@@ -322,7 +339,8 @@ DESC = whitespace1 "DESC"
 DETACH = whitespace1 "DETACH"
 DISTINCT = whitespace1 "DISTINCT"
 DROP = whitespace1 "DROP"
-E = whitespace1 "E"
+E =
+  "E"
 EACH = whitespace1 "EACH"
 ELSE = whitespace1 "ELSE"
 END = whitespace1 "END"