X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FLexer.x;h=51aa2f397f1f01fa99544604f2a4dd8c7e60fbd7;hp=b3502b8664de9fa17f9328192710bed474bec982;hb=fa306a37eaae1020f4cbd6cbed04847db6c23273;hpb=aa24834506285f4b4a0d78f28ac6978a6b5b9087

diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index b3502b8..51aa2f3 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -1954,6 +1954,8 @@ lexTokenAlr = do mPending <- popPendingImplicitToken
                      ITlet   -> setAlrExpectingOCurly (Just ALRLayoutLet)
                      ITof    -> setAlrExpectingOCurly (Just ALRLayoutOf)
                      ITdo    -> setAlrExpectingOCurly (Just ALRLayoutDo)
+                     ITmdo   -> setAlrExpectingOCurly (Just ALRLayoutDo)
+                     ITrec   -> setAlrExpectingOCurly (Just ALRLayoutDo)
                      _       -> return ()
                  return t
 
@@ -2065,14 +2067,15 @@ alternativeLayoutRuleToken t
              (_, _, _) -> return t
 
 isALRopen :: Token -> Bool
-isALRopen ITcase   = True
-isALRopen ITif     = True
-isALRopen IToparen = True
-isALRopen ITobrack = True
-isALRopen ITocurly = True
+isALRopen ITcase        = True
+isALRopen ITif          = True
+isALRopen IToparen      = True
+isALRopen ITobrack      = True
+isALRopen ITocurly      = True
 -- GHC Extensions:
-isALRopen IToubxparen = True
-isALRopen _        = False
+isALRopen IToubxparen   = True
+isALRopen ITparenEscape = True
+isALRopen _             = False
 
 isALRclose :: Token -> Bool
 isALRclose ITof     = True