Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 12 additions & 19 deletions crates/squawk_parser/src/grammar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2515,34 +2515,27 @@ fn expr_bp(p: &mut Parser<'_>, bp: u8, r: &Restrictions) -> Option<CompletedMark
}
let m = lhs.precede(p);
p.bump(op);
if matches!(op, COLON_COLON) {
type_name(p);
let cast_expr = m.complete(p, CAST_EXPR);
lhs = postfix_expr(p, cast_expr, true);
continue;
}

let op_bp = match associativity {
Associativity::Left => op_bp + 1,
Associativity::Right => op_bp,
};
let rhs = expr_bp(p, op_bp, r);
lhs = if matches!(op, COLON_COLON) {
if let Some(rhs) = rhs {
match rhs.kind() {
NAME_REF => {
// wrap our previous expression in a type
// TODO: can we unify types & exprs?
let path_segment = rhs.precede(p).complete(p, PATH_SEGMENT);
let path = path_segment.precede(p).complete(p, PATH);
path.precede(p).complete(p, PATH_TYPE);
}
FIELD_EXPR | CALL_EXPR | INDEX_EXPR => {
rhs.precede(p).complete(p, EXPR_TYPE);
}
_ => {}
}
};
m.complete(p, CAST_EXPR)
} else if matches!(op, FAT_ARROW | COLON_EQ) {
let _rhs = expr_bp(p, op_bp, r);
lhs = if matches!(op, FAT_ARROW | COLON_EQ) {
m.complete(p, NAMED_ARG)
} else {
m.complete(p, BIN_EXPR)
};
}
if r.order_by_allowed && p.at(ORDER_KW) {
opt_order_by_clause(p);
}
Some(lhs)
}

Expand Down
2 changes: 2 additions & 0 deletions crates/squawk_parser/tests/data/ok/select_casts.sql
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ select cast('{1}' as integer[3][3]);

select '{1}'::integer[1][2][3][][][1000];

select '{}'::int array[10];

select array[]::integer[];

-- casts
Expand Down
42 changes: 24 additions & 18 deletions crates/squawk_parser/tests/snapshots/tests__misc_ok.snap
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,14 @@ SOURCE_FILE
COLON_COLON
COLON ":"
COLON ":"
EXPR_TYPE
INDEX_EXPR
NAME_REF
IDENT "timestamptz"
L_BRACK "["
R_BRACK "]"
ARRAY_TYPE
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "timestamptz"
L_BRACK "["
R_BRACK "]"
COMMA ","
WHITESPACE " \n "
CAST_EXPR
Expand All @@ -118,12 +120,14 @@ SOURCE_FILE
COLON_COLON
COLON ":"
COLON ":"
EXPR_TYPE
INDEX_EXPR
NAME_REF
TEXT_KW "text"
L_BRACK "["
R_BRACK "]"
ARRAY_TYPE
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
TEXT_KW "text"
L_BRACK "["
R_BRACK "]"
COMMA ","
WHITESPACE " \n "
CAST_EXPR
Expand All @@ -132,12 +136,14 @@ SOURCE_FILE
COLON_COLON
COLON ":"
COLON ":"
EXPR_TYPE
INDEX_EXPR
NAME_REF
IDENT "float8"
L_BRACK "["
R_BRACK "]"
ARRAY_TYPE
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "float8"
L_BRACK "["
R_BRACK "]"
WHITESPACE "\n"
R_PAREN ")"
SEMICOLON ";"
Expand Down
Loading
Loading