* Pugs 6.2.13.20120203 for GHC 7.4.1 compatibility.

audreyt · audreyt · commit 971da1272e57 · 2012-02-03T21:42:28.000+08:00
diff --git a/Pugs/Pugs.cabal b/Pugs/Pugs.cabal
@@ -1,9 +1,9 @@
 Name            : Pugs
-Version         : 6.2.13.20111008
+Version         : 6.2.13.20120203
 license         : BSD3
 license-file    : LICENSE
 cabal-version   : >= 1.2.3
-copyright       : 2005-2008, The Pugs Contributors
+copyright       : 2005-2012, The Pugs Contributors
 maintainer      : Audrey Tang <audreyt@audreyt.org>
 category        : Language, Pugs
 stability       : experimental
@@ -12,7 +12,7 @@ homepage        : http://pugscode.org/
 synopsis        : A Perl 6 Implementation
 description     : A Perl 6 Implementation
 author          : Audrey Tang <audreyt@audreyt.org>
-Tested-With:    GHC==6.8.2, GHC==6.8.3, GHC==6.10.1, GHC==6.12.1, GHC==7.0.1, GHC==7.2.1
+Tested-With:    GHC==6.8.2, GHC==6.8.3, GHC==6.10.1, GHC==6.12.1, GHC==7.0.1, GHC==7.2.1, GHC==7.4.1
 data-files      :
     blib6/pugs/perl5/lib/Parse/Yapp/Driver.pm
     blib6/pugs/perl5/lib/Parse/Yapp/Grammar.pm
diff --git a/Pugs/src/Pugs/AST.hs b/Pugs/src/Pugs/AST.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances -fparr #-}
+{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances #-}
 {-# LANGUAGE GADTs #-}
 
 {-|
diff --git a/Pugs/src/Pugs/AST/Functions.hs b/Pugs/src/Pugs/AST/Functions.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}
+{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances #-}
 module Pugs.AST.Functions where
 import Pugs.Internals
 import Pugs.Types
diff --git a/Pugs/src/Pugs/AST/Internals.hs b/Pugs/src/Pugs/AST/Internals.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}
+{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances #-}
 {-# LANGUAGE GADTs #-}
 
 module Pugs.AST.Internals (
diff --git a/Pugs/src/Pugs/AST/Internals/Instances.hs b/Pugs/src/Pugs/AST/Internals/Instances.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}
+{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances #-}
 {-# LANGUAGE GADTs #-}
 
 
diff --git a/Pugs/src/Pugs/AST/Pad.hs b/Pugs/src/Pugs/AST/Pad.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fparr #-}
+{-# OPTIONS_GHC -fglasgow-exts #-}
 {-# LANGUAGE GADTs #-}
 module Pugs.AST.Pad (
   mkPad, unionPads, padKeys, filterPad, adjustPad, mergePadEntry,
diff --git a/Pugs/src/Pugs/AST/Types.hs b/Pugs/src/Pugs/AST/Types.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}
+{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances #-}
 module Pugs.AST.Types where
 import Pugs.Internals
 import Pugs.Types
diff --git a/Pugs/src/Pugs/Class.hs b/Pugs/src/Pugs/Class.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fparr -fallow-undecidable-instances -fallow-incoherent-instances #-}
+{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fallow-incoherent-instances #-}
 
 {-|
     Class meta-model.  (object meta-meta-model)
diff --git a/Pugs/src/Pugs/Compile/Pugs.hs b/Pugs/src/Pugs/Compile/Pugs.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances -fparr #-}
+{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-}
 {-# LANGUAGE GADTs #-}
 
 module Pugs.Compile.Pugs (genPugs) where
diff --git a/Pugs/src/Pugs/Eval.hs b/Pugs/src/Pugs/Eval.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp -fno-warn-deprecations -fallow-overlapping-instances -fparr #-}
+{-# OPTIONS_GHC -fglasgow-exts -cpp -fno-warn-deprecations -fallow-overlapping-instances #-}
 {-# LANGUAGE GADTs #-}
 
 {-|
diff --git a/Pugs/src/Pugs/Eval/Var.hs b/Pugs/src/Pugs/Eval/Var.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances -funbox-strict-fields -fparr #-}
+{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances -funbox-strict-fields #-}
 {-# LANGUAGE GADTs #-}
 
 module Pugs.Eval.Var (
diff --git a/Pugs/src/Pugs/Internals.hs b/Pugs/src/Pugs/Internals.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-undecidable-instances -fallow-overlapping-instances -fparr #-}
+{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-undecidable-instances -fallow-overlapping-instances #-}
 
 {-|
     Internal utilities and library imports.
diff --git a/Pugs/src/Pugs/Types.hs b/Pugs/src/Pugs/Types.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-deprecations -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances -fparr #-}
+{-# OPTIONS_GHC -fglasgow-exts -fno-warn-deprecations -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances #-}
 {-|
     Implementation Types.
 
@@ -130,7 +130,7 @@ enumCxt (CxtItem _)   = 0
 enumCxt (CxtSlurpy _) = 1
 
 -- | Return the 'Cxt' corresponding to the given P5 calling convention bits.
-cxtEnum :: (Show a, Num a) => a -> Cxt
+cxtEnum :: (Show a, Num a, Eq a) => a -> Cxt
 cxtEnum 128 = CxtVoid
 cxtEnum 0   = cxtItemAny
 cxtEnum 1   = cxtSlurpyAny
diff --git a/Pugs/src/Pugs/Val/Code.hs b/Pugs/src/Pugs/Val/Code.hs
@@ -6,7 +6,7 @@ import Pugs.Types
 -- import Pugs.Val.Capture
 import Pugs.Class
 import Text.PrettyPrint
-import Data.Monoid
+import Data.Monoid (Monoid(..))
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 import qualified Pugs.Types as Types

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances -fparr #-}`
	`1`	`+{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances #-}`
`2`	`2`	`{-# LANGUAGE GADTs #-}`
`3`	`3`
`4`	`4`	`{-\|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}`
	`1`	`+{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances #-}`
`2`	`2`	`module Pugs.AST.Functions where`
`3`	`3`	`import Pugs.Internals`
`4`	`4`	`import Pugs.Types`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{-# OPTIONS_GHC -fglasgow-exts -fparr #-}`
	`1`	`+{-# OPTIONS_GHC -fglasgow-exts #-}`
`2`	`2`	`{-# LANGUAGE GADTs #-}`
`3`	`3`	`module Pugs.AST.Pad (`
`4`	`4`	`mkPad, unionPads, padKeys, filterPad, adjustPad, mergePadEntry,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{-# OPTIONS_GHC -fglasgow-exts -fparr -fallow-undecidable-instances -fallow-incoherent-instances #-}`
	`1`	`+{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fallow-incoherent-instances #-}`
`2`	`2`
`3`	`3`	`{-\|`
`4`	`4`	`Class meta-model. (object meta-meta-model)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances -fparr #-}`
	`1`	`+{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-}`
`2`	`2`	`{-# LANGUAGE GADTs #-}`
`3`	`3`
`4`	`4`	`module Pugs.Compile.Pugs (genPugs) where`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{-# OPTIONS_GHC -fglasgow-exts -cpp -fno-warn-deprecations -fallow-overlapping-instances -fparr #-}`
	`1`	`+{-# OPTIONS_GHC -fglasgow-exts -cpp -fno-warn-deprecations -fallow-overlapping-instances #-}`
`2`	`2`	`{-# LANGUAGE GADTs #-}`
`3`	`3`
`4`	`4`	`{-\|`