X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2FParser.y;h=965863abb9d29d350d798343dbb5ac65db9713ac;hb=e9e72bd1cd7776609aa7d7f5e71edc4c2edced4d;hp=9333122c75d0904028c6482c5192f11706e463fd;hpb=f901ffc86ada53aaa65a3d941d344b9c036a6147;p=ghc-hetmet.git

diff --git a/ghc/compiler/parser/Parser.y b/ghc/compiler/parser/Parser.y
index 9333122..965863a 100644
--- a/ghc/compiler/parser/Parser.y
+++ b/ghc/compiler/parser/Parser.y
@@ -1,6 +1,6 @@
 {-								-*-haskell-*-
 -----------------------------------------------------------------------------
-$Id: Parser.y,v 1.130 2003/11/26 10:07:19 simonmar Exp $
+$Id: Parser.y,v 1.131 2003/11/27 13:26:39 simonmar Exp $
 
 Haskell grammar.
 
@@ -137,6 +137,7 @@ Conflicts: 29 shift/reduce, [SDM 19/9/2002]
  '{-# CORE'        { T _ _ ITcore_prag }              -- hdaume: annotated core
  '{-# SCC'	   { T _ _ ITscc_prag }
  '{-# DEPRECATED'  { T _ _ ITdeprecated_prag }
+ '{-# UNPACK'      { T _ _ ITunpack_prag }
  '#-}'		   { T _ _ ITclose_prag }
 
  '..'		{ T _ _ ITdotdot }  			-- reserved symbols
@@ -827,7 +828,7 @@ stype :: { RdrNameBangType }
 
 strict_mark :: { HsBang }
 	: '!'				{ HsStrict }
-	| '!' '!'			{ HsUnbox }
+	| '{-# UNPACK' '#-}' '!'	{ HsUnbox }
 
 deriving :: { Maybe RdrNameContext }
 	: {- empty -}			{ Nothing }