X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FParsePkgConf.y;h=abbbcea1eb31107f16eb8ca029c976cc60b26b15;hb=8575cfe27f04474172a2b244bd5a575b4cbe735c;hp=c61d31c80f7a2c14747e8c653f7d2bac8a74bf97;hpb=972d6442ee3a6ee0a5fa20655d882e0041646892;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/ParsePkgConf.y b/ghc/compiler/main/ParsePkgConf.y
index c61d31c..abbbcea 100644
--- a/ghc/compiler/main/ParsePkgConf.y
+++ b/ghc/compiler/main/ParsePkgConf.y
@@ -1,38 +1,40 @@
 {
 module ParsePkgConf( loadPackageConfig ) where
 
+#include "HsVersions.h"
+
 import Packages  ( PackageConfig(..), defaultPackageConfig )
-import Lex
+import Lexer
+import CmdLineOpts
 import FastString
 import StringBuffer
 import SrcLoc
 import Outputable
 import Panic     ( GhcException(..) )
-import Exception ( throwDyn )
-
-#include "HsVersions.h"
+import EXCEPTION ( throwDyn )
 
 }
 
 %token
- '{'		{ ITocurly }
- '}'		{ ITccurly }
- '['		{ ITobrack }
- ']'		{ ITcbrack }
- ','		{ ITcomma }
- '='		{ ITequal }
- VARID   	{ ITvarid    $$ }
- CONID   	{ ITconid    $$ }
- STRING		{ ITstring   $$ }
-
-%monad { P } { thenP } { returnP }
-%lexer { lexer } { ITeof }
+ '{'		{ T _ _ ITocurly }
+ '}'		{ T _ _ ITccurly }
+ '['		{ T _ _ ITobrack }
+ ']'		{ T _ _ ITcbrack }
+ ','		{ T _ _ ITcomma }
+ '='		{ T _ _ ITequal }
+ VARID   	{ T _ _ (ITvarid    $$) }
+ CONID   	{ T _ _ (ITconid    $$) }
+ STRING		{ T _ _ (ITstring   $$) }
+
+%monad { P } { >>= } { return }
+%lexer { lexer } { T _ _ ITeof }
 %name parse
 %tokentype { Token }
 %%
 
 pkgconf :: { [ PackageConfig ] }
-	: '[' pkgs ']'			{ reverse $2 }
+	: '[' ']'			{ [] }
+	| '[' pkgs ']'			{ reverse $2 }
 
 pkgs 	:: { [ PackageConfig ] }
 	: pkg 				{ [ $1 ] }
@@ -47,9 +49,15 @@ fields  :: { PackageConfig -> PackageConfig }
 
 field	:: { PackageConfig -> PackageConfig }
 	: VARID '=' STRING		
-		{\p -> case unpackFS $1 of
-		        "name" -> p{name = unpackFS $3} }
+                 {% case unpackFS $1 of { 
+		   "name" -> return (\ p -> p{name = unpackFS $3});
+		   _      -> happyError } }
 			
+        | VARID '=' bool
+		{\p -> case unpackFS $1 of {
+		   	"auto" -> p{auto = $3};
+		   	_      -> p } }
+
 	| VARID '=' strlist		
 		{\p -> case unpackFS $1 of
 		        "import_dirs"     -> p{import_dirs     = $3}
@@ -62,6 +70,8 @@ field	:: { PackageConfig -> PackageConfig }
 		        "extra_ghc_opts"  -> p{extra_ghc_opts  = $3}
 		        "extra_cc_opts"   -> p{extra_cc_opts   = $3}
 		        "extra_ld_opts"   -> p{extra_ld_opts   = $3}
+		        "framework_dirs"  -> p{framework_dirs  = $3}
+		        "extra_frameworks"-> p{extra_frameworks= $3}
 			_other            -> p
 		}
 
@@ -73,21 +83,24 @@ strs	:: { [String] }
 	: STRING			{ [ unpackFS $1 ] }
 	| strs ',' STRING		{ unpackFS $3 : $1 }
 
+bool    :: { Bool }
+	: CONID				{% case unpackFS $1 of {
+					    "True"  -> return True;
+					    "False" -> return False;
+					    _       -> happyError } }
+
 {
 happyError :: P a
-happyError buf PState{ loc = loc } = PFailed (srcParseErr buf loc)
+happyError = srcParseFail
 
 loadPackageConfig :: FilePath -> IO [PackageConfig]
 loadPackageConfig conf_filename = do
-   buf <- hGetStringBuffer False conf_filename
-   case parse buf PState{ bol = 0#, atbol = 1#,
-	 	          context = [], glasgow_exts = 0#,
-  			  loc = mkSrcLoc (_PK_ conf_filename) 1 } of
-	PFailed err -> do
-	    freeStringBuffer buf
-            throwDyn (InstallationError (showSDoc err))
+   buf <- hGetStringBuffer conf_filename
+   let loc  = mkSrcLoc (mkFastString conf_filename) 1 0
+   case unP parse (mkPState buf loc defaultDynFlags) of
+	PFailed l1 l2 err -> 
+	  throwDyn (InstallationError (showSDoc (showPFailed l1 l2 err)))
 
 	POk _ pkg_details -> do
-	    freeStringBuffer buf
 	    return pkg_details
 }