Re: [commit: ghc] master: Check: More Clang/CPP wibbles (befc4e4)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [commit: ghc] master: Check: More Clang/CPP wibbles (befc4e4)

Gabor Greif-2
Hi Ben,

there are still a bunch left:

git grep "ASSERT ("

Cheers,

    Gabor

On 12/4/15, [hidden email] <[hidden email]> wrote:

> Repository : ssh://[hidden email]/ghc
>
> On branch  : master
> Link       :
> http://ghc.haskell.org/trac/ghc/changeset/befc4e4c4c76fd89a092240935d9f508de2ee664/ghc
>
>>---------------------------------------------------------------
>
> commit befc4e4c4c76fd89a092240935d9f508de2ee664
> Author: Ben Gamari <[hidden email]>
> Date:   Fri Dec 4 13:07:16 2015 +0100
>
>     Check: More Clang/CPP wibbles
>
>
>>---------------------------------------------------------------
>
> befc4e4c4c76fd89a092240935d9f508de2ee664
>  compiler/deSugar/Check.hs | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
> index 55dcfc2..dcf3b23 100644
> --- a/compiler/deSugar/Check.hs
> +++ b/compiler/deSugar/Check.hs
> @@ -370,12 +370,12 @@ translateConPatVec  univ_tys  ex_tvs c (RecCon
> (HsRecFields fs _))
>      -- The data constructor was not defined using record syntax. For the
>      -- pattern to be in record syntax it should be empty (e.g. Just {}).
>      -- So just like the previous case.
> -  | null orig_lbls = ASSERT (null matched_lbls) mkPatternVarsSM arg_tys
> +  | null orig_lbls = ASSERT(null matched_lbls) mkPatternVarsSM arg_tys
>      -- Some of the fields appear, in the original order (there may be
> holes).
>      -- Generate a simple constructor pattern and make up fresh variables
> for
>      -- the rest of the fields
>    | matched_lbls `subsetOf` orig_lbls
> -  = ASSERT (length orig_lbls == length arg_tys)
> +  = ASSERT(length orig_lbls == length arg_tys)
>        let translateOne (lbl, ty) = case lookup lbl matched_pats of
>              Just p  -> translatePat p
>              Nothing -> mkPatternVarsSM [ty]
> @@ -616,7 +616,7 @@ process_guards us  gs
>  -- * Basic utilities
>
>  patternType :: Pattern -> Type
> -patternType (PmGuard pv _) = ASSERT (patVecArity pv == 1) (patternType p)
> +patternType (PmGuard pv _) = ASSERT(patVecArity pv == 1) (patternType p)
>    where Just p = find ((==1) . patternArity) pv
>  patternType (NonGuard pat) = pmPatType pat
>
> @@ -826,8 +826,8 @@ splitConstraints (c : rest)
>    = case c of
>        TyConstraint cs    -> (cs ++ ty_cs, tm_cs, bot_cs)
>        TmConstraint e1 e2 -> (ty_cs, (e1,e2):tm_cs, bot_cs)
> -      BtConstraint cs    -> ASSERT (isNothing bot_cs) -- NB: Only one x ~
> _|_
> -                                   (ty_cs, tm_cs, Just cs)
> +      BtConstraint cs    -> ASSERT(isNothing bot_cs) -- NB: Only one x ~
> _|_
> +                                  (ty_cs, tm_cs, Just cs)
>    where
>      (ty_cs, tm_cs, bot_cs) = splitConstraints rest
>
>
> _______________________________________________
> ghc-commits mailing list
> [hidden email]
> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-commits
>
_______________________________________________
ghc-devs mailing list
[hidden email]
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Reply | Threaded
Open this post in threaded view
|

Re: [commit: ghc] master: Check: More Clang/CPP wibbles (befc4e4)

Ben Gamari-2
Gabor Greif <[hidden email]> writes:

> Hi Ben,
>
> there are still a bunch left:
>
Indeed there are many in the RTS but for some reason these have never
caused trouble. That being said, I have a patch removing them, as well
as a linter to ensure that they don't return in the future. I'm waiting
until the tree is green before I commit these, however.

Cheers,

- Ben


_______________________________________________
ghc-devs mailing list
[hidden email]
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs

signature.asc (482 bytes) Download Attachment