Skip to content

Commit

Permalink
fix: make add and sub less strict
Browse files Browse the repository at this point in the history
  • Loading branch information
@PrettyWood
PrettyWood committed Dec 11, 2023
1 parent 4b351b8 commit a11fb55
Show file tree
Hide file tree
Showing 11 changed files with 116 additions and 331 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
**Fixes**:

- Fix an issue with arithmetic precedence (@max-sixty, #3846)
- `+` and `-` can be used after a cast (@PrettyWood, #3923)

**Documentation**:

Expand Down
60 changes: 5 additions & 55 deletions ...src/semantic/resolver/snapshots/prql_compiler__semantic__resolver__test__functions_1.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,84 +9,34 @@ expression: "resolve_derive(r#\"\n let subtract = a b -> a - b\n\n
- this
- employees
- gross_salary
ty:
kind:
Union:
- - ~
- kind:
Primitive: Int
span: "2:1030-1033"
name: ~
- - ~
- kind:
Primitive: Float
span: "2:1037-1042"
name: ~
- - ~
- kind:
Primitive: Timestamp
span: "2:1046-1055"
name: ~
- - ~
- kind:
Primitive: Date
span: "2:1059-1063"
name: ~
span: "2:1030-1063"
name: ~
- Ident:
- this
- employees
- tax
ty:
kind:
Union:
- - ~
- kind:
Primitive: Int
span: "2:1071-1074"
name: ~
- - ~
- kind:
Primitive: Float
span: "2:1078-1083"
name: ~
- - ~
- kind:
Primitive: Timestamp
span: "2:1087-1096"
name: ~
- - ~
- kind:
Primitive: Date
span: "2:1100-1104"
name: ~
span: "2:1071-1104"
name: ~
alias: net_salary
ty:
kind:
Union:
- - ~
- kind:
Primitive: Int
span: "2:1110-1113"
span: "2:970-973"
name: ~
- - ~
- kind:
Primitive: Float
span: "2:1117-1122"
span: "2:977-982"
name: ~
- - ~
- kind:
Primitive: Timestamp
span: "2:1126-1135"
span: "2:986-995"
name: ~
- - ~
- kind:
Primitive: Date
span: "2:1139-1143"
span: "2:999-1003"
name: ~
span: "2:1110-1143"
span: "2:970-1003"
name: ~

45 changes: 10 additions & 35 deletions ...emantic/resolver/snapshots/prql_compiler__semantic__resolver__test__functions_nested.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,77 +53,52 @@ expression: "resolve_derive(r#\"\n let lag_day = x -> s\"lag_day_todo
- - ~
- kind:
Primitive: Int
span: "2:1110-1113"
span: "2:970-973"
name: ~
- - ~
- kind:
Primitive: Float
span: "2:1117-1122"
span: "2:977-982"
name: ~
- - ~
- kind:
Primitive: Timestamp
span: "2:1126-1135"
span: "2:986-995"
name: ~
- - ~
- kind:
Primitive: Date
span: "2:1139-1143"
span: "2:999-1003"
name: ~
span: "2:1110-1143"
span: "2:970-1003"
name: ~
- Ident:
- this
- a
- c
ty:
kind:
Union:
- - ~
- kind:
Primitive: Int
span: "2:924-927"
name: ~
- - ~
- kind:
Primitive: Float
span: "2:931-936"
name: ~
- - ~
- kind:
Primitive: Timestamp
span: "2:940-949"
name: ~
- - ~
- kind:
Primitive: Date
span: "2:953-957"
name: ~
span: "2:924-957"
name: ~
ty:
kind:
Union:
- - ~
- kind:
Primitive: Int
span: "2:963-966"
span: "2:893-896"
name: ~
- - ~
- kind:
Primitive: Float
span: "2:970-975"
span: "2:900-905"
name: ~
- - ~
- kind:
Primitive: Timestamp
span: "2:979-988"
span: "2:909-918"
name: ~
- - ~
- kind:
Primitive: Date
span: "2:992-996"
span: "2:922-926"
name: ~
span: "2:963-996"
span: "2:893-926"
name: ~

30 changes: 15 additions & 15 deletions ...tic/resolver/snapshots/prql_compiler__semantic__resolver__test__functions_pipeline-2.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,24 @@ expression: "resolve_derive(r#\"\n let plus_one = x -> x + 1\n
kind:
Array:
kind: Any
span: "2:2069-2076"
span: "2:1929-1936"
name: ~
span: "2:2068-2077"
span: "2:1928-1937"
name: array
ty:
kind:
Union:
- - ~
- kind:
Primitive: Int
span: "2:4300-4303"
span: "2:4160-4163"
name: ~
- - ~
- kind:
Primitive: Float
span: "2:4307-4312"
span: "2:4167-4172"
name: ~
span: "2:4300-4312"
span: "2:4160-4172"
name: ~
- Literal:
Integer: 1
Expand All @@ -58,24 +58,24 @@ expression: "resolve_derive(r#\"\n let plus_one = x -> x + 1\n
- - ~
- kind:
Primitive: Int
span: "2:963-966"
span: "2:893-896"
name: ~
- - ~
- kind:
Primitive: Float
span: "2:970-975"
span: "2:900-905"
name: ~
- - ~
- kind:
Primitive: Timestamp
span: "2:979-988"
span: "2:909-918"
name: ~
- - ~
- kind:
Primitive: Date
span: "2:992-996"
span: "2:922-926"
name: ~
span: "2:963-996"
span: "2:893-926"
name: ~
alias: b
ty:
Expand All @@ -84,23 +84,23 @@ expression: "resolve_derive(r#\"\n let plus_one = x -> x + 1\n
- - ~
- kind:
Primitive: Int
span: "2:963-966"
span: "2:893-896"
name: ~
- - ~
- kind:
Primitive: Float
span: "2:970-975"
span: "2:900-905"
name: ~
- - ~
- kind:
Primitive: Timestamp
span: "2:979-988"
span: "2:909-918"
name: ~
- - ~
- kind:
Primitive: Date
span: "2:992-996"
span: "2:922-926"
name: ~
span: "2:963-996"
span: "2:893-926"
name: ~

10 changes: 5 additions & 5 deletions ...antic/resolver/snapshots/prql_compiler__semantic__resolver__test__functions_pipeline.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ expression: "resolve_derive(r#\"\n from a\n derive one = (
kind:
Array:
kind: Any
span: "2:2069-2076"
span: "2:1929-1936"
name: ~
span: "2:2068-2077"
span: "2:1928-1937"
name: array
alias: one
ty:
Expand All @@ -24,13 +24,13 @@ expression: "resolve_derive(r#\"\n from a\n derive one = (
- - ~
- kind:
Primitive: Int
span: "2:4300-4303"
span: "2:4160-4163"
name: ~
- - ~
- kind:
Primitive: Float
span: "2:4307-4312"
span: "2:4167-4172"
name: ~
span: "2:4300-4312"
span: "2:4160-4172"
name: ~

Loading

0 comments on commit a11fb55

Please sign in to comment.