X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmLex.x;h=0adb610bb3b160959d0d3aa3a23bac81fe91aa7e;hb=a1515d75e38a32d69636c98bb590f6195e2ab3d1;hp=dffb3553f8997cff25d541e6e58cfa6475dbbf8e;hpb=f2cc8b5bc34519a65581dc40b7bfebac97bffd73;p=ghc-hetmet.git

diff --git a/compiler/cmm/CmmLex.x b/compiler/cmm/CmmLex.x
index dffb355..0adb610 100644
--- a/compiler/cmm/CmmLex.x
+++ b/compiler/cmm/CmmLex.x
@@ -11,6 +11,13 @@
 -----------------------------------------------------------------------------
 
 {
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module CmmLex (
    CmmToken(..), cmmlex,
   ) where
@@ -29,7 +36,7 @@ import Util
 --import TRACE
 }
 
-$whitechar   = [\ \t\n\r\f\v\xa0]
+$whitechar   = [\ \t\n\r\f\v\xa0] -- \xa0 is Unicode no-break space
 $white_no_nl = $whitechar # \n
 
 $ascdigit  = 0-9
@@ -138,8 +145,10 @@ data CmmToken
   | CmmT_if
   | CmmT_jump
   | CmmT_foreign
+  | CmmT_never
   | CmmT_prim
   | CmmT_return
+  | CmmT_returns
   | CmmT_import
   | CmmT_switch
   | CmmT_case
@@ -214,8 +223,10 @@ reservedWordsFM = listToUFM $
 	( "if",			CmmT_if ),
 	( "jump",		CmmT_jump ),
 	( "foreign",		CmmT_foreign ),
+	( "never",		CmmT_never ),
 	( "prim",		CmmT_prim ),
 	( "return",		CmmT_return ),
+	( "returns",		CmmT_returns ),
 	( "import",		CmmT_import ),
 	( "switch",		CmmT_switch ),
 	( "case",		CmmT_case ),