Merge pull request #1338 from dsyme/semis-5

more code sanatization

Author: dsyme

src/fsharp/AugmentWithHashCompare.fs

@@ -850,24 +850,24 @@ let TyconIsCandidateForAugmentationWithHash g tycon = TyconIsCandidateForAugment
 //------------------------------------------------------------------------- 
 
 let slotImplMethod (final,c,slotsig) : ValMemberInfo = 
-  { ImplementedSlotSigs=[slotsig];
+  { ImplementedSlotSigs=[slotsig]
     MemberFlags=
-        { IsInstance=true; 
-          IsDispatchSlot=false;
-          IsFinal=final;
-          IsOverrideOrExplicitImpl=true;
-          MemberKind=MemberKind.Member};
-    IsImplemented=false;
+        { IsInstance=true 
+          IsDispatchSlot=false
+          IsFinal=final
+          IsOverrideOrExplicitImpl=true
+          MemberKind=MemberKind.Member}
+    IsImplemented=false
     ApparentParent=c} 
 
 let nonVirtualMethod c : ValMemberInfo = 
-  { ImplementedSlotSigs=[];
-    MemberFlags={ IsInstance=true; 
-                  IsDispatchSlot=false;
-                  IsFinal=false;
-                  IsOverrideOrExplicitImpl=false;
-                  MemberKind=MemberKind.Member};
-    IsImplemented=false;
+  { ImplementedSlotSigs=[]
+    MemberFlags={ IsInstance=true 
+                  IsDispatchSlot=false
+                  IsFinal=false
+                  IsOverrideOrExplicitImpl=false
+                  MemberKind=MemberKind.Member}
+    IsImplemented=false
     ApparentParent=c} 
 
 let unitArg = ValReprInfo.unitArgData
@@ -945,7 +945,7 @@ let MakeBindingsForCompareAugmentation g (tycon:Tycon) =
               let thisv,thatv,comparee = comparef g tcref tycon 
               mkLambdas m tps [thisv;thatv] (comparee,g.int_ty)  
             [ // This one must come first because it may be inlined into the second
-              mkCompGenBind vspec2 rhs2;
+              mkCompGenBind vspec2 rhs2
               mkCompGenBind vspec1 rhs1; ] 
     if tycon.IsUnionTycon then mkCompare mkUnionCompare 
     elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkCompare mkRecdCompare 
@@ -1016,8 +1016,8 @@ let MakeBindingsForEqualityWithComparerAugmentation g (tycon:Tycon) =
 
                 mkLambdas m tps [thisv; unitv] (hashe,g.int_ty)  
 
-            [(mkCompGenBind withcGetHashCodeVal.Deref withcGetHashCodeExpr) ; 
-             (mkCompGenBind objGetHashCodeVal.Deref objGetHashCodeExpr) ; 
+            [(mkCompGenBind withcGetHashCodeVal.Deref withcGetHashCodeExpr)  
+             (mkCompGenBind objGetHashCodeVal.Deref objGetHashCodeExpr)  
              (mkCompGenBind withcEqualsVal.Deref withcEqualsExpr)] 
     if tycon.IsUnionTycon then mkStructuralEquatable mkUnionHashWithComparer mkUnionEqualityWithComparer
     elif (tycon.IsRecordTycon || tycon.IsStructOrEnumTycon) then mkStructuralEquatable mkRecdHashWithComparer mkRecdEqualityWithComparer
@@ -1054,8 +1054,8 @@ let MakeBindingsForEqualsAugmentation g (tycon:Tycon) =
             mkLambdas m tps [thisv;thatobjv] (equalse,g.bool_ty)  
 
 
-          [ mkCompGenBind nocEqualsVal.Deref nocEqualsExpr;
-            mkCompGenBind objEqualsVal.Deref objEqualsExpr;   ] 
+          [ mkCompGenBind nocEqualsVal.Deref nocEqualsExpr
+            mkCompGenBind objEqualsVal.Deref objEqualsExpr   ] 
     if tycon.IsExceptionDecl then mkEquals mkExnEquality 
     elif tycon.IsUnionTycon then mkEquals mkUnionEquality 
     elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkEquals mkRecdEquality 

src/fsharp/CompileOps.fs

@@ -1613,11 +1613,10 @@ and AddConstraint (csenv:ConstraintSolverEnv) ndeep m2 trace tp newConstraint  =
         // Record a entry in the undo trace if one is provided 
         let d = tp.Data
         let orig = d.typar_constraints
-        begin match trace with 
+        match trace with 
         | NoTrace -> () 
         | WithTrace trace -> trace.Push (fun () -> d.typar_constraints <- orig) 
-        end;
-        d.typar_constraints <- newConstraints;
+        d.typar_constraints <- newConstraints
 
         CompleteD)))
 
@@ -2403,7 +2402,7 @@ let EliminateConstraintsForGeneralizedTypars csenv trace (generalizedTypars: Typ
         let cxs = cxst.FindAll tpn
         if isNil cxs then () else
         cxs |> List.iter (fun cx -> 
-            cxst.Remove tpn;
+            cxst.Remove tpn
             match trace with 
             | NoTrace -> () 
             | WithTrace trace -> trace.Push (fun () -> (csenv.SolverState.ExtraCxs.Add (tpn,cx))))

src/fsharp/CompileOptions.fs

@@ -227,13 +227,13 @@ module GlobalUsageAnalysis =
     let logNonRecBinding z (bind:Binding) =
         let v = bind.Var
         let vs = FlatList.one v
-        {z with RecursiveBindings = Zmap.add v (false,vs) z.RecursiveBindings;
+        {z with RecursiveBindings = Zmap.add v (false,vs) z.RecursiveBindings
                 Defns = Zmap.add v bind.Expr z.Defns } 
 
     /// Log the definition of a recursive binding
     let logRecBindings z binds =
         let vs = valsOfBinds binds
-        {z with RecursiveBindings = (z.RecursiveBindings,vs) ||> FlatList.fold (fun mubinds v -> Zmap.add v (true,vs) mubinds);
+        {z with RecursiveBindings = (z.RecursiveBindings,vs) ||> FlatList.fold (fun mubinds v -> Zmap.add v (true,vs) mubinds)
                 Defns    = (z.Defns,binds) ||> FlatList.fold (fun eqns bind -> Zmap.add bind.Var bind.Expr eqns)  } 
 
     /// Work locally under a lambda of some kind
@@ -392,7 +392,7 @@ let rebuildTS g m ts vs =
           (x,ty),vs
 
     let (x,_ty),vs = rebuild vs ts
-    if vs.Length <> 0 then internalError "rebuildTS: had more fringe vars than fringe. REPORT BUG" else ();
+    if vs.Length <> 0 then internalError "rebuildTS: had more fringe vars than fringe. REPORT BUG" 
     x
 
 /// CallPattern is tuple-structure for each argument position.
@@ -794,7 +794,7 @@ let passBind penv (TBind(fOrig,repr,letSeqPtOpt) as bind) =
          // fCBody - parts - formals 
          let transformedFormals = trans.transformedFormals 
          let p     = transformedFormals.Length
-         if (vss.Length < p) then internalError "passBinds: |vss|<p - detuple pass" else (); (* ASSERTION *)
+         if (vss.Length < p) then internalError "passBinds: |vss|<p - detuple pass" 
          let xqNs  = List.drop p vss  
          let x1ps  = List.take p vss  
          let y1Ps  = List.concat (List.map2 transFormal transformedFormals x1ps)