X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=ef48bb457aed807b9952eaae9f2c0935621390ad;hb=d874b8c93b737bf26c949ef7bf19fc43e335bd1f;hp=7465adb673879c9f58417852648d340e7beafbf6;hpb=6e0f552430600d95768c1668b6d458c71a52f2d4;p=ghc-hetmet.git

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 7465adb..ef48bb4 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -240,12 +240,13 @@ incorrect.
  'label'	{ L _ ITlabel } 
  'dynamic'	{ L _ ITdynamic }
  'safe'		{ L _ ITsafe }
- 'threadsafe'	{ L _ ITthreadsafe }
+ 'threadsafe'	{ L _ ITthreadsafe }  -- ToDo: remove deprecated alias
  'unsafe'	{ L _ ITunsafe }
  'mdo'		{ L _ ITmdo }
  'family'	{ L _ ITfamily }
  'stdcall'      { L _ ITstdcallconv }
  'ccall'        { L _ ITccallconv }
+ 'prim'         { L _ ITprimcallconv }
  'dotnet'       { L _ ITdotnet }
  'proc'		{ L _ ITproc }		-- for arrow notation extension
  'rec'		{ L _ ITrec }		-- for arrow notation extension
@@ -952,12 +953,13 @@ fdecl : 'import' callconv safety fspec
 callconv :: { CallConv }
 	  : 'stdcall'			{ CCall  StdCallConv }
 	  | 'ccall'			{ CCall  CCallConv   }
+	  | 'prim'			{ CCall  PrimCallConv}
 	  | 'dotnet'			{ DNCall	     }
 
 safety :: { Safety }
 	: 'unsafe'			{ PlayRisky }
 	| 'safe'			{ PlaySafe  False }
-	| 'threadsafe'			{ PlaySafe  True }
+	| 'threadsafe'			{ PlaySafe  True } -- deprecated alias
 
 fspec :: { Located (Located FastString, Located RdrName, LHsType RdrName) }
        : STRING var '::' sigtypedoc     { LL (L (getLoc $1) (getSTRING $1), $2, $4) }
@@ -1902,6 +1904,7 @@ special_id
 	| 'dynamic'		{ L1 (fsLit "dynamic") }
 	| 'stdcall'             { L1 (fsLit "stdcall") }
 	| 'ccall'               { L1 (fsLit "ccall") }
+	| 'prim'                { L1 (fsLit "prim") }
 
 special_sym :: { Located FastString }
 special_sym : '!'	{ L1 (fsLit "!") }