Merge pull request #7692 from dotnet/merges/master-to-release/dev16.4

merge master to release/dev16.4

Author: brettfo

.vsts-signed.yaml

@@ -298,17 +298,17 @@ stages:
             continueOnError: true
             condition: always()
 
-        - job: Linux_FCS
-          pool:
-            vmImage: ubuntu-16.04
-          variables:
-          - name: _SignType
-            value: Test
-          steps:
-          - checkout: self
-            clean: true
-          - script: ./fcs/build.sh Build
-            displayName: Build
+        #- job: Linux_FCS
+        #  pool:
+        #    vmImage: ubuntu-16.04
+        #  variables:
+        #  - name: _SignType
+        #    value: Test
+        #  steps:
+        #  - checkout: self
+        #    clean: true
+        #  - script: ./fcs/build.sh Build
+        #    displayName: Build
 
         - job: MacOS_FCS
           pool:

azure-pipelines.yml

@@ -2,7 +2,7 @@
   "tools": {
     "dotnet": "3.0.100",
     "vs": {
-      "version": "16.1",
+      "version": "16.3",
       "components": [
         "Microsoft.Net.Core.Component.SDK.2.1",
         "Microsoft.VisualStudio.Component.FSharp"

global.json

@@ -1924,6 +1924,11 @@ atomicPatternLongIdent:
     }
   | GLOBAL DOT pathOp  { let (LongIdentWithDots(lid,dotms)) = $3 in (None,LongIdentWithDots(ident(MangledGlobalName,rhs parseState 1) :: lid, rhs parseState 2 :: dotms)) }
   | pathOp { (None,$1) }
+  | access UNDERSCORE DOT pathOp {
+    if not (parseState.LexBuffer.SupportsFeature LanguageFeature.SingleUnderscorePattern) then
+        raiseParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnexpectedSymbolDot())
+    let (LongIdentWithDots(lid,dotms)) = $4 in (Some($1),LongIdentWithDots(ident("_",rhs parseState 1)::lid, rhs parseState 2::dotms))
+    }  
   | access pathOp { (Some($1), $2) }
 
 

src/fsharp/pars.fsy

@@ -26,19 +26,46 @@ type MyStructWithUnderscoreIdentifier =
     member _.MethodWithUnderscoreSelf() = true
     member __.MethodWithDoubleUnderscoreSelf() = true
     member _E.MethodWithUnderscoreESelf() = true
+    member private _.PrivateMethodWithUnderscoreSelf() = true
+    member private __.PrivateMethodWithDoubleUnderscoreSelf() = true
+    member private _E.PrivateMethodWithUnderscoreESelf() = true
+    member inline _.InlineMethodWithUnderscoreSelf() = true
+    member inline __.InlineMethodWithDoubleUnderscoreSelf() = true
+    member inline _E.InlineMethodWithUnderscoreESelf() = true
+    member inline private _.InlinePrivateMethodWithUnderscoreSelf() = true
+    member inline private __.InlinePrivateMethodWithDoubleUnderscoreSelf() = true
+    member inline private _E.InlinePrivateMethodWithUnderscoreESelf() = true
 
 type MyClassWithUnderscoreIdentifier () =
     class
         member _.MethodWithUnderscoreSelf() = true
         member __.MethodWithDoubleUnderscoreSelf() = true
         member _E.MethodWithUnderscoreESelf() = true
+        member private _.PrivateMethodWithUnderscoreSelf() = true
+        member private __.PrivateMethodWithDoubleUnderscoreSelf() = true
+        member private _E.PrivateMethodWithUnderscoreESelf() = true
+        member inline _.InlineMethodWithUnderscoreSelf() = true
+        member inline __.InlineMethodWithDoubleUnderscoreSelf() = true
+        member inline _E.InlineMethodWithUnderscoreESelf() = true
+        member inline private _.InlinePrivateMethodWithUnderscoreSelf() = true
+        member inline private __.InlinePrivateMethodWithDoubleUnderscoreSelf() = true
+        member inline private _E.InlinePrivateMethodWithUnderscoreESelf() = true
     end
 
 type MyStructTypeWithUnderscoreIdentifier =
     struct
         member _.MethodWithUnderscoreSelf() = true
         member __.MethodWithDoubleUnderscoreSelf() = true
         member _E.MethodWithUnderscoreESelf() = true
+        member private _.PrivateMethodWithUnderscoreSelf() = true
+        member private __.PrivateMethodWithDoubleUnderscoreSelf() = true
+        member private _E.PrivateMethodWithUnderscoreESelf() = true
+        member inline _.InlineMethodWithUnderscoreSelf() = true
+        member inline __.InlineMethodWithDoubleUnderscoreSelf() = true
+        member inline _E.InlineMethodWithUnderscoreESelf() = true
+        member inline private _.InlinePrivateMethodWithUnderscoreSelf() = true
+        member inline private __.InlinePrivateMethodWithDoubleUnderscoreSelf() = true
+        member inline private _E.InlinePrivateMethodWithUnderscoreESelf() = true
     end