sync with uhc-util, work on chr typing

Author: atzedijkstra

EHC/changelog.md.editthis

@@ -1,3 +1,5 @@
+- [type system] Ongoing work for CHR based type system
+- [uhc-util] Ongoing sync with uhc-util
 - [compiler driver] check for writeability of directory is now on dest dir, not src dir
 - [pragmas] bangpatterns pragma turned off by default
 - [pragmas] bangpatterns pragma propagation to parser fixed

EHC/src/ehc/Base/Pragma.chs

@@ -18,6 +18,9 @@
 %%[99 import({%{EH}Opts.CommandLine})
 %%]
 
+%%[(99 chrtysys) import(UHC.Util.CHR.GTerm)
+%%]
+
 %%[doesWhat doclatex
 Internal representation of pragmas.
 %%]
@@ -50,11 +53,14 @@ data Pragma
   | Pragma_OptionsUHC              			-- commandline options
       { pragmaOptions   			:: String
       }
-%%[[99
   | Pragma_ExcludeIfTarget
       { pragmaExcludeTargets   		:: [Target]
       }
-%%]]
+{-
+  | Pragma_CHR              			    -- CHR rules
+      { pragmaCHR   			    :: String
+      }
+-}
   deriving (Eq,Ord,Show,Typeable,Generic)
 
 %%]