ref: 8f7a66fb7513f469f247d6f9ced7ed09914a097a
parent: 9dda8f763515213e6c1db3e76c483affada599bc
author: Lennart Augustsson <lennart.augustsson@epicgames.com>
date: Fri Feb 16 09:48:25 EST 2024
Fix bug with negative literals in patterns.
--- a/TODO
+++ b/TODO
@@ -42,7 +42,6 @@
- do everything in Haskell
- make a low level primError that takes a utf8 string
- get rid of noMatch and noDefault primitives
-* Fix bug with negative literal patterns
* Implement more Char/String literals
* Implement lazy matching
* Implement strict matching
--- a/generated/mhs.c
+++ b/generated/mhs.c
@@ -7468,10 +7468,12 @@
32,112,97,116,116,101,114,110,34,32,64,32,64,32,64,32,64,32,64,32,
64,32,58,49,48,50,56,32,64,10,65,32,95,56,57,50,32,95,49,48,
50,54,32,64,32,58,49,48,50,55,32,64,10,65,32,66,32,89,32,64,
-32,67,39,32,67,39,32,83,32,64,32,64,32,67,39,32,67,39,32,83,
-32,64,32,64,32,66,32,66,32,83,39,32,67,39,32,64,32,66,32,64,
-32,64,32,64,32,83,39,32,83,39,32,66,32,64,32,64,32,66,32,66,
-32,83,39,32,83,39,32,83,32,64,32,64,32,64,32,64,32,66,32,66,
+32,67,39,32,67,39,32,83,32,64,32,64,32,67,39,32,83,39,32,83,
+39,32,83,32,64,32,64,32,64,32,67,39,32,67,39,32,83,32,64,32,
+64,32,66,32,66,32,83,39,32,67,39,32,64,32,66,32,67,39,32,64,
+32,66,32,64,32,64,32,64,32,64,32,83,39,32,83,39,32,66,32,64,
+32,64,32,66,32,66,32,83,39,32,66,32,64,32,64,32,64,32,66,32,
+66,32,66,32,83,39,32,83,32,64,32,64,32,64,32,64,32,66,32,66,
32,66,32,66,32,83,39,32,83,39,32,64,32,67,32,60,32,64,32,35,
56,32,64,32,64,32,64,32,64,32,64,32,64,32,83,39,32,67,39,32,
83,39,32,83,39,32,83,32,64,32,64,32,64,32,64,32,66,32,66,32,
@@ -7575,153 +7577,158 @@
50,32,64,32,66,32,95,52,56,51,32,64,32,85,32,75,32,65,32,64,
32,64,32,64,32,64,32,64,32,64,32,64,32,95,49,48,48,55,32,64,
32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,
-32,64,32,64,32,64,32,83,39,32,67,39,32,83,39,32,83,39,32,67,
-39,32,83,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,66,32,
-66,32,66,32,83,39,32,83,39,32,64,32,67,32,60,32,64,32,35,50,
-32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,67,39,32,83,39,
-32,67,39,32,67,39,32,83,39,32,83,32,64,32,64,32,64,32,64,32,
-64,32,66,32,66,32,66,32,66,32,66,32,83,39,32,83,39,32,64,32,
-67,32,60,32,64,32,35,52,32,64,32,64,32,64,32,64,32,64,32,64,
-32,64,32,67,39,66,32,66,39,32,66,32,83,39,32,66,32,64,32,64,
-32,66,32,66,32,83,32,64,32,64,32,66,32,66,32,67,39,32,83,39,
-32,64,32,67,32,60,32,64,32,35,55,32,64,32,64,32,64,32,64,32,
-66,32,66,32,85,32,64,32,64,32,66,32,66,32,83,39,32,95,48,32,
-95,53,53,54,32,64,32,64,32,66,32,95,55,32,95,53,53,52,32,64,
-32,95,51,50,49,32,64,32,64,32,95,51,50,50,32,95,53,53,54,32,
-64,32,95,49,48,48,56,32,64,32,64,32,64,32,64,32,64,32,66,32,
-66,32,66,32,85,32,64,32,64,32,64,32,67,39,32,67,39,32,67,39,
-66,32,64,32,64,32,66,32,66,32,66,32,67,32,64,32,64,32,64,32,
-67,39,32,67,39,32,67,39,32,67,39,66,32,64,32,64,32,64,32,66,
-32,66,32,66,32,66,32,95,54,51,32,95,53,53,54,32,64,32,64,32,
-64,32,64,32,64,32,67,39,32,83,39,32,66,32,64,32,64,32,66,32,
-66,39,32,64,32,67,32,95,57,57,49,32,95,51,49,49,32,64,32,64,
-32,64,32,64,32,66,32,66,32,95,56,52,49,32,64,32,64,32,67,39,
-66,32,95,54,53,49,32,64,32,95,51,50,55,32,64,32,64,32,64,32,
-64,32,64,32,66,32,95,49,49,32,95,53,53,54,32,64,32,64,32,83,
-39,32,67,32,64,32,83,39,32,80,32,64,32,66,32,95,51,48,48,32,
-64,32,85,32,90,32,75,32,64,32,64,32,64,32,64,32,66,32,95,51,
-48,48,32,64,32,85,32,75,32,75,32,64,32,64,32,64,32,64,32,64,
-32,66,32,95,52,56,52,32,64,32,85,32,75,32,65,32,64,32,64,32,
-64,32,64,32,64,32,64,32,64,32,64,32,95,49,48,48,55,32,64,32,
-64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,
-66,32,67,39,32,67,39,66,32,64,32,67,32,67,32,61,61,32,64,32,
-35,52,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,66,
-32,85,32,64,32,64,32,64,32,66,32,66,32,90,32,64,32,64,32,66,
-32,66,32,90,32,64,32,64,32,67,39,66,32,66,32,64,32,67,39,32,
-83,39,32,95,57,56,56,32,64,32,64,32,67,39,32,95,52,55,57,32,
-64,32,66,32,95,52,56,48,32,64,32,67,32,95,54,53,48,32,64,32,
-102,114,111,109,85,84,70,56,32,34,61,61,34,32,64,32,64,32,64,32,
-64,32,64,32,66,32,95,52,56,48,32,64,32,67,32,95,54,53,48,32,
-64,32,102,114,111,109,85,84,70,56,32,34,84,114,117,101,34,32,64,32,
-64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,
-64,32,66,32,67,39,32,67,39,66,32,64,32,67,32,67,32,61,61,32,
-64,32,35,50,32,64,32,64,32,64,32,64,32,66,32,85,32,64,32,67,
-39,32,67,39,32,95,48,32,95,53,53,54,32,64,32,64,32,64,32,95,
-49,48,50,48,32,95,51,49,49,32,64,32,64,32,64,32,64,32,64,32,
-64,32,64,32,83,39,32,66,32,64,32,66,32,83,39,32,67,32,64,32,
-64,32,66,32,66,32,67,39,32,83,39,32,64,32,67,32,60,32,64,32,
-35,49,32,64,32,64,32,64,32,64,32,66,32,66,32,85,32,64,32,64,
-32,66,32,66,32,67,39,66,32,66,32,95,48,32,95,53,53,54,32,64,
-32,64,32,95,49,48,48,56,32,64,32,64,32,64,32,64,32,66,32,66,
-32,66,32,85,32,64,32,64,32,64,32,66,32,66,32,66,32,67,32,66,
-32,64,32,64,32,64,32,64,32,66,32,83,39,32,66,32,64,32,66,32,
-67,39,66,32,64,32,66,32,66,39,32,64,32,66,32,66,39,32,64,32,
-66,32,66,32,95,48,32,95,53,53,54,32,64,32,64,32,64,32,95,56,
-56,49,32,95,51,49,49,32,64,32,64,32,64,32,64,32,64,32,64,32,
-64,32,66,32,66,32,66,32,66,32,66,32,66,32,85,32,64,32,64,32,
-64,32,64,32,64,32,64,32,66,32,66,32,67,39,66,32,66,39,32,66,
-39,32,66,32,67,39,66,32,64,32,66,32,66,32,95,48,32,95,53,53,
-54,32,64,32,64,32,64,32,67,32,95,49,48,50,55,32,64,32,64,32,
-64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,66,32,66,32,
-66,32,66,32,85,32,64,32,64,32,64,32,64,32,64,32,64,32,67,39,
-32,67,39,66,32,64,32,66,32,66,39,32,64,32,66,32,66,39,32,64,
-32,66,32,66,32,67,39,66,32,64,32,64,32,66,32,66,32,66,39,32,
-64,32,64,32,66,32,66,32,66,39,32,64,32,64,32,66,32,66,32,66,
-32,95,54,51,32,95,53,53,54,32,64,32,64,32,64,32,64,32,67,39,
-32,67,32,64,32,95,49,48,48,54,32,95,51,49,49,32,64,32,64,32,
-64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,66,32,
-66,32,66,32,66,32,95,49,49,32,95,53,53,54,32,64,32,64,32,64,
-32,64,32,64,32,64,32,64,32,67,39,32,67,39,66,32,64,32,66,32,
-66,32,67,39,32,67,39,66,32,64,32,64,32,64,32,66,32,66,32,66,
-32,66,32,67,32,64,32,64,32,64,32,64,32,67,39,66,32,66,32,67,
-39,66,32,64,32,66,32,66,32,80,32,64,32,64,32,95,49,53,52,32,
-64,32,64,32,64,32,95,49,53,52,32,64,32,64,32,64,32,64,32,95,
-52,55,57,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,
-64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,66,32,85,32,
-64,32,64,32,64,32,83,39,32,66,32,64,32,66,32,67,39,32,67,32,
-64,32,64,32,66,32,66,32,83,32,95,54,52,52,32,64,32,64,32,64,
-32,83,39,32,83,39,32,83,32,64,32,64,32,66,32,66,32,83,32,95,
-54,52,51,32,64,32,64,32,64,32,67,39,66,32,66,39,32,66,32,95,
-48,32,95,53,53,54,32,64,32,64,32,95,49,48,48,53,32,64,32,64,
-32,64,32,66,32,67,39,66,32,66,32,95,48,32,95,53,53,54,32,64,
-32,64,32,95,49,48,48,52,32,95,51,49,49,32,64,32,64,32,64,32,
-64,32,66,32,66,32,85,32,64,32,64,32,67,39,32,67,39,66,32,64,
-32,66,32,66,32,67,39,32,95,54,51,32,95,53,53,54,32,64,32,64,
-32,64,32,64,32,66,32,66,32,83,32,73,32,64,32,64,32,64,32,66,
-32,66,32,67,39,32,67,39,66,32,64,32,66,32,67,32,67,32,61,61,
-32,64,32,35,49,57,32,64,32,64,32,64,32,95,55,48,49,32,95,51,
-49,49,32,64,32,80,32,95,55,48,50,32,64,32,95,54,54,50,32,64,
-32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,85,32,64,32,64,
-32,66,32,67,32,64,32,95,56,55,57,32,95,51,49,49,32,64,32,64,
-32,64,32,64,32,64,32,64,32,64,32,66,32,95,49,49,32,95,53,53,
-54,32,64,32,64,32,67,32,80,32,95,53,53,32,64,32,95,53,53,32,
-64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,
-66,32,67,39,32,95,48,32,95,53,53,54,32,64,32,64,32,95,49,48,
-48,52,32,95,51,49,49,32,64,32,64,32,64,32,64,32,66,32,66,32,
-83,39,32,95,54,51,32,95,53,53,54,32,64,32,64,32,85,32,75,32,
-85,32,67,39,66,32,67,32,67,32,61,61,32,64,32,35,50,49,32,64,
-32,64,32,95,50,50,48,32,64,32,64,32,85,32,75,32,85,32,67,39,
-66,32,67,32,67,32,61,61,32,64,32,35,50,49,32,64,32,64,32,95,
-50,50,48,32,64,32,64,32,85,32,75,50,32,95,49,49,32,95,53,53,
-54,32,64,32,95,49,48,55,32,64,32,64,32,64,32,64,32,64,32,64,
-32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,
-32,67,39,32,95,48,32,95,53,53,54,32,64,32,64,32,95,49,48,50,
-49,32,64,32,64,32,64,32,66,32,66,32,85,32,64,32,64,32,66,32,
-66,32,66,32,85,32,64,32,64,32,64,32,66,32,66,32,66,32,67,39,
-66,32,67,32,67,32,61,61,32,64,32,35,50,49,32,64,32,64,32,95,
-49,48,50,50,32,95,49,48,50,53,32,64,32,102,114,111,109,85,84,70,
-56,32,34,98,105,110,100,34,32,64,32,64,32,64,32,64,32,64,32,64,
-32,64,32,66,32,66,32,66,32,85,32,64,32,64,32,64,32,66,32,66,
-32,66,32,67,39,32,83,39,32,95,48,32,95,53,53,54,32,64,32,64,
-32,64,32,95,56,56,51,32,64,32,64,32,64,32,64,32,66,32,66,32,
-66,32,66,32,85,32,64,32,64,32,64,32,64,32,66,32,83,39,32,67,
-39,32,67,39,66,32,64,32,64,32,66,32,66,32,66,32,67,39,32,95,
-48,32,95,53,53,54,32,64,32,64,32,64,32,64,32,64,32,66,32,83,
-39,32,67,39,32,67,32,64,32,64,32,66,32,66,32,67,32,95,56,52,
-55,32,64,32,64,32,64,32,66,32,66,32,95,49,49,32,95,53,53,54,
-32,64,32,64,32,64,32,66,32,67,32,64,32,80,32,95,53,53,32,64,
-32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,85,32,64,32,64,
-32,67,39,66,32,66,39,32,66,39,32,66,32,95,48,32,95,53,53,54,
-32,64,32,64,32,95,56,57,52,32,64,32,64,32,64,32,64,32,66,32,
-66,32,66,32,66,32,95,49,49,32,95,53,53,54,32,64,32,64,32,64,
-32,64,32,64,32,66,32,66,32,67,39,32,67,32,64,32,64,32,64,32,
-66,32,67,39,32,83,39,32,80,32,64,32,64,32,67,39,32,67,39,32,
-79,32,64,32,64,32,67,32,80,32,64,32,64,32,75,32,64,32,64,32,
-64,32,67,39,66,32,95,52,55,57,32,64,32,95,52,56,48,32,64,32,
-64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,
-66,32,66,32,85,32,64,32,64,32,64,32,67,39,32,67,39,66,32,64,
-32,66,32,66,39,32,64,32,66,32,66,32,67,39,32,67,39,32,95,48,
-32,95,53,53,54,32,64,32,64,32,64,32,64,32,64,32,67,32,67,39,
-32,83,39,32,64,32,66,32,83,39,32,64,32,83,39,32,64,32,64,32,
-67,39,66,32,66,32,67,39,32,67,39,32,95,54,51,32,95,53,53,54,
-32,64,32,64,32,64,32,64,32,66,32,67,32,64,32,95,56,55,57,32,
-95,51,49,49,32,64,32,64,32,64,32,64,32,95,49,49,32,95,53,53,
-54,32,64,32,64,32,64,32,64,32,66,32,66,32,67,32,64,32,64,32,
-95,56,56,55,32,95,51,49,49,32,64,32,64,32,64,32,64,32,64,32,
-64,32,66,32,66,32,66,32,95,49,49,32,95,53,53,54,32,64,32,64,
-32,64,32,64,32,66,32,66,32,67,32,64,32,64,32,80,32,64,32,64,
+32,64,32,64,32,64,32,64,32,83,39,32,67,39,66,32,64,32,66,32,
+66,32,83,39,32,83,39,32,67,39,32,83,32,64,32,64,32,64,32,64,
+32,64,32,66,32,66,32,66,32,66,32,66,32,83,39,32,83,39,32,64,
+32,67,32,60,32,64,32,35,50,32,64,32,64,32,64,32,64,32,64,32,
+64,32,64,32,67,39,66,32,66,32,67,39,32,67,39,32,83,39,32,83,
+32,64,32,64,32,64,32,64,32,66,32,66,32,66,32,66,32,83,39,32,
+83,39,32,64,32,67,32,60,32,64,32,35,52,32,64,32,64,32,64,32,
+64,32,64,32,64,32,67,39,32,67,39,66,32,64,32,66,32,66,39,32,
+64,32,66,32,66,32,83,32,64,32,64,32,66,32,66,32,67,39,32,83,
+39,32,64,32,67,32,60,32,64,32,35,55,32,64,32,64,32,64,32,64,
+32,66,32,66,32,85,32,64,32,64,32,66,32,66,32,83,39,32,95,48,
+32,95,53,53,54,32,64,32,64,32,66,32,95,55,32,95,53,53,52,32,
+64,32,95,51,50,49,32,64,32,64,32,95,51,50,50,32,95,53,53,54,
+32,64,32,95,49,48,48,56,32,64,32,64,32,64,32,64,32,64,32,66,
+32,66,32,66,32,85,32,64,32,64,32,64,32,67,39,32,67,39,32,67,
+39,66,32,64,32,64,32,66,32,66,32,66,32,67,32,64,32,64,32,64,
+32,67,39,32,67,39,32,67,39,32,67,39,66,32,64,32,64,32,64,32,
+66,32,66,32,66,32,66,32,95,54,51,32,95,53,53,54,32,64,32,64,
+32,64,32,64,32,64,32,67,39,32,83,39,32,66,32,64,32,64,32,66,
+32,66,39,32,64,32,67,32,95,57,57,49,32,95,51,49,49,32,64,32,
+64,32,64,32,64,32,66,32,66,32,95,56,52,49,32,64,32,64,32,67,
+39,66,32,95,54,53,49,32,64,32,95,51,50,55,32,64,32,64,32,64,
+32,64,32,64,32,66,32,95,49,49,32,95,53,53,54,32,64,32,64,32,
+83,39,32,67,32,64,32,83,39,32,80,32,64,32,66,32,95,51,48,48,
+32,64,32,85,32,90,32,75,32,64,32,64,32,64,32,64,32,66,32,95,
+51,48,48,32,64,32,85,32,75,32,75,32,64,32,64,32,64,32,64,32,
+64,32,66,32,95,52,56,52,32,64,32,85,32,75,32,65,32,64,32,64,
+32,64,32,64,32,64,32,64,32,64,32,64,32,95,49,48,48,55,32,64,
+32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,67,39,32,
+67,39,66,32,64,32,67,32,67,32,61,61,32,64,32,35,52,32,64,32,
+64,32,64,32,64,32,66,32,85,32,64,32,90,32,75,32,64,32,64,32,
+64,32,64,32,64,32,64,32,64,32,66,32,67,39,32,67,39,66,32,64,
+32,67,32,67,32,61,61,32,64,32,35,50,32,64,32,64,32,64,32,64,
+32,66,32,85,32,64,32,67,39,32,67,39,32,95,48,32,95,53,53,54,
+32,64,32,64,32,64,32,95,49,48,50,48,32,95,51,49,49,32,64,32,
+64,32,64,32,64,32,64,32,64,32,64,32,64,32,83,39,32,66,32,64,
+32,66,32,83,39,32,67,39,32,67,32,64,32,64,32,64,32,66,32,66,
+32,66,32,67,39,32,83,39,32,64,32,67,32,60,32,64,32,35,49,32,
+64,32,64,32,64,32,64,32,64,32,66,32,66,32,66,32,85,32,64,32,
+64,32,64,32,66,32,66,32,67,32,64,32,64,32,66,32,66,32,83,39,
+32,67,39,32,64,32,85,32,67,39,66,32,67,32,67,32,61,61,32,64,
+32,35,48,32,64,32,64,32,95,52,49,32,64,32,64,32,85,32,67,32,
+95,51,55,32,95,50,48,51,32,64,32,64,32,95,50,56,55,32,102,114,
+111,109,85,84,70,56,32,34,110,101,103,97,116,101,34,32,64,32,64,32,
+64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,67,39,
+66,32,66,32,95,48,32,95,53,53,54,32,64,32,64,32,95,49,48,48,
+56,32,64,32,64,32,64,32,64,32,66,32,66,32,66,32,85,32,64,32,
+64,32,64,32,66,32,66,32,66,32,67,32,66,32,64,32,64,32,64,32,
+64,32,66,32,83,39,32,66,32,64,32,66,32,67,39,66,32,64,32,66,
+32,66,39,32,64,32,66,32,66,39,32,64,32,66,32,66,32,95,48,32,
+95,53,53,54,32,64,32,64,32,64,32,95,56,56,49,32,95,51,49,49,
+32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,66,
+32,66,32,66,32,66,32,85,32,64,32,64,32,64,32,64,32,64,32,64,
+32,66,32,66,32,67,39,66,32,66,39,32,66,39,32,66,32,67,39,66,
+32,64,32,66,32,66,32,95,48,32,95,53,53,54,32,64,32,64,32,64,
+32,67,32,95,49,48,50,55,32,64,32,64,32,64,32,64,32,64,32,64,
+32,64,32,64,32,66,32,66,32,66,32,66,32,66,32,66,32,85,32,64,
+32,64,32,64,32,64,32,64,32,64,32,67,39,32,67,39,66,32,64,32,
+66,32,66,39,32,64,32,66,32,66,39,32,64,32,66,32,66,32,67,39,
+66,32,64,32,64,32,66,32,66,32,66,39,32,64,32,64,32,66,32,66,
+32,66,39,32,64,32,64,32,66,32,66,32,66,32,95,54,51,32,95,53,
+53,54,32,64,32,64,32,64,32,64,32,67,39,32,67,32,64,32,95,49,
+48,48,54,32,95,51,49,49,32,64,32,64,32,64,32,64,32,64,32,64,
+32,64,32,64,32,64,32,66,32,66,32,66,32,66,32,66,32,66,32,95,
+49,49,32,95,53,53,54,32,64,32,64,32,64,32,64,32,64,32,64,32,
+64,32,67,39,32,67,39,66,32,64,32,66,32,66,32,67,39,32,67,39,
+66,32,64,32,64,32,64,32,66,32,66,32,66,32,66,32,67,32,64,32,
+64,32,64,32,64,32,67,39,66,32,66,32,67,39,66,32,64,32,66,32,
+66,32,80,32,64,32,64,32,95,49,53,52,32,64,32,64,32,64,32,95,
+49,53,52,32,64,32,64,32,64,32,64,32,95,52,55,57,32,64,32,64,
32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,
-32,64,32,64,32,64,32,64,32,64,32,64,32,67,39,66,32,66,32,95,
-48,32,95,53,53,54,32,64,32,64,32,95,49,48,48,53,32,64,32,64,
-32,90,32,66,32,95,49,49,32,95,53,53,54,32,64,32,64,32,67,32,
-80,32,95,53,53,32,64,32,95,53,53,32,64,32,64,32,64,32,64,32,
-64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,95,50,
-54,32,95,50,56,32,64,32,64,32,66,32,95,49,53,52,32,102,114,111,
-109,85,84,70,56,32,34,116,99,80,97,116,58,32,34,32,64,32,64,32,
-64,32,83,39,32,95,49,53,52,32,64,32,66,32,95,49,53,53,32,95,
-55,48,48,32,64,32,64,32,95,51,49,50,32,95,54,54,50,32,64,32,
-64,32,64,32,66,32,95,49,53,52,32,79,32,35,51,50,32,64,32,75,
-32,64,32,64,32,64,32,95,49,53,53,32,95,55,48,50,32,64,32,64,
+32,64,32,64,32,64,32,64,32,66,32,66,32,66,32,85,32,64,32,64,
+32,64,32,83,39,32,66,32,64,32,66,32,67,39,32,67,32,64,32,64,
+32,66,32,66,32,83,32,95,54,52,52,32,64,32,64,32,64,32,83,39,
+32,83,39,32,83,32,64,32,64,32,66,32,66,32,83,32,95,54,52,51,
+32,64,32,64,32,64,32,67,39,66,32,66,39,32,66,32,95,48,32,95,
+53,53,54,32,64,32,64,32,95,49,48,48,53,32,64,32,64,32,64,32,
+66,32,67,39,66,32,66,32,95,48,32,95,53,53,54,32,64,32,64,32,
+95,49,48,48,52,32,95,51,49,49,32,64,32,64,32,64,32,64,32,66,
+32,66,32,85,32,64,32,64,32,67,39,32,67,39,66,32,64,32,66,32,
+66,32,67,39,32,95,54,51,32,95,53,53,54,32,64,32,64,32,64,32,
+64,32,66,32,66,32,83,32,73,32,64,32,64,32,64,32,66,32,66,32,
+67,39,32,67,39,66,32,64,32,66,32,67,32,67,32,61,61,32,64,32,
+35,49,57,32,64,32,64,32,64,32,95,55,48,49,32,95,51,49,49,32,
+64,32,80,32,95,55,48,50,32,64,32,95,54,54,50,32,64,32,64,32,
+64,32,64,32,64,32,64,32,66,32,66,32,85,32,64,32,64,32,66,32,
+67,32,64,32,95,56,55,57,32,95,51,49,49,32,64,32,64,32,64,32,
+64,32,64,32,64,32,64,32,66,32,95,49,49,32,95,53,53,54,32,64,
+32,64,32,67,32,80,32,95,53,53,32,64,32,95,53,53,32,64,32,64,
+32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,67,
+39,32,95,48,32,95,53,53,54,32,64,32,64,32,95,49,48,48,52,32,
+95,51,49,49,32,64,32,64,32,64,32,64,32,66,32,66,32,83,39,32,
+95,54,51,32,95,53,53,54,32,64,32,64,32,85,32,75,32,85,32,67,
+39,66,32,67,32,67,32,61,61,32,64,32,35,50,49,32,64,32,64,32,
+95,50,50,48,32,64,32,64,32,85,32,75,32,85,32,67,39,66,32,67,
+32,67,32,61,61,32,64,32,35,50,49,32,64,32,64,32,95,50,50,48,
+32,64,32,64,32,85,32,75,50,32,95,49,49,32,95,53,53,54,32,64,
+32,95,49,48,55,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,
+64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,67,39,
+32,95,48,32,95,53,53,54,32,64,32,64,32,95,49,48,50,49,32,64,
+32,64,32,64,32,66,32,66,32,85,32,64,32,64,32,66,32,66,32,66,
+32,85,32,64,32,64,32,64,32,66,32,66,32,66,32,67,39,66,32,67,
+32,67,32,61,61,32,64,32,35,50,49,32,64,32,64,32,95,49,48,50,
+50,32,95,49,48,50,53,32,64,32,102,114,111,109,85,84,70,56,32,34,
+98,105,110,100,34,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,
+66,32,66,32,66,32,85,32,64,32,64,32,64,32,66,32,66,32,66,32,
+67,39,32,83,39,32,95,48,32,95,53,53,54,32,64,32,64,32,64,32,
+95,56,56,51,32,64,32,64,32,64,32,64,32,66,32,66,32,66,32,66,
+32,85,32,64,32,64,32,64,32,64,32,66,32,83,39,32,67,39,32,67,
+39,66,32,64,32,64,32,66,32,66,32,66,32,67,39,32,95,48,32,95,
+53,53,54,32,64,32,64,32,64,32,64,32,64,32,66,32,83,39,32,67,
+39,32,67,32,64,32,64,32,66,32,66,32,67,32,95,56,52,55,32,64,
+32,64,32,64,32,66,32,66,32,95,49,49,32,95,53,53,54,32,64,32,
+64,32,64,32,66,32,67,32,64,32,80,32,95,53,53,32,64,32,64,32,
+64,32,64,32,64,32,64,32,66,32,66,32,85,32,64,32,64,32,67,39,
+66,32,66,39,32,66,39,32,66,32,95,48,32,95,53,53,54,32,64,32,
+64,32,95,56,57,52,32,64,32,64,32,64,32,64,32,66,32,66,32,66,
+32,66,32,95,49,49,32,95,53,53,54,32,64,32,64,32,64,32,64,32,
+64,32,66,32,66,32,67,39,32,67,32,64,32,64,32,64,32,66,32,67,
+39,32,83,39,32,80,32,64,32,64,32,67,39,32,67,39,32,79,32,64,
+32,64,32,67,32,80,32,64,32,64,32,75,32,64,32,64,32,64,32,67,
+39,66,32,95,52,55,57,32,64,32,95,52,56,48,32,64,32,64,32,64,
+32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,66,32,66,
+32,85,32,64,32,64,32,64,32,67,39,32,67,39,66,32,64,32,66,32,
+66,39,32,64,32,66,32,66,32,67,39,32,67,39,32,95,48,32,95,53,
+53,54,32,64,32,64,32,64,32,64,32,64,32,67,32,67,39,32,83,39,
+32,64,32,66,32,83,39,32,64,32,83,39,32,64,32,64,32,67,39,66,
+32,66,32,67,39,32,67,39,32,95,54,51,32,95,53,53,54,32,64,32,
+64,32,64,32,64,32,66,32,67,32,64,32,95,56,55,57,32,95,51,49,
+49,32,64,32,64,32,64,32,64,32,95,49,49,32,95,53,53,54,32,64,
+32,64,32,64,32,64,32,66,32,66,32,67,32,64,32,64,32,95,56,56,
+55,32,95,51,49,49,32,64,32,64,32,64,32,64,32,64,32,64,32,66,
+32,66,32,66,32,95,49,49,32,95,53,53,54,32,64,32,64,32,64,32,
+64,32,66,32,66,32,67,32,64,32,64,32,80,32,64,32,64,32,64,32,
+64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,64,32,
+64,32,64,32,64,32,64,32,64,32,67,39,66,32,66,32,95,48,32,95,
+53,53,54,32,64,32,64,32,95,49,48,48,53,32,64,32,64,32,90,32,
+66,32,95,49,49,32,95,53,53,54,32,64,32,64,32,67,32,80,32,95,
+53,53,32,64,32,95,53,53,32,64,32,64,32,64,32,64,32,64,32,64,
+32,64,32,64,32,64,32,64,32,64,32,64,32,66,32,95,50,54,32,95,
+50,56,32,64,32,64,32,66,32,95,49,53,52,32,102,114,111,109,85,84,
+70,56,32,34,116,99,80,97,116,58,32,34,32,64,32,64,32,64,32,83,
+39,32,95,49,53,52,32,64,32,66,32,95,49,53,53,32,95,55,48,48,
+32,64,32,64,32,95,51,49,50,32,95,54,54,50,32,64,32,64,32,64,
+32,66,32,95,49,53,52,32,79,32,35,51,50,32,64,32,75,32,64,32,
+64,32,64,32,95,49,53,53,32,95,55,48,50,32,64,32,64,32,64,32,
+64,32,64,32,64,32,64,32,67,39,66,32,66,32,64,32,67,39,32,83,
+39,32,95,57,56,56,32,64,32,64,32,67,39,32,95,52,55,57,32,64,
+32,66,32,95,52,56,48,32,64,32,67,32,95,54,53,48,32,64,32,102,
+114,111,109,85,84,70,56,32,34,61,61,34,32,64,32,64,32,64,32,64,
+32,64,32,66,32,95,52,56,48,32,64,32,67,32,95,54,53,48,32,64,
+32,102,114,111,109,85,84,70,56,32,34,84,114,117,101,34,32,64,32,64,
32,64,32,64,32,64,32,64,32,64,32,95,51,49,50,32,95,54,54,50,
32,64,32,64,32,64,32,58,49,48,50,54,32,64,10,65,32,95,49,48,
50,51,32,95,53,53,54,32,64,32,95,49,48,50,52,32,95,49,48,50,
@@ -15089,4 +15096,4 @@
64,32,64,32,64,32,125,
};
unsigned char *combexpr = data;
-int combexprlen = 301747;
+int combexprlen = 301887;
--- a/src/MicroHs/TypeCheck.hs
+++ b/src/MicroHs/TypeCheck.hs
@@ -1921,7 +1921,11 @@
-- XXX Has some duplication with tcExpr
tcPat :: Expected -> EPat -> T EPatRet
tcPat mt ae =
- let { loc = getSLoc ae } in+ let loc = getSLoc ae
+ lit = tcPat mt (EViewPat (EApp (EVar (mkIdentSLoc loc "==")) ae) (EVar (mkIdentSLoc loc "True")))
+ isNeg (EVar i) = i == mkIdent "negate"
+ isNeg _ = False
+ in
case ae of
EVar i | isDummyIdent i -> do
-- _ can be anything, so just ignore it
@@ -1962,7 +1966,9 @@
EOper e ies -> do e' <- tcOper e ies; tcPat mt e'
- EApp f a -> do
+ EApp f a
+ | isNeg f -> lit -- if it's (negate e) it must have been a negative literal
+ | otherwise -> do
((skf, df, f'), ft) <- tInferPat f
-- traceM $ "tcPat: EApp f=" ++ showExpr f ++ "; e'=" ++ showExpr f' ++ " :: " ++ showEType ft
(at, rt) <- unArrow loc ft
@@ -1988,8 +1994,7 @@
let (sks, ds, es') = unzip3 xs
return (concat sks, concat ds, EListish (LList es'))
- ELit _ _ ->
- tcPat mt (EViewPat (EApp (EVar (mkIdentSLoc loc "==")) ae) (EVar (mkIdentSLoc loc "True")))
+ ELit _ _ -> lit
ESign e t -> do
t' <- tcType (Check kType) t
--- a/tests/LitMatch.hs
+++ b/tests/LitMatch.hs
@@ -4,6 +4,7 @@
f :: Int -> Int
f 0 = 10
f 1 = 20
+f (-1) = 30
f n = 0
g :: Int -> Int -> Int
@@ -25,7 +26,7 @@
main :: IO ()
main = do
- putStrLn $ show [f 0, f 1, f 10]
+ putStrLn $ show [f 0, f 1, f 10, f (-1)]
putStrLn $ show [g 1 0, g 1 1, g 2 0, g 2 1, g 2 2]
putStrLn $ show [h 'a', h 'b', h 'c']
putStrLn $ show [s "aaa", s "apa", s "foo"]
--- a/tests/LitMatch.ref
+++ b/tests/LitMatch.ref
@@ -1,4 +1,4 @@
-[10,20,0]
+[10,20,0,30]
[10,11,20,21,99]
[1,2,3]
[3,1,2]
--
⑨