From 464bdc6acd758303a3a8f1a5ec69ac0a29b17fc8 Mon Sep 17 00:00:00 2001 From: Phillip Carter Date: Tue, 26 May 2020 16:35:38 -0700 Subject: [PATCH] Seekreadcompresseduint32 to struct tuple (#9222) * seekReadTypeDefRowExtents returns a struct tuple * seekReadCompressedUInt32 returns a struct tuple --- src/absil/ilread.fs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs index 1fa52dce047..6a0c2ffdfa1 100644 --- a/src/absil/ilread.fs +++ b/src/absil/ilread.fs @@ -199,17 +199,17 @@ let seekReadUInt16AsInt32 mdv addr = int32 (seekReadUInt16 mdv addr) let seekReadCompressedUInt32 mdv addr = let b0 = seekReadByte mdv addr - if b0 <= 0x7Fuy then int b0, addr+1 + if b0 <= 0x7Fuy then struct (int b0, addr+1) elif b0 <= 0xBFuy then let b0 = b0 &&& 0x7Fuy let b1 = seekReadByteAsInt32 mdv (addr+1) - (int b0 <<< 8) ||| int b1, addr+2 + struct ((int b0 <<< 8) ||| int b1, addr+2) else let b0 = b0 &&& 0x3Fuy let b1 = seekReadByteAsInt32 mdv (addr+1) let b2 = seekReadByteAsInt32 mdv (addr+2) let b3 = seekReadByteAsInt32 mdv (addr+3) - (int b0 <<< 24) ||| (int b1 <<< 16) ||| (int b2 <<< 8) ||| int b3, addr+4 + struct ((int b0 <<< 24) ||| (int b1 <<< 16) ||| (int b2 <<< 8) ||| int b3, addr+4) let seekReadSByte mdv addr = sbyte (seekReadByte mdv addr) let seekReadSingle mdv addr = singleOfBits (seekReadInt32 mdv addr) @@ -226,11 +226,11 @@ let seekReadUTF8String mdv addr = System.Text.Encoding.UTF8.GetString (bytes, 0, bytes.Length) let seekReadBlob mdv addr = - let len, addr = seekReadCompressedUInt32 mdv addr + let struct (len, addr) = seekReadCompressedUInt32 mdv addr seekReadBytes mdv addr len let seekReadUserString mdv addr = - let len, addr = seekReadCompressedUInt32 mdv addr + let struct (len, addr) = seekReadCompressedUInt32 mdv addr let bytes = seekReadBytes mdv addr (len - 1) Encoding.Unicode.GetString(bytes, 0, bytes.Length)