projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8cb8732
)
Tweak the alternative layout rule: {} contains commas
author
Ian Lynagh
<igloo@earth.li>
Sun, 29 Nov 2009 15:54:54 +0000
(15:54 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 29 Nov 2009 15:54:54 +0000
(15:54 +0000)
compiler/parser/Lexer.x
patch
|
blob
|
history
diff --git
a/compiler/parser/Lexer.x
b/compiler/parser/Lexer.x
index
7594079
..
c6457a4
100644
(file)
--- a/
compiler/parser/Lexer.x
+++ b/
compiler/parser/Lexer.x
@@
-2100,6
+2100,10
@@
isNonDecreasingIntentation _ = False
containsCommas :: Token -> Bool
containsCommas IToparen = True
containsCommas ITobrack = True
containsCommas :: Token -> Bool
containsCommas IToparen = True
containsCommas ITobrack = True
+-- John doesn't have {} as containing commas, but records contain them,
+-- which caused a problem parsing Cabal's Distribution.Simple.InstallDirs
+-- (defaultInstallDirs).
+containsCommas ITocurly = True
-- GHC Extensions:
containsCommas IToubxparen = True
containsCommas _ = False
-- GHC Extensions:
containsCommas IToubxparen = True
containsCommas _ = False