Skip to content

whitespace and comments #3686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 3, 2017
Merged

whitespace and comments #3686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51a19b9
fix assembly reference
dsyme Sep 25, 2017
af82cbe
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Sep 25, 2017
b96f64b
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Sep 27, 2017
1d59de8
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Oct 3, 2017
9d07802
whitespace and comments
dsyme Oct 3, 2017
5cde9d3
whitespace and comments
dsyme Oct 3, 2017
bfa290a
whitespace and comments
dsyme Oct 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/absil/ilascii.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,18 +149,18 @@ let wordsOfNoArgInstr, isNoArgInstr =
let t =
lazy
(let t = HashMultiMap(300, HashIdentity.Structural)
noArgInstrs |> Lazy.force |> List.iter (fun (x,mk) -> t.Add(mk,x)) ;
noArgInstrs |> Lazy.force |> List.iter (fun (x, mk) -> t.Add(mk, x)) ;
t)
(fun s -> (Lazy.force t).[s]),
(fun s -> (Lazy.force t).[s]),
(fun s -> (Lazy.force t).ContainsKey s)
#endif

// --------------------------------------------------------------------
// Instructions are preceded by prefixes, e.g. ".tail" etc.
// --------------------------------------------------------------------

let mk_stind (nm,dt) = (nm, (fun () -> I_stind(Aligned,Nonvolatile,dt)))
let mk_ldind (nm,dt) = (nm, (fun () -> I_ldind(Aligned,Nonvolatile,dt)))
let mk_stind (nm, dt) = (nm, (fun () -> I_stind(Aligned, Nonvolatile, dt)))
let mk_ldind (nm, dt) = (nm, (fun () -> I_ldind(Aligned, Nonvolatile, dt)))

// --------------------------------------------------------------------
// Parsing only... Tables of different types of instructions.
Expand Down Expand Up @@ -192,7 +192,7 @@ type LazyInstrTable<'T> = Lazy<InstrTable<'T>>
// --------------------------------------------------------------------

let NoArgInstrs =
lazy (((noArgInstrs |> Lazy.force |> List.map (fun (nm,i) -> (nm,(fun () -> i)))) @
lazy (((noArgInstrs |> Lazy.force |> List.map (fun (nm, i) -> (nm, (fun () -> i)))) @
[ (mk_stind (["stind";"u"], DT_I));
(mk_stind (["stind";"i"], DT_I));
(mk_stind (["stind";"u1"], DT_I1));(* ILX EQUIVALENT *)
Expand All @@ -218,8 +218,8 @@ let NoArgInstrs =
(mk_ldind (["ldind";"r4"], DT_R4));
(mk_ldind (["ldind";"r8"], DT_R8));
(mk_ldind (["ldind";"ref"], DT_REF));
(["cpblk"], (fun () -> I_cpblk(Aligned,Nonvolatile)));
(["initblk"], (fun () -> I_initblk(Aligned,Nonvolatile)));
(["cpblk"], (fun () -> I_cpblk(Aligned, Nonvolatile)));
(["initblk"], (fun () -> I_initblk(Aligned, Nonvolatile)));
]
) : NoArgInstr InstrTable);;

Expand All @@ -231,14 +231,14 @@ let Int32Instrs =
(["ldc";"i4";"s"], (fun x -> ((mkLdcInt32 x)))); ] : Int32Instr InstrTable)

let Int32Int32Instrs =
lazy ([ (["ldlen";"multi"], (fun (x,y) -> EI_ldlen_multi (x, y))); ] : Int32Int32Instr InstrTable)
lazy ([ (["ldlen";"multi"], (fun (x, y) -> EI_ldlen_multi (x, y))); ] : Int32Int32Instr InstrTable)

let DoubleInstrs =
lazy ([ (["ldc";"r4"], (fun x -> (AI_ldc (DT_R4, x))));
(["ldc";"r8"], (fun x -> (AI_ldc (DT_R8, x)))); ] : DoubleInstr InstrTable)

