Fix "build from source"

dotnet · Oct 9, 2018 · 89e498b · 89e498b
1 parent 58c2097
commit 89e498b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs
@@ -3916,6 +3916,15 @@ type internal SR private() =
     /// Union case/exception '%s' does not have field named '%s'.
     /// (Originally from ..\FSComp.txt:1296)
     static member tcUnionCaseConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcUnionCaseConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1)
+    /// The exception '%s' does not have a field named '%s'.
+    /// (Originally from ..\FSComp.txt:1297)
+    static member tcExceptionConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcExceptionConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1)
+    /// Active patterns do not have fields. This syntax is invalid.
+    /// (Originally from ..\FSComp.txt:1298)
+    static member tcActivePatternsDoNotHaveFields() = (3174, GetStringFunc("tcActivePatternsDoNotHaveFields",",,,") )
+    /// The constructor does not have a field named '%s'.
+    /// (Originally from ..\FSComp.txt:1299)
+    static member tcConstructorDoesNotHaveFieldWithGivenName(a0 : System.String) = (3174, GetStringFunc("tcConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,") a0)
     /// Union case/exception field '%s' cannot be used more than once.
     /// (Originally from ..\FSComp.txt:1297)
     static member tcUnionCaseFieldCannotBeUsedMoreThanOnce(a0 : System.String) = (3175, GetStringFunc("tcUnionCaseFieldCannotBeUsedMoreThanOnce",",,,%s,,,") a0)

diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx
@@ -3916,7 +3916,16 @@
     <value>Array method '{0}' is supplied by the runtime and cannot be directly used in code. For operations with array elements consider using family of GetArray/SetArray functions from LanguagePrimitives.IntrinsicFunctions module.</value>
   </data>
   <data name="tcUnionCaseConstructorDoesNotHaveFieldWithGivenName" xml:space="preserve">
-    <value>Union case/exception '{0}' does not have field named '{1}'.</value>
+    <value>The union case '{0}' does not have a field named '{1}'.</value>
+  </data>
+  <data name="tcExceptionConstructorDoesNotHaveFieldWithGivenName" xml:space="preserve">
+    <value>The exception '{0}' does not have a field named '{1}'.</value>
+  </data>
+  <data name="tcActivePatternsDoNotHaveFields" xml:space="preserve">
+    <value>Active patterns do not have fields. This syntax is invalid.</value>
+  </data>
+  <data name="tcConstructorDoesNotHaveFieldWithGivenName" xml:space="preserve">
+    <value>The constructor does not have a field named '{0}'.</value>
   </data>
   <data name="tcUnionCaseFieldCannotBeUsedMoreThanOnce" xml:space="preserve">
     <value>Union case/exception field '{0}' cannot be used more than once.</value>

diff --git a/...ce/Conformance/BasicTypeAndModuleDefinitions/UnionTypes/E_UnionConstructorBadFieldName.fs b/...ce/Conformance/BasicTypeAndModuleDefinitions/UnionTypes/E_UnionConstructorBadFieldName.fs
@@ -2,7 +2,7 @@
 // Make sure we properly detect bogus named field in constructors
 //<Expects id="FS3174" span="(10,18-10,20)" status="error">The union case 'Case1' does not have a field named 'V3'\.</Expects>
 //<Expects id="FS3174" span="(14,9-14,11)" status="error">The union case 'Case1' does not have a field named 'V3'\.</Expects>
-//<Expects id="FS3174" span="(17,12-17,14)" status="error">The union casen 'Case1' does not have a field named 'V4'\.</Expects>
+//<Expects id="FS3174" span="(17,12-17,14)" status="error">The union case 'Case1' does not have a field named 'V4'\.</Expects>
 
 type MyDU = 
     | Case1 of V1 : int * V2 : string