[RFC FS-1091] Extend Unsigned Integers to Carry Units of Measure

src/fsharp/FSComp.txt

@@ -477,7 +477,7 @@ parsSyntaxModuleSigEndDeprecated,"The syntax 'module ... : sig .. end' is not us
 634,tcNonZeroConstantCannotHaveGenericUnit,"Non-zero constants cannot have generic units. For generic zero, write 0.0<_>."
 635,tcSeqResultsUseYield,"In sequence expressions, results are generated using 'yield'"
 tcUnexpectedBigRationalConstant,"Unexpected big rational constant"
-636,tcInvalidTypeForUnitsOfMeasure,"Units-of-measure supported only on float, float32, decimal and signed integer types"
+636,tcInvalidTypeForUnitsOfMeasure,"Units-of-measure are only supported on float, float32, decimal, and integer types."
 tcUnexpectedConstUint16Array,"Unexpected Const_uint16array"
 tcUnexpectedConstByteArray,"Unexpected Const_bytearray"
 640,tcParameterRequiresName,"A parameter with attributes must also be given a name, e.g. '[<Attribute>] Name : Type'"
@@ -1226,6 +1226,7 @@ invalidFullNameForProvidedType,"invalid full name for provided type"
 3086,tcCustomOperationMayNotBeUsedHere,"A custom operation may not be used in conjunction with 'use', 'try/with', 'try/finally', 'if/then/else' or 'match' operators within this computation expression"
 3087,tcCustomOperationMayNotBeOverloaded,"The custom operation '%s' refers to a method which is overloaded. The implementations of custom operations may not be overloaded."
 featureOverloadsForCustomOperations,"overloads for custom operations"
+featureExpandedMeasurables,"more types support units of measure"
 3090,tcIfThenElseMayNotBeUsedWithinQueries,"An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead."
 3091,ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen,"Invalid argument to 'methodhandleof' during codegen"
 3092,etProvidedTypeReferenceMissingArgument,"A reference to a provided type was missing a value for the static parameter '%s'. You may need to recompile one or more referenced assemblies."

src/fsharp/FSharp.Core/prim-types.fs

@@ -369,11 +369,42 @@ namespace Microsoft.FSharp.Core
     [<MeasureAnnotatedAbbreviation>] type sbyte<[<Measure>] 'Measure> = sbyte
     [<MeasureAnnotatedAbbreviation>] type int16<[<Measure>] 'Measure> = int16
     [<MeasureAnnotatedAbbreviation>] type int64<[<Measure>] 'Measure> = int64
+
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+    [<MeasureAnnotatedAbbreviation>] 
+    type nativeint<[<Measure>] 'Measure> = nativeint
+
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+    [<MeasureAnnotatedAbbreviation>] 
+    type uint<[<Measure>] 'Measure> = uint
+
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+    [<MeasureAnnotatedAbbreviation>] 
+    type byte<[<Measure>] 'Measure> = byte
+
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+    [<MeasureAnnotatedAbbreviation>] 
+    type uint16<[<Measure>] 'Measure> = uint16
+
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+    [<MeasureAnnotatedAbbreviation>] 
+    type uint64<[<Measure>] 'Measure> = uint64
+
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+    [<MeasureAnnotatedAbbreviation>] 
+    type unativeint<[<Measure>] 'Measure> = unativeint
+
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>] type double<[<Measure>] 'Measure> = float<'Measure>
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>] type single<[<Measure>] 'Measure> = float32<'Measure>
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>] type int8<[<Measure>] 'Measure> = sbyte<'Measure>
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>] type int32<[<Measure>] 'Measure> = int<'Measure>
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>] type uint8<[<Measure>] 'Measure> = byte<'Measure>
+    [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>] type uint32<[<Measure>] 'Measure> = uint<'Measure>
 
     /// <summary>Represents a managed pointer in F# code.</summary>
     type byref<'T> = (# "!0&" #)
 
