X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FParsePkgConf.y;h=d05a6d54c050566120af9aedebcbcad21926b0e2;hb=72547264724117d689a7fa400104185557fb2a0c;hp=9cf6d0491a313eb038115ce41a6079bf35aad92b;hpb=aa9a4f1053d3c554629a2ec25955e7530c95b892;p=ghc-hetmet.git

diff --git a/compiler/main/ParsePkgConf.y b/compiler/main/ParsePkgConf.y
index 9cf6d04..d05a6d5 100644
--- a/compiler/main/ParsePkgConf.y
+++ b/compiler/main/ParsePkgConf.y
@@ -1,5 +1,5 @@
 {
-{-# OPTIONS -fno-warn-unused-binds -fno-warn-unused-matches -fno-warn-missing-signatures -fno-warn-incomplete-patterns #-}
+{-# OPTIONS -fno-warn-unused-binds -fno-warn-unused-matches -fno-warn-missing-signatures -fno-warn-incomplete-patterns -Wwarn #-}
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix
 -- any warnings in the module. See
@@ -24,6 +24,8 @@ import Panic
 
 }
 
+%expect 0
+
 %token
  '{'		{ L _ ITocurly }
  '}'		{ L _ ITccurly }
@@ -79,8 +81,12 @@ field	:: { PackageConfig -> PackageConfig }
 		   	_         -> happyError }
 		}
 
-	| VARID '=' CONID STRING	{ id }
-		-- another case of license
+	| VARID '=' CONID STRING
+		{ \p -> case unpackFS $1 of
+                          "installedPackageId" ->
+                              p{installedPackageId = InstalledPackageId (unpackFS $4)}
+			  _ -> p -- another case of license
+		}
 
 	| VARID '=' strlist		
 	{\p -> case unpackFS $1 of
@@ -105,7 +111,7 @@ field	:: { PackageConfig -> PackageConfig }
 		_ -> p
 	}
 
-	| VARID '=' pkgidlist
+	| VARID '=' ipidlist
 		{% case unpackFS $1 of
 		        "depends"     -> return (\p -> p{depends = $3})
 			_             -> happyError
@@ -127,13 +133,20 @@ version :: { Version }
 			{ Version{ versionBranch=$5, 
                                    versionTags=map unpackFS $9 } }
 
-pkgidlist :: { [PackageIdentifier] }
-	: '[' pkgids ']'		{ $2 }
+ipid    :: { InstalledPackageId }
+        : CONID STRING
+            {% case unpackFS $1 of
+               "InstalledPackageId" -> return (InstalledPackageId (unpackFS $2))
+               _ -> happyError
+            }
+
+ipidlist :: { [InstalledPackageId] }
+	: '[' ipids ']'		{ $2 }
 	-- empty list case is covered by strlist, to avoid conflicts
 
-pkgids	:: { [PackageIdentifier] }
-	: pkgid				{ [ $1 ] }
-	| pkgid ',' pkgids		{ $1 : $3 }
+ipids	:: { [InstalledPackageId] }
+	: ipid				{ [ $1 ] }
+	| ipid ',' ipids                { $1 : $3 }
 
 intlist :: { [Int] }
         : '[' ']'			{ [] }