From 671dfe67aaea136f0adbcc45952b04cb913b2dc9 Mon Sep 17 00:00:00 2001 From: sof Date: Sat, 15 Jun 2002 12:05:13 +0000 Subject: [PATCH] [project @ 2002-06-15 12:05:13 by sof] Accept empty package lists. --- ghc/compiler/main/ParsePkgConf.y | 3 ++- ghc/utils/ghc-pkg/ParsePkgConfLite.y | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc/compiler/main/ParsePkgConf.y b/ghc/compiler/main/ParsePkgConf.y index fa83513..71fe194 100644 --- 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 --- 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 -- 1.7.10.4