uuagc 0.9.37.0 → 0.9.37.1

raw patch · 36 files changed

+125/−95 lines, 36 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

cabal-plugin/src/Distribution/Simple/UUAGC/AbsSyn.hs +14/−1
cabal-plugin/src/Distribution/Simple/UUAGC/Options.hs +57/−50
cabal-plugin/src/Distribution/Simple/UUAGC/Parser.hs +14/−6
cabal-plugin/src/Distribution/Simple/UUAGC/UUAGC.hs +6/−2
src-derived/AG2AspectAG.hs +1/−1
src-derived/AbstractSyntax.hs +1/−1
src-derived/AbstractSyntaxDump.hs +1/−1
src-derived/Code.hs +1/−1
src-derived/CodeSyntax.hs +1/−1
src-derived/CodeSyntaxDump.hs +1/−1
src-derived/ConcreteSyntax.hs +1/−1
src-derived/DeclBlocks.hs +1/−1
src-derived/DefaultRules.hs +1/−1
src-derived/Desugar.hs +1/−1
src-derived/ErrorMessages.hs +1/−1
src-derived/Expression.hs +1/−1
src-derived/GenerateCode.hs +1/−1
src-derived/HsToken.hs +1/−1
src-derived/Interfaces.hs +1/−1
src-derived/InterfacesRules.hs +1/−1
src-derived/Order.hs +1/−1
src-derived/Patterns.hs +1/−1
src-derived/PrintCode.hs +1/−1
src-derived/PrintErrorMessages.hs +1/−1
src-derived/PrintOcamlCode.hs +1/−1
src-derived/PrintVisitCode.hs +1/−1
src-derived/SemHsTokens.hs +1/−1
src-derived/TfmToVisage.hs +1/−1
src-derived/Transform.hs +1/−1
src-derived/Visage.hs +1/−1
src-derived/VisagePatterns.hs +1/−1
src-derived/VisageSyntax.hs +1/−1
src/RhsCheck.hs +3/−5
src/Version.hs +1/−1
uuagc.cabal +1/−1
uuagc.cabal-for-ghc-6.6 +1/−1

cabal-plugin/src/Distribution/Simple/UUAGC/AbsSyn.hs view

@@ -58,12 +58,19 @@                  | USepSemMods                  | UGenFileDeps                  | UGenVisage+                 | UGenAspectAG                  | UGenAttrList                  | UForceIrrefutable FilePath+                 | UUniqueDispenser  String                  | ULCKeyWords                  | UOptimize                  | UDoubleColons                  | UHaskellSyntax+                 | UStatistics FilePath+                 | UCheckParseRhs+                 | UCheckParseTys+                 | UCheckParseBlocks+                 | UCheckParseHaskell                    deriving (Eq, Read, Show)  type UUAGCOptions = [UUAGCOption]@@ -128,13 +135,20 @@ fromUUAGCOtoArgs USepSemMods            = toLOp osepsemmods fromUUAGCOtoArgs UGenFileDeps           = toLOp ogenfiledeps fromUUAGCOtoArgs UGenVisage             = toLOp ogenvisage+fromUUAGCOtoArgs UGenAspectAG           = toLOp ogenaspectag fromUUAGCOtoArgs UGenAttrList           = toLOp ogenattrlist fromUUAGCOtoArgs (UForceIrrefutable fp) = toLEOpA oforceirrefutable fp+fromUUAGCOtoArgs (UUniqueDispenser  nm) = toLEOpA ouniquedispenser  nm fromUUAGCOtoArgs UOptimize              = toLOp ooptimize fromUUAGCOtoArgs UModuleDefault         = toLOp omodule fromUUAGCOtoArgs UHaskellSyntax         = toLOp ohaskellsyntax fromUUAGCOtoArgs UDoubleColons          = toLOp odoublecolons fromUUAGCOtoArgs ULCKeyWords            = toLOp olckeywords+fromUUAGCOtoArgs (UStatistics fp)       = toLEOpA ostatistics fp+fromUUAGCOtoArgs UCheckParseRhs         = toLOp ocheckparserhs+fromUUAGCOtoArgs UCheckParseTys         = toLOp ocheckparsetys+fromUUAGCOtoArgs UCheckParseBlocks      = toLOp ocheckparseblocks+fromUUAGCOtoArgs UCheckParseHaskell     = toLOp ocheckparsehaskell  fromUUAGCOstoArgs :: UUAGCOptions -> [String] fromUUAGCOstoArgs = map fromUUAGCOtoArgs@@ -144,4 +158,3 @@     where f e (AGFileOption s' classes opt)               | s == (normalise s')  = opt               | otherwise            = e-

