diff options
Diffstat (limited to 'testsuite')
22 files changed, 26 insertions, 26 deletions
diff --git a/testsuite/driver/perf_notes.py b/testsuite/driver/perf_notes.py index cfbd5e529f..cebb8f9815 100644 --- a/testsuite/driver/perf_notes.py +++ b/testsuite/driver/perf_notes.py @@ -517,7 +517,7 @@ def get_commit_metric(gitNoteRef, # tolerance_dev: allowed deviation of the actual value from the expected value. # allowed_perf_changes: allowed changes in stats. This is a dictionary as returned by get_allowed_perf_changes(). # force_print: Print stats even if the test stat was in the tolerance range. -# Returns a (MetricChange, pass/fail object) tuple. Passes if the stats are withing the expected value ranges. +# Returns a (MetricChange, pass/fail object) tuple. Passes if the stats are within the expected value ranges. def check_stats_change(actual: PerfStat, baseline: Baseline, tolerance_dev, diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index c39ca7a8c9..2393247b22 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -133,7 +133,7 @@ class TestConfig: # Do we have SMP support? self.have_smp = False - # Is gdb avaliable? + # Is gdb available? self.have_gdb = False # Is readelf available? diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 79d504a845..07206799c1 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -1379,7 +1379,7 @@ def metric_dict(name, way, metric, value) -> PerfStat: # way: the way. # stats_file: the path of the stats_file containing the stats for the test. # range_fields: see TestOptions.stats_range_fields -# Returns a pass/fail object. Passes if the stats are withing the expected value ranges. +# Returns a pass/fail object. Passes if the stats are within the expected value ranges. # This prints the results for the user. def check_stats(name: TestName, way: WayName, diff --git a/testsuite/tests/concurrent/prog001/Arithmetic.hs b/testsuite/tests/concurrent/prog001/Arithmetic.hs index a1253969b0..bce3ff6400 100644 --- a/testsuite/tests/concurrent/prog001/Arithmetic.hs +++ b/testsuite/tests/concurrent/prog001/Arithmetic.hs @@ -32,7 +32,7 @@ plusOne (0:xs) = 1:fl xs --- Substraction by 1, the input must be in (0,1) +-- Subtraction by 1, the input must be in (0,1) minusOne :: Gray -> Gray minusOne (1:xs) = 0:fl xs diff --git a/testsuite/tests/cps/cps021.cmm b/testsuite/tests/cps/cps021.cmm index fa7e809ee0..db67d97da2 100644 --- a/testsuite/tests/cps/cps021.cmm +++ b/testsuite/tests/cps/cps021.cmm @@ -1,4 +1,4 @@ -// Verify jumping to the begining of the current continuation +// Verify jumping to the beginning of the current continuation // is done with a branch and not a jump foo() { diff --git a/testsuite/tests/deSugar/should_compile/T12944.hs b/testsuite/tests/deSugar/should_compile/T12944.hs index 076812d6e7..540ea06e81 100644 --- a/testsuite/tests/deSugar/should_compile/T12944.hs +++ b/testsuite/tests/deSugar/should_compile/T12944.hs @@ -31,7 +31,7 @@ instance (AdditiveGroup (poly a), Num a) => AdditiveGroup (IntOfLog poly a) wher IntOfLog k p ^+^ IntOfLog k' p' = IntOfLog (k + k') (p ^+^ p') negateV (IntOfLog k p) = IntOfLog (negate k) (negateV p) {-# SPECIALISE instance Num a => AdditiveGroup (IntOfLog Poly1 a) #-} - -- This pragmas casued the crash + -- This pragmas caused the crash instance (VectorSpace (poly a), Scalar (poly a) ~ a, Num a) => VectorSpace (IntOfLog poly a) where type Scalar (IntOfLog poly a) = a diff --git a/testsuite/tests/deriving/should_fail/T7148a.hs b/testsuite/tests/deriving/should_fail/T7148a.hs index 6441058b24..fd4a8fcda6 100644 --- a/testsuite/tests/deriving/should_fail/T7148a.hs +++ b/testsuite/tests/deriving/should_fail/T7148a.hs @@ -19,7 +19,7 @@ instance Convert (SAFE a) where newtype IS_NO_LONGER a = IS_NO_LONGER a deriving Convert type instance Result (IS_NO_LONGER a) b = b ---infered type is +--inferred type is unsafeCoerce :: forall a b. a -> b unsafeCoerce = coerce (Proxy :: Proxy b) . IS_NO_LONGER . SAFE @@ -34,4 +34,4 @@ crash = unsafeCoerce . tail . tail . tail . unsafeCoerce $ True --time for side effects unsafePerformIO :: IO a -> a -unsafePerformIO x = runST $ unsafeCoerce x
\ No newline at end of file +unsafePerformIO x = runST $ unsafeCoerce x diff --git a/testsuite/tests/module/mod183.stderr b/testsuite/tests/module/mod183.stderr index cf7fdf4fa0..5f3c131537 100644 --- a/testsuite/tests/module/mod183.stderr +++ b/testsuite/tests/module/mod183.stderr @@ -1 +1 @@ -mod183.hs:5:26: Multiple occurences of 'qualified' +mod183.hs:5:26: Multiple occurrences of 'qualified' diff --git a/testsuite/tests/perf/should_run/T8763.hs b/testsuite/tests/perf/should_run/T8763.hs index 90c4436ce9..fac6e6302a 100644 --- a/testsuite/tests/perf/should_run/T8763.hs +++ b/testsuite/tests/perf/should_run/T8763.hs @@ -1,7 +1,7 @@ -- | The fusion helper for @enumFromThenTo \@Int@ had multiple --- occurences of @c@, which made the simplifier refuse to inline it. +-- occurrences of @c@, which made the simplifier refuse to inline it. -- The new implementation for @efdtInt{Up,Dn}FB@ only have a single --- occurence of @c@ which the simplifier inlines unconditionally. +-- occurrence of @c@ which the simplifier inlines unconditionally. module Main (main) where import Control.Monad (when, forM_) @@ -12,7 +12,7 @@ nop _ = return () {-# NOINLINE nop #-} -- This is the baseline, using @enumFromTo@ which already had only a --- single occurence of @c@. +-- single occurrence of @c@. f :: Int -> ST s () f n = do diff --git a/testsuite/tests/programs/andy_cherry/DataTypes.hs b/testsuite/tests/programs/andy_cherry/DataTypes.hs index bcb6cbcf60..01df7f5abd 100644 --- a/testsuite/tests/programs/andy_cherry/DataTypes.hs +++ b/testsuite/tests/programs/andy_cherry/DataTypes.hs @@ -13,7 +13,7 @@ class Presentable a where - userFormat :: a -> String -- in prefered display format + userFormat :: a -> String -- in preferred display format diff --git a/testsuite/tests/programs/seward-space-leak/Main.lhs b/testsuite/tests/programs/seward-space-leak/Main.lhs index 6c3f9f9d32..fb1527e330 100644 --- a/testsuite/tests/programs/seward-space-leak/Main.lhs +++ b/testsuite/tests/programs/seward-space-leak/Main.lhs @@ -97,7 +97,7 @@ parameter numbering starts at 1). @Call@. Calls to other functions are done with @Call@, which expects the callee to return @Zero@ or @One@, and selects the relevant -branch. The @Tag@s identify calls in the dependancy list. +branch. The @Tag@s identify calls in the dependency list. Although a @Call@ is a glorified @Case@ statement, the only allowed return values are @Zero@ and @One@. Hence the @CDS CDS@ continuations rather than the more comprehensive @(AList Return CDS)@. @@ -166,7 +166,7 @@ as necessary. ToDo: Need to rename call sites? I don't think so. Main CDS evaluator takes \begin{itemize} \item the code store -\item the dependancy list, a list of @Tag@s of calls which are +\item the dependency list, a list of @Tag@s of calls which are currently in progress \item the current arguments \item the CDS fragment currently being worked on diff --git a/testsuite/tests/safeHaskell/check/Check06.hs b/testsuite/tests/safeHaskell/check/Check06.hs index a4debfc2cb..99649fa079 100644 --- a/testsuite/tests/safeHaskell/check/Check06.hs +++ b/testsuite/tests/safeHaskell/check/Check06.hs @@ -1,7 +1,7 @@ {-# LANGUAGE Trustworthy, NoImplicitPrelude #-} {-# OPTIONS_GHC -fpackage-trust #-} --- make sure importing a safe-infered module brings in the +-- make sure importing a safe-inferred module brings in the -- pkg trust requirements correctly. module Check06 ( main' ) where diff --git a/testsuite/tests/safeHaskell/check/Check06_A.hs b/testsuite/tests/safeHaskell/check/Check06_A.hs index 9c9d92ba24..4cda329fec 100644 --- a/testsuite/tests/safeHaskell/check/Check06_A.hs +++ b/testsuite/tests/safeHaskell/check/Check06_A.hs @@ -1,4 +1,4 @@ --- safe infered, with requirement base is trusted +-- safe inferred, with requirement base is trusted module Check06_A where mainM :: Int -> Int diff --git a/testsuite/tests/safeHaskell/check/Check07_A.hs b/testsuite/tests/safeHaskell/check/Check07_A.hs index 5b38c6a07b..efc58e0bfe 100644 --- a/testsuite/tests/safeHaskell/check/Check07_A.hs +++ b/testsuite/tests/safeHaskell/check/Check07_A.hs @@ -1,6 +1,6 @@ {-# LANGUAGE NoImplicitPrelude #-} --- safe infered, with no pkg trust reqs +-- safe inferred, with no pkg trust reqs module Check07_A where a :: a -> a diff --git a/testsuite/tests/safeHaskell/check/Check07_B.hs b/testsuite/tests/safeHaskell/check/Check07_B.hs index 4a2003f9a9..5085cc18ab 100644 --- a/testsuite/tests/safeHaskell/check/Check07_B.hs +++ b/testsuite/tests/safeHaskell/check/Check07_B.hs @@ -1,4 +1,4 @@ --- safe infered, with requirement base is trusted +-- safe inferred, with requirement base is trusted module Check07_B where import Prelude diff --git a/testsuite/tests/safeHaskell/check/Check08_A.hs b/testsuite/tests/safeHaskell/check/Check08_A.hs index c888a59b71..4438a34e09 100644 --- a/testsuite/tests/safeHaskell/check/Check08_A.hs +++ b/testsuite/tests/safeHaskell/check/Check08_A.hs @@ -1,6 +1,6 @@ {-# LANGUAGE NoImplicitPrelude #-} --- safe infered, with no pkg trust reqs +-- safe inferred, with no pkg trust reqs module Check08_A where a :: a -> a diff --git a/testsuite/tests/safeHaskell/check/Check08_B.hs b/testsuite/tests/safeHaskell/check/Check08_B.hs index 41feab5eae..42d01f2b33 100644 --- a/testsuite/tests/safeHaskell/check/Check08_B.hs +++ b/testsuite/tests/safeHaskell/check/Check08_B.hs @@ -1,4 +1,4 @@ --- safe infered, with requirement base is trusted +-- safe inferred, with requirement base is trusted module Check08_B where import Prelude diff --git a/testsuite/tests/safeHaskell/check/all.T b/testsuite/tests/safeHaskell/check/all.T index 47e875d3be..8cf37d3b43 100644 --- a/testsuite/tests/safeHaskell/check/all.T +++ b/testsuite/tests/safeHaskell/check/all.T @@ -41,7 +41,7 @@ test('Check04', normal, multi_compile, ['Check04', [ # Check -fpackage-trust with no safe haskell flag is an error test('Check05', normal, compile, ['']) -# Check safe-infered modules have correct pkg trust requirements +# Check safe-inferred modules have correct pkg trust requirements test('Check06', [], multimod_compile_fail, ['Check06', '']) # Check selective safe imports bring in correct pkg trust requirements diff --git a/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg5.hs b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg5.hs index a4b7390352..75bde26b4e 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg5.hs +++ b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg5.hs @@ -1,6 +1,6 @@ -- safe inference -- same module as M_SafePkg4 which compiles with -XSafe. --- Want to make sure compiles fine and is infered safe and +-- Want to make sure compiles fine and is inferred safe and -- also picks up corrected pkg trust requirements. module M_SafePkg5 where diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags21.hs b/testsuite/tests/safeHaskell/flags/SafeFlags21.hs index c7e8b0d87a..5169a03583 100644 --- a/testsuite/tests/safeHaskell/flags/SafeFlags21.hs +++ b/testsuite/tests/safeHaskell/flags/SafeFlags21.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fwarn-unsafe #-} -- | Basic test to see if Safe warning flags compile --- Warn if module is infered unsafe +-- Warn if module is inferred unsafe -- In this test the warning _shouldn't_ fire module SafeFlags21 where diff --git a/testsuite/tests/typecheck/should_compile/tc163.hs b/testsuite/tests/typecheck/should_compile/tc163.hs index 21d8a72949..fb8682bc22 100644 --- a/testsuite/tests/typecheck/should_compile/tc163.hs +++ b/testsuite/tests/typecheck/should_compile/tc163.hs @@ -24,7 +24,7 @@ flop = \m' k -> mkM3' m' (\bm k1 -> error "urk") -- But if we give mkM3' the type -- forall a r. M3' a -> (forall b. ...) -> r --- everthing works fine. Very very delicate. +-- everything works fine. Very very delicate. ---------------- A more complex case ------------- bind :: M3 a -> (a -> M3 b) -> M3 b diff --git a/testsuite/tests/typecheck/should_compile/type_in_type_hole_fits.hs b/testsuite/tests/typecheck/should_compile/type_in_type_hole_fits.hs index 566f8aa102..982d7e596c 100644 --- a/testsuite/tests/typecheck/should_compile/type_in_type_hole_fits.hs +++ b/testsuite/tests/typecheck/should_compile/type_in_type_hole_fits.hs @@ -55,7 +55,7 @@ newtype Sorted (cpu :: AsympPoly) -- The minimum operational complexity -- Merge sort is O(N*Log(N)) on average in complexity, so that's the -- minimum complexity we promise to satisfy. Same goes with memory, which is --- O(N), and as we all know, mergesort is a stable sorting algoritm. +-- O(N), and as we all know, mergesort is a stable sorting algorithm. mergeSort :: (Ord a, n >=. O(N*.LogN), m >=. O(N), IsStable s) => [a] -> Sorted n m s a mergeSort = Sorted . sort |