Skip to content

parser: add syntax node ptr & update grammar #729

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

Merged
kodiakhq merged 1 commit into from
Dec 8, 2025
Merged

parser: add syntax node ptr & update grammar #729

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
2 changes: 2 additions & 0 deletions crates/squawk_ide/src/expand_selection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const DELIMITED_LIST_KINDS: &[SyntaxKind] = &[
SyntaxKind::ALTER_OPTION_LIST,
SyntaxKind::ARG_LIST,
SyntaxKind::ATTRIBUTE_LIST,
SyntaxKind::BEGIN_FUNC_OPTION_LIST,
SyntaxKind::COLUMN_LIST,
SyntaxKind::CONFLICT_INDEX_ITEM_LIST,
SyntaxKind::CONSTRAINT_EXCLUSION_LIST,
Expand All @@ -60,6 +61,7 @@ const DELIMITED_LIST_KINDS: &[SyntaxKind] = &[
SyntaxKind::SET_EXPR_LIST,
SyntaxKind::SET_OPTIONS_LIST,
SyntaxKind::SORT_BY_LIST,
SyntaxKind::TABLE_AND_COLUMNS_LIST,
SyntaxKind::TABLE_ARG_LIST,
SyntaxKind::TABLE_LIST,
SyntaxKind::TARGET_LIST,
Expand Down
3 changes: 3 additions & 0 deletions crates/squawk_parser/src/generated/syntax_kind.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 36 additions & 15 deletions crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8173,7 +8173,7 @@ fn analyze(p: &mut Parser<'_>) -> CompletedMarker {
if !p.eat(VERBOSE_KW) {
opt_option_list(p);
}
opt_relation_list(p);
opt_table_and_columns_list(p);
m.complete(p, ANALYZE)
}

Expand Down Expand Up @@ -11691,7 +11691,7 @@ fn vacuum(p: &mut Parser<'_>) -> CompletedMarker {
// [ ANALYZE ]
let _ = p.eat(ANALYZE_KW) || p.eat(ANALYSE_KW);
opt_vacuum_option_list(p);
opt_relation_list(p);
opt_table_and_columns_list(p);
m.complete(p, VACUUM)
}

Expand All @@ -11715,16 +11715,29 @@ fn opt_vacuum_option_list(p: &mut Parser<'_>) {
// [ table_and_columns [, ...] ]
// where table_and_coumns is:
// table_name [ ( column_name [, ...] ) ]
fn opt_relation_list(p: &mut Parser<'_>) {
fn opt_table_and_columns_list(p: &mut Parser<'_>) {
let m = p.start();
while !p.at(EOF) {
if opt_relation_name(p).is_none() {
break;
if !opt_table_and_columns(p) {
m.abandon(p);
return;
}
opt_column_list(p);
if !p.eat(COMMA) {
break;
}
}
m.complete(p, TABLE_AND_COLUMNS_LIST);
}

fn opt_table_and_columns(p: &mut Parser<'_>) -> bool {
let m = p.start();
if opt_relation_name(p).is_none() {
m.abandon(p);
return false;
}
opt_column_list(p);
m.complete(p, TABLE_AND_COLUMNS);
true
}

const VACUUM_OPTION_FIRST: TokenSet = NON_RESERVED_WORD
Expand Down Expand Up @@ -13194,20 +13207,13 @@ fn opt_function_option(p: &mut Parser<'_>) -> bool {
if p.eat(SEMICOLON) {
continue;
}
// sql standard
if p.eat(RETURN_KW) {
if expr(p).is_none() {
p.error("expected expr")
}
} else {
stmt(p, &StmtRestrictions::default());
}
begin_func_option(p);
if p.at(END_KW) {
p.expect(SEMICOLON);
}
}
p.expect(END_KW);
BEGIN_FUNC_OPTION
BEGIN_FUNC_OPTION_LIST
}
_ => {
m.abandon(p);
Expand All @@ -13218,6 +13224,21 @@ fn opt_function_option(p: &mut Parser<'_>) -> bool {
true
}

fn begin_func_option(p: &mut Parser<'_>) {
let m = p.start();
if p.at(RETURN_KW) {
let m = p.start();
p.bump(RETURN_KW);
if expr(p).is_none() {
p.error("expected expr")
}
m.complete(p, RETURN_FUNC_OPTION);
} else {
stmt(p, &StmtRestrictions::default());
}
m.complete(p, BEGIN_FUNC_OPTION);
}

// SET configuration_parameter { TO | = } { value | DEFAULT }
// SET configuration_parameter FROM CURRENT
fn set_configuration_param(p: &mut Parser<'_>) {
Expand Down
138 changes: 72 additions & 66 deletions crates/squawk_parser/tests/snapshots/tests__analyze_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,51 +20,55 @@ SOURCE_FILE
WHITESPACE " "
VERBOSE_KW "verbose"
WHITESPACE " "
RELATION_NAME
PATH
PATH
PATH_SEGMENT
NAME_REF
IDENT "foo"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "bar"
COMMA ","
WHITESPACE " "
RELATION_NAME
PATH
PATH
PATH_SEGMENT
NAME_REF
IDENT "foo"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "bar"
COLUMN_LIST
L_PAREN "("
COLUMN
NAME_REF
IDENT "a"
TABLE_AND_COLUMNS_LIST
TABLE_AND_COLUMNS
RELATION_NAME
PATH
PATH
PATH_SEGMENT
NAME_REF
IDENT "foo"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "bar"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
IDENT "b"
TABLE_AND_COLUMNS
RELATION_NAME
PATH
PATH
PATH_SEGMENT
NAME_REF
IDENT "foo"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "bar"
COLUMN_LIST
L_PAREN "("
COLUMN
NAME_REF
IDENT "a"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
IDENT "b"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
IDENT "c"
R_PAREN ")"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
IDENT "c"
R_PAREN ")"
COMMA ","
WHITESPACE " "
RELATION_NAME
PATH
PATH_SEGMENT
NAME_REF
IDENT "foo"
TABLE_AND_COLUMNS
RELATION_NAME
PATH
PATH_SEGMENT
NAME_REF
IDENT "foo"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- full_parens"
Expand Down Expand Up @@ -92,31 +96,33 @@ SOURCE_FILE
INT_NUMBER "10"
R_PAREN ")"
WHITESPACE " "
RELATION_NAME
PATH
PATH
PATH_SEGMENT
TABLE_AND_COLUMNS_LIST
TABLE_AND_COLUMNS
RELATION_NAME
PATH
PATH
PATH_SEGMENT
NAME_REF
IDENT "foo"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "bar"
COLUMN_LIST
L_PAREN "("
COLUMN
NAME_REF
IDENT "foo"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "bar"
COLUMN_LIST
L_PAREN "("
COLUMN
NAME_REF
IDENT "a"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
IDENT "b"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
IDENT "c"
R_PAREN ")"
IDENT "a"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
IDENT "b"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
IDENT "c"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n"
74 changes: 39 additions & 35 deletions crates/squawk_parser/tests/snapshots/tests__create_function_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1783,29 +1783,31 @@ SOURCE_FILE
WHITESPACE " "
SQL_KW "sql"
WHITESPACE "\n"
BEGIN_FUNC_OPTION
BEGIN_FUNC_OPTION_LIST
BEGIN_KW "begin"
WHITESPACE " "
ATOMIC_KW "atomic"
WHITESPACE "\n "
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
LITERAL
INT_NUMBER "1"
BEGIN_FUNC_OPTION
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
LITERAL
INT_NUMBER "1"
SEMICOLON ";"
WHITESPACE "\n "
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
LITERAL
INT_NUMBER "2"
BEGIN_FUNC_OPTION
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
LITERAL
INT_NUMBER "2"
SEMICOLON ";"
WHITESPACE "\n"
END_KW "end"
Expand Down Expand Up @@ -1839,19 +1841,20 @@ SOURCE_FILE
WHITESPACE " "
SQL_KW "sql"
WHITESPACE "\n"
BEGIN_FUNC_OPTION
BEGIN_FUNC_OPTION_LIST
BEGIN_KW "begin"
WHITESPACE " "
ATOMIC_KW "atomic"
WHITESPACE "\n "
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
LITERAL
INT_NUMBER "1"
BEGIN_FUNC_OPTION
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
LITERAL
INT_NUMBER "1"
SEMICOLON ";"
WHITESPACE "\n "
END_KW "end"
Expand Down Expand Up @@ -1891,7 +1894,7 @@ SOURCE_FILE
WHITESPACE " "
SQL_KW "sql"
WHITESPACE "\n"
BEGIN_FUNC_OPTION
BEGIN_FUNC_OPTION_LIST
BEGIN_KW "begin"
WHITESPACE " "
ATOMIC_KW "atomic"
Expand All @@ -1904,14 +1907,15 @@ SOURCE_FILE
WHITESPACE "\n"
SEMICOLON ";"
WHITESPACE "\n "
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
LITERAL
INT_NUMBER "1"
BEGIN_FUNC_OPTION
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
LITERAL
INT_NUMBER "1"
SEMICOLON ";"
WHITESPACE "\n"
SEMICOLON ";"
Expand Down
Loading
Loading