cabal-plugin/src/Distribution/Simple/UUAGC/Options.hs view

@@ -1,52 +1,59 @@ module Distribution.Simple.UUAGC.Options where -odata           = "data"-ostrictdata     = "strictdata"-ostrictwrap     = "strictwrap"-ocatas          = "catas"-osemfuns        = "semfuns"-osignatures     = "signatures"-onewtypes       = "newtypes"-opretty         = "pretty"-owrappers       = "wrappers"-orename         = "rename"-omodcopy        = "modcopy"-onest           = "nest"-osyntaxmacro    = "syntaxmacro"-overbose        = "verbose"-ohelp           = "help"-oself           = "self"-ocycle          = "cycle"-oversion        = "version"-ovisit          = "visit"-oseq            = "seq"-ounbox          = "unbox"-obangpats       = "bangpats" -ocase           = "case"-ostrictcase     = "strictcase"-ostrictercase   = "strictercase"-olocalcps       = "localcps"-osplitsems      = "splitsems"-owerrors        = "Werrors"-owignore        = "Wignore"-odumpgrammar    = "dumpgrammar"-odumpcgrammar   = "dumpcgrammar"-ogentraces      = "gentraces"-ogenusetraces   = "genusetraces"-ogencostcentres = "gencostcentres"-ogenlinepragmas = "genlinepragmas"-osepsemmods     = "sepsemmods"-ogenfiledeps    = "genfiledeps"-ogenvisage      = "genvisage"-ogenattrlist    = "genattrlist"-olckeywords     = "lckeywords"-ooptimize       = "optimize"-odoublecolons   = "doublecolons"-ohaskellsyntax  = "haskellsyntax"-oall            = "all"-omodule         = "module"-ooutput         = "output"-osearch         = "path"-oprefix         = "prefix"-owmax           = "Wmax"-oforceirrefutable = "forceirrefutable"+odata              = "data"+ostrictdata        = "strictdata"+ostrictwrap        = "strictwrap"+ocatas             = "catas"+osemfuns           = "semfuns"+osignatures        = "signatures"+onewtypes          = "newtypes"+opretty            = "pretty"+owrappers          = "wrappers"+orename            = "rename"+omodcopy           = "modcopy"+onest              = "nest"+osyntaxmacro       = "syntaxmacro"+overbose           = "verbose"+ohelp              = "help"+oself              = "self"+ocycle             = "cycle"+oversion           = "version"+ovisit             = "visit"+oseq               = "seq"+ounbox             = "unbox"+obangpats          = "bangpats" +ocase              = "case"+ostrictcase        = "strictcase"+ostrictercase      = "strictercase"+olocalcps          = "localcps"+osplitsems         = "splitsems"+owerrors           = "Werrors"+owignore           = "Wignore"+owmax              = "Wmax"+odumpgrammar       = "dumpgrammar"+odumpcgrammar      = "dumpcgrammar"+ogentraces         = "gentraces"+ogenusetraces      = "genusetraces"+ogencostcentres    = "gencostcentres"+ogenlinepragmas    = "genlinepragmas"+osepsemmods        = "sepsemmods"+ogenfiledeps       = "genfiledeps"+ogenvisage         = "genvisage"+ogenaspectag       = "genAspectAG"+ogenattrlist       = "genattrlist"+oforceirrefutable  = "forceirrefutable"+ouniquedispenser   = "uniquedispenser"+olckeywords        = "lckeywords"+ooptimize          = "optimize"+odoublecolons      = "doublecolons"+ohaskellsyntax     = "haskellsyntax"+oall               = "all"+omodule            = "module"+ooutput            = "output"+osearch            = "path"+oprefix            = "prefix"+ostatistics        = "statistics"+ocheckparserhs     = "checkParseRhs"+ocheckparsetys     = "checkParseTys"+ocheckparseblocks  = "checkParseBlocks"+ocheckparsehaskell = "checkParseHaskell"

cabal-plugin/src/Distribution/Simple/UUAGC/Parser.hs view

