Changeset 12324

Show
Ignore:
Timestamp:
08/16/06 20:03:31 (2 years ago)
Author:
gaal
Message:

* Bring the glory to 6.4.2

Location:
src
Files:
22 modified

Legend:

Unmodified
Added
Removed

  • src/Pugs.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-} 
    22 
    33{-| 

  • src/Pugs/AST.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields #-} 
     1{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances #-} 
    22 
    33{-| 
    … …  
    313313filterUserDefinedPad (MkPad pad) = MkPad $ Map.filterWithKey doFilter pad 
    314314    where 
    315     doFilter key _ = key `Set.notMember` _reserved 
     315    doFilter key _ = (not . Set.member key) _reserved 
    316316 
    317317_reserved :: Set Var 

  • src/Pugs/AST/SIO.hs

    r12317 r12324  
    1919 
    2020{-# INLINE runSIO #-} 
    21 {-# SPECIALISE INLINE runSIO :: SIO () -> Maybe () #-} 
    22 {-# SPECIALISE INLINE runSIO :: SIO () -> Either String () #-} 
     21{-# SPECIALISE runSIO :: SIO () -> Maybe () #-} 
     22{-# SPECIALISE runSIO :: SIO () -> Either String () #-} 
    2323runSIO :: Monad m => SIO a -> m a 
    2424runSIO MkSTM{}      = fail "Unsafe STM caught in pure computation" 
    … …  
    2727 
    2828{-# INLINE runSTM #-} 
    29 {-# SPECIALISE INLINE runSTM :: SIO () -> STM () #-} 
     29{-# SPECIALISE runSTM :: SIO () -> STM () #-} 
    3030runSTM :: SIO a -> STM a 
    3131runSTM (MkSTM stm)  = stm 
    … …  
    3434 
    3535{-# INLINE runIO #-} 
    36 {-# SPECIALISE INLINE runIO :: SIO () -> IO () #-} 
     36{-# SPECIALISE runIO :: SIO () -> IO () #-} 
    3737runIO :: SIO a -> IO a 
    3838runIO (MkIO io)     = io 

  • src/Pugs/Bind.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-} 
    22 
    33{-| 

  • src/Pugs/CodeGen/PIR.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp -fallow-overlapping-instances #-} 
    22 
    33{-| 

  • src/Pugs/Compile.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp -fno-warn-deprecations #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp -fno-warn-deprecations -fallow-overlapping-instances #-} 
    22 
    33{-| 

  • src/Pugs/Compile/PIL2.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp -fno-warn-deprecations #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp -fno-warn-deprecations -fallow-overlapping-instances #-} 
    22 
    33module Pugs.Compile.PIL2 ( 

  • src/Pugs/Compile/Pugs.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-} 
    22 
    33module Pugs.Compile.Pugs (genPugs) where 

  • src/Pugs/Eval.hs

    r12321 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts -cpp -fno-warn-deprecations #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -cpp -fno-warn-deprecations -fallow-overlapping-instances #-} 
    22 
    33{-| 

  • src/Pugs/Eval/Var.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts -cpp #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -cpp -fallow-overlapping-instances #-} 
    22 
    33module Pugs.Eval.Var ( 

  • src/Pugs/External.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts -cpp #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -cpp -fallow-overlapping-instances #-} 
    22 
    33{-| 

  • src/Pugs/Internals.hs

    r12317 r12324  
    162162--  
    163163class ((:>:) a) b where 
    164     {-# SPECIALISE INLINE cast :: ID -> ID #-} 
    165     {-# SPECIALISE INLINE cast :: ByteString -> ByteString #-} 
    166     {-# SPECIALISE INLINE cast :: String -> String #-} 
    167     {-# SPECIALISE INLINE cast :: ByteString -> ByteString #-} 
    168     {-# SPECIALISE INLINE cast :: String -> String #-} 
    169     {-# SPECIALISE INLINE cast :: ID -> ByteString #-} 
    170     {-# SPECIALISE INLINE cast :: ID -> String #-} 
    171     {-# SPECIALISE INLINE cast :: ByteString -> ID #-} 
    172     {-# SPECIALISE INLINE cast :: String -> ID #-} 
     164    {-# SPECIALISE cast :: ID -> ID #-} 
     165    {-# SPECIALISE cast :: ByteString -> ByteString #-} 
     166    {-# SPECIALISE cast :: String -> String #-} 
     167    {-# SPECIALISE cast :: ByteString -> ByteString #-} 
     168    {-# SPECIALISE cast :: String -> String #-} 
     169    {-# SPECIALISE cast :: ID -> ByteString #-} 
     170    {-# SPECIALISE cast :: ID -> String #-} 
     171    {-# SPECIALISE cast :: ByteString -> ID #-} 
     172    {-# SPECIALISE cast :: String -> ID #-} 
    173173    cast :: b -> a 
    174174 

  • src/Pugs/Monads.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-} 
    22 
    33{-| 

  • src/Pugs/Parser/Operator.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -cpp -fglasgow-exts -funbox-strict-fields -fno-full-laziness -fno-cse #-} 
     1{-# OPTIONS_GHC -cpp -fglasgow-exts -funbox-strict-fields -fno-full-laziness -fno-cse -fallow-overlapping-instances #-} 
    22 
    33module Pugs.Parser.Operator where 
    … …  
    184184        (optionary', unary') = mapPair (map snd) . partition fst . sort $ 
    185185            [ (isOptional param, var) | (var, _, [param]) <- unary 
    186             , v_name var `Set.notMember` restNames 
     186            , not (v_name var `Set.member` restNames) 
    187187            ] 
    188188        (namedUnary, preUnary, postUnary) = foldr splitUnary ([],[],[]) unary' 

  • src/Pugs/Parser/Util.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-} 
    22module Pugs.Parser.Util where 
    33 

  • src/Pugs/Prim.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fno-full-laziness -fno-cse #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fno-full-laziness -fno-cse -fallow-overlapping-instances #-} 
    22 
    33{-| 

  • src/Pugs/Prim/Code.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-} 
    22module Pugs.Prim.Code ( 
    33    op1CodeAssoc, op1CodeName, op1CodeArity, op1CodeBody, op1CodePos, 

  • src/Pugs/Prim/Eval.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-} 
    22module Pugs.Prim.Eval ( 
    33    -- used by Pugs.Prim 

  • src/Pugs/Prim/Match.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances #-} 
    22 
    33module Pugs.Prim.Match ( 

  • src/Pugs/Prim/Param.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-} 
    22 
    33module Pugs.Prim.Param ( 

  • src/Pugs/Run.hs

    r12317 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts -fno-full-laziness -fno-cse -cpp #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -fno-full-laziness -fno-cse -cpp -fallow-overlapping-instances #-} 
    22 
    33 

  • src/Pugs/Run/Perl5.hs

    r12323 r12324  
    1 {-# OPTIONS_GHC -fglasgow-exts -cpp -fvia-C -optc-w -fno-warn-unused-binds -fno-warn-unused-imports #-} 
     1{-# OPTIONS_GHC -fglasgow-exts -cpp -fvia-C -optc-w -fno-warn-unused-binds -fno-warn-unused-imports -fallow-overlapping-instances #-} 
    22 
    33module Pugs.Run.Perl5 () where