Merge pull request #7 from vbfox/vbfox/B_specifier

Support the %B specifier

Readme.md

@@ -104,7 +104,7 @@ The details of string interpolation internals are specified in [F# RFC FS-1001 -
 
 They appear as follow in this library:
 * Type-checked "printf-style" fills behave exactly as they do in `sprintf` and friends.
-* Unchecked ".NET-style" fills appear with a `Specifier.TypeChar` of 'P' and the .NET format string
+* Unchecked ".NET-style" fills appear with a `Specifier.TypeChar` of `'P'` and the .NET format string
   in `Specifier.InteropHoleDotNetFormat`.
 
 [fs-1001]: https://github.com/fsharp/fslang-design/blob/aca88da13cdb95f4f337d4f7d44cbf9d343704ae/FSharp-5.0/FS-1001-StringInterpolation.md#f-rfc-fs-1001---string-interpolation

Release Notes.md

@@ -1,3 +1,7 @@
+### New in 2.1.0
+
+* Synchronize with the latest FSharp.Core version and support the `%B` format specifier
+
 ### New in 2.0.0
 
 * Include the readme in the NuGet package

src/BlackFox.MasterOfFoo.Tests/InternalRepresentationTests.fs

@@ -143,6 +143,16 @@ Finalize
 """
     }
 
+    test "int hole only %B" {
+        testEqual
+            (testprintf "%B" 42)
+            """
+Init
+Write value: 42, type: FromFormatSpecifier, valueType: System.Int32, spec: 'B', Precision=-, Width=-, Flags=None, starWidth: , starPrecision: , AsPrintF: 101010;
+Finalize
+"""
+    }
+
     test "float64 hole only %f" {
         testEqual
             (testprintf "%f" 42.42)

src/BlackFox.MasterOfFoo.Tests/Test.fs

@@ -74,13 +74,20 @@ let tests = [
             "%s"
     }
 
-    test "int format" {
+    test "int format %i" {
         Expect.equal
             (coreprintf "%i" 5)
             (testprintf "%i" 5)
             "%i"
     }
 
+    test "int format %B" {
+        Expect.equal
+            (coreprintf "%B" 5)
+            (testprintf "%B" 5)
+            "%B"
+    }
+
     test "int untyped interpolation" {
         Expect.equal
             (coreprintf $"{5}")

src/BlackFox.MasterOfFoo/PrintfEnv.fs

@@ -135,3 +135,10 @@ type PrintfEnv<'State, 'Residue, 'Result>(state: 'State) =
                 env.Write(PrintableElement("%", PrintableElementType.MadeByEngine))
 
         env.Finalize()
+
+    /// This is the new name of Finalize in the new version of FSharp.Core
+    ///
+    /// We can't rename our method without breaking customers code but changing the name everywhere in printf.fs is
+    /// also a pain. So as an alternative this internal version, made only to ease porting was introduced.
+    member internal env.Finish () =
+        env.Finalize()