let MethodSpecInstrs =
lazy ([ ( (["call"], (fun (mspec,y) -> I_call (Normalcall,mspec,y)))) ] : InstrTable<MethodSpecInstr>)
lazy ([ ( (["call"], (fun (mspec, y) -> I_call (Normalcall, mspec, y)))) ] : InstrTable<MethodSpecInstr>)

let StringInstrs =
lazy ([ (["ldstr"], (fun x -> I_ldstr x)); ] : InstrTable<StringInstr>)
Expand All @@ -248,27 +248,27 @@ let TokenInstrs =


let TypeInstrs =
lazy ([ (["ldelema"], (fun x -> I_ldelema (NormalAddress,false,ILArrayShape.SingleDimensional,x)));
(["ldelem";"any"], (fun x -> I_ldelem_any (ILArrayShape.SingleDimensional,x)));
lazy ([ (["ldelema"], (fun x -> I_ldelema (NormalAddress, false, ILArrayShape.SingleDimensional, x)));
(["ldelem";"any"], (fun x -> I_ldelem_any (ILArrayShape.SingleDimensional, x)));
(["stelem";"any"], (fun x -> I_stelem_any (ILArrayShape.SingleDimensional, x)));
(["newarr"], (fun x -> I_newarr (ILArrayShape.SingleDimensional,x)));
(["newarr"], (fun x -> I_newarr (ILArrayShape.SingleDimensional, x)));
(["castclass"], (fun x -> I_castclass x));
(["ilzero"], (fun x -> EI_ilzero x));
(["isinst"], (fun x -> I_isinst x));
(["initobj";"any"], (fun x -> I_initobj x));
(["unbox";"any"], (fun x -> I_unbox_any x)); ] : InstrTable<TypeInstr>)

let IntTypeInstrs =
lazy ([ (["ldelem";"multi"], (fun (x,y) -> (I_ldelem_any (ILArrayShape.FromRank x,y))));
(["stelem";"multi"], (fun (x,y) -> (I_stelem_any (ILArrayShape.FromRank x,y))));
(["newarr";"multi"], (fun (x,y) -> (I_newarr (ILArrayShape.FromRank x,y))));
(["ldelema";"multi"], (fun (x,y) -> (I_ldelema (NormalAddress,false,ILArrayShape.FromRank x,y)))); ] : InstrTable<IntTypeInstr>)
lazy ([ (["ldelem";"multi"], (fun (x, y) -> (I_ldelem_any (ILArrayShape.FromRank x, y))));
(["stelem";"multi"], (fun (x, y) -> (I_stelem_any (ILArrayShape.FromRank x, y))));
(["newarr";"multi"], (fun (x, y) -> (I_newarr (ILArrayShape.FromRank x, y))));
(["ldelema";"multi"], (fun (x, y) -> (I_ldelema (NormalAddress, false, ILArrayShape.FromRank x, y)))); ] : InstrTable<IntTypeInstr>)

let ValueTypeInstrs =
lazy ([ (["cpobj"], (fun x -> I_cpobj x));
(["initobj"], (fun x -> I_initobj x));
(["ldobj"], (fun z -> I_ldobj (Aligned,Nonvolatile,z)));
(["stobj"], (fun z -> I_stobj (Aligned,Nonvolatile,z)));
(["ldobj"], (fun z -> I_ldobj (Aligned, Nonvolatile, z)));
(["stobj"], (fun z -> I_stobj (Aligned, Nonvolatile, z)));
(["sizeof"], (fun x -> I_sizeof x));
(["box"], (fun x -> I_box x));
(["unbox"], (fun x -> I_unbox x)); ] : InstrTable<ValueTypeInstr>)
Expand Down
10 changes: 5 additions & 5 deletions src/absil/ilprint.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,11 @@ and goutput_permission _env os p =

match p with
| PermissionSet (sa,b) ->
output_string os " .permissionset ";
output_security_action os sa ;
output_string os " = (" ;
output_bytes os b ;
output_string os ")" ;
output_string os " .permissionset "
output_security_action os sa
output_string os " = ("
output_bytes os b
output_string os ")"

and goutput_security_decls env os (ps: ILPermissions) = output_seq " " (goutput_permission env) os ps.AsList

Expand Down
Loading