X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fcmm%2FCmmParse.y;h=0ae88e23363f6933088d1556961924c730997dc4;hp=ff6358da31dbf0aa5996aabf6cbb17fa2655b238;hb=7854ec4b11e117f8514553890851d14a66690fbb;hpb=e5fba2f55f560b41e27047bf59958729d51aca84

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index ff6358d..0ae88e2 100644
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -214,7 +214,7 @@ static 	:: { ExtFCode [CmmStatic] }
 	| 'CLOSURE' '(' NAME lits ')'
 		{ do lits <- sequence $4;
 		     return $ map CmmStaticLit $
-                       mkStaticClosure (mkForeignLabel $3 Nothing True IsData)
+                       mkStaticClosure (mkForeignLabel $3 Nothing ForeignLabelInExternalPackage IsData)
                          -- mkForeignLabel because these are only used
                          -- for CHARLIKE and INTLIKE closures in the RTS.
 			 dontCareCCS (map getLit lits) [] [] [] }
@@ -346,14 +346,21 @@ decl	:: { ExtCode }
 
 -- an imported function name, with optional packageId
 importNames  
-	:: { [(Maybe PackageId, FastString)] }
+	:: { [(FastString, CLabel)] }
 	: importName			{ [$1] }
 	| importName ',' importNames	{ $1 : $3 }		
 	
 importName
-	:: { (Maybe PackageId, FastString) }
-	: NAME				{ (Nothing, $1) }
-	| STRING NAME			{ (Just (fsToPackageId (mkFastString $1)), $2) }
+	:: { (FastString,  CLabel) }
+
+	-- A label imported without an explicit packageId.
+	--	These are taken to come frome some foreign, unnamed package.
+	: NAME	
+	{ ($1, mkForeignLabel $1 Nothing ForeignLabelInExternalPackage IsFunction) }
+
+	-- A label imported with an explicit packageId.
+	| STRING NAME
+	{ ($2, mkCmmCodeLabel (fsToPackageId (mkFastString $1)) $2) }
 	
 	
 names 	:: { [FastString] }