Skip to content

Commit b1a000f

Browse files
authored
Standardize comments on parsing optional keywords (#773)
1 parent 61c661c commit b1a000f

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

src/parser.rs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,7 @@ impl<'a> Parser<'a> {
12301230
/// if `named` is `true`, came from an expression like `ARRAY[ex1, ex2]`
12311231
pub fn parse_array_expr(&mut self, named: bool) -> Result<Expr, ParserError> {
12321232
if self.peek_token().token == Token::RBracket {
1233-
let _ = self.next_token();
1233+
let _ = self.next_token(); // consume ]
12341234
Ok(Expr::Array(Array {
12351235
elem: vec![],
12361236
named,
@@ -2723,8 +2723,7 @@ impl<'a> Parser<'a> {
27232723
let if_not_exists = self.parse_keywords(&[Keyword::IF, Keyword::NOT, Keyword::EXISTS]);
27242724
let names = self.parse_comma_separated(Parser::parse_object_name)?;
27252725

2726-
// Parse optional WITH
2727-
let _ = self.parse_keyword(Keyword::WITH);
2726+
let _ = self.parse_keyword(Keyword::WITH); // [ WITH ]
27282727

27292728
let optional_keywords = if dialect_of!(self is MsSqlDialect) {
27302729
vec![Keyword::AUTHORIZATION]
@@ -3664,7 +3663,7 @@ impl<'a> Parser<'a> {
36643663
let object_type = self.expect_one_of_keywords(&[Keyword::TABLE, Keyword::INDEX])?;
36653664
match object_type {
36663665
Keyword::TABLE => {
3667-
let _ = self.parse_keyword(Keyword::ONLY);
3666+
let _ = self.parse_keyword(Keyword::ONLY); // [ ONLY ]
36683667
let table_name = self.parse_object_name()?;
36693668
let operation = if self.parse_keyword(Keyword::ADD) {
36703669
if let Some(constraint) = self.parse_optional_table_constraint()? {
@@ -3711,7 +3710,7 @@ impl<'a> Parser<'a> {
37113710
let table_name = self.parse_object_name()?;
37123711
AlterTableOperation::RenameTable { table_name }
37133712
} else {
3714-
let _ = self.parse_keyword(Keyword::COLUMN);
3713+
let _ = self.parse_keyword(Keyword::COLUMN); // [ COLUMN ]
37153714
let old_column_name = self.parse_identifier()?;
37163715
self.expect_keyword(Keyword::TO)?;
37173716
let new_column_name = self.parse_identifier()?;
@@ -3751,7 +3750,7 @@ impl<'a> Parser<'a> {
37513750
{
37523751
AlterTableOperation::DropPrimaryKey
37533752
} else {
3754-
let _ = self.parse_keyword(Keyword::COLUMN);
3753+
let _ = self.parse_keyword(Keyword::COLUMN); // [ COLUMN ]
37553754
let if_exists = self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]);
37563755
let column_name = self.parse_identifier()?;
37573756
let cascade = self.parse_keyword(Keyword::CASCADE);
@@ -3775,7 +3774,7 @@ impl<'a> Parser<'a> {
37753774
new_partitions: renames,
37763775
}
37773776
} else if self.parse_keyword(Keyword::CHANGE) {
3778-
let _ = self.parse_keyword(Keyword::COLUMN);
3777+
let _ = self.parse_keyword(Keyword::COLUMN); // [ COLUMN ]
37793778
let old_name = self.parse_identifier()?;
37803779
let new_name = self.parse_identifier()?;
37813780
let data_type = self.parse_data_type()?;
@@ -3791,7 +3790,7 @@ impl<'a> Parser<'a> {
37913790
options,
37923791
}
37933792
} else if self.parse_keyword(Keyword::ALTER) {
3794-
let _ = self.parse_keyword(Keyword::COLUMN);
3793+
let _ = self.parse_keyword(Keyword::COLUMN); // [ COLUMN ]
37953794
let column_name = self.parse_identifier()?;
37963795
let is_postgresql = dialect_of!(self is PostgreSqlDialect);
37973796

@@ -3834,7 +3833,6 @@ impl<'a> Parser<'a> {
38343833
})
38353834
}
38363835
Keyword::INDEX => {
3837-
let _ = self.parse_keyword(Keyword::ONLY);
38383836
let index_name = self.parse_object_name()?;
38393837
let operation = if self.parse_keyword(Keyword::RENAME) {
38403838
if self.parse_keyword(Keyword::TO) {
@@ -3879,7 +3877,7 @@ impl<'a> Parser<'a> {
38793877
filename: self.parse_literal_string()?,
38803878
}
38813879
};
3882-
let _ = self.parse_keyword(Keyword::WITH);
3880+
let _ = self.parse_keyword(Keyword::WITH); // [ WITH ]
38833881
let mut options = vec![];
38843882
if self.consume_token(&Token::LParen) {
38853883
options = self.parse_comma_separated(Parser::parse_copy_option)?;
@@ -5376,12 +5374,12 @@ impl<'a> Parser<'a> {
53765374

53775375
let join_operator_type = match peek_keyword {
53785376
Keyword::INNER | Keyword::JOIN => {
5379-
let _ = self.parse_keyword(Keyword::INNER);
5377+
let _ = self.parse_keyword(Keyword::INNER); // [ INNER ]
53805378
self.expect_keyword(Keyword::JOIN)?;
53815379
JoinOperator::Inner
53825380
}
53835381
kw @ Keyword::LEFT | kw @ Keyword::RIGHT => {
5384-
let _ = self.next_token();
5382+
let _ = self.next_token(); // consume LEFT/RIGHT
53855383
let is_left = kw == Keyword::LEFT;
53865384
let join_type = self.parse_one_of_keywords(&[
53875385
Keyword::OUTER,
@@ -5430,8 +5428,8 @@ impl<'a> Parser<'a> {
54305428
}
54315429
}
54325430
Keyword::FULL => {
5433-
let _ = self.next_token();
5434-
let _ = self.parse_keyword(Keyword::OUTER);
5431+
let _ = self.next_token(); // consume FULL
5432+
let _ = self.parse_keyword(Keyword::OUTER); // [ OUTER ]
54355433
self.expect_keyword(Keyword::JOIN)?;
54365434
JoinOperator::FullOuter
54375435
}

0 commit comments

Comments
 (0)