diff options
author | KC Sivaramakrishnan <chandras@cs.purdue.edu> | 2013-09-27 14:12:59 -0400 |
---|---|---|
committer | KC Sivaramakrishnan <chandras@cs.purdue.edu> | 2013-09-27 14:12:59 -0400 |
commit | d52fcc8c46124662cef44a1f90d9f6d78cb3d88e (patch) | |
tree | e9aff1fc01cc23da9530192f04e8de68ea963745 | |
parent | bd9f9074eb9be2a805d376b93aa68f2801316fb3 (diff) | |
download | haskell-d52fcc8c46124662cef44a1f90d9f6d78cb3d88e.tar.gz |
Removes tabs from tab-free files.
-rw-r--r-- | compiler/prelude/PrelNames.lhs | 12 | ||||
-rw-r--r-- | libraries/base/GHC/Exception.lhs | 4 | ||||
-rw-r--r-- | libraries/base/tests/all.T | 34 | ||||
-rw-r--r-- | packages | 2 | ||||
-rw-r--r-- | rts/Capability.c | 28 | ||||
-rw-r--r-- | rts/RtsAPI.c | 2 | ||||
-rw-r--r-- | rts/Weak.c | 48 | ||||
-rw-r--r-- | tests/Benchmarks/ChameneosRedux/chameneos-redux-lwc.hs | 12 |
8 files changed, 71 insertions, 71 deletions
diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index cdc5a58b66..632748a0bc 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -1340,12 +1340,12 @@ arrayArrayPrimTyConKey = mkPreludeTyConUnique 39 mutableArrayArrayPrimTyConKey = mkPreludeTyConUnique 40 statePrimTyConKey, stableNamePrimTyConKey, stableNameTyConKey, - mutVarPrimTyConKey, ioTyConKey, wordPrimTyConKey, wordTyConKey, - word8TyConKey, word16TyConKey, word32PrimTyConKey, word32TyConKey, - word64PrimTyConKey, word64TyConKey, liftedConKey, unliftedConKey, - anyBoxConKey, kindConKey, boxityConKey, typeConKey, threadIdPrimTyConKey, - sContPrimTyConKey, bcoPrimTyConKey, ptrTyConKey, funPtrTyConKey, - tVarPrimTyConKey, eqPrimTyConKey, eqReprPrimTyConKey :: Unique + mutVarPrimTyConKey, ioTyConKey, wordPrimTyConKey, wordTyConKey, + word8TyConKey, word16TyConKey, word32PrimTyConKey, word32TyConKey, + word64PrimTyConKey, word64TyConKey, liftedConKey, unliftedConKey, + anyBoxConKey, kindConKey, boxityConKey, typeConKey, threadIdPrimTyConKey, + sContPrimTyConKey, bcoPrimTyConKey, ptrTyConKey, funPtrTyConKey, + tVarPrimTyConKey, eqPrimTyConKey, eqReprPrimTyConKey :: Unique statePrimTyConKey = mkPreludeTyConUnique 50 stableNamePrimTyConKey = mkPreludeTyConUnique 51 diff --git a/libraries/base/GHC/Exception.lhs b/libraries/base/GHC/Exception.lhs index 540df31da1..b0819d2917 100644 --- a/libraries/base/GHC/Exception.lhs +++ b/libraries/base/GHC/Exception.lhs @@ -194,8 +194,8 @@ data ArithException deriving (Eq, Ord, Typeable) divZeroException, overflowException, ratioZeroDenomException :: SomeException -divZeroException = toException DivideByZero -overflowException = toException Overflow +divZeroException = toException DivideByZero +overflowException = toException Overflow ratioZeroDenomException = toException RatioZeroDenominator instance Exception ArithException diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T index 37e3c13ee6..211f3e90b1 100644 --- a/libraries/base/tests/all.T +++ b/libraries/base/tests/all.T @@ -48,10 +48,10 @@ test('hGetBuf003', normal, compile_and_run, ['']) test('hPutBuf001', normal, compile_and_run, ['']) test('hPutBuf002', extra_clean(['hPutBuf002.out']), compile_and_run, ['']) -test('char001', normal, compile_and_run, ['']) -test('char002', normal, compile_and_run, ['']) +test('char001', normal, compile_and_run, ['']) +test('char002', normal, compile_and_run, ['']) -test('cstring001', normal, compile_and_run, ['']) +test('cstring001', normal, compile_and_run, ['']) test('length001', # This fails without -O, as it relies on a RULE being applied @@ -59,28 +59,28 @@ test('length001', compile_and_run, ['']) -test('ratio001', normal, compile_and_run, ['']) +test('ratio001', normal, compile_and_run, ['']) -test('rand001', reqlib('random'), compile_and_run, ['']) -test('reads001', normal, compile_and_run, ['']) -test('show001', normal, compile_and_run, ['']) -test('text001', normal, compile_and_run, ['']) +test('rand001', reqlib('random'), compile_and_run, ['']) +test('reads001', normal, compile_and_run, ['']) +test('show001', normal, compile_and_run, ['']) +test('text001', normal, compile_and_run, ['']) -test('tup001', normal, compile_and_run, ['']) +test('tup001', normal, compile_and_run, ['']) -test('addr001', normal, compile_and_run, ['']) +test('addr001', normal, compile_and_run, ['']) test('dynamic001', normal, compile_and_run, ['']) test('dynamic002', normal, compile_and_run, ['']) test('dynamic003', extra_run_opts('+RTS -K32m -RTS'), compile_and_run, ['']) test('dynamic004', omit_ways(['normal', 'threaded1', 'ghci']), compile_and_run, ['']) test('dynamic005', normal, compile_and_run, ['']) test('enum01', when(fast(), skip), compile_and_run, ['-cpp']) -test('enum02', when(fast(), skip), compile_and_run, ['-cpp']) -test('enum03', when(fast(), skip), compile_and_run, ['-cpp']) -test('enum04', normal, compile_and_run, ['']) -test('exceptionsrun001', normal, compile_and_run, ['']) -test('exceptionsrun002', normal, compile_and_run, ['']) -test('list001' , when(fast(), skip), compile_and_run, ['']) +test('enum02', when(fast(), skip), compile_and_run, ['-cpp']) +test('enum03', when(fast(), skip), compile_and_run, ['-cpp']) +test('enum04', normal, compile_and_run, ['']) +test('exceptionsrun001', normal, compile_and_run, ['']) +test('exceptionsrun002', normal, compile_and_run, ['']) +test('list001' , when(fast(), skip), compile_and_run, ['']) test('list002', when(fast(), skip), compile_and_run, ['']) test('list003', when(fast(), skip), compile_and_run, ['']) @@ -93,7 +93,7 @@ test('memo001', test('memo002', [extra_run_opts('20'), extra_clean(['Memo2.hi', 'Memo2.o'])], - multimod_compile_and_run, ['memo002','']) + multimod_compile_and_run, ['memo002','']) test('packedstring001', reqlib('packedstring'), compile_and_run, ['-package packedstring']) @@ -65,7 +65,7 @@ libraries/hoopl - packages/hoopl.git - libraries/hpc - packages/hpc.git - libraries/integer-gmp - packages/integer-gmp.git - libraries/integer-simple - packages/integer-simple.git - -libraries/lwconc - packages/lwconc.git - +libraries/lwconc - packages/lwconc.git - libraries/old-locale - packages/old-locale.git - libraries/old-time - packages/old-time.git - libraries/pretty - - https://github.com/haskell/pretty.git diff --git a/rts/Capability.c b/rts/Capability.c index f577da0322..06616ceb08 100644 --- a/rts/Capability.c +++ b/rts/Capability.c @@ -358,7 +358,7 @@ moreCapabilities (nat from USED_IF_THREADS, nat to USED_IF_THREADS) if (to == 1) { // THREADED_RTS must work on builds that don't have a mutable // BaseReg (eg. unregisterised), so in this case - // capabilities[0] must coincide with &MainCapability. + // capabilities[0] must coincide with &MainCapability. capabilities[0] = &MainCapability; } @@ -626,29 +626,29 @@ waitForReturnCapability (Capability **pCap, Task *task) Capability *cap = *pCap; if (cap == NULL) { - // Try last_free_capability first - cap = last_free_capability; - if (cap->running_task) { - nat i; - // otherwise, search for a free capability + // Try last_free_capability first + cap = last_free_capability; + if (cap->running_task) { + nat i; + // otherwise, search for a free capability cap = NULL; - for (i = 0; i < n_capabilities; i++) { + for (i = 0; i < n_capabilities; i++) { if (!capabilities[i]->running_task) { cap = capabilities[i]; - break; - } - } + break; + } + } if (cap == NULL) { // Can't find a free one, use last_free_capability. cap = last_free_capability; } - } + } - // record the Capability as the one this Task is now assocated with. - task->cap = cap; + // record the Capability as the one this Task is now assocated with. + task->cap = cap; } else { - ASSERT(task->cap == cap); + ASSERT(task->cap == cap); } ACQUIRE_LOCK(&cap->lock); diff --git a/rts/RtsAPI.c b/rts/RtsAPI.c index 84f99be07a..20d0903e8e 100644 --- a/rts/RtsAPI.c +++ b/rts/RtsAPI.c @@ -584,7 +584,7 @@ rts_checkSchedStatus (char* site, Capability *cap) errorBelch("%s: uncaught exception",site); stg_exit(EXIT_FAILURE); case Interrupted: - errorBelch("%s: interrupted", site); + errorBelch("%s: interrupted", site); #ifdef THREADED_RTS // The RTS is shutting down, and the process will probably // soon exit. We don't want to preempt the shutdown diff --git a/rts/Weak.c b/rts/Weak.c index 98ac7603b7..420601de2a 100644 --- a/rts/Weak.c +++ b/rts/Weak.c @@ -43,7 +43,7 @@ runAllCFinalizers(StgWeak *list) } for (w = list; w; w = w->link) { - runCFinalizers((StgCFinalizerList *)w->cfinalizers); + runCFinalizers((StgCFinalizerList *)w->cfinalizers); } if (task != NULL) { @@ -83,29 +83,29 @@ scheduleFinalizers(Capability *cap, StgWeak *list) // count number of finalizers, and kill all the weak pointers first... n = 0; - for (w = list; w; w = w->link) { - // Better not be a DEAD_WEAK at this stage; the garbage - // collector removes DEAD_WEAKs from the weak pointer list. - ASSERT(w->header.info != &stg_DEAD_WEAK_info); + for (w = list; w; w = w->link) { + // Better not be a DEAD_WEAK at this stage; the garbage + // collector removes DEAD_WEAKs from the weak pointer list. + ASSERT(w->header.info != &stg_DEAD_WEAK_info); - if (w->finalizer != &stg_NO_FINALIZER_closure) { - n++; - } + if (w->finalizer != &stg_NO_FINALIZER_closure) { + n++; + } - runCFinalizers((StgCFinalizerList *)w->cfinalizers); + runCFinalizers((StgCFinalizerList *)w->cfinalizers); #ifdef PROFILING // A weak pointer is inherently used, so we do not need to call // LDV_recordDead(). - // + // // Furthermore, when PROFILING is turned on, dead weak // pointers are exactly as large as weak pointers, so there is // no need to fill the slop, either. See stg_DEAD_WEAK_info // in StgMiscClosures.hc. #endif - SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs); + SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs); } - + if (task != NULL) { task->running_finalizers = rtsFalse; } @@ -124,23 +124,23 @@ scheduleFinalizers(Capability *cap, StgWeak *list) n = 0; for (w = list; w; w = w->link) { - if (w->finalizer != &stg_NO_FINALIZER_closure) { - arr->payload[n] = w->finalizer; - n++; - } + if (w->finalizer != &stg_NO_FINALIZER_closure) { + arr->payload[n] = w->finalizer; + n++; + } } // set all the cards to 1 for (i = n; i < size; i++) { arr->payload[i] = (StgClosure *)(W_)(-1); } - t = createIOThread(cap, - RtsFlags.GcFlags.initialStkSize, - rts_apply(cap, - rts_apply(cap, - (StgClosure *)runFinalizerBatch_closure, - rts_mkInt(cap,n)), - (StgClosure *)arr) - ); + t = createIOThread(cap, + RtsFlags.GcFlags.initialStkSize, + rts_apply(cap, + rts_apply(cap, + (StgClosure *)runFinalizerBatch_closure, + rts_mkInt(cap,n)), + (StgClosure *)arr) + ); scheduleThread(cap,t); } diff --git a/tests/Benchmarks/ChameneosRedux/chameneos-redux-lwc.hs b/tests/Benchmarks/ChameneosRedux/chameneos-redux-lwc.hs index da5e7582e9..787445c7ed 100644 --- a/tests/Benchmarks/ChameneosRedux/chameneos-redux-lwc.hs +++ b/tests/Benchmarks/ChameneosRedux/chameneos-redux-lwc.hs @@ -5,13 +5,13 @@ Modified by Péter Diviánszky, 19 May 2010 Modified by Louis Wasserman, 14 June 2010 - Should be compiled with -O2 -threaded -fvia-c -optc-O3 and run with +RTS - -N<number of cores>. Disable thread migration <+RTS -qm> for predictable - performance. + Should be compiled with -O2 -threaded -fvia-c -optc-O3 and run with +RTS + -N<number of cores>. Disable thread migration <+RTS -qm> for predictable + performance. - XXX KC: The use of withArrayLen is unsafe. We obtain pointers to addresses - inside the array but not the byte array itself. This is a recipe for - disaster. See http://hackage.haskell.org/trac/ghc/ticket/7012. Solution? + XXX KC: The use of withArrayLen is unsafe. We obtain pointers to addresses + inside the array but not the byte array itself. This is a recipe for + disaster. See http://hackage.haskell.org/trac/ghc/ticket/7012. Solution? -} import LwConc.Substrate |