diff --git a/Parser.y b/Parser.y --- a/Parser.y +++ b/Parser.y @@ -121,7 +121,7 @@ or_formula :: {F c} or_formula : unitary_formula vline unitary_formula more_or_formula - { foldl (.|.) ($1 .|. $3) $4 } + { L.foldl (.|.) ($1 .|. $3) $4 } more_or_formula :: {[F c]} more_or_formula : {[]} | vline unitary_formula more_or_formula @@ -129,7 +129,7 @@ and_formula :: {F c} and_formula : unitary_formula ampersand unitary_formula more_and_formula - { foldl (.&.) ($1 .&. $3) $4 } + { L.foldl (.&.) ($1 .&. $3) $4 } more_and_formula :: {[F c]} @@ -168,7 +168,7 @@ disjunction :: {F c} disjunction : literal more_disjunction - { foldl (.|.) $1 $2 } + { L.foldl (.|.) $1 $2 } more_disjunction :: {[F c]} more_disjunction : {[]} | vline literal more_disjunction diff --git a/ParserC.y b/ParserC.y --- a/ParserC.y +++ b/ParserC.y @@ -120,7 +120,7 @@ or_formula :: {F c} or_formula : unitary_formula vline unitary_formula more_or_formula - { foldl (.|.) ($1 .|. $3) $4 } + { L.foldl (.|.) ($1 .|. $3) $4 } more_or_formula :: {[F c]} more_or_formula : {[]} | vline unitary_formula more_or_formula @@ -128,7 +128,7 @@ and_formula :: {F c} and_formula : unitary_formula ampersand unitary_formula more_and_formula - { foldl (.&.) ($1 .&. $3) $4 } + { L.foldl (.&.) ($1 .&. $3) $4 } more_and_formula :: {[F c]} @@ -167,7 +167,7 @@ disjunction :: {F c} disjunction : literal more_disjunction - { foldl (.|.) $1 $2 } + { L.foldl (.|.) $1 $2 } more_disjunction :: {[F c]} more_disjunction : {[]} | vline literal more_disjunction diff --git a/dist/build/Lexer.hs b/dist/build/Lexer.hs --- a/dist/build/Lexer.hs +++ b/dist/build/Lexer.hs @@ -24,7 +24,6 @@ #endif {-# LINE 1 "templates/wrappers.hs" #-} {-# LINE 1 "templates/wrappers.hs" #-} -{-# LINE 1 "" #-} {-# LINE 1 "" #-} {-# LINE 1 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- @@ -72,7 +71,8 @@ [Byte], -- pending bytes on current char String) -- current input string -ignorePendingBytes (p,c,ps,s) = (p,c,s) +ignorePendingBytes :: AlexInput -> AlexInput +ignorePendingBytes (p,c,ps,s) = (p,c,[],s) alexInputPrevChar :: AlexInput -> Char alexInputPrevChar (p,c,bs,s) = c @@ -85,11 +85,11 @@ in p' `seq` Just (b, (p', c, bs, s)) -{-# LINE 88 "templates/wrappers.hs" #-} +{-# LINE 89 "templates/wrappers.hs" #-} -{-# LINE 102 "templates/wrappers.hs" #-} +{-# LINE 103 "templates/wrappers.hs" #-} -{-# LINE 117 "templates/wrappers.hs" #-} +{-# LINE 118 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Token positions @@ -117,27 +117,27 @@ -- ----------------------------------------------------------------------------- -- Default monad -{-# LINE 230 "templates/wrappers.hs" #-} +{-# LINE 231 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Monad (with ByteString input) -{-# LINE 319 "templates/wrappers.hs" #-} +{-# LINE 320 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Basic wrapper -{-# LINE 345 "templates/wrappers.hs" #-} +{-# LINE 346 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Basic wrapper, ByteString version -{-# LINE 363 "templates/wrappers.hs" #-} +{-# LINE 364 "templates/wrappers.hs" #-} -{-# LINE 376 "templates/wrappers.hs" #-} +{-# LINE 377 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- @@ -160,7 +160,7 @@ -- ----------------------------------------------------------------------------- -- Posn wrapper, ByteString version -{-# LINE 408 "templates/wrappers.hs" #-} +{-# LINE 409 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- @@ -275,7 +275,6 @@ alex_action_22 = withPos $ const Slash {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} -{-# LINE 1 "" #-} {-# LINE 1 "" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} -- ----------------------------------------------------------------------------- diff --git a/dist/build/Parser.hs b/dist/build/Parser.hs --- a/dist/build/Parser.hs +++ b/dist/build/Parser.hs @@ -18,7 +18,7 @@ import qualified Data.Array as Happy_Data_Array import qualified GHC.Exts as Happy_GHC_Exts --- parser produced by Happy Version 1.18.6 +-- parser produced by Happy Version 1.18.9 newtype HappyAbsSyn = HappyAbsSyn HappyAny #if __GLASGOW_HASKELL__ >= 607 @@ -1043,7 +1043,7 @@ case happyOut19 happy_x_3 of { happy_var_3 -> case happyOut16 happy_x_4 of { happy_var_4 -> happyIn15 - (foldl (.|.) (happy_var_1 .|. happy_var_3) happy_var_4 + (L.foldl (.|.) (happy_var_1 .|. happy_var_3) happy_var_4 ) `HappyStk` happyRest}}} happyReduce_21 = happySpecReduce_0 12# happyReduction_21 @@ -1071,7 +1071,7 @@ case happyOut19 happy_x_3 of { happy_var_3 -> case happyOut18 happy_x_4 of { happy_var_4 -> happyIn17 - (foldl (.&.) (happy_var_1 .&. happy_var_3) happy_var_4 + (L.foldl (.&.) (happy_var_1 .&. happy_var_3) happy_var_4 ) `HappyStk` happyRest}}} happyReduce_24 = happySpecReduce_0 14# happyReduction_24 @@ -1189,7 +1189,7 @@ = case happyOut26 happy_x_1 of { happy_var_1 -> case happyOut25 happy_x_2 of { happy_var_2 -> happyIn24 - (foldl (.|.) happy_var_1 happy_var_2 + (L.foldl (.|.) happy_var_1 happy_var_2 )}} happyReduce_38 = happySpecReduce_0 21# happyReduction_38 @@ -2222,7 +2222,8 @@ _ -> happyError' (tk:tks) } -happyError_ tk tks = happyError' (tk:tks) +happyError_ 38# tk tks = happyError' tks +happyError_ _ tk tks = happyError' (tk:tks) newtype HappyIdentity a = HappyIdentity a happyIdentity = HappyIdentity @@ -2259,7 +2260,6 @@ fApp2pApp (T (Identity (FunApp x args))) = (F (Identity (PredApp x args))) {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} -{-# LINE 1 "" #-} {-# LINE 1 "" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} -- Id: GenericTemplate.hs,v 1.26 2005/01/14 14:47:22 simonmar Exp @@ -2444,9 +2444,10 @@ -- Error recovery (0# is the error token) -- parse error if we are in recovery and we fail again -happyFail 0# tk old_st _ stk = +happyFail 0# tk old_st _ stk@(x `HappyStk` _) = + let (i) = (case Happy_GHC_Exts.unsafeCoerce# x of { (Happy_GHC_Exts.I# (i)) -> i }) in -- trace "failing" $ - happyError_ tk + happyError_ i tk {- We don't need state discarding for our restricted implementation of "error". In fact, it can cause some bogus parses, so I've disabled it diff --git a/dist/build/ParserC.hs b/dist/build/ParserC.hs --- a/dist/build/ParserC.hs +++ b/dist/build/ParserC.hs @@ -17,7 +17,7 @@ import qualified Data.Array as Happy_Data_Array import qualified GHC.Exts as Happy_GHC_Exts --- parser produced by Happy Version 1.18.6 +-- parser produced by Happy Version 1.18.9 newtype HappyAbsSyn = HappyAbsSyn HappyAny #if __GLASGOW_HASKELL__ >= 607 @@ -1042,7 +1042,7 @@ case happyOut19 happy_x_3 of { happy_var_3 -> case happyOut16 happy_x_4 of { happy_var_4 -> happyIn15 - (foldl (.|.) (happy_var_1 .|. happy_var_3) happy_var_4 + (L.foldl (.|.) (happy_var_1 .|. happy_var_3) happy_var_4 ) `HappyStk` happyRest}}} happyReduce_21 = happySpecReduce_0 12# happyReduction_21 @@ -1070,7 +1070,7 @@ case happyOut19 happy_x_3 of { happy_var_3 -> case happyOut18 happy_x_4 of { happy_var_4 -> happyIn17 - (foldl (.&.) (happy_var_1 .&. happy_var_3) happy_var_4 + (L.foldl (.&.) (happy_var_1 .&. happy_var_3) happy_var_4 ) `HappyStk` happyRest}}} happyReduce_24 = happySpecReduce_0 14# happyReduction_24 @@ -1189,7 +1189,7 @@ = case happyOut26 happy_x_1 of { happy_var_1 -> case happyOut25 happy_x_2 of { happy_var_2 -> happyIn24 - (foldl (.|.) happy_var_1 happy_var_2 + (L.foldl (.|.) happy_var_1 happy_var_2 )}} happyReduce_38 = happySpecReduce_0 21# happyReduction_38 @@ -2223,7 +2223,8 @@ _ -> happyError' (tk:tks) } -happyError_ tk tks = happyError' (tk:tks) +happyError_ 38# tk tks = happyError' tks +happyError_ _ tk tks = happyError' (tk:tks) newtype HappyIdentity a = HappyIdentity a happyIdentity = HappyIdentity @@ -2273,7 +2274,6 @@ return $ PredApp x args {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} -{-# LINE 1 "" #-} {-# LINE 1 "" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} -- Id: GenericTemplate.hs,v 1.26 2005/01/14 14:47:22 simonmar Exp @@ -2458,9 +2458,10 @@ -- Error recovery (0# is the error token) -- parse error if we are in recovery and we fail again -happyFail 0# tk old_st _ stk = +happyFail 0# tk old_st _ stk@(x `HappyStk` _) = + let (i) = (case Happy_GHC_Exts.unsafeCoerce# x of { (Happy_GHC_Exts.I# (i)) -> i }) in -- trace "failing" $ - happyError_ tk + happyError_ i tk {- We don't need state discarding for our restricted implementation of "error". In fact, it can cause some bogus parses, so I've disabled it diff --git a/logic-TPTP.cabal b/logic-TPTP.cabal --- a/logic-TPTP.cabal +++ b/logic-TPTP.cabal @@ -1,5 +1,5 @@ name: logic-TPTP -version: 0.3.0.1 +version: 0.3.0.2 cabal-version: >= 1.6 build-type: Simple license: GPL @@ -42,6 +42,7 @@ testing/ParseRandom.hs MACROS.h +tested-with: GHC==7.4.1 tested-with: GHC==7.2.1 tested-with: GHC==7.0.4 @@ -76,4 +77,6 @@ , ParserC , Codec.TPTP.QuickCheck , Util + + build-tools: alex, happy