Skip to content

Commit

Permalink
Fix test conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
HarrisL2 committed Oct 12, 2023
1 parent 25bc4b9 commit 36cfb70
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
6 changes: 3 additions & 3 deletions shared/src/test/diff/codegen/NewMatching.mls
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ fun sum(v) =
//│ return (a = v, a instanceof V0.class ? 0 : a instanceof V1.class ? (([a]) => a)(V1.unapply(v)) : a instanceof V2.class ? (([
//│ a,
//│ b
//│ ]) => a + b)(V2.unapply(v)) : a instanceof Pos.class ? (([x]) => x > 0 === true ? x : 0 - 1)(Pos.unapply(v)) : a instanceof V22.class ? (([
//│ ]) => a + b)(V2.unapply(v)) : a instanceof Pos.class ? (([x]) => x > 0 === true ? x : -1)(Pos.unapply(v)) : a instanceof V22.class ? (([
//│ tmp0,
//│ tmp1
//│ ]) => tmp0 instanceof V2.class ? (([
Expand All @@ -51,10 +51,10 @@ fun sum(v) =
//│ ]) => tmp1 instanceof V2.class ? (([
//│ x2,
//│ y2
//│ ]) => x1 + y1 + x2 + y2)(V2.unapply(tmp1)) : 0 - 1)(V2.unapply(tmp0)) : 0 - 1)(V22.unapply(v)) : a instanceof Half.class ? (([
//│ ]) => x1 + y1 + x2 + y2)(V2.unapply(tmp1)) : -1)(V2.unapply(tmp0)) : -1)(V22.unapply(v)) : a instanceof Half.class ? (([
//│ tmp2,
//│ x
//│ ]) => x)(Half.unapply(v)) : a instanceof None.class ? (([tmp3]) => 0)(None.unapply(v)) : 0 - 1);
//│ ]) => x)(Half.unapply(v)) : a instanceof None.class ? (([tmp3]) => 0)(None.unapply(v)) : -1);
//│ })());
//│ };
//│ // End of generated code
Expand Down
4 changes: 2 additions & 2 deletions shared/src/test/diff/nu/UnaryMinus.mls
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
1 - (3 - 5)
//│ Int
//│ res
//│ = -7
//│ = 3

3 - 1
//│ Int
Expand All @@ -53,7 +53,7 @@
1 - (1 - 1)
//│ Int
//│ res
//│ = -1
//│ = 1

1 - 1
//│ Int
Expand Down
1 change: 0 additions & 1 deletion shared/src/test/diff/parser/NegativeLits.mls
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
:NewParser
:ParseOnly

:e // FIXME: What does this test represent?
type MinusOne = -1
//│ |#type| |MinusOne| |#=| |-|1|
//│ Parsed: {type alias MinusOne: -1 {}}
Expand Down

0 comments on commit 36cfb70

Please sign in to comment.