@@ -30,8 +30,9 @@          ,ocase, ostrictcase, ostrictercase, olocalcps, osplitsems          ,owerrors, owignore, odumpgrammar, odumpcgrammar, ogentraces          ,ogenusetraces, ogencostcentres, ogenlinepragmas, osepsemmods-         ,ogenfiledeps, ogenvisage, ogenattrlist, olckeywords-         ,odoublecolons, oself ]+         ,ogenfiledeps, ogenvisage, ogenaspectag, ogenattrlist, olckeywords+         ,odoublecolons, oself+         ,ocheckparserhs,ocheckparsetys,ocheckparseblocks,ocheckparsehaskell]  uabsFlags = [UData, UStrictData, UStrictWData, UCatas, USemFuns, USignatures             ,UNewTypes, UPretty@@ -40,8 +41,9 @@             ,UCase, UStrictCase, UStricterCase, ULocalCPS, USplitSems             ,UWErrors, UWIgnore, UDumpGrammar, UDumpCGrammar, UGenTraces             ,UGenUseTraces, UGenCostCentres, UGenLinePragmas, USepSemMods-            ,UGenFileDeps, UGenVisage, UGenAttrList, ULCKeyWords-            ,UDoubleColons, USelf ]+            ,UGenFileDeps, UGenVisage, UGenAspectAG, UGenAttrList, ULCKeyWords+            ,UDoubleColons, USelf+            ,UCheckParseRhs, UCheckParseTys, UCheckParseBlocks, UCheckParseHaskell]  gFlags = [(oall, [odata, ocatas, osemfuns, osignatures, opretty, orename])          ,(ooptimize, [ovisit,ocase])@@ -51,7 +53,7 @@ gabsFlags = [UAll, UOptimize, UHaskellSyntax]  -aFlags = [omodule, ooutput, osearch, oprefix, owmax, oforceirrefutable]+aFlags = [omodule, ooutput, osearch, oprefix, owmax, oforceirrefutable, ouniquedispenser, ostatistics]  ugFlags = uFlags ++ (map (fst) gFlags) @@ -92,7 +94,13 @@ pForceIrrefutable :: Parser Token UUAGCOption pForceIrrefutable = UForceIrrefutable <$> (pKey oforceirrefutable *> pString) -pAllFlags = pugFlags ++ [pModule,pOutput,pSearch,pPrefix,pWmax,pForceIrrefutable]+pUniqueDispenser :: Parser Token UUAGCOption+pUniqueDispenser = UUniqueDispenser <$> (pKey ouniquedispenser *> pString)++pStatistics :: Parser Token UUAGCOption+pStatistics = UStatistics <$> (pKey ostatistics *> pString)++pAllFlags = pugFlags ++ [pModule,pOutput,pSearch,pPrefix,pWmax,pForceIrrefutable,pUniqueDispenser,pStatistics]  pAnyFlag = pAny id pAllFlags

cabal-plugin/src/Distribution/Simple/UUAGC/UUAGC.hs view

@@ -10,7 +10,7 @@ import Distribution.Simple.LocalBuildInfo import Distribution.Simple.Utils import Distribution.Simple.Setup-import Distribution.PackageDescription+import Distribution.PackageDescription hiding (Flag) import Distribution.Simple.UUAGC.AbsSyn( AGFileOption(..)                                          , AGFileOptions                                          , AGOptionsClass(..)@@ -23,6 +23,7 @@                                          , fileClasses                                          ) import Distribution.Simple.UUAGC.Parser+import Distribution.Verbosity import System.Process( CreateProcess(..), createProcess, CmdSpec(..)                      , StdStream(..), runProcess, waitForProcess                      , proc)@@ -220,7 +221,10 @@   options <- getAGFileOptions (bis >>= customFieldsBI)   fileOptions <- forM options (\ opt ->       let (notFound, opts) = getOptionsFromClass classes $ opt-      in forM_ notFound (hPutStrLn stderr) >> return (normalise . filename $ opt, opts))+      in do case buildVerbosity bf of+              Flag v | v >= verbose -> putStrLn ("options for " ++ filename opt ++ ": " ++ show opts)+              _ -> return () +            forM_ notFound (hPutStrLn stderr) >> return (normalise . filename $ opt, opts))   writeFileOptions fileOptions   let agflSP = map (id &&& dropFileName) $ nub $ getAGFileList options   mapM_ (updateAGFile pd lbi) agflSP

