Commit eca30442 authored by Jan Stolarek's avatar Jan Stolarek

Trailing whitespaces

parent 690b7e49
...@@ -10,7 +10,7 @@ import Data.Char ( chr ) ...@@ -10,7 +10,7 @@ import Data.Char ( chr )
import Control.Monad.ST import Control.Monad.ST
import Data.Array.ST import Data.Array.ST
import Data.Array.Unboxed import Data.Array.Unboxed
import Data.Ratio import Data.Ratio
main = putStr main = putStr
......
...@@ -11,7 +11,7 @@ import Control.Monad (liftM, ap) ...@@ -11,7 +11,7 @@ import Control.Monad (liftM, ap)
-- parser produced by Happy Version 1.16 -- parser produced by Happy Version 1.16
data HappyAbsSyn data HappyAbsSyn
= HappyTerminal Token = HappyTerminal Token
| HappyErrorToken Int | HappyErrorToken Int
| HappyAbsSyn4 (Exp) | HappyAbsSyn4 (Exp)
...@@ -68,7 +68,7 @@ happyReduction_2 (HappyAbsSyn5 happy_var_1) ...@@ -68,7 +68,7 @@ happyReduction_2 (HappyAbsSyn5 happy_var_1)
= HappyAbsSyn4 = HappyAbsSyn4
(Exp1 happy_var_1 (Exp1 happy_var_1
) )
happyReduction_2 _ = notHappyAtAll happyReduction_2 _ = notHappyAtAll
happyReduce_3 = happySpecReduce_3 1# happyReduction_3 happyReduce_3 = happySpecReduce_3 1# happyReduction_3
happyReduction_3 (HappyAbsSyn6 happy_var_3) happyReduction_3 (HappyAbsSyn6 happy_var_3)
...@@ -77,7 +77,7 @@ happyReduction_3 (HappyAbsSyn6 happy_var_3) ...@@ -77,7 +77,7 @@ happyReduction_3 (HappyAbsSyn6 happy_var_3)
= HappyAbsSyn5 = HappyAbsSyn5
(Plus happy_var_1 happy_var_3 (Plus happy_var_1 happy_var_3
) )
happyReduction_3 _ _ _ = notHappyAtAll happyReduction_3 _ _ _ = notHappyAtAll
happyReduce_4 = happySpecReduce_3 1# happyReduction_4 happyReduce_4 = happySpecReduce_3 1# happyReduction_4
happyReduction_4 (HappyAbsSyn6 happy_var_3) happyReduction_4 (HappyAbsSyn6 happy_var_3)
...@@ -86,14 +86,14 @@ happyReduction_4 (HappyAbsSyn6 happy_var_3) ...@@ -86,14 +86,14 @@ happyReduction_4 (HappyAbsSyn6 happy_var_3)
= HappyAbsSyn5 = HappyAbsSyn5
(Minus happy_var_1 happy_var_3 (Minus happy_var_1 happy_var_3
) )
happyReduction_4 _ _ _ = notHappyAtAll happyReduction_4 _ _ _ = notHappyAtAll
happyReduce_5 = happySpecReduce_1 1# happyReduction_5 happyReduce_5 = happySpecReduce_1 1# happyReduction_5
happyReduction_5 (HappyAbsSyn6 happy_var_1) happyReduction_5 (HappyAbsSyn6 happy_var_1)
= HappyAbsSyn5 = HappyAbsSyn5
(Term happy_var_1 (Term happy_var_1
) )
happyReduction_5 _ = notHappyAtAll happyReduction_5 _ = notHappyAtAll
happyReduce_6 = happySpecReduce_3 2# happyReduction_6 happyReduce_6 = happySpecReduce_3 2# happyReduction_6
happyReduction_6 (HappyAbsSyn7 happy_var_3) happyReduction_6 (HappyAbsSyn7 happy_var_3)
...@@ -102,7 +102,7 @@ happyReduction_6 (HappyAbsSyn7 happy_var_3) ...@@ -102,7 +102,7 @@ happyReduction_6 (HappyAbsSyn7 happy_var_3)
= HappyAbsSyn6 = HappyAbsSyn6
(Times happy_var_1 happy_var_3 (Times happy_var_1 happy_var_3
) )
happyReduction_6 _ _ _ = notHappyAtAll happyReduction_6 _ _ _ = notHappyAtAll
happyReduce_7 = happySpecReduce_3 2# happyReduction_7 happyReduce_7 = happySpecReduce_3 2# happyReduction_7
happyReduction_7 (HappyAbsSyn7 happy_var_3) happyReduction_7 (HappyAbsSyn7 happy_var_3)
...@@ -111,28 +111,28 @@ happyReduction_7 (HappyAbsSyn7 happy_var_3) ...@@ -111,28 +111,28 @@ happyReduction_7 (HappyAbsSyn7 happy_var_3)
= HappyAbsSyn6 = HappyAbsSyn6
(Div happy_var_1 happy_var_3 (Div happy_var_1 happy_var_3
) )
happyReduction_7 _ _ _ = notHappyAtAll happyReduction_7 _ _ _ = notHappyAtAll
happyReduce_8 = happySpecReduce_1 2# happyReduction_8 happyReduce_8 = happySpecReduce_1 2# happyReduction_8
happyReduction_8 (HappyAbsSyn7 happy_var_1) happyReduction_8 (HappyAbsSyn7 happy_var_1)
= HappyAbsSyn6 = HappyAbsSyn6
(Factor happy_var_1 (Factor happy_var_1
) )
happyReduction_8 _ = notHappyAtAll happyReduction_8 _ = notHappyAtAll
happyReduce_9 = happySpecReduce_1 3# happyReduction_9 happyReduce_9 = happySpecReduce_1 3# happyReduction_9
happyReduction_9 (HappyTerminal (TokenInt happy_var_1)) happyReduction_9 (HappyTerminal (TokenInt happy_var_1))
= HappyAbsSyn7 = HappyAbsSyn7
(Int happy_var_1 (Int happy_var_1
) )
happyReduction_9 _ = notHappyAtAll happyReduction_9 _ = notHappyAtAll
happyReduce_10 = happySpecReduce_1 3# happyReduction_10 happyReduce_10 = happySpecReduce_1 3# happyReduction_10
happyReduction_10 (HappyTerminal (TokenVar happy_var_1)) happyReduction_10 (HappyTerminal (TokenVar happy_var_1))
= HappyAbsSyn7 = HappyAbsSyn7
(Var happy_var_1 (Var happy_var_1
) )
happyReduction_10 _ = notHappyAtAll happyReduction_10 _ = notHappyAtAll
happyReduce_11 = happySpecReduce_3 3# happyReduction_11 happyReduce_11 = happySpecReduce_3 3# happyReduction_11
happyReduction_11 _ happyReduction_11 _
...@@ -141,7 +141,7 @@ happyReduction_11 _ ...@@ -141,7 +141,7 @@ happyReduction_11 _
= HappyAbsSyn7 = HappyAbsSyn7
(Brack happy_var_2 (Brack happy_var_2
) )
happyReduction_11 _ _ _ = notHappyAtAll happyReduction_11 _ _ _ = notHappyAtAll
happyNewToken action sts stk [] = happyNewToken action sts stk [] =
happyDoAction 12# notHappyAtAll action sts stk [] happyDoAction 12# notHappyAtAll action sts stk []
...@@ -200,10 +200,10 @@ happyError tks = error "Parse error" ...@@ -200,10 +200,10 @@ happyError tks = error "Parse error"
data Exp = Let String Exp Exp | Exp1 Exp1 data Exp = Let String Exp Exp | Exp1 Exp1
data Exp1 = Plus Exp1 Term | Minus Exp1 Term | Term Term data Exp1 = Plus Exp1 Term | Minus Exp1 Term | Term Term
data Term = Times Term Factor | Div Term Factor | Factor Factor data Term = Times Term Factor | Div Term Factor | Factor Factor
data Factor = Int Int | Var String | Brack Exp data Factor = Int Int | Var String | Brack Exp
...@@ -224,7 +224,7 @@ data Token ...@@ -224,7 +224,7 @@ data Token
lexer :: String -> [Token] lexer :: String -> [Token]
lexer [] = [] lexer [] = []
lexer (c:cs) lexer (c:cs)
| isSpace c = lexer cs | isSpace c = lexer cs
| isAlpha c = lexVar (c:cs) | isAlpha c = lexVar (c:cs)
| isDigit c = lexNum (c:cs) | isDigit c = lexNum (c:cs)
...@@ -260,14 +260,14 @@ main = case runCalc "1 + 2 + 3" of { ...@@ -260,14 +260,14 @@ main = case runCalc "1 + 2 + 3" of {
case runCalc "1 + 2 * 3" of { case runCalc "1 + 2 * 3" of {
(Exp1 (Plus (Term (Factor (Int 1))) (Times (Factor (Int 2)) (Int 3)))) -> (Exp1 (Plus (Term (Factor (Int 1))) (Times (Factor (Int 2)) (Int 3)))) ->
case runCalc "let x = 2 in x * (x - 2)" of { case runCalc "let x = 2 in x * (x - 2)" of {
(Let "x" (Exp1 (Term (Factor (Int 2)))) (Exp1 (Term (Times (Factor (Var "x")) (Brack (Exp1 (Minus (Term (Factor (Var "x"))) (Factor (Int 2))))))))) -> print "Test works\n"; (Let "x" (Exp1 (Term (Factor (Int 2)))) (Exp1 (Term (Times (Factor (Var "x")) (Brack (Exp1 (Minus (Term (Factor (Var "x"))) (Factor (Int 2))))))))) -> print "Test works\n";
_ -> quit } ; _ -> quit } ; _ -> quit } ; _ -> quit } _ -> quit } ; _ -> quit } ; _ -> quit } ; _ -> quit }
quit = print "Test failed\n" quit = print "Test failed\n"
{-# LINE 1 "GenericTemplate.hs" #-} {-# LINE 1 "GenericTemplate.hs" #-}
{-# LINE 1 "<built-in>" #-} {-# LINE 1 "<built-in>" #-}
{-# LINE 1 "<command line>" #-} {-# LINE 1 "<command line>" #-}
{-# LINE 1 "GenericTemplate.hs" #-} {-# LINE 1 "GenericTemplate.hs" #-}
-- Id: GenericTemplate.hs,v 1.26 2005/01/14 14:47:22 simonmar Exp -- Id: GenericTemplate.hs,v 1.26 2005/01/14 14:47:22 simonmar Exp
{-# LINE 28 "GenericTemplate.hs" #-} {-# LINE 28 "GenericTemplate.hs" #-}
...@@ -307,7 +307,7 @@ happyParse start_state = happyNewToken start_state notHappyAtAll notHappyAtAll ...@@ -307,7 +307,7 @@ happyParse start_state = happyNewToken start_state notHappyAtAll notHappyAtAll
-- the stack in this case. -- the stack in this case.
happyAccept 0# tk st sts (_ `HappyStk` ans `HappyStk` _) = happyAccept 0# tk st sts (_ `HappyStk` ans `HappyStk` _) =
happyReturn1 ans happyReturn1 ans
happyAccept j tk st sts (HappyStk ans _) = happyAccept j tk st sts (HappyStk ans _) =
(happyTcHack j (happyTcHack st)) (happyReturn1 ans) (happyTcHack j (happyTcHack st)) (happyReturn1 ans)
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
...@@ -451,7 +451,7 @@ happyDropStk n (x `HappyStk` xs) = happyDropStk (n -# (1#::Int#)) xs ...@@ -451,7 +451,7 @@ happyDropStk n (x `HappyStk` xs) = happyDropStk (n -# (1#::Int#)) xs
-- Moving to a new state after a reduction -- Moving to a new state after a reduction
happyGoto nt j tk st = happyGoto nt j tk st =
(happyTrace (", goto state " ++ show (I# (new_state)) ++ "\n")) $ (happyTrace (", goto state " ++ show (I# (new_state)) ++ "\n")) $
happyDoAction j tk new_state happyDoAction j tk new_state
where off = indexShortOffAddr happyGotoOffsets st where off = indexShortOffAddr happyGotoOffsets st
...@@ -466,7 +466,7 @@ happyGoto nt j tk st = ...@@ -466,7 +466,7 @@ happyGoto nt j tk st =
-- parse error if we are in recovery and we fail again -- parse error if we are in recovery and we fail again
happyFail 0# tk old_st _ stk = happyFail 0# tk old_st _ stk =
-- trace "failing" $ -- trace "failing" $
happyError_ tk happyError_ tk
{- We don't need state discarding for our restricted implementation of {- We don't need state discarding for our restricted implementation of
...@@ -474,7 +474,7 @@ happyFail 0# tk old_st _ stk = ...@@ -474,7 +474,7 @@ happyFail 0# tk old_st _ stk =
for now --SDM for now --SDM
-- discard a state -- discard a state
happyFail 0# tk old_st (HappyCons ((action)) (sts)) happyFail 0# tk old_st (HappyCons ((action)) (sts))
(saved_tok `HappyStk` _ `HappyStk` stk) = (saved_tok `HappyStk` _ `HappyStk` stk) =
-- trace ("discarding state, depth " ++ show (length stk)) $ -- trace ("discarding state, depth " ++ show (length stk)) $
happyDoAction 0# tk action sts ((saved_tok`HappyStk`stk)) happyDoAction 0# tk action sts ((saved_tok`HappyStk`stk))
...@@ -500,7 +500,7 @@ happyTcHack x y = y ...@@ -500,7 +500,7 @@ happyTcHack x y = y
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Seq-ing. If the --strict flag is given, then Happy emits -- Seq-ing. If the --strict flag is given, then Happy emits
-- happySeq = happyDoSeq -- happySeq = happyDoSeq
-- otherwise it emits -- otherwise it emits
-- happySeq = happyDontSeq -- happySeq = happyDontSeq
......
...@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk ...@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/test.mk include $(TOP)/mk/test.mk
T7865: T7865:
$(RM) -f T7865.o T7865.hi $(RM) -f T7865.o T7865.hi
'$(TEST_HC)' $(TEST_HC_OPTS) -dsuppress-uniques -O2 -c -ddump-simpl T7865.hs | grep expensive '$(TEST_HC)' $(TEST_HC_OPTS) -dsuppress-uniques -O2 -c -ddump-simpl T7865.hs | grep expensive
T3055: T3055:
...@@ -12,27 +12,27 @@ T3055: ...@@ -12,27 +12,27 @@ T3055:
grep 'I# (-28)' T3055.simpl | sed 's/.*\(I# (-28)\).*/\1/' grep 'I# (-28)' T3055.simpl | sed 's/.*\(I# (-28)\).*/\1/'
T5658b: T5658b:
$(RM) -f T5658b.o T5658b.hi $(RM) -f T5658b.o T5658b.hi
'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T5658b.hs -ddump-simpl | grep --count indexIntArray '$(TEST_HC)' $(TEST_HC_OPTS) -O -c T5658b.hs -ddump-simpl | grep --count indexIntArray
# Trac 5658 meant that there were three calls to indexIntArray instead of two # Trac 5658 meant that there were three calls to indexIntArray instead of two
T5776: T5776:
$(RM) -f T5776.o T5776.hi $(RM) -f T5776.o T5776.hi
'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T5776.hs -ddump-rules | grep --count dEq '$(TEST_HC)' $(TEST_HC_OPTS) -O -c T5776.hs -ddump-rules | grep --count dEq
T3772: T3772:
$(RM) -f T3772*.hi T3772*.o $(RM) -f T3772*.hi T3772*.o
'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772_A.hs '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772_A.hs
'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772.hs -dsuppress-uniques -ddump-simpl '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772.hs -dsuppress-uniques -ddump-simpl
T4306: T4306:
$(RM) -f T4306.hi T4306.o $(RM) -f T4306.hi T4306.o
'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4306.hs '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4306.hs
'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4306.hi | grep 'wupd ::' '$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4306.hi | grep 'wupd ::'
T4201: T4201:
$(RM) -f T4201.hi T4201.o $(RM) -f T4201.hi T4201.o
'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4201.hs '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4201.hs
'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4201.hi | grep -B2 'Sym' '$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4201.hi | grep -B2 'Sym'
# This one looped as a result of bogus specialisation # This one looped as a result of bogus specialisation
...@@ -43,8 +43,8 @@ T4903: ...@@ -43,8 +43,8 @@ T4903:
T4918: T4918:
$(RM) -f T4918.hi T4918.o T4918a.hi T4918a.o $(RM) -f T4918.hi T4918.o T4918a.hi T4918a.o
'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918a.hs '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918a.hs
'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918.hs '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918.hs
'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4918.hi | grep 'C#' '$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4918.hi | grep 'C#'
EvalTest: EvalTest:
...@@ -109,5 +109,5 @@ T7995: ...@@ -109,5 +109,5 @@ T7995:
'$(TEST_HC)' $(TEST_HC_OPTS) -package ghc -ddump-rule-firings -c -O T7995.hs | grep 'text/str' '$(TEST_HC)' $(TEST_HC_OPTS) -package ghc -ddump-rule-firings -c -O T7995.hs | grep 'text/str'
T8221: T8221:
'$(TEST_HC)' $(TEST_HC_OPTS) -c -O -fforce-recomp T8221a.hs '$(TEST_HC)' $(TEST_HC_OPTS) -c -O -fforce-recomp T8221a.hs
'$(TEST_HC)' $(TEST_HC_OPTS) -c -O -fforce-recomp T8221.hs '$(TEST_HC)' $(TEST_HC_OPTS) -c -O -fforce-recomp T8221.hs
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment