diff --git a/oberon0.cabal b/oberon0.cabal --- a/oberon0.cabal +++ b/oberon0.cabal @@ -1,7 +1,7 @@ cabal-version: >= 1.8 build-type: Custom name: oberon0 -version: 0.0.1 +version: 0.0.2 license: LGPL license-file: LICENSE-LGPL maintainer: Marcos Viera @@ -51,10 +51,10 @@ build-depends: base >= 4, base < 5, ghc-prim >= 0.2.0.0, template-haskell build-depends: containers >= 0.4, transformers >= 0.2.2.0, mtl >= 2.0.1.0, array >= 0.3.0.3 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: AspectAG >= 0.3.6.1 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances ghc-options: -fcontext-stack=1000 hs-source-dirs: src @@ -119,10 +119,10 @@ build-depends: oberon0 build-depends: base >= 4, base < 5 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L1/T1.hs if !(flag(l1) && flag(t1)) @@ -134,10 +134,10 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L1/T2.hs if !(flag(l1) && flag(t2)) @@ -149,10 +149,10 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L1/T3.hs if !(flag(l1) && flag(t3)) @@ -164,11 +164,11 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 build-depends: language-c >= 0.4.2 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L1/T5.hs if !(flag(l1) && flag(t5)) @@ -181,10 +181,10 @@ build-depends: oberon0 build-depends: base >= 4, base < 5 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L2/T1.hs if !(flag(l2) && flag(t1)) @@ -196,10 +196,10 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L2/T2.hs if !(flag(l2) && flag(t2)) @@ -210,10 +210,10 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L2/T3.hs if !(flag(l2) && flag(t3)) @@ -225,11 +225,11 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 build-depends: language-c >= 0.4.2 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L2/T5.hs if !(flag(l2) && flag(t5)) @@ -241,10 +241,10 @@ build-depends: oberon0 build-depends: base >= 4, base < 5 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L3/T1.hs if !(flag(l3) && flag(t1)) @@ -255,10 +255,10 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L3/T2.hs if !(flag(l3) && flag(t2)) @@ -269,10 +269,10 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L3/T3.hs if !(flag(l3) && flag(t3)) @@ -284,11 +284,11 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 build-depends: language-c >= 0.4.2 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L3/T5.hs if !(flag(l3) && flag(t5)) @@ -302,10 +302,10 @@ build-depends: oberon0 build-depends: base >= 4, base < 5 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L4/T1.hs if !(flag(l4) && flag(t1)) @@ -318,10 +318,10 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L4/T2.hs if !(flag(l4) && flag(t2)) @@ -333,10 +333,10 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L4/T3.hs if !(flag(l4) && flag(t3)) @@ -348,11 +348,11 @@ build-depends: base >= 4, base < 5 build-depends: containers >= 0.4 build-depends: AspectAG >= 0.3.6.1 - build-depends: murder >= 1.2 + build-depends: murder >= 1.3.2 build-depends: uulib >= 0.9.14, uu-parsinglib >= 2.7.3.4 build-depends: HList >= 0.2.3 build-depends: language-c >= 0.4.2 - extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, DoRec, + extensions: TemplateHaskell, EmptyDataDecls, NoMonomorphismRestriction, Arrows, RecursiveDo, TypeSynonymInstances, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances main-is: src/Language/Oberon0/L4/T5.hs if !(flag(l4) && flag(t5)) diff --git a/src/Language/Oberon0/L1/Gram.hs b/src/Language/Oberon0/L1/Gram.hs --- a/src/Language/Oberon0/L1/Gram.hs +++ b/src/Language/Oberon0/L1/Gram.hs @@ -1,6 +1,6 @@ {-# OPTIONS -fcontext-stack=100 #-} -{-# LANGUAGE Arrows, DoRec, TemplateHaskell #-} +{-# LANGUAGE Arrows, RecursiveDo, TemplateHaskell #-} module Language.Oberon0.L1.Gram where @@ -14,6 +14,7 @@ import Language.Grammars.Murder import Language.Grammars.Murder.Derive import Language.Grammars.Grammar +import Language.Grammars.Grammar.AspectAG import Language.Grammars.AspectAG $(csLabels [ "cs_Module", "cs_Declarations", "cs_Expression", "cs_Factor", "cs_StatementSequence" diff --git a/src/Language/Oberon0/L2/Gram.hs b/src/Language/Oberon0/L2/Gram.hs --- a/src/Language/Oberon0/L2/Gram.hs +++ b/src/Language/Oberon0/L2/Gram.hs @@ -1,6 +1,6 @@ {-# OPTIONS -fcontext-stack=100 #-} -{-# LANGUAGE Arrows, DoRec #-} +{-# LANGUAGE Arrows, RecursiveDo #-} module Language.Oberon0.L2.Gram (module Language.Oberon0.L2.Gram, module Language.Oberon0.L1.Gram) where @@ -13,6 +13,7 @@ import Language.Grammars.Murder import Language.Grammars.Grammar +import Language.Grammars.Grammar.AspectAG import Language.Grammars.AspectAG diff --git a/src/Language/Oberon0/L3/Gram.hs b/src/Language/Oberon0/L3/Gram.hs --- a/src/Language/Oberon0/L3/Gram.hs +++ b/src/Language/Oberon0/L3/Gram.hs @@ -1,6 +1,6 @@ {-# OPTIONS -fcontext-stack=100 #-} -{-# LANGUAGE Arrows, DoRec #-} +{-# LANGUAGE Arrows, RecursiveDo #-} module Language.Oberon0.L3.Gram (module Language.Oberon0.L3.Gram, module Language.Oberon0.L2.Gram) where @@ -13,6 +13,7 @@ import Language.Grammars.Murder import Language.Grammars.Grammar +import Language.Grammars.Grammar.AspectAG import Language.Grammars.AspectAG diff --git a/src/Language/Oberon0/L4/Gram.hs b/src/Language/Oberon0/L4/Gram.hs --- a/src/Language/Oberon0/L4/Gram.hs +++ b/src/Language/Oberon0/L4/Gram.hs @@ -1,6 +1,6 @@ {-# OPTIONS -fcontext-stack=100 #-} -{-# LANGUAGE Arrows, DoRec #-} +{-# LANGUAGE Arrows, RecursiveDo #-} module Language.Oberon0.L4.Gram (module Language.Oberon0.L4.Gram, module Language.Oberon0.L3.Gram) where @@ -13,6 +13,7 @@ import Language.Grammars.Murder import Language.Grammars.Grammar +import Language.Grammars.Grammar.AspectAG import Language.Grammars.AspectAG