[commit: ghc] wip/type-app: Remove vestigial prefixq{var, con}sym from parser. (6e4e962)
git at git.haskell.org
git at git.haskell.org
Fri Aug 7 12:03:51 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/type-app
Link : http://ghc.haskell.org/trac/ghc/changeset/6e4e962d43df25094ce40a318c222d70818a136c/ghc
>---------------------------------------------------------------
commit 6e4e962d43df25094ce40a318c222d70818a136c
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date: Sat Jun 27 12:55:36 2015 -0400
Remove vestigial prefixq{var,con}sym from parser.
>---------------------------------------------------------------
6e4e962d43df25094ce40a318c222d70818a136c
compiler/parser/Lexer.x | 6 +-----
compiler/parser/Parser.y | 7 -------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 5839a41..935e3ac 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -634,8 +634,6 @@ data Token
| ITqconid (FastString,FastString)
| ITqvarsym (FastString,FastString)
| ITqconsym (FastString,FastString)
- | ITprefixqvarsym (FastString,FastString)
- | ITprefixqconsym (FastString,FastString)
| ITdupipvarid FastString -- GHC extension: implicit param: ?x
@@ -1144,11 +1142,9 @@ varid span buf len =
conid :: StringBuffer -> Int -> Token
conid buf len = ITconid $! lexemeToFastString buf len
-qvarsym, qconsym, prefixqvarsym, prefixqconsym :: StringBuffer -> Int -> Token
+qvarsym, qconsym :: StringBuffer -> Int -> Token
qvarsym buf len = ITqvarsym $! splitQualName buf len False
qconsym buf len = ITqconsym $! splitQualName buf len False
-prefixqvarsym buf len = ITprefixqvarsym $! splitQualName buf len True
-prefixqconsym buf len = ITprefixqconsym $! splitQualName buf len True
varsym, consym :: Action
varsym = sym ITvarsym
diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index d5d8c6c..5fcf070 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -514,8 +514,6 @@ for some background.
QCONID { L _ (ITqconid _) }
QVARSYM { L _ (ITqvarsym _) }
QCONSYM { L _ (ITqconsym _) }
- PREFIXQVARSYM { L _ (ITprefixqvarsym _) }
- PREFIXQCONSYM { L _ (ITprefixqconsym _) }
IPDUPVARID { L _ (ITdupipvarid _) } -- GHC extension
@@ -2854,7 +2852,6 @@ qtyconop :: { Located RdrName } -- Qualified or unqualified
qtycon :: { Located RdrName } -- Qualified or unqualified
: QCONID { sL1 $1 $! mkQual tcClsName (getQCONID $1) }
- | PREFIXQCONSYM { sL1 $1 $! mkQual tcClsName (getPREFIXQCONSYM $1) }
| tycon { $1 }
tycon :: { Located RdrName } -- Unqualified
@@ -2952,7 +2949,6 @@ qvar :: { Located RdrName }
qvarid :: { Located RdrName }
: varid { $1 }
| QVARID { sL1 $1 $! mkQual varName (getQVARID $1) }
- | PREFIXQVARSYM { sL1 $1 $! mkQual varName (getPREFIXQVARSYM $1) }
-- Note that 'role' and 'family' get lexed separately regardless of
-- the use of extensions. However, because they are listed here, this
@@ -3017,7 +3013,6 @@ special_sym : '!' {% ams (sL1 $1 (fsLit "!")) [mj AnnBang $1] }
qconid :: { Located RdrName } -- Qualified or unqualified
: conid { $1 }
| QCONID { sL1 $1 $! mkQual dataName (getQCONID $1) }
- | PREFIXQCONSYM { sL1 $1 $! mkQual dataName (getPREFIXQCONSYM $1) }
conid :: { Located RdrName }
: CONID { sL1 $1 $ mkUnqual dataName (getCONID $1) }
@@ -3116,8 +3111,6 @@ getQVARID (L _ (ITqvarid x)) = x
getQCONID (L _ (ITqconid x)) = x
getQVARSYM (L _ (ITqvarsym x)) = x
getQCONSYM (L _ (ITqconsym x)) = x
-getPREFIXQVARSYM (L _ (ITprefixqvarsym x)) = x
-getPREFIXQCONSYM (L _ (ITprefixqconsym x)) = x
getIPDUPVARID (L _ (ITdupipvarid x)) = x
getCHAR (L _ (ITchar _ x)) = x
getSTRING (L _ (ITstring _ x)) = x
More information about the ghc-commits
mailing list