src-derived/AG2AspectAG.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (AG2AspectAG.ag)+-- UUAGC 0.9.37.1 (AG2AspectAG.ag) module AG2AspectAG where {-# LINE 7 "AG2AspectAG.ag" #-}

src-derived/AbstractSyntax.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (AbstractSyntax.ag)+-- UUAGC 0.9.37.1 (AbstractSyntax.ag) module AbstractSyntax where {-# LINE 2 "AbstractSyntax.ag" #-}

src-derived/AbstractSyntaxDump.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (AbstractSyntaxDump.ag)+-- UUAGC 0.9.37.1 (AbstractSyntaxDump.ag) module AbstractSyntaxDump where {-# LINE 6 "AbstractSyntaxDump.ag" #-}

src-derived/Code.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (Code.ag)+-- UUAGC 0.9.37.1 (Code.ag) module Code where {-# LINE 2 "Code.ag" #-}

src-derived/CodeSyntax.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (CodeSyntax.ag)+-- UUAGC 0.9.37.1 (CodeSyntax.ag) module CodeSyntax where {-# LINE 2 "CodeSyntax.ag" #-}

src-derived/CodeSyntaxDump.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (CodeSyntaxDump.ag)+-- UUAGC 0.9.37.1 (CodeSyntaxDump.ag) module CodeSyntaxDump where {-# LINE 5 "CodeSyntaxDump.ag" #-}

src-derived/ConcreteSyntax.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (ConcreteSyntax.ag)+-- UUAGC 0.9.37.1 (ConcreteSyntax.ag) module ConcreteSyntax where {-# LINE 2 "ConcreteSyntax.ag" #-}

src-derived/DeclBlocks.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (DeclBlocks.ag)+-- UUAGC 0.9.37.1 (DeclBlocks.ag) module DeclBlocks where {-# LINE 2 "DeclBlocks.ag" #-}

src-derived/DefaultRules.hs view

@@ -1,6 +1,6 @@ {-# OPTIONS_GHC -XBangPatterns #-} --- UUAGC 0.9.36.2 (DefaultRules.ag)+-- UUAGC 0.9.37.1 (DefaultRules.ag) module DefaultRules where {-# LINE 10 "DefaultRules.ag" #-}

src-derived/Desugar.hs view

@@ -1,6 +1,6 @@ {-# OPTIONS_GHC -XBangPatterns #-} --- UUAGC 0.9.36.2 (Desugar.ag)+-- UUAGC 0.9.37.1 (Desugar.ag) module Desugar where {-# LINE 13 "Desugar.ag" #-}

src-derived/ErrorMessages.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (ErrorMessages.ag)+-- UUAGC 0.9.37.1 (ErrorMessages.ag) module ErrorMessages where {-# LINE 2 "ErrorMessages.ag" #-}

src-derived/Expression.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (Expression.ag)+-- UUAGC 0.9.37.1 (Expression.ag) module Expression where {-# LINE 2 "Expression.ag" #-}

src-derived/GenerateCode.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (GenerateCode.ag)+-- UUAGC 0.9.37.1 (GenerateCode.ag) module GenerateCode where {-# LINE 9 "GenerateCode.ag" #-}

src-derived/HsToken.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (HsToken.ag)+-- UUAGC 0.9.37.1 (HsToken.ag) module HsToken where {-# LINE 2 "HsToken.ag" #-}

src-derived/Interfaces.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (Interfaces.ag)+-- UUAGC 0.9.37.1 (Interfaces.ag) module Interfaces where {-# LINE 2 "Interfaces.ag" #-}

src-derived/InterfacesRules.hs view

@@ -1,6 +1,6 @@ {-# OPTIONS_GHC -XBangPatterns #-} --- UUAGC 0.9.36.2 (InterfacesRules.lag)+-- UUAGC 0.9.37.1 (InterfacesRules.lag) module InterfacesRules where {-# LINE 10 "InterfacesRules.lag" #-}

src-derived/Order.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (Order.ag)+-- UUAGC 0.9.37.1 (Order.ag) module Order where {-# LINE 9 "Order.ag" #-}

src-derived/Patterns.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (Patterns.ag)+-- UUAGC 0.9.37.1 (Patterns.ag) module Patterns where {-# LINE 2 "Patterns.ag" #-}

src-derived/PrintCode.hs view

@@ -1,6 +1,6 @@ {-# OPTIONS_GHC -XBangPatterns #-} --- UUAGC 0.9.36.2 (PrintCode.ag)+-- UUAGC 0.9.37.1 (PrintCode.ag) module PrintCode where {-# LINE 10 "PrintCode.ag" #-}

src-derived/PrintErrorMessages.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (PrintErrorMessages.ag)+-- UUAGC 0.9.37.1 (PrintErrorMessages.ag) module PrintErrorMessages where {-# LINE 4 "PrintErrorMessages.ag" #-}

src-derived/PrintOcamlCode.hs view

@@ -1,6 +1,6 @@ {-# OPTIONS_GHC -XBangPatterns #-} --- UUAGC 0.9.36.2 (PrintOcamlCode.ag)+-- UUAGC 0.9.37.1 (PrintOcamlCode.ag) module PrintOcamlCode where {-# LINE 10 "PrintOcamlCode.ag" #-}

src-derived/PrintVisitCode.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (PrintVisitCode.ag)+-- UUAGC 0.9.37.1 (PrintVisitCode.ag) module PrintVisitCode where {-# LINE 10 "PrintVisitCode.ag" #-}

src-derived/SemHsTokens.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (SemHsTokens.ag)+-- UUAGC 0.9.37.1 (SemHsTokens.ag) module SemHsTokens where {-# LINE 4 "SemHsTokens.ag" #-}

src-derived/TfmToVisage.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (TfmToVisage.ag)+-- UUAGC 0.9.37.1 (TfmToVisage.ag) module TfmToVisage where {-# LINE 8 "TfmToVisage.ag" #-}

src-derived/Transform.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (Transform.ag)+-- UUAGC 0.9.37.1 (Transform.ag) module Transform where {-# LINE 8 "Transform.ag" #-}

src-derived/Visage.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (Visage.ag)+-- UUAGC 0.9.37.1 (Visage.ag) module Visage where {-# LINE 6 "Visage.ag" #-}

src-derived/VisagePatterns.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (VisagePatterns.ag)+-- UUAGC 0.9.37.1 (VisagePatterns.ag) module VisagePatterns where {-# LINE 2 "VisagePatterns.ag" #-}

src-derived/VisageSyntax.hs view

@@ -1,6 +1,6 @@  --- UUAGC 0.9.36.2 (VisageSyntax.ag)+-- UUAGC 0.9.37.1 (VisageSyntax.ag) module VisageSyntax where {-# LINE 2 "VisageSyntax.ag" #-}

src/RhsCheck.hs view

@@ -6,18 +6,16 @@ import Expression import HsToken import UU.Scanner.Position-import Debug.Trace  checkRhs,checkBlock,checkTy :: Expression -> Errors-checkRhs = check parseExpWithMode+checkRhs   = check parseExpWithMode checkBlock = check parseModuleWithMode-checkTy = check parseTypeWithMode+checkTy    = check parseTypeWithMode  check :: (ParseMode -> String -> ParseResult a) -> Expression -> Errors check p (Expression pos tks) = case res of    ParseOk _           -> []-   ParseFailed loc msg -> trace (">>\n" ++ str ++ "\n" ++ msg ++ "<<") $-                          let pos' = Pos (srcLine loc + line pos - 1) (srcColumn loc) (srcFilename loc)+   ParseFailed loc msg -> let pos' = Pos (srcLine loc + line pos - 1) (srcColumn loc) (srcFilename loc)                           in [HsParseError pos' msg]  where   pos0 = Pos (line pos) 1 (file pos)

src/Version.hs view

@@ -1,4 +1,4 @@ module Version where
 
 banner :: String
-banner = "Attribute Grammar compiler / HUT project. Version 0.9.37.0"
+banner = "Attribute Grammar compiler / HUT project. Version 0.9.37.1"

uuagc.cabal view

@@ -1,7 +1,7 @@ cabal-version: >=1.2 build-type: Simple name: uuagc-version: 0.9.37.0+version: 0.9.37.1 license: GPL license-file: LICENSE maintainer: Arie Middelkoop <ariem@cs.uu.nl>

uuagc.cabal-for-ghc-6.6 view

@@ -1,5 +1,5 @@ name: uuagc-version: 0.9.37.0+version: 0.9.37.1 license: GPL license-file: LICENSE maintainer: Arie Middelkoop <ariem@cs.uu.nl>