projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1999-06-28 10:01:04 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
parser
/
Lex.lhs
diff --git
a/ghc/compiler/parser/Lex.lhs
b/ghc/compiler/parser/Lex.lhs
index
b8f2595
..
25aa14c
100644
(file)
--- a/
ghc/compiler/parser/Lex.lhs
+++ b/
ghc/compiler/parser/Lex.lhs
@@
-272,7
+272,6
@@
haskellKeywordsFM = listToUFM $
( "_scc_", ITscc )
]
( "_scc_", ITscc )
]
-
ghcExtensionKeywordsFM = listToUFM $
map (\ (x,y) -> (_PK_ x,y))
[ ( "forall", ITforall ),
ghcExtensionKeywordsFM = listToUFM $
map (\ (x,y) -> (_PK_ x,y))
[ ( "forall", ITforall ),
@@
-1003,12
+1002,9
@@
lex_id3 cont glaexts mod buf just_a_conid
in
case _scc_ "Lex.haskellKeyword" lookupUFM haskellKeywordsFM lexeme of {
Just kwd_token -> just_a_conid; -- avoid M.where etc.
in
case _scc_ "Lex.haskellKeyword" lookupUFM haskellKeywordsFM lexeme of {
Just kwd_token -> just_a_conid; -- avoid M.where etc.
- Nothing ->
- if flag glaexts
- then case lookupUFM ghcExtensionKeywordsFM lexeme of {
- Just kwd_token -> just_a_conid;
- Nothing -> is_a_qvarid }
- else is_a_qvarid
+ Nothing -> is_a_qvarid
+ -- TODO: special ids (as, qualified, hiding) shouldn't be
+ -- recognised as keywords here. ie. M.as is a qualified varid.
}}}
}}}