diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-03-02 20:51:05 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-03-02 20:51:05 +0000 |
| commit | 8dbd52c7606588ab7fc7ffd3a54641b7cadc4431 (patch) | |
| tree | 21da2b65c03db39a7274f4ebabeee93bdcf351a8 /compiler/parser/Lexer.x | |
| parent | e9f9ec1e57d53b9302a395ce0d02c0fa59e28341 (diff) | |
| download | haskell-8dbd52c7606588ab7fc7ffd3a54641b7cadc4431.tar.gz | |
Tweak alternative layout rule
Now not only is if/then a bracketting pair, but then/else is too
Diffstat (limited to 'compiler/parser/Lexer.x')
| -rw-r--r-- | compiler/parser/Lexer.x | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x index a4a343985a..5df5e4ea25 100644 --- a/compiler/parser/Lexer.x +++ b/compiler/parser/Lexer.x @@ -2064,10 +2064,8 @@ alternativeLayoutRuleToken t -- Note that we use lastLoc, as we may need to close -- more layouts, or give a semicolon return (L lastLoc ITccurly) - (u, _, _) - | isALRopen u -> - do setALRContext (ALRNoLayout (containsCommas u) False : context) - return t + -- We need to handle close before open, as 'then' is both + -- an open and a close (u, _, _) | isALRclose u -> case context of @@ -2076,13 +2074,24 @@ alternativeLayoutRuleToken t setNextToken t return (L thisLoc ITccurly) ALRNoLayout _ isLet : ls -> - do setALRContext ls + do let ls' = if isALRopen u + then ALRNoLayout (containsCommas u) False : ls + else ls + setALRContext ls' when isLet $ setJustClosedExplicitLetBlock True return t [] -> - -- XXX This is an error in John's code, but - -- it looks reachable to me at first glance - return t + do let ls = if isALRopen u + then [ALRNoLayout (containsCommas u) False] + else ls + setALRContext ls + -- XXX This is an error in John's code, but + -- it looks reachable to me at first glance + return t + (u, _, _) + | isALRopen u -> + do setALRContext (ALRNoLayout (containsCommas u) False : context) + return t (ITin, ALRLayout ALRLayoutLet _ : ls, _) -> do setALRContext ls setPendingImplicitTokens [t] @@ -2112,6 +2121,7 @@ transitionalAlternativeLayoutWarning msg isALRopen :: Token -> Bool isALRopen ITcase = True isALRopen ITif = True +isALRopen ITthen = True isALRopen IToparen = True isALRopen ITobrack = True isALRopen ITocurly = True @@ -2123,6 +2133,7 @@ isALRopen _ = False isALRclose :: Token -> Bool isALRclose ITof = True isALRclose ITthen = True +isALRclose ITelse = True isALRclose ITcparen = True isALRclose ITcbrack = True isALRclose ITccurly = True |