[project @ 2002-06-15 12:05:13 by sof]

Accept empty package lists.

diff --git a/ghc/compiler/main/ParsePkgConf.y b/ghc/compiler/main/ParsePkgConf.y
index fa83513..71fe194 100644 (file)
--- a/ghc/compiler/main/ParsePkgConf.y
+++ b/ghc/compiler/main/ParsePkgConf.y
@@ -32,7 +32,8 @@ import Exception ( throwDyn )
 %%
 
 pkgconf :: { [ PackageConfig ] }
-       : '[' pkgs ']'                  { reverse $2 }
+       : '[' ']'                       { [] }
+       | '[' pkgs ']'                  { reverse $2 }
 
 pkgs   :: { [ PackageConfig ] }
        : pkg                           { [ $1 ] }

diff --git a/ghc/utils/ghc-pkg/ParsePkgConfLite.y b/ghc/utils/ghc-pkg/ParsePkgConfLite.y
index 7656b9e..152ff9b 100644 (file)
--- a/ghc/utils/ghc-pkg/ParsePkgConfLite.y
+++ b/ghc/utils/ghc-pkg/ParsePkgConfLite.y
@@ -28,7 +28,8 @@ import List(break)
 %%
 
 pkgconf :: { [ PackageConfig ] }
-       : '[' pkgs ']'                  { reverse $2 }
+       : '[' ']'                       { [] }
+       | '[' pkgs ']'                  { reverse $2 }
 
 pkgs   :: { [ PackageConfig ] }
        : pkg                           { [ $1 ] }
@@ -45,7 +46,7 @@ field :: { PackageConfig -> PackageConfig }
        : VARID '=' STRING              
                  {\p -> case $1 of
                   "name" -> p{name = $3}
-                  _      -> error "unkown key in config file" }
+                  _      -> error "unknown key in config file" }
                        
        | VARID '=' strlist             
                {\p -> case $1 of