Skip to content

Commit

Permalink
merge: #806
Browse files Browse the repository at this point in the history 
806: Partially fix page width problem r=imkiva a=imkiva

fix #805 

Just fixed the case with `Doc.english`, you can still construct a counterexample with `Doc.sep(Doc.plain(), Doc.plain(), ...)`

Co-authored-by: imkiva <[email protected]>
  • Loading branch information
@bors @imkiva
bors[bot] and imkiva authored Dec 11, 2022
2 parents 74bc594 + be5b7a9 commit a4d3c26
Show file tree
Hide file tree
Showing 18 changed files with 145 additions and 109 deletions.
4 changes: 2 additions & 2 deletions base/src/test/resources/failure/operator/no-assoc.aya.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ In file $FILE:9:24 ->
9 | def test3 => (suc zero) = (suc (suc zero)) = (suc (suc (suc zero)))
^^

Error: Cannot figure out computation order because `=` (Infix) and `=` (Infix) share
the same precedence but no associativity was specified.
Error: Cannot figure out computation order because `=` (Infix) and `=` (Infix)
share the same precedence but no associativity was specified.
note: Make them both left/right-associative to resolve this problem.

1 error(s), 0 warning(s).
Expand Down
76 changes: 44 additions & 32 deletions base/src/test/resources/failure/patterns/confl-literal.aya.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,29 @@ In file $FILE:4:4 ->
4 | | 0 => 0
^----^

Warning: The 2nd clause dominates the 1st clause. The 1st clause will be unreachable

Warning: The 2nd clause dominates the 1st clause. The 1st clause will be
unreachable

In file $FILE:6:4 ->

4 | | 0 => 0
5 | | a => a
6 | | suc a => suc a
^------------^

Warning: The 2nd clause dominates the 3rd clause. The 3rd clause will be unreachable

Warning: The 2nd clause dominates the 3rd clause. The 3rd clause will be
unreachable

In file $FILE:10:4 ->

8 | | 2147483647 => 3
9 | | 2147483647 => 4
10 | | 114514 => 1919
^------------^

Warning: The 2nd clause dominates the 7th clause. The 7th clause will be unreachable

Warning: The 2nd clause dominates the 7th clause. The 7th clause will be
unreachable

In file $FILE:3:12 ->

1 | open data Nat | zero | suc Nat
Expand All @@ -44,25 +47,27 @@ Error: The 7th and the 2nd clauses are not confluent because we failed to unify
1919
and
114514

In file $FILE:6:4 ->

4 | | 0 => 0
5 | | a => a
6 | | suc a => suc a
^------------^

Warning: The 2nd clause dominates the 3rd clause. The 3rd clause will be unreachable

Warning: The 2nd clause dominates the 3rd clause. The 3rd clause will be
unreachable

In file $FILE:7:4 ->

5 | | a => a
6 | | suc a => suc a
7 | | suc (suc a) => a
^--------------^

Warning: The 3rd clause dominates the 4th clause. The 4th clause will be unreachable

Warning: The 3rd clause dominates the 4th clause. The 4th clause will be
unreachable

In file $FILE:3:12 ->

1 | open data Nat | zero | suc Nat
Expand All @@ -79,25 +84,27 @@ Error: The 3rd and the 4th clauses are not confluent because we failed to unify
suc (suc a)
and
a

In file $FILE:9:4 ->

7 | | suc (suc a) => a
8 | | 2147483647 => 3
9 | | 2147483647 => 4
^-------------^

Warning: The 5th clause dominates the 6th clause. The 6th clause will be unreachable

Warning: The 5th clause dominates the 6th clause. The 6th clause will be
unreachable

In file $FILE:8:4 ->

6 | | suc a => suc a
7 | | suc (suc a) => a
8 | | 2147483647 => 3
^-------------^

Warning: The 6th clause dominates the 5th clause. The 5th clause will be unreachable

Warning: The 6th clause dominates the 5th clause. The 5th clause will be
unreachable

In file $FILE:3:12 ->

1 | open data Nat | zero | suc Nat
Expand All @@ -116,16 +123,17 @@ Error: The 5th and the 6th clauses are not confluent because we failed to unify
3
and
4

In file $FILE:9:4 ->

7 | | suc (suc a) => a
8 | | 2147483647 => 3
9 | | 2147483647 => 4
^-------------^

Warning: The 2nd clause dominates the 6th clause. The 6th clause will be unreachable

Warning: The 2nd clause dominates the 6th clause. The 6th clause will be
unreachable

In file $FILE:3:12 ->

1 | open data Nat | zero | suc Nat
Expand All @@ -144,25 +152,27 @@ Error: The 6th and the 2nd clauses are not confluent because we failed to unify
4
and
2147483647

In file $FILE:6:4 ->

4 | | 0 => 0
5 | | a => a
6 | | suc a => suc a
^------------^

Warning: The 2nd clause dominates the 3rd clause. The 3rd clause will be unreachable

Warning: The 2nd clause dominates the 3rd clause. The 3rd clause will be
unreachable

In file $FILE:7:4 ->

5 | | a => a
6 | | suc a => suc a
7 | | suc (suc a) => a
^--------------^

Warning: The 3rd clause dominates the 4th clause. The 4th clause will be unreachable

Warning: The 3rd clause dominates the 4th clause. The 4th clause will be
unreachable

In file $FILE:3:12 ->

1 | open data Nat | zero | suc Nat
Expand All @@ -179,25 +189,27 @@ Error: The 3rd and the 4th clauses are not confluent because we failed to unify
suc (suc a)
and
a

In file $FILE:6:4 ->

4 | | 0 => 0
5 | | a => a
6 | | suc a => suc a
^------------^

Warning: The 2nd clause dominates the 3rd clause. The 3rd clause will be unreachable

Warning: The 2nd clause dominates the 3rd clause. The 3rd clause will be
unreachable

In file $FILE:7:4 ->

5 | | a => a
6 | | suc a => suc a
7 | | suc (suc a) => a
^--------------^

Warning: The 3rd clause dominates the 4th clause. The 4th clause will be unreachable

Warning: The 3rd clause dominates the 4th clause. The 4th clause will be
unreachable

In file $FILE:3:12 ->

1 | open data Nat | zero | suc Nat
Expand All @@ -214,6 +226,6 @@ Error: The 3rd and the 4th clauses are not confluent because we failed to unify
suc (suc a)
and
a
6 error(s), 12 warning(s).
What are you doing?

6 error(s), 12 warning(s).
What are you doing?
Loading

0 comments on commit a4d3c26

Please sign in to comment.