[Pkg-haskell-commits] darcs: uuagc: To avoid self-build-dependency, ship the generated files in debian/generated-files/* and provide the debian/rules update-generated-files to update these.
Joachim Breitner
mail at joachim-breitner.de
Thu Apr 12 19:36:25 UTC 2012
Thu Apr 12 19:33:17 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* To avoid self-build-dependency, ship the generated files in debian/generated-files/* and provide the debian/rules update-generated-files to update these.
Ignore-this: d4fc644e640a0eb6c96824bab2b23d0
M ./changelog +8
M ./control -1
A ./generated-files/
A ./generated-files-uuagc/
A ./generated-files/AG2AspectAG.hs
A ./generated-files/AbstractSyntax.hs
A ./generated-files/AbstractSyntaxDump.hs
A ./generated-files/Code.hs
A ./generated-files/CodeSyntax.hs
A ./generated-files/CodeSyntaxDump.hs
A ./generated-files/ConcreteSyntax.hs
A ./generated-files/DeclBlocks.hs
A ./generated-files/DefaultRules.hs
A ./generated-files/Desugar.hs
A ./generated-files/ErrorMessages.hs
A ./generated-files/ExecutionPlan.hs
A ./generated-files/ExecutionPlan2Hs.hs
A ./generated-files/Expression.hs
A ./generated-files/GenerateCode.hs
A ./generated-files/HsToken.hs
A ./generated-files/Interfaces.hs
A ./generated-files/InterfacesRules.hs
A ./generated-files/KWOrder.hs
A ./generated-files/Macro.hs
A ./generated-files/Order.hs
A ./generated-files/Patterns.hs
A ./generated-files/PrintCode.hs
A ./generated-files/PrintErrorMessages.hs
A ./generated-files/PrintOcamlCode.hs
A ./generated-files/PrintVisitCode.hs
A ./generated-files/ResolveLocals.hs
A ./generated-files/SemHsTokens.hs
A ./generated-files/TfmToVisage.hs
A ./generated-files/Transform.hs
A ./generated-files/Visage.hs
A ./generated-files/VisagePatterns.hs
A ./generated-files/VisageSyntax.hs
M ./patches/use-uuagc-to-bootstrap -8 +12
M ./rules -1 +26
A ./uuagc.sh
Thu Apr 12 19:33:17 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* To avoid self-build-dependency, ship the generated files in debian/generated-files/* and provide the debian/rules update-generated-files to update these.
Ignore-this: d4fc644e640a0eb6c96824bab2b23d0
diff -rN -u old-uuagc//changelog new-uuagc//changelog
--- old-uuagc//changelog 2012-04-12 19:36:23.503252804 +0000
+++ new-uuagc//changelog 2012-04-12 19:36:23.739249339 +0000
@@ -1,3 +1,11 @@
+uuagc (0.9.40.3-2) UNRELEASED; urgency=low
+
+ * To avoid self-build-dependency, ship the generated files in
+ debian/generated-files/* and provide the debian/rules
+ update-generated-files to update these.
+
+ -- Joachim Breitner <nomeata at debian.org> Thu, 12 Apr 2012 20:55:46 +0200
+
uuagc (0.9.40.3-1) unstable; urgency=low
* New upstream release (Closes: #666365)
diff -rN -u old-uuagc//control new-uuagc//control
--- old-uuagc//control 2012-04-12 19:36:23.503252804 +0000
+++ new-uuagc//control 2012-04-12 19:36:23.511248623 +0000
@@ -8,7 +8,6 @@
, haskell-devscripts (>= 0.8)
, cdbs
, ghc
- , uuagc
, libghc-uuagc-cabal-dev (>= 1.0.2.0)
, libghc-uulib-dev (>= 0.9.14)
, libghc-mtl-dev (>= 1.1.1.)
diff -rN -u old-uuagc//generated-files/AbstractSyntaxDump.hs new-uuagc//generated-files/AbstractSyntaxDump.hs
--- old-uuagc//generated-files/AbstractSyntaxDump.hs 1970-01-01 00:00:00.000000000 +0000
+++ new-uuagc//generated-files/AbstractSyntaxDump.hs 2012-04-12 19:36:23.535249483 +0000
@@ -0,0 +1,1040 @@
+
+
+-- UUAGC 0.9.40.3 (src-ag/AbstractSyntaxDump.ag)
+module AbstractSyntaxDump where
+{-# LINE 6 "src-ag/AbstractSyntaxDump.ag" #-}
+
+import Data.List
+import qualified Data.Map as Map
+
+import Pretty
+import PPUtil
+
+import AbstractSyntax
+import TokenDef
+{-# LINE 16 "dist-ghc/build/AbstractSyntaxDump.hs" #-}
+
+{-# LINE 2 "src-ag/AbstractSyntax.ag" #-}
+
+-- AbstractSyntax.ag imports
+import Data.Set(Set)
+import Data.Map(Map)
+import Patterns (Pattern(..),Patterns)
+import Expression (Expression(..))
+import Macro --marcos
+import CommonTypes
+import ErrorMessages
+{-# LINE 28 "dist-ghc/build/AbstractSyntaxDump.hs" #-}
+
+{-# LINE 2 "src-ag/Patterns.ag" #-}
+
+-- Patterns.ag imports
+import UU.Scanner.Position(Pos)
+import CommonTypes (ConstructorIdent,Identifier)
+{-# LINE 35 "dist-ghc/build/AbstractSyntaxDump.hs" #-}
+
+{-# LINE 2 "src-ag/Expression.ag" #-}
+
+import UU.Scanner.Position(Pos)
+import HsToken
+{-# LINE 41 "dist-ghc/build/AbstractSyntaxDump.hs" #-}
+-- Child -------------------------------------------------------
+{-
+ visit 0:
+ synthesized attribute:
+ pp : PP_Doc
+ alternatives:
+ alternative Child:
+ child name : {Identifier}
+ child tp : {Type}
+ child kind : {ChildKind}
+-}
+-- cata
+sem_Child :: Child ->
+ T_Child
+sem_Child (Child _name _tp _kind) =
+ (sem_Child_Child _name _tp _kind)
+-- semantic domain
+newtype T_Child = T_Child (( PP_Doc))
+data Inh_Child = Inh_Child {}
+data Syn_Child = Syn_Child {pp_Syn_Child :: PP_Doc}
+wrap_Child :: T_Child ->
+ Inh_Child ->
+ Syn_Child
+wrap_Child (T_Child sem) (Inh_Child) =
+ (let ( _lhsOpp) = sem
+ in (Syn_Child _lhsOpp))
+sem_Child_Child :: Identifier ->
+ Type ->
+ ChildKind ->
+ T_Child
+sem_Child_Child name_ tp_ kind_ =
+ (T_Child (let _lhsOpp :: PP_Doc
+ -- "src-ag/AbstractSyntaxDump.ag"(line 35, column 33)
+ _lhsOpp =
+ ({-# LINE 35 "src-ag/AbstractSyntaxDump.ag" #-}
+ ppNestInfo ["Child","Child"] [pp name_, ppShow tp_] [ppF "kind" $ ppShow kind_] []
+ {-# LINE 78 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ in ( _lhsOpp)))
+-- Children ----------------------------------------------------
+{-
+ visit 0:
+ synthesized attributes:
+ pp : PP_Doc
+ ppL : [PP_Doc]
+ alternatives:
+ alternative Cons:
+ child hd : Child
+ child tl : Children
+ alternative Nil:
+-}
+-- cata
+sem_Children :: Children ->
+ T_Children
+sem_Children list =
+ (Prelude.foldr sem_Children_Cons sem_Children_Nil (Prelude.map sem_Child list))
+-- semantic domain
+newtype T_Children = T_Children (( PP_Doc,([PP_Doc])))
+data Inh_Children = Inh_Children {}
+data Syn_Children = Syn_Children {pp_Syn_Children :: PP_Doc,ppL_Syn_Children :: ([PP_Doc])}
+wrap_Children :: T_Children ->
+ Inh_Children ->
+ Syn_Children
+wrap_Children (T_Children sem) (Inh_Children) =
+ (let ( _lhsOpp,_lhsOppL) = sem
+ in (Syn_Children _lhsOpp _lhsOppL))
+sem_Children_Cons :: T_Child ->
+ T_Children ->
+ T_Children
+sem_Children_Cons (T_Child hd_) (T_Children tl_) =
+ (T_Children (let _lhsOppL :: ([PP_Doc])
+ _lhsOpp :: PP_Doc
+ _hdIpp :: PP_Doc
+ _tlIpp :: PP_Doc
+ _tlIppL :: ([PP_Doc])
+ -- "src-ag/AbstractSyntaxDump.ag"(line 67, column 33)
+ _lhsOppL =
+ ({-# LINE 67 "src-ag/AbstractSyntaxDump.ag" #-}
+ _hdIpp : _tlIppL
+ {-# LINE 121 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ -- use rule "src-ag/AbstractSyntaxDump.ag"(line 17, column 58)
+ _lhsOpp =
+ ({-# LINE 17 "src-ag/AbstractSyntaxDump.ag" #-}
+ _hdIpp >-< _tlIpp
+ {-# LINE 127 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ ( _hdIpp) =
+ hd_
+ ( _tlIpp,_tlIppL) =
+ tl_
+ in ( _lhsOpp,_lhsOppL)))
+sem_Children_Nil :: T_Children
+sem_Children_Nil =
+ (T_Children (let _lhsOppL :: ([PP_Doc])
+ _lhsOpp :: PP_Doc
+ -- "src-ag/AbstractSyntaxDump.ag"(line 68, column 33)
+ _lhsOppL =
+ ({-# LINE 68 "src-ag/AbstractSyntaxDump.ag" #-}
+ []
+ {-# LINE 142 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ -- use rule "src-ag/AbstractSyntaxDump.ag"(line 17, column 58)
+ _lhsOpp =
+ ({-# LINE 17 "src-ag/AbstractSyntaxDump.ag" #-}
+ empty
+ {-# LINE 148 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ in ( _lhsOpp,_lhsOppL)))
+-- Expression --------------------------------------------------
+{-
+ visit 0:
+ synthesized attribute:
+ pp : PP_Doc
+ alternatives:
+ alternative Expression:
+ child pos : {Pos}
+ child tks : {[HsToken]}
+-}
+-- cata
+sem_Expression :: Expression ->
+ T_Expression
+sem_Expression (Expression _pos _tks) =
+ (sem_Expression_Expression _pos _tks)
+-- semantic domain
+newtype T_Expression = T_Expression (( PP_Doc))
+data Inh_Expression = Inh_Expression {}
+data Syn_Expression = Syn_Expression {pp_Syn_Expression :: PP_Doc}
+wrap_Expression :: T_Expression ->
+ Inh_Expression ->
+ Syn_Expression
+wrap_Expression (T_Expression sem) (Inh_Expression) =
+ (let ( _lhsOpp) = sem
+ in (Syn_Expression _lhsOpp))
+sem_Expression_Expression :: Pos ->
+ ([HsToken]) ->
+ T_Expression
+sem_Expression_Expression pos_ tks_ =
+ (T_Expression (let _lhsOpp :: PP_Doc
+ -- "src-ag/AbstractSyntaxDump.ag"(line 50, column 25)
+ _lhsOpp =
+ ({-# LINE 50 "src-ag/AbstractSyntaxDump.ag" #-}
+ ppNestInfo ["Expression","Expression"] [ppShow pos_] [ppF "txt" $ vlist . showTokens . tokensToStrings $ tks_] []
+ {-# LINE 185 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ in ( _lhsOpp)))
+-- Grammar -----------------------------------------------------
+{-
+ visit 0:
+ synthesized attribute:
+ pp : PP_Doc
+ alternatives:
+ alternative Grammar:
+ child typeSyns : {TypeSyns}
+ child useMap : {UseMap}
+ child derivings : {Derivings}
+ child wrappers : {Set NontermIdent}
+ child nonts : Nonterminals
+ child pragmas : {PragmaMap}
+ child manualAttrOrderMap : {AttrOrderMap}
+ child paramMap : {ParamMap}
+ child contextMap : {ContextMap}
+ child quantMap : {QuantMap}
+ child uniqueMap : {UniqueMap}
+ child augmentsMap : {Map NontermIdent (Map ConstructorIdent (Map Identifier [Expression]))}
+ child aroundsMap : {Map NontermIdent (Map ConstructorIdent (Map Identifier [Expression]))}
+ child mergeMap : {Map NontermIdent (Map ConstructorIdent (Map Identifier (Identifier, [Identifier], Expression)))}
+-}
+-- cata
+sem_Grammar :: Grammar ->
+ T_Grammar
+sem_Grammar (Grammar _typeSyns _useMap _derivings _wrappers _nonts _pragmas _manualAttrOrderMap _paramMap _contextMap _quantMap _uniqueMap _augmentsMap _aroundsMap _mergeMap) =
+ (sem_Grammar_Grammar _typeSyns _useMap _derivings _wrappers (sem_Nonterminals _nonts) _pragmas _manualAttrOrderMap _paramMap _contextMap _quantMap _uniqueMap _augmentsMap _aroundsMap _mergeMap)
+-- semantic domain
+newtype T_Grammar = T_Grammar (( PP_Doc))
+data Inh_Grammar = Inh_Grammar {}
+data Syn_Grammar = Syn_Grammar {pp_Syn_Grammar :: PP_Doc}
+wrap_Grammar :: T_Grammar ->
+ Inh_Grammar ->
+ Syn_Grammar
+wrap_Grammar (T_Grammar sem) (Inh_Grammar) =
+ (let ( _lhsOpp) = sem
+ in (Syn_Grammar _lhsOpp))
+sem_Grammar_Grammar :: TypeSyns ->
+ UseMap ->
+ Derivings ->
+ (Set NontermIdent) ->
+ T_Nonterminals ->
+ PragmaMap ->
+ AttrOrderMap ->
+ ParamMap ->
+ ContextMap ->
+ QuantMap ->
+ UniqueMap ->
+ (Map NontermIdent (Map ConstructorIdent (Map Identifier [Expression]))) ->
+ (Map NontermIdent (Map ConstructorIdent (Map Identifier [Expression]))) ->
+ (Map NontermIdent (Map ConstructorIdent (Map Identifier (Identifier, [Identifier], Expression)))) ->
+ T_Grammar
+sem_Grammar_Grammar typeSyns_ useMap_ derivings_ wrappers_ (T_Nonterminals nonts_) pragmas_ manualAttrOrderMap_ paramMap_ contextMap_ quantMap_ uniqueMap_ augmentsMap_ aroundsMap_ mergeMap_ =
+ (T_Grammar (let _lhsOpp :: PP_Doc
+ _nontsIpp :: PP_Doc
+ _nontsIppL :: ([PP_Doc])
+ -- "src-ag/AbstractSyntaxDump.ag"(line 20, column 25)
+ _lhsOpp =
+ ({-# LINE 20 "src-ag/AbstractSyntaxDump.ag" #-}
+ ppNestInfo ["Grammar","Grammar"] []
+ [ ppF "typeSyns" $ ppAssocL typeSyns_
+ , ppF "useMap" $ ppMap $ Map.map ppMap $ useMap_
+ , ppF "derivings" $ ppMap $ derivings_
+ , ppF "wrappers" $ ppShow $ wrappers_
+ , ppF "nonts" $ ppVList _nontsIppL
+ ] []
+ {-# LINE 254 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ ( _nontsIpp,_nontsIppL) =
+ nonts_
+ in ( _lhsOpp)))
+-- Nonterminal -------------------------------------------------
+{-
+ visit 0:
+ synthesized attribute:
+ pp : PP_Doc
+ alternatives:
+ alternative Nonterminal:
+ child nt : {NontermIdent}
+ child params : {[Identifier]}
+ child inh : {Attributes}
+ child syn : {Attributes}
+ child prods : Productions
+-}
+-- cata
+sem_Nonterminal :: Nonterminal ->
+ T_Nonterminal
+sem_Nonterminal (Nonterminal _nt _params _inh _syn _prods) =
+ (sem_Nonterminal_Nonterminal _nt _params _inh _syn (sem_Productions _prods))
+-- semantic domain
+newtype T_Nonterminal = T_Nonterminal (( PP_Doc))
+data Inh_Nonterminal = Inh_Nonterminal {}
+data Syn_Nonterminal = Syn_Nonterminal {pp_Syn_Nonterminal :: PP_Doc}
+wrap_Nonterminal :: T_Nonterminal ->
+ Inh_Nonterminal ->
+ Syn_Nonterminal
+wrap_Nonterminal (T_Nonterminal sem) (Inh_Nonterminal) =
+ (let ( _lhsOpp) = sem
+ in (Syn_Nonterminal _lhsOpp))
+sem_Nonterminal_Nonterminal :: NontermIdent ->
+ ([Identifier]) ->
+ Attributes ->
+ Attributes ->
+ T_Productions ->
+ T_Nonterminal
+sem_Nonterminal_Nonterminal nt_ params_ inh_ syn_ (T_Productions prods_) =
+ (T_Nonterminal (let _lhsOpp :: PP_Doc
+ _prodsIpp :: PP_Doc
+ _prodsIppL :: ([PP_Doc])
+ -- "src-ag/AbstractSyntaxDump.ag"(line 29, column 25)
+ _lhsOpp =
+ ({-# LINE 29 "src-ag/AbstractSyntaxDump.ag" #-}
+ ppNestInfo ["Nonterminal","Nonterminal"] (pp nt_ : map pp params_) [ppF "inh" $ ppMap inh_, ppF "syn" $ ppMap syn_, ppF "prods" $ ppVList _prodsIppL] []
+ {-# LINE 301 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ ( _prodsIpp,_prodsIppL) =
+ prods_
+ in ( _lhsOpp)))
+-- Nonterminals ------------------------------------------------
+{-
+ visit 0:
+ synthesized attributes:
+ pp : PP_Doc
+ ppL : [PP_Doc]
+ alternatives:
+ alternative Cons:
+ child hd : Nonterminal
+ child tl : Nonterminals
+ alternative Nil:
+-}
+-- cata
+sem_Nonterminals :: Nonterminals ->
+ T_Nonterminals
+sem_Nonterminals list =
+ (Prelude.foldr sem_Nonterminals_Cons sem_Nonterminals_Nil (Prelude.map sem_Nonterminal list))
+-- semantic domain
+newtype T_Nonterminals = T_Nonterminals (( PP_Doc,([PP_Doc])))
+data Inh_Nonterminals = Inh_Nonterminals {}
+data Syn_Nonterminals = Syn_Nonterminals {pp_Syn_Nonterminals :: PP_Doc,ppL_Syn_Nonterminals :: ([PP_Doc])}
+wrap_Nonterminals :: T_Nonterminals ->
+ Inh_Nonterminals ->
+ Syn_Nonterminals
+wrap_Nonterminals (T_Nonterminals sem) (Inh_Nonterminals) =
+ (let ( _lhsOpp,_lhsOppL) = sem
+ in (Syn_Nonterminals _lhsOpp _lhsOppL))
+sem_Nonterminals_Cons :: T_Nonterminal ->
+ T_Nonterminals ->
+ T_Nonterminals
+sem_Nonterminals_Cons (T_Nonterminal hd_) (T_Nonterminals tl_) =
+ (T_Nonterminals (let _lhsOppL :: ([PP_Doc])
+ _lhsOpp :: PP_Doc
+ _hdIpp :: PP_Doc
+ _tlIpp :: PP_Doc
+ _tlIppL :: ([PP_Doc])
+ -- "src-ag/AbstractSyntaxDump.ag"(line 75, column 33)
+ _lhsOppL =
+ ({-# LINE 75 "src-ag/AbstractSyntaxDump.ag" #-}
+ _hdIpp : _tlIppL
+ {-# LINE 346 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ -- use rule "src-ag/AbstractSyntaxDump.ag"(line 17, column 58)
+ _lhsOpp =
+ ({-# LINE 17 "src-ag/AbstractSyntaxDump.ag" #-}
+ _hdIpp >-< _tlIpp
+ {-# LINE 352 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ ( _hdIpp) =
+ hd_
+ ( _tlIpp,_tlIppL) =
+ tl_
+ in ( _lhsOpp,_lhsOppL)))
+sem_Nonterminals_Nil :: T_Nonterminals
+sem_Nonterminals_Nil =
+ (T_Nonterminals (let _lhsOppL :: ([PP_Doc])
+ _lhsOpp :: PP_Doc
+ -- "src-ag/AbstractSyntaxDump.ag"(line 76, column 33)
+ _lhsOppL =
+ ({-# LINE 76 "src-ag/AbstractSyntaxDump.ag" #-}
+ []
+ {-# LINE 367 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ -- use rule "src-ag/AbstractSyntaxDump.ag"(line 17, column 58)
+ _lhsOpp =
+ ({-# LINE 17 "src-ag/AbstractSyntaxDump.ag" #-}
+ empty
+ {-# LINE 373 "dist-ghc/build/AbstractSyntaxDump" #-}
+ )
+ in ( _lhsOpp,_lhsOppL)))
+-- Pattern -----------------------------------------------------
+{-
+ visit 0:
+ synthesized attributes:
+ copy : Pattern
+ pp : PP_Doc
+ alternatives:
+ alternative Alias:
+ child field : {Identifier}
+ child attr : {Identifier}
+ child pat : Pattern
+ visit 0:
+ local copy : _
+ alternative Constr:
+ child name : {ConstructorIdent}
+ child pats : Patterns
+ visit 0:
+ local copy : _
+ alternative Irrefutable:
+ child pat : Pattern
+ visit 0:
+ local copy : _
+ alternative Product:
+ child pos : {Pos}
+ child pats : Patterns
+ visit 0:
+ local copy : _
+ alternative Underscore:
+ child pos : {Pos}
+ visit 0:
+ local copy : _
+-}
+-- cata
+sem_Pattern :: Pattern ->
+ T_Pattern
+sem_Pattern (Alias _field _attr _pat) =
+ (sem_Pattern_Alias _field _attr (sem_Pattern _pat))
+sem_Pattern (Constr _name _pats) =
+ (sem_Pattern_Constr _name (sem_Patterns _pats))
+sem_Pattern (Irrefutable _pat) =
+ (sem_Pattern_Irrefutable (sem_Pattern _pat))
+sem_Pattern (Product _pos _pats) =
+ (sem_Pattern_Product _pos (sem_Patterns _pats))
+sem_Pattern (Underscore _pos) =
+ (sem_Pattern_Underscore _pos)
+-- semantic domain
+newtype T_Pattern = T_Pattern (( Pattern,PP_Doc))
+data Inh_Pattern = Inh_Pattern {}
+data Syn_Pattern = Syn_Pattern {copy_Syn_Pattern :: Pattern,pp_Syn_Pattern :: PP_Doc}
+wrap_Pattern :: T_Pattern ->
+ Inh_Pattern ->
+ Syn_Pattern
+wrap_Pattern (T_Pattern sem) (Inh_Pattern) =
+ (let ( _lhsOcopy,_lhsOpp) = sem
+ in (Syn_Pattern _lhsOcopy _lhsOpp))
+sem_Pattern_Alias :: Identifier ->
+ Identifier ->
+ T_Pattern ->
+ T_Pattern
+sem_Pattern_Alias field_ attr_ (T_Pattern pat_) =
+ (T_Pattern (let _lhsOpp :: PP_Doc
+ _lhsOcopy :: Pattern
+ _patIcopy :: Pattern
+ [...incomplete...]
More information about the Pkg-haskell-commits
mailing list