diff options
| author | panne <unknown> | 2000-02-20 17:51:58 +0000 |
|---|---|---|
| committer | panne <unknown> | 2000-02-20 17:51:58 +0000 |
| commit | 6cce4a58fb206f16db579fded00fd0a7090543ae (patch) | |
| tree | 8cda8d8d06f5cc9772991695132fd95c1d29251c /ghc/compiler/parser/Parser.y | |
| parent | 770cf8801c6b71f77051e96705a0418e723d7244 (diff) | |
| download | haskell-6cce4a58fb206f16db579fded00fd0a7090543ae.tar.gz | |
[project @ 2000-02-20 17:51:30 by panne]
Get deprecation info out of the renamer again
Diffstat (limited to 'ghc/compiler/parser/Parser.y')
| -rw-r--r-- | ghc/compiler/parser/Parser.y | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ghc/compiler/parser/Parser.y b/ghc/compiler/parser/Parser.y index d45e39626c..2f907b0200 100644 --- a/ghc/compiler/parser/Parser.y +++ b/ghc/compiler/parser/Parser.y @@ -1,6 +1,6 @@ {- ----------------------------------------------------------------------------- -$Id: Parser.y,v 1.22 2000/02/17 14:47:26 panne Exp $ +$Id: Parser.y,v 1.23 2000/02/20 17:51:45 panne Exp $ Haskell grammar. @@ -36,7 +36,7 @@ import GlaExts ----------------------------------------------------------------------------- Conflicts: 14 shift/reduce (note: it's currently 21 -- JRL, 31/1/2000) - (note2: it' currently 36, but not because of me -- SUP, 15/2/2000 :-) + (note2: it's currently 36, but not because of me -- SUP, 15/2/2000 :-) 8 for abiguity in 'if x then y else z + 1' (shift parses as 'if x then y else (z + 1)', as per longest-parse rule) @@ -218,8 +218,8 @@ module :: { RdrNameHsModule } | srcloc body { HsModule mAIN_Name Nothing Nothing (fst $2) (snd $2) Nothing $1 } -maybemoddeprec :: { Maybe FAST_STRING } - : '{-# DEPRECATED' STRING '#-}' { Just $2 } +maybemoddeprec :: { Maybe (Deprecation RdrName) } + : '{-# DEPRECATED' STRING '#-}' { Just (DeprecMod $2) } | {- empty -} { Nothing } body :: { ([RdrNameImportDecl], [RdrNameHsDecl]) } @@ -482,7 +482,7 @@ deprecations :: { RdrBinding } deprecation :: { RdrBinding } : deprecated_names STRING - { foldr1 RdrAndBindings [ RdrSig (DeprecSig n $2 l) | (l,n) <- $1 ] } + { foldr1 RdrAndBindings [ RdrSig (DeprecSig (DeprecName n $2) l) | (l,n) <- $1 ] } deprecated_names :: { [(SrcLoc,RdrName)] } : deprecated_names ',' deprecated_name { $3 : $1 } |