-    /// <summary>Represents a managed pointer in F# code.</summary>
+    /// <summary>Represents a managed pointer in F# code.</summary> 
     type byref<'T, 'Kind> = (# "!0&" #)
 
     /// Represents the types of byrefs in F# 4.5+
@@ -2256,6 +2287,24 @@ namespace Microsoft.FSharp.Core
         let inline Int16WithMeasure (f : int16) : int16<'Measure> = retype f
         let inline SByteWithMeasure (f : sbyte) : sbyte<'Measure> = retype f
         let inline Int64WithMeasure (f : int64) : int64<'Measure> = retype f
+
+        [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+        let inline IntPtrWithMeasure (f : nativeint) : nativeint<'Measure> = retype f
+
+        [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+        let inline UInt32WithMeasure (f : uint) : uint<'Measure> = retype f
+
+        [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+        let inline UInt16WithMeasure (f : uint16) : uint16<'Measure> = retype f
+
+        [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+        let inline UInt64WithMeasure (f : uint64) : uint64<'Measure> = retype f
+
+        [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+        let inline ByteWithMeasure (f : byte) : byte<'Measure> = retype f
+
+        [<Experimental(ExperimentalAttributeMessages.RequiresPreview)>]
+        let inline UIntPtrWithMeasure (f : unativeint) : unativeint<'Measure> = retype f
 
         let inline formatError() = raise (new System.FormatException(SR.GetString(SR.badFormatString)))
 

src/fsharp/FSharp.Core/prim-types.fsi

@@ -921,17 +921,17 @@ namespace Microsoft.FSharp.Core
         member Path: string
 
     [<MeasureAnnotatedAbbreviation>] 
-    /// <summary>The type of floating point numbers, annotated with a unit of measure. The unit
-    /// of measure is erased in compiled code and when values of this type
+    /// <summary>The type of double-precision floating point numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
     /// are analyzed using reflection. The type is representationally equivalent to 
     /// <see cref="T:System.Double"/>.</summary>
     ///
     /// <category index="6">Basic Types with Units of Measure</category>
     type float<[<Measure>] 'Measure> = float
 
     [<MeasureAnnotatedAbbreviation>] 
-    /// <summary>The type of floating point numbers, annotated with a unit of measure. The unit
-    /// of measure is erased in compiled code and when values of this type
+    /// <summary>The type of single-precision floating point numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
     /// are analyzed using reflection. The type is representationally equivalent to 
     /// <see cref="T:System.Single"/>.
     /// </summary>
@@ -956,7 +956,7 @@ namespace Microsoft.FSharp.Core
     ///
     /// <category>Basic Types with Units of Measure</category>
     type int<[<Measure>] 'Measure> = int
-
+    
     [<MeasureAnnotatedAbbreviation>] 
     /// <summary>The type of 8-bit signed integer numbers, annotated with a unit of measure. The unit
     /// of measure is erased in compiled code and when values of this type
@@ -984,6 +984,120 @@ namespace Microsoft.FSharp.Core
     /// <category>Basic Types with Units of Measure</category>
     type int64<[<Measure>] 'Measure> = int64
 
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    [<MeasureAnnotatedAbbreviation>]
+    /// <summary>The type of machine-sized signed integer numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.IntPtr"/>.</summary>
+    ///
+    /// <category>Basic Types with Units of Measure</category>
+    type nativeint<[<Measure>] 'Measure> = nativeint
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    [<MeasureAnnotatedAbbreviation>] 
+    /// <summary>The type of 32-bit unsigned integer numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.UInt32"/>.</summary>
+    ///
+    /// <category>Basic Types with Units of Measure</category>
+    type uint<[<Measure>] 'Measure> = uint
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    [<MeasureAnnotatedAbbreviation>] 
+    /// <summary>The type of 8-bit unsigned integer numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.Byte"/>.</summary>
+    ///
+    /// <category>Basic Types with Units of Measure</category>
+    type byte<[<Measure>] 'Measure> = byte
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    [<MeasureAnnotatedAbbreviation>] 
+    /// <summary>The type of 16-bit unsigned integer numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.UInt16"/>.</summary>
+    ///
+    /// <category>Basic Types with Units of Measure</category>
+    type uint16<[<Measure>] 'Measure> = uint16
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    [<MeasureAnnotatedAbbreviation>] 
+    /// <summary>The type of 64-bit unsigned integer numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.UInt64"/>.</summary>
+    ///
+    /// <category>Basic Types with Units of Measure</category>
+    type uint64<[<Measure>] 'Measure> = uint64
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    [<MeasureAnnotatedAbbreviation>]
+    /// <summary>The type of machine-sized unsigned integer numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.UIntPtr"/>.</summary>
+    ///
+    /// <category>Basic Types with Units of Measure</category>
+    type unativeint<[<Measure>] 'Measure> = unativeint
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    /// <summary>The type of double-precision floating point numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.Double"/>.</summary>
+    ///
+    /// <category index="6">Basic Types with Units of Measure</category>
+    type double<[<Measure>] 'Measure> = float<'Measure>
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    /// <summary>The type of single-precision floating point numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.Single"/>.</summary>
+    ///
+    /// <category index="6">Basic Types with Units of Measure</category>
+    type single<[<Measure>] 'Measure> = float32<'Measure>
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    /// <summary>The type of 8-bit signed integer numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.SByte"/>.</summary>
+    ///
+    /// <category>Basic Types with Units of Measure</category>
+    type int8<[<Measure>] 'Measure> = sbyte<'Measure>
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    /// <summary>The type of 32-bit signed integer numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.Int32"/>.</summary>
+    ///
+    /// <category>Basic Types with Units of Measure</category>
+    type int32<[<Measure>] 'Measure> = int<'Measure>
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    /// <summary>The type of 8-bit unsigned integer numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.Byte"/>.</summary>
+    ///
+    /// <category>Basic Types with Units of Measure</category>
+    type uint8<[<Measure>] 'Measure> = byte<'Measure>
+
+    [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+    /// <summary>The type of 32-bit unsigned integer numbers, annotated with a unit of measure. 
+    /// The unit of measure is erased in compiled code and when values of this type
+    /// are analyzed using reflection. The type is representationally equivalent to 
+    /// <see cref="T:System.UInt32"/>.</summary>
+    ///
+    /// <category>Basic Types with Units of Measure</category>
+    type uint32<[<Measure>] 'Measure> = uint<'Measure>
+
     /// <summary>Represents a managed pointer in F# code.</summary>
 #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE
     [<CompilerMessage("This construct is for use in the FSharp.Core library and should not be used directly", 1204, IsHidden=true)>]
@@ -1278,6 +1392,54 @@ namespace Microsoft.FSharp.Core
         /// <returns>The sbyte with units-of-measure.</returns>
         val inline SByteWithMeasure : input: sbyte -> sbyte<'Measure>
 
+        [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+        /// <summary>Creates a nativeint value with units-of-measure</summary>
+        ///
+        /// <param name="input">The input nativeint.</param>
+        ///
+        /// <returns>The nativeint with units-of-measure.</returns>
+        val inline IntPtrWithMeasure : input: nativeint -> nativeint<'Measure>
+
+        [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+        /// <summary>Creates a uint value with units-of-measure</summary>
+        ///
+        /// <param name="input">The input uint.</param>
+        ///
+        /// <returns>The uint with units-of-measure.</returns>
+        val inline UInt32WithMeasure : input: uint -> uint<'Measure>
+
+        [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+        /// <summary>Creates a uint64 value with units-of-measure</summary>
+        ///
+        /// <param name="input">The input uint64.</param>
+        ///
+        /// <returns>The uint64 with units-of-measure.</returns>
+        val inline UInt64WithMeasure : input: uint64 -> uint64<'Measure>
+
+        [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+        /// <summary>Creates a uint16 value with units-of-measure</summary>
+        ///
+        /// <param name="input">The input uint16.</param>
+        ///
+        /// <returns>The uint16 with units-of-measure.</returns>
+        val inline UInt16WithMeasure : input: uint16 -> uint16<'Measure>
+
+        [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+        /// <summary>Creates a byte value with units-of-measure</summary>
+        ///
+        /// <param name="input">The input byte.</param>
+        ///
+        /// <returns>The byte with units-of-measure.</returns>
+        val inline ByteWithMeasure : input: byte -> byte<'Measure>
+
+        [<Experimental("Experimental library feature, requires '--langversion:preview'")>] 
+        /// <summary>Creates a unativeint value with units-of-measure</summary>
+        ///
+        /// <param name="input">The input unativeint.</param>
+        ///
+        /// <returns>The unativeint with units-of-measure.</returns>
+        val inline UIntPtrWithMeasure : input: unativeint -> unativeint<'Measure>
+
         /// <summary>Parse an int32 according to the rules used by the overloaded 'int32' conversion operator when applied to strings</summary>
         ///
         /// <param name="s">The input string.</param>

src/fsharp/LanguageFeatures.fs

@@ -35,6 +35,7 @@ type LanguageFeature =
     | InterfacesWithMultipleGenericInstantiation
     | StringInterpolation
     | OverloadsForCustomOperations
+    | ExpandedMeasurables
 
 /// LanguageVersion management
 type LanguageVersion (specifiedVersionAsString) =
@@ -75,6 +76,7 @@ type LanguageVersion (specifiedVersionAsString) =
             LanguageFeature.NameOf, previewVersion
             LanguageFeature.StringInterpolation, previewVersion
             LanguageFeature.OverloadsForCustomOperations, previewVersion
+            LanguageFeature.ExpandedMeasurables, previewVersion
         ]
 
     let specified =
@@ -147,6 +149,7 @@ type LanguageVersion (specifiedVersionAsString) =
         | LanguageFeature.InterfacesWithMultipleGenericInstantiation -> FSComp.SR.featureInterfacesWithMultipleGenericInstantiation()
         | LanguageFeature.StringInterpolation -> FSComp.SR.featureStringInterpolation()
         | LanguageFeature.OverloadsForCustomOperations -> FSComp.SR.featureOverloadsForCustomOperations()
+        | LanguageFeature.ExpandedMeasurables -> FSComp.SR.featureExpandedMeasurables()
 
     /// Get a version string associated with the given feature.
     member _.GetFeatureVersionString feature =

src/fsharp/LanguageFeatures.fsi

@@ -23,6 +23,7 @@ type LanguageFeature =
     | InterfacesWithMultipleGenericInstantiation
     | StringInterpolation
     | OverloadsForCustomOperations
+    | ExpandedMeasurables
 
 /// LanguageVersion management
 type LanguageVersion =

src/fsharp/LexFilter.fs

@@ -2229,7 +2229,7 @@ type LexFilterImpl (lightStatus: LightSyntaxStatus, compilingFsLib, lexer, lexbu
               true
 
           // Insert HIGH_PRECEDENCE_TYAPP if needed 
-          | (DELEGATE | IDENT _ | IEEE64 _ | IEEE32 _ | DECIMAL _ | INT8 _ | INT16 _ | INT32 _ | INT64 _ | NATIVEINT _ | UINT8 _ | UINT16 _ | UINT32 _ | UINT64 _ | BIGNUM _) when peekAdjacentTypars false tokenTup ->
+          | (DELEGATE | IDENT _ | IEEE64 _ | IEEE32 _ | DECIMAL _ | INT8 _ | INT16 _ | INT32 _ | INT64 _ | NATIVEINT _ | UINT8 _ | UINT16 _ | UINT32 _ | UINT64 _ | UNATIVEINT _ | BIGNUM _) when peekAdjacentTypars false tokenTup ->
               let lessTokenTup = popNextTokenTup()
               delayToken (pool.UseLocation(lessTokenTup, match lessTokenTup.Token with LESS _ -> LESS true | _ -> failwith "unreachable"))