From b7cd5de4214a8b900f6941ca74da891273052b5a Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Tue, 30 Jan 2018 19:19:26 +0000 Subject: [PATCH] Imported Upstream version 5.10.0.71 Former-commit-id: 65f7f4344e4c1c5e42628faefa5b9d36955387d1 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000001/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000001/mcs.exe.REMOVED.git-id | 2 +- .../1051000001/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000001/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000001/mcs.exe.REMOVED.git-id | 2 +- .../1051000001/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000001/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000001/mcs.exe.REMOVED.git-id | 2 +- .../1051000001/mscorlib.dll.REMOVED.git-id | 2 +- mcs/errors/cs1644-59.cs | 13 + mcs/mcs/cs-parser.jay.REMOVED.git-id | 2 +- mcs/mcs/delegate.cs | 2 + mcs/mcs/expression.cs.REMOVED.git-id | 2 +- mcs/mcs/method.cs | 4 + mcs/mcs/module.cs | 8 + mcs/mcs/statement.cs.REMOVED.git-id | 2 +- mcs/mcs/typespec.cs | 30 +- mcs/tests/test-readonly-02.cs | 27 ++ mcs/tests/ver-il-net_4_x.xml.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 270 +++++++++--------- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 44 files changed, 251 insertions(+), 169 deletions(-) create mode 100644 mcs/errors/cs1644-59.cs create mode 100644 mcs/tests/test-readonly-02.cs diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 13e74fea8c..80d6c39221 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -5b34281abf0849c98261c0cfdd0d23e326e8bcd9 \ No newline at end of file +f3cdec28bfd3d14c4e51f3f8697b1c542f26bcfa \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 43281d14d4..e23dd8ee83 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -f6abc4fd387f6974da69a91114d1ccdd791df5f0 \ No newline at end of file +34b930d40a1798a2e6cf86e9dc5b5aef795412f2 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 57c36a8c8d..8567a66161 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,7 +34,7 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.10.0.69"; + public const string MonoVersion = "5.10.0.71"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/class/lib/monolite-darwin/1051000001/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/Mono.Security.dll.REMOVED.git-id index 71214bec84..8c03f2c6a2 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -6a12bbf6b6b494794344c6f5dbe585de0e5c4e9a \ No newline at end of file +f46637fe7b50026e71c6ce268ea9f06072f1427c \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/System.Configuration.dll.REMOVED.git-id index 9da941e2c7..9bad1b0204 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -ab9de6de6fdf886eee4177e261571f49ac7d95d4 \ No newline at end of file +09a0bbd139544d6660f459487cd7b64444fa0110 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/System.Numerics.dll.REMOVED.git-id index 6540c5c1e9..a6948a1980 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -12e34db1e270c4a5878c1fa53d0d867bea22606a \ No newline at end of file +9dbd62725d59ac2b05fb7b233c7392fc2701c97c \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/System.Security.dll.REMOVED.git-id index 70b41aa741..cd8eb5648b 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -ade40d1fab96b3435c4dde44ea9e11bf697460d0 \ No newline at end of file +155d65127d43b1f2e787e1c95de7098297585a65 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/System.Xml.dll.REMOVED.git-id index c2274c0270..784dca5eaf 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -b9a167340545a1ef4092db9539ebc85dae3a2430 \ No newline at end of file +7934a0f5c354efc029c3deca559be7d379278ae7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/mcs.exe.REMOVED.git-id index 501cc38240..9ad25097c0 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -40243be7f09fee217d4b7571bcb4919e6c75c2de \ No newline at end of file +a2d6f567f1c826b06f814cdc88138a155050fb50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000001/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000001/mscorlib.dll.REMOVED.git-id index 2be11d1095..794ec7774a 100644 --- a/mcs/class/lib/monolite-darwin/1051000001/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000001/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1472389e53b7376dce7e6d0a8cbbe98df0866fef \ No newline at end of file +e66da28062c88338d362b64caa5b9844cceac6c6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/Mono.Security.dll.REMOVED.git-id index 71214bec84..8c03f2c6a2 100644 --- a/mcs/class/lib/monolite-linux/1051000001/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -6a12bbf6b6b494794344c6f5dbe585de0e5c4e9a \ No newline at end of file +f46637fe7b50026e71c6ce268ea9f06072f1427c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/System.Configuration.dll.REMOVED.git-id index 9da941e2c7..9bad1b0204 100644 --- a/mcs/class/lib/monolite-linux/1051000001/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -ab9de6de6fdf886eee4177e261571f49ac7d95d4 \ No newline at end of file +09a0bbd139544d6660f459487cd7b64444fa0110 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/System.Numerics.dll.REMOVED.git-id index 6540c5c1e9..a6948a1980 100644 --- a/mcs/class/lib/monolite-linux/1051000001/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -12e34db1e270c4a5878c1fa53d0d867bea22606a \ No newline at end of file +9dbd62725d59ac2b05fb7b233c7392fc2701c97c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/System.Security.dll.REMOVED.git-id index 70b41aa741..cd8eb5648b 100644 --- a/mcs/class/lib/monolite-linux/1051000001/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -ade40d1fab96b3435c4dde44ea9e11bf697460d0 \ No newline at end of file +155d65127d43b1f2e787e1c95de7098297585a65 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/System.Xml.dll.REMOVED.git-id index c2274c0270..784dca5eaf 100644 --- a/mcs/class/lib/monolite-linux/1051000001/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -b9a167340545a1ef4092db9539ebc85dae3a2430 \ No newline at end of file +7934a0f5c354efc029c3deca559be7d379278ae7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/mcs.exe.REMOVED.git-id index 501cc38240..9ad25097c0 100644 --- a/mcs/class/lib/monolite-linux/1051000001/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -40243be7f09fee217d4b7571bcb4919e6c75c2de \ No newline at end of file +a2d6f567f1c826b06f814cdc88138a155050fb50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000001/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000001/mscorlib.dll.REMOVED.git-id index 2be11d1095..794ec7774a 100644 --- a/mcs/class/lib/monolite-linux/1051000001/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000001/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1472389e53b7376dce7e6d0a8cbbe98df0866fef \ No newline at end of file +e66da28062c88338d362b64caa5b9844cceac6c6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/Mono.Security.dll.REMOVED.git-id index 71214bec84..8c03f2c6a2 100644 --- a/mcs/class/lib/monolite-win32/1051000001/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -6a12bbf6b6b494794344c6f5dbe585de0e5c4e9a \ No newline at end of file +f46637fe7b50026e71c6ce268ea9f06072f1427c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/System.Configuration.dll.REMOVED.git-id index 9da941e2c7..9bad1b0204 100644 --- a/mcs/class/lib/monolite-win32/1051000001/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -ab9de6de6fdf886eee4177e261571f49ac7d95d4 \ No newline at end of file +09a0bbd139544d6660f459487cd7b64444fa0110 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/System.Numerics.dll.REMOVED.git-id index 6540c5c1e9..a6948a1980 100644 --- a/mcs/class/lib/monolite-win32/1051000001/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -12e34db1e270c4a5878c1fa53d0d867bea22606a \ No newline at end of file +9dbd62725d59ac2b05fb7b233c7392fc2701c97c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/System.Security.dll.REMOVED.git-id index 70b41aa741..cd8eb5648b 100644 --- a/mcs/class/lib/monolite-win32/1051000001/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -ade40d1fab96b3435c4dde44ea9e11bf697460d0 \ No newline at end of file +155d65127d43b1f2e787e1c95de7098297585a65 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/System.Xml.dll.REMOVED.git-id index c2274c0270..784dca5eaf 100644 --- a/mcs/class/lib/monolite-win32/1051000001/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -b9a167340545a1ef4092db9539ebc85dae3a2430 \ No newline at end of file +7934a0f5c354efc029c3deca559be7d379278ae7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/mcs.exe.REMOVED.git-id index 501cc38240..9ad25097c0 100644 --- a/mcs/class/lib/monolite-win32/1051000001/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -40243be7f09fee217d4b7571bcb4919e6c75c2de \ No newline at end of file +a2d6f567f1c826b06f814cdc88138a155050fb50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000001/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000001/mscorlib.dll.REMOVED.git-id index 2be11d1095..794ec7774a 100644 --- a/mcs/class/lib/monolite-win32/1051000001/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000001/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1472389e53b7376dce7e6d0a8cbbe98df0866fef \ No newline at end of file +e66da28062c88338d362b64caa5b9844cceac6c6 \ No newline at end of file diff --git a/mcs/errors/cs1644-59.cs b/mcs/errors/cs1644-59.cs new file mode 100644 index 0000000000..2f8aed6b95 --- /dev/null +++ b/mcs/errors/cs1644-59.cs @@ -0,0 +1,13 @@ +// CS1644: Feature `readonly references' cannot be used because it is not part of the C# 7.0 language specification +// Line: 9 +// Compiler options: -langversion:7 + +class X +{ + int i; + + ref readonly int Test () + { + return ref i; + } +} diff --git a/mcs/mcs/cs-parser.jay.REMOVED.git-id b/mcs/mcs/cs-parser.jay.REMOVED.git-id index 65e97dae30..bf180782e1 100644 --- a/mcs/mcs/cs-parser.jay.REMOVED.git-id +++ b/mcs/mcs/cs-parser.jay.REMOVED.git-id @@ -1 +1 @@ -b27caaa0982fd67a1d7894558a1ad7e1bc5164da \ No newline at end of file +4d6fcb44c0d9390b15f0449683dd69fb56c10390 \ No newline at end of file diff --git a/mcs/mcs/delegate.cs b/mcs/mcs/delegate.cs index f3772e7cd8..52cee8f345 100644 --- a/mcs/mcs/delegate.cs +++ b/mcs/mcs/delegate.cs @@ -338,6 +338,8 @@ namespace Mono.CSharp { Module.PredefinedAttributes.Dynamic.EmitAttribute (CreateReturnBuilder ().Builder); } else if (rtype.HasDynamicElement) { Module.PredefinedAttributes.Dynamic.EmitAttribute (CreateReturnBuilder ().Builder, rtype, Location); + } else if (rtype is ReadOnlyReferenceContainer) { + Module.PredefinedAttributes.IsReadOnly.EmitAttribute (CreateReturnBuilder ().Builder); } if (rtype.HasNamedTupleElement) { diff --git a/mcs/mcs/expression.cs.REMOVED.git-id b/mcs/mcs/expression.cs.REMOVED.git-id index 6096802326..e25fd53186 100644 --- a/mcs/mcs/expression.cs.REMOVED.git-id +++ b/mcs/mcs/expression.cs.REMOVED.git-id @@ -1 +1 @@ -cf27d94416e563d7cd096b31566b356ef3f05640 \ No newline at end of file +51f268737c01310008f6ef3be4705ffc0373b7ed \ No newline at end of file diff --git a/mcs/mcs/method.cs b/mcs/mcs/method.cs index 7b9bc5b581..7a10191ba7 100644 --- a/mcs/mcs/method.cs +++ b/mcs/mcs/method.cs @@ -720,6 +720,8 @@ namespace Mono.CSharp { Module.PredefinedAttributes.Dynamic.EmitAttribute (CreateReturnBuilder ().Builder); } else if (ReturnType.HasDynamicElement) { Module.PredefinedAttributes.Dynamic.EmitAttribute (CreateReturnBuilder ().Builder, ReturnType, Location); + } else if (ReturnType is ReadOnlyReferenceContainer) { + Module.PredefinedAttributes.IsReadOnly.EmitAttribute (CreateReturnBuilder ().Builder); } if (ReturnType.HasNamedTupleElement) { @@ -2466,6 +2468,8 @@ namespace Mono.CSharp { Module.PredefinedAttributes.Dynamic.EmitAttribute (CreateReturnBuilder ().Builder); } else if (ReturnType.HasDynamicElement) { Module.PredefinedAttributes.Dynamic.EmitAttribute (CreateReturnBuilder ().Builder, ReturnType, Location); + } else if (ReturnType is ReadOnlyReferenceContainer) { + Module.PredefinedAttributes.IsReadOnly.EmitAttribute (CreateReturnBuilder ().Builder); } if (ReturnType.HasNamedTupleElement) { diff --git a/mcs/mcs/module.cs b/mcs/mcs/module.cs index 00afac6c60..2293d825b3 100644 --- a/mcs/mcs/module.cs +++ b/mcs/mcs/module.cs @@ -265,6 +265,7 @@ namespace Mono.CSharp readonly Dictionary array_types; readonly Dictionary pointer_types; readonly Dictionary reference_types; + readonly Dictionary readonly_reference_types; readonly Dictionary attrs_cache; readonly Dictionary awaiters; readonly Dictionary type_info_cache; @@ -301,6 +302,7 @@ namespace Mono.CSharp array_types = new Dictionary (); pointer_types = new Dictionary (); reference_types = new Dictionary (); + readonly_reference_types = new Dictionary (); attrs_cache = new Dictionary (); awaiters = new Dictionary (); type_info_cache = new Dictionary (); @@ -427,6 +429,12 @@ namespace Mono.CSharp } } + internal Dictionary ReadonlyReferenceTypesCache { + get { + return readonly_reference_types; + } + } + internal Dictionary TypeInfoCache { get { return type_info_cache; diff --git a/mcs/mcs/statement.cs.REMOVED.git-id b/mcs/mcs/statement.cs.REMOVED.git-id index ae1a1036cc..95a3f2795f 100644 --- a/mcs/mcs/statement.cs.REMOVED.git-id +++ b/mcs/mcs/statement.cs.REMOVED.git-id @@ -1 +1 @@ -78cc7661ddc8331cbf6788617ee8e450077108dc \ No newline at end of file +6f86db260bf6516fe48fce41e5197b299a5cfc88 \ No newline at end of file diff --git a/mcs/mcs/typespec.cs b/mcs/mcs/typespec.cs index 5b47547ca9..b01ad6ebcd 100644 --- a/mcs/mcs/typespec.cs +++ b/mcs/mcs/typespec.cs @@ -2023,7 +2023,7 @@ namespace Mono.CSharp [System.Diagnostics.DebuggerDisplay("{DisplayDebugInfo()}")] class ReferenceContainer : ElementTypeSpec { - ReferenceContainer (TypeSpec element) + protected ReferenceContainer (TypeSpec element) : base (MemberKind.ByRef, element, null) { cache = null; @@ -2074,6 +2074,34 @@ namespace Mono.CSharp } } + [System.Diagnostics.DebuggerDisplay ("{DisplayDebugInfo()}")] + class ReadOnlyReferenceContainer : ReferenceContainer + { + public ReadOnlyReferenceContainer (TypeSpec element) + : base (element) + { + } + + string DisplayDebugInfo () + { + return "ref readonly " + GetSignatureForError (); + } + + public new static ReferenceContainer MakeType (ModuleContainer module, TypeSpec element) + { + if (element.Kind == MemberKind.ByRef) + throw new ArgumentException (); + + ReadOnlyReferenceContainer pc; + if (!module.ReadonlyReferenceTypesCache.TryGetValue (element, out pc)) { + pc = new ReadOnlyReferenceContainer (element); + module.ReadonlyReferenceTypesCache.Add (element, pc); + } + + return pc; + } + } + class PointerContainer : ElementTypeSpec { private PointerContainer (TypeSpec element) diff --git a/mcs/tests/test-readonly-02.cs b/mcs/tests/test-readonly-02.cs new file mode 100644 index 0000000000..231b8cd8fd --- /dev/null +++ b/mcs/tests/test-readonly-02.cs @@ -0,0 +1,27 @@ +// Compiler options: -langversion:latest +using System; + +public delegate ref readonly int D (int x); + +class X +{ + public static void Main () + { + + } + + Guid g; + + ref readonly Guid TestMethod () + { + return ref g; + } + + ref readonly Guid TestProp { + get { + ref readonly var rg = ref g; + return ref rg; + } + } + +} \ No newline at end of file diff --git a/mcs/tests/ver-il-net_4_x.xml.REMOVED.git-id b/mcs/tests/ver-il-net_4_x.xml.REMOVED.git-id index 9db18b7cbf..048ecf456f 100644 --- a/mcs/tests/ver-il-net_4_x.xml.REMOVED.git-id +++ b/mcs/tests/ver-il-net_4_x.xml.REMOVED.git-id @@ -1 +1 @@ -53b3539833656acb93be1ac56ce37dd74ae46aea \ No newline at end of file +4e488c37bc46fed416be09476a01fed86a94ba5e \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index d97e1befc0..f2c30586e5 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/f9011ff" +#define FULL_VERSION "explicit/94fa6e5" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index ab5e2c685a008cdd4d57cd3b74c8803359737206..ad6891d713797c680eb6aa040d2c3dfc0f78dcb1 100644 GIT binary patch delta 21 ccmbQIHBW296D|&80|i41D^v5$Z@7%O08m&4t^fc4 delta 21 ccmbQIHBW296D|%TO9ev\n" "Language-Team: LANGUAGE \n" @@ -236,7 +236,7 @@ msgstr "" msgid "Cannot link resource file when building a module" msgstr "" -#: mcs/mcs/assembly.cs:861 mcs/mcs/module.cs:752 +#: mcs/mcs/assembly.cs:861 mcs/mcs/module.cs:760 #, csharp-format msgid "Error reading resource file `{0}'" msgstr "" @@ -1243,56 +1243,56 @@ msgid "" "delegate `{1}'" msgstr "" -#: mcs/mcs/delegate.cs:567 +#: mcs/mcs/delegate.cs:569 #, csharp-format msgid "" "Cannot create delegate from method `{0}' because it is a member of System." "Nullable type" msgstr "" -#: mcs/mcs/delegate.cs:580 +#: mcs/mcs/delegate.cs:582 #, csharp-format msgid "" "Extension method `{0}' of value type `{1}' cannot be used to create delegates" msgstr "" -#: mcs/mcs/delegate.cs:597 +#: mcs/mcs/delegate.cs:599 #, csharp-format msgid "Cannot create delegate from partial method declaration `{0}'" msgstr "" -#: mcs/mcs/delegate.cs:600 +#: mcs/mcs/delegate.cs:602 #, csharp-format msgid "" "Cannot create delegate with `{0}' because it has a Conditional attribute" msgstr "" -#: mcs/mcs/delegate.cs:657 +#: mcs/mcs/delegate.cs:659 #, csharp-format msgid "" "A method or delegate `{0} {1}' parameters and return type must be same as " "delegate `{2} {3}' parameters and return type" msgstr "" -#: mcs/mcs/delegate.cs:664 +#: mcs/mcs/delegate.cs:666 #, csharp-format msgid "" "A method or delegate `{0}' parameters do not match delegate `{1}' parameters" msgstr "" -#: mcs/mcs/delegate.cs:670 +#: mcs/mcs/delegate.cs:672 #, csharp-format msgid "By reference return delegate does not match `{0}' return type" msgstr "" -#: mcs/mcs/delegate.cs:675 +#: mcs/mcs/delegate.cs:677 #, csharp-format msgid "" "A method or delegate `{0} {1}' return type does not match delegate `{2} {3}' " "return type" msgstr "" -#: mcs/mcs/delegate.cs:852 +#: mcs/mcs/delegate.cs:854 msgid "Method name expected" msgstr "" @@ -1428,8 +1428,8 @@ msgstr "" msgid "Internal compiler error: {0}" msgstr "" -#: mcs/mcs/ecore.cs:605 mcs/mcs/expression.cs:1932 mcs/mcs/expression.cs:8146 -#: mcs/mcs/expression.cs:8154 +#: mcs/mcs/ecore.cs:605 mcs/mcs/expression.cs:1932 mcs/mcs/expression.cs:8148 +#: mcs/mcs/expression.cs:8156 msgid "A constant value is expected" msgstr "" @@ -2090,182 +2090,182 @@ msgstr "" msgid "Cannot use uninitialized variable `{0}'" msgstr "" -#: mcs/mcs/expression.cs:6972 +#: mcs/mcs/expression.cs:6974 #, csharp-format msgid "" "Parameter `{0}' cannot be used inside `{1}' when using `ref' or `out' " "modifier" msgstr "" -#: mcs/mcs/expression.cs:7042 +#: mcs/mcs/expression.cs:7044 #, csharp-format msgid "Use of unassigned out parameter `{0}'" msgstr "" -#: mcs/mcs/expression.cs:7215 +#: mcs/mcs/expression.cs:7217 msgid "The syntax `var (...)' as an lvalue is reserved" msgstr "" -#: mcs/mcs/expression.cs:7296 +#: mcs/mcs/expression.cs:7298 #, csharp-format msgid "Cannot invoke a non-delegate type `{0}'" msgstr "" -#: mcs/mcs/expression.cs:7307 +#: mcs/mcs/expression.cs:7309 #, csharp-format msgid "The member `{0}' cannot be used as method or delegate" msgstr "" -#: mcs/mcs/expression.cs:7329 +#: mcs/mcs/expression.cs:7331 msgid "" "Do not directly call your base class Finalize method. It is called " "automatically from your destructor" msgstr "" -#: mcs/mcs/expression.cs:7331 +#: mcs/mcs/expression.cs:7333 msgid "" "Destructors and object.Finalize cannot be called directly. Consider calling " "IDisposable.Dispose if available" msgstr "" -#: mcs/mcs/expression.cs:7364 +#: mcs/mcs/expression.cs:7366 #, csharp-format msgid "" "The base call to method `{0}' cannot be dynamically dispatched. Consider " "casting the dynamic arguments or eliminating the base access" msgstr "" -#: mcs/mcs/expression.cs:7459 +#: mcs/mcs/expression.cs:7461 #, csharp-format msgid "`{0}': cannot explicitly call operator or accessor" msgstr "" -#: mcs/mcs/expression.cs:7650 +#: mcs/mcs/expression.cs:7652 msgid "" "Tuple type cannot be used in an object creation expression. Use a tuple " "literal expression instead." msgstr "" -#: mcs/mcs/expression.cs:7660 +#: mcs/mcs/expression.cs:7662 #, csharp-format msgid "Unsafe type `{0}' cannot be used in an object creation expression" msgstr "" -#: mcs/mcs/expression.cs:7683 +#: mcs/mcs/expression.cs:7685 #, csharp-format msgid "" "Cannot create an instance of the variable type `{0}' because it does not " "have the new() constraint" msgstr "" -#: mcs/mcs/expression.cs:7689 +#: mcs/mcs/expression.cs:7691 #, csharp-format msgid "" "`{0}': cannot provide arguments when creating an instance of a variable type" msgstr "" -#: mcs/mcs/expression.cs:7698 +#: mcs/mcs/expression.cs:7700 #, csharp-format msgid "Cannot create an instance of the static class `{0}'" msgstr "" -#: mcs/mcs/expression.cs:7710 +#: mcs/mcs/expression.cs:7712 #, csharp-format msgid "Cannot create an instance of the abstract class or interface `{0}'" msgstr "" -#: mcs/mcs/expression.cs:7995 +#: mcs/mcs/expression.cs:7997 msgid "" "An implicitly typed local variable declarator cannot use an array initializer" msgstr "" -#: mcs/mcs/expression.cs:8160 mcs/mcs/expression.cs:8185 +#: mcs/mcs/expression.cs:8162 mcs/mcs/expression.cs:8187 #, csharp-format msgid "An array initializer of length `{0}' was expected" msgstr "" -#: mcs/mcs/expression.cs:8176 +#: mcs/mcs/expression.cs:8178 msgid "" "Array initializers can only be used in a variable or field initializer. Try " "using a new expression instead" msgstr "" -#: mcs/mcs/expression.cs:8193 +#: mcs/mcs/expression.cs:8195 msgid "A nested array initializer was expected" msgstr "" -#: mcs/mcs/expression.cs:8240 +#: mcs/mcs/expression.cs:8242 msgid "An expression tree cannot contain a multidimensional array initializer" msgstr "" -#: mcs/mcs/expression.cs:8276 +#: mcs/mcs/expression.cs:8278 msgid "Cannot create an array with a negative size" msgstr "" -#: mcs/mcs/expression.cs:8378 +#: mcs/mcs/expression.cs:8380 msgid "" "Can only use array initializer expressions to assign to array types. Try " "using a new expression instead" msgstr "" -#: mcs/mcs/expression.cs:8819 +#: mcs/mcs/expression.cs:8821 msgid "" "The type of an implicitly typed array cannot be inferred from the " "initializer. Try specifying array type explicitly" msgstr "" -#: mcs/mcs/expression.cs:8974 +#: mcs/mcs/expression.cs:8976 msgid "" "The `this' object cannot be used before all of its fields are assigned to" msgstr "" -#: mcs/mcs/expression.cs:8980 +#: mcs/mcs/expression.cs:8982 msgid "" "Keyword `this' is not valid in a static property, static method, or static " "field initializer" msgstr "" -#: mcs/mcs/expression.cs:8983 +#: mcs/mcs/expression.cs:8985 msgid "" "Anonymous methods inside structs cannot access instance members of `this'. " "Consider copying `this' to a local variable outside the anonymous method and " "using the local instead" msgstr "" -#: mcs/mcs/expression.cs:8986 +#: mcs/mcs/expression.cs:8988 msgid "Keyword `this' is not available in the current context" msgstr "" -#: mcs/mcs/expression.cs:9062 +#: mcs/mcs/expression.cs:9064 msgid "Cannot take the address of `this' because it is read-only" msgstr "" -#: mcs/mcs/expression.cs:9064 +#: mcs/mcs/expression.cs:9066 msgid "Cannot pass `this' as a ref or out argument because it is read-only" msgstr "" -#: mcs/mcs/expression.cs:9066 +#: mcs/mcs/expression.cs:9068 msgid "Cannot assign to `this' because it is read-only" msgstr "" -#: mcs/mcs/expression.cs:9134 +#: mcs/mcs/expression.cs:9136 msgid "The __arglist construct is valid only within a variable argument method" msgstr "" -#: mcs/mcs/expression.cs:9195 +#: mcs/mcs/expression.cs:9197 msgid "An expression tree cannot contain a method with variable arguments" msgstr "" -#: mcs/mcs/expression.cs:9469 +#: mcs/mcs/expression.cs:9471 msgid "The typeof operator cannot be used on the dynamic type" msgstr "" -#: mcs/mcs/expression.cs:9510 +#: mcs/mcs/expression.cs:9512 #, csharp-format msgid "`{0}': an attribute argument cannot use type parameters" msgstr "" -#: mcs/mcs/expression.cs:9725 +#: mcs/mcs/expression.cs:9727 #, csharp-format msgid "" "`{0}' does not have a predefined size, therefore sizeof can only be used in " @@ -2273,203 +2273,203 @@ msgid "" "SizeOf)" msgstr "" -#: mcs/mcs/expression.cs:9790 +#: mcs/mcs/expression.cs:9792 #, csharp-format msgid "Alias `{0}' not found" msgstr "" -#: mcs/mcs/expression.cs:9831 +#: mcs/mcs/expression.cs:9833 msgid "" "The namespace alias qualifier `::' cannot be used to invoke a method. " "Consider using `.' instead" msgstr "" -#: mcs/mcs/expression.cs:9921 +#: mcs/mcs/expression.cs:9923 msgid "Cannot perform member binding on `null' value" msgstr "" -#: mcs/mcs/expression.cs:10088 +#: mcs/mcs/expression.cs:10090 #, csharp-format msgid "" "`{0}': cannot reference a type through an expression. Consider using `{1}' " "instead" msgstr "" -#: mcs/mcs/expression.cs:10167 +#: mcs/mcs/expression.cs:10169 #, csharp-format msgid "A nested type cannot be specified through a type parameter `{0}'" msgstr "" -#: mcs/mcs/expression.cs:10175 +#: mcs/mcs/expression.cs:10177 #, csharp-format msgid "" "Alias `{0}' cannot be used with `::' since it denotes a type. Consider " "replacing `::' with `.'" msgstr "" -#: mcs/mcs/expression.cs:10244 +#: mcs/mcs/expression.cs:10246 #, csharp-format msgid "The nested type `{0}' does not exist in the type `{1}'" msgstr "" -#: mcs/mcs/expression.cs:10268 +#: mcs/mcs/expression.cs:10270 #, csharp-format msgid "" "Type `{0}' does not contain a definition for `{1}' and no extension method " "`{1}' of type `{0}' could be found. Are you missing {2}?" msgstr "" -#: mcs/mcs/expression.cs:10560 +#: mcs/mcs/expression.cs:10562 #, csharp-format msgid "Cannot apply indexing with [] to an expression of type `{0}'" msgstr "" -#: mcs/mcs/expression.cs:10697 +#: mcs/mcs/expression.cs:10699 #, csharp-format msgid "Wrong number of indexes `{0}' inside [], expected `{1}'" msgstr "" -#: mcs/mcs/expression.cs:11135 +#: mcs/mcs/expression.cs:11137 msgid "" "The indexer base access cannot be dynamically dispatched. Consider casting " "the dynamic arguments or eliminating the base access" msgstr "" -#: mcs/mcs/expression.cs:11234 +#: mcs/mcs/expression.cs:11236 msgid "An expression tree may not contain a base access" msgstr "" -#: mcs/mcs/expression.cs:11252 +#: mcs/mcs/expression.cs:11254 msgid "Keyword `base' is not available in a static method" msgstr "" -#: mcs/mcs/expression.cs:11254 +#: mcs/mcs/expression.cs:11256 msgid "Keyword `base' is not available in the current context" msgstr "" -#: mcs/mcs/expression.cs:11292 +#: mcs/mcs/expression.cs:11294 msgid "" "A property, indexer or dynamic member access may not be passed as `ref' or " "`out' parameter" msgstr "" -#: mcs/mcs/expression.cs:11641 +#: mcs/mcs/expression.cs:11643 #, csharp-format msgid "Array elements cannot be of type `{0}'" msgstr "" -#: mcs/mcs/expression.cs:11644 +#: mcs/mcs/expression.cs:11646 #, csharp-format msgid "Array elements cannot be of static type `{0}'" msgstr "" -#: mcs/mcs/expression.cs:11853 +#: mcs/mcs/expression.cs:11865 msgid "Cannot use a negative size with stackalloc" msgstr "" -#: mcs/mcs/expression.cs:11857 +#: mcs/mcs/expression.cs:11869 msgid "Cannot use stackalloc in finally or catch" msgstr "" -#: mcs/mcs/expression.cs:12016 +#: mcs/mcs/expression.cs:12028 #, csharp-format msgid "" "Member `{0}' cannot be initialized. An object initializer may only be used " "for fields, or properties" msgstr "" -#: mcs/mcs/expression.cs:12024 +#: mcs/mcs/expression.cs:12036 #, csharp-format msgid "" "Static field or property `{0}' cannot be assigned in an object initializer" msgstr "" -#: mcs/mcs/expression.cs:12095 +#: mcs/mcs/expression.cs:12107 msgid "" "An expression tree cannot contain a collection initializer with extension " "method" msgstr "" -#: mcs/mcs/expression.cs:12133 +#: mcs/mcs/expression.cs:12145 msgid "Expression tree cannot contain a dictionary initializer" msgstr "" -#: mcs/mcs/expression.cs:12258 +#: mcs/mcs/expression.cs:12270 #, csharp-format msgid "" "A field or property `{0}' cannot be initialized with a collection object " "initializer because type `{1}' does not implement `{2}' interface" msgstr "" -#: mcs/mcs/expression.cs:12269 +#: mcs/mcs/expression.cs:12281 #, csharp-format msgid "Inconsistent `{0}' member declaration" msgstr "" -#: mcs/mcs/expression.cs:12277 +#: mcs/mcs/expression.cs:12289 #, csharp-format msgid "" "An object initializer includes more than one member `{0}' initialization" msgstr "" -#: mcs/mcs/expression.cs:12295 +#: mcs/mcs/expression.cs:12307 #, csharp-format msgid "Cannot initialize object of type `{0}' with a collection initializer" msgstr "" -#: mcs/mcs/expression.cs:12440 +#: mcs/mcs/expression.cs:12452 msgid "" "Object and collection initializers cannot be used to instantiate a delegate" msgstr "" -#: mcs/mcs/expression.cs:12659 +#: mcs/mcs/expression.cs:12671 msgid "Anonymous types cannot be used in this expression" msgstr "" -#: mcs/mcs/expression.cs:12753 +#: mcs/mcs/expression.cs:12765 #, csharp-format msgid "An anonymous type property `{0}' cannot be initialized with `{1}'" msgstr "" -#: mcs/mcs/expression.cs:12993 +#: mcs/mcs/expression.cs:13005 msgid "An expression tree cannot not contain a throw expression" msgstr "" -#: mcs/mcs/expression.cs:13064 +#: mcs/mcs/expression.cs:13076 msgid "" "An expression cannot be used in this context because it may not be returned " "by reference" msgstr "" -#: mcs/mcs/expression.cs:13089 +#: mcs/mcs/expression.cs:13101 #, csharp-format msgid "" "The expression must be of type `{0}' because it is being assigned by " "reference" msgstr "" -#: mcs/mcs/expression.cs:13121 +#: mcs/mcs/expression.cs:13133 msgid "" "An expression tree lambda cannot contain a call to a method, property, or " "indexer that returns by reference" msgstr "" -#: mcs/mcs/expression.cs:13166 +#: mcs/mcs/expression.cs:13178 #, csharp-format msgid "" "`await' cannot be used in an expression containing a call to `{0}' because " "it returns by reference" msgstr "" -#: mcs/mcs/expression.cs:13221 +#: mcs/mcs/expression.cs:13233 msgid "An expression tree cannot contain a discard" msgstr "" -#: mcs/mcs/expression.cs:13235 +#: mcs/mcs/expression.cs:13247 msgid "Cannot infer the type of implicitly-typed discard" msgstr "" -#: mcs/mcs/expression.cs:13241 +#: mcs/mcs/expression.cs:13253 msgid "Cannot assign void to a discard" msgstr "" @@ -2978,64 +2978,64 @@ msgstr "" msgid "`{0}': A partial method parameters cannot use `out' modifier" msgstr "" -#: mcs/mcs/method.cs:767 +#: mcs/mcs/method.cs:769 #, csharp-format msgid "" "Conditional not valid on `{0}' because it is a constructor, destructor, " "operator or explicit interface implementation" msgstr "" -#: mcs/mcs/method.cs:773 +#: mcs/mcs/method.cs:775 #, csharp-format msgid "The return type of `{0}' is not allowed" msgstr "" -#: mcs/mcs/method.cs:944 +#: mcs/mcs/method.cs:946 msgid "" "A partial method cannot define access modifier or any of abstract, extern, " "new, override, sealed, or virtual modifiers" msgstr "" -#: mcs/mcs/method.cs:950 +#: mcs/mcs/method.cs:952 msgid "" "A partial method must be declared within a partial class or partial struct" msgstr "" -#: mcs/mcs/method.cs:955 +#: mcs/mcs/method.cs:957 #, csharp-format msgid "`{0}': Extension methods must be declared static" msgstr "" -#: mcs/mcs/method.cs:971 +#: mcs/mcs/method.cs:973 #, csharp-format msgid "Program `{0}' has more than one entry point defined: `{1}'" msgstr "" -#: mcs/mcs/method.cs:1014 +#: mcs/mcs/method.cs:1016 #, csharp-format msgid "Conditional not valid on `{0}' because it is an override method" msgstr "" -#: mcs/mcs/method.cs:1019 +#: mcs/mcs/method.cs:1021 #, csharp-format msgid "Conditional not valid on `{0}' because its return type is not void" msgstr "" -#: mcs/mcs/method.cs:1024 +#: mcs/mcs/method.cs:1026 msgid "Conditional not valid on interface members" msgstr "" -#: mcs/mcs/method.cs:1030 +#: mcs/mcs/method.cs:1032 #, csharp-format msgid "Conditional member `{0}' cannot implement interface member `{1}'" msgstr "" -#: mcs/mcs/method.cs:1037 +#: mcs/mcs/method.cs:1039 #, csharp-format msgid "Conditional method `{0}' cannot have an out parameter" msgstr "" -#: mcs/mcs/method.cs:1219 +#: mcs/mcs/method.cs:1221 #, csharp-format msgid "" "The constraints for type parameter `{0}' of method `{1}' must match the " @@ -3043,16 +3043,16 @@ msgid "" "using an explicit interface implementation instead" msgstr "" -#: mcs/mcs/method.cs:1269 +#: mcs/mcs/method.cs:1271 msgid "The return type of an async method must be void, Task, or Task" msgstr "" -#: mcs/mcs/method.cs:1286 +#: mcs/mcs/method.cs:1288 #, csharp-format msgid "`{0}': Extension methods cannot be defined in a nested class" msgstr "" -#: mcs/mcs/method.cs:1292 +#: mcs/mcs/method.cs:1294 #, csharp-format msgid "" "`{0}': Extension methods require `System.Runtime.CompilerServices." @@ -3060,183 +3060,183 @@ msgid "" "reference?" msgstr "" -#: mcs/mcs/method.cs:1301 +#: mcs/mcs/method.cs:1303 #, csharp-format msgid "`{0}': Extension methods must be defined in a non-generic static class" msgstr "" -#: mcs/mcs/method.cs:1317 +#: mcs/mcs/method.cs:1319 #, csharp-format msgid "`{0}': an entry point cannot be async method" msgstr "" -#: mcs/mcs/method.cs:1373 +#: mcs/mcs/method.cs:1375 #, csharp-format msgid "" "A partial method `{0}' implementation is missing a partial method declaration" msgstr "" -#: mcs/mcs/method.cs:1497 +#: mcs/mcs/method.cs:1499 msgid "" "The constructor call cannot be dynamically dispatched within constructor " "initializer" msgstr "" -#: mcs/mcs/method.cs:1511 +#: mcs/mcs/method.cs:1513 #, csharp-format msgid "`{0}': Struct constructors cannot call base constructors" msgstr "" -#: mcs/mcs/method.cs:1520 +#: mcs/mcs/method.cs:1522 #, csharp-format msgid "Constructor `{0}' cannot call itself" msgstr "" -#: mcs/mcs/method.cs:1706 +#: mcs/mcs/method.cs:1708 #, csharp-format msgid "" "`{0}': Structs with primary constructor cannot specify default constructor " "initializer" msgstr "" -#: mcs/mcs/method.cs:1709 +#: mcs/mcs/method.cs:1711 #, csharp-format msgid "" "`{0}': Instance constructor of type with primary constructor must specify " "`this' constructor initializer" msgstr "" -#: mcs/mcs/method.cs:1715 +#: mcs/mcs/method.cs:1717 #, csharp-format msgid "`{0}': Contructors cannot be extern and have a constructor initializer" msgstr "" -#: mcs/mcs/method.cs:1750 +#: mcs/mcs/method.cs:1752 #, csharp-format msgid "" "`{0}': A class with the ComImport attribute cannot have a user-defined " "constructor" msgstr "" -#: mcs/mcs/method.cs:1998 +#: mcs/mcs/method.cs:2000 #, csharp-format msgid "`{0}' is an accessor not found in interface member `{1}{2}'" msgstr "" -#: mcs/mcs/method.cs:2004 +#: mcs/mcs/method.cs:2006 #, csharp-format msgid "" "`{0}.{1}' in explicit interface declaration is not a member of interface" msgstr "" -#: mcs/mcs/method.cs:2012 +#: mcs/mcs/method.cs:2014 #, csharp-format msgid "" "`{0}' explicit method implementation cannot implement `{1}' because it is an " "accessor" msgstr "" -#: mcs/mcs/method.cs:2022 +#: mcs/mcs/method.cs:2024 #, csharp-format msgid "Method `{0}' cannot implement interface accessor `{1}'" msgstr "" -#: mcs/mcs/method.cs:2029 +#: mcs/mcs/method.cs:2031 #, csharp-format msgid "" "Accessor `{0}' cannot implement interface member `{1}' for type `{2}'. Use " "an explicit interface implementation" msgstr "" -#: mcs/mcs/method.cs:2036 +#: mcs/mcs/method.cs:2038 #, csharp-format msgid "" "Accessor `{0}' must be declared public to implement interface member `{1}'" msgstr "" -#: mcs/mcs/method.cs:2044 mcs/mcs/method.cs:2052 +#: mcs/mcs/method.cs:2046 mcs/mcs/method.cs:2054 #, csharp-format msgid "" "The tuple element names in the signature type of member `{0}' must match the " "tuple element names of interface member `{1}''" msgstr "" -#: mcs/mcs/method.cs:2070 +#: mcs/mcs/method.cs:2072 #, csharp-format msgid "" "`{0}': the explicit interface implementation cannot introduce the params " "modifier" msgstr "" -#: mcs/mcs/method.cs:2416 +#: mcs/mcs/method.cs:2418 #, csharp-format msgid "" "Attribute `{0}' is not valid on property or event accessors. It is valid on " "`{1}' declarations only" msgstr "" -#: mcs/mcs/method.cs:2658 +#: mcs/mcs/method.cs:2662 #, csharp-format msgid "User-defined operator `{0}' must be declared static and public" msgstr "" -#: mcs/mcs/method.cs:2702 +#: mcs/mcs/method.cs:2706 msgid "" "User-defined operator cannot take an object of the enclosing type and " "convert to an object of the enclosing type" msgstr "" -#: mcs/mcs/method.cs:2713 +#: mcs/mcs/method.cs:2717 msgid "User-defined conversion must convert to or from the enclosing type" msgstr "" -#: mcs/mcs/method.cs:2719 +#: mcs/mcs/method.cs:2723 #, csharp-format msgid "" "User-defined conversion `{0}' cannot convert to or from the dynamic type" msgstr "" -#: mcs/mcs/method.cs:2726 +#: mcs/mcs/method.cs:2730 #, csharp-format msgid "" "User-defined conversion `{0}' cannot convert to or from an interface type" msgstr "" -#: mcs/mcs/method.cs:2733 +#: mcs/mcs/method.cs:2737 #, csharp-format msgid "User-defined conversion `{0}' cannot convert to or from a base class" msgstr "" -#: mcs/mcs/method.cs:2739 +#: mcs/mcs/method.cs:2743 #, csharp-format msgid "User-defined conversion `{0}' cannot convert to or from a derived class" msgstr "" -#: mcs/mcs/method.cs:2746 +#: mcs/mcs/method.cs:2750 msgid "" "Overloaded shift operator must have the type of the first operand be the " "containing type, and the type of the second operand must be int" msgstr "" -#: mcs/mcs/method.cs:2755 +#: mcs/mcs/method.cs:2759 msgid "" "The return type for ++ or -- operator must be the containing type or derived " "from the containing type" msgstr "" -#: mcs/mcs/method.cs:2760 +#: mcs/mcs/method.cs:2764 msgid "The parameter type for ++ or -- operator must be the containing type" msgstr "" -#: mcs/mcs/method.cs:2767 +#: mcs/mcs/method.cs:2771 msgid "The parameter type of a unary operator must be the containing type" msgstr "" -#: mcs/mcs/method.cs:2775 +#: mcs/mcs/method.cs:2779 msgid "The return type of operator True or False must be bool" msgstr "" -#: mcs/mcs/method.cs:2790 +#: mcs/mcs/method.cs:2794 msgid "One of the parameters of a binary operator must be the containing type" msgstr "" @@ -3611,7 +3611,7 @@ msgstr "" msgid "Cannot set the `IndexerName' attribute on an indexer marked override" msgstr "" -#: mcs/mcs/module.cs:501 +#: mcs/mcs/module.cs:509 #, csharp-format msgid "Value specified for the argument to `{0}' is not valid" msgstr "" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 703668eb383c0bc90690e12dedff7e38e73b3708..23cba20e9d447bc3bd35610b4ea435e0488c01dd 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}IgAYy3@xlo%{Qk`Wo!okb$JN3 delta 23 fcmaF1gXP%{mJP8}IgBh73@xloj5eoEWo!okb+ZV# diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 577ef4e0e9..d71406bfeb 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -b77f75d96ef033158cd1d1e10a7b3ae15ac3c526 \ No newline at end of file +a40a4e7f3a6f233e6afa13e4a33b434134da328f \ No newline at end of file