X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fsettings.cs;h=9ba66c1613e6e861e7b548e13cddf1e5ab0bd741;hb=dacc3f8c5d4331f7a40413f3a802ec4049da1e2e;hp=01c37873ecd60872cbc71cd8b3e707d17be34189;hpb=bc1d754ec15285422b73d40d86cc85ddbd37ce16;p=mono.git

diff --git a/mcs/mcs/settings.cs b/mcs/mcs/settings.cs
index 01c37873ecd..9ba66c1613e 100644
--- a/mcs/mcs/settings.cs
+++ b/mcs/mcs/settings.cs
@@ -28,9 +28,10 @@ namespace Mono.CSharp {
 		V_3 = 3,
 		V_4 = 4,
 		V_5 = 5,
-		Future = 100,
+		V_6 = 6,
+		Experimental = 100,
 
-		Default = LanguageVersion.V_5,
+		Default = LanguageVersion.V_6,
 	}
 
 	public enum RuntimeVersion
@@ -160,6 +161,8 @@ namespace Mono.CSharp {
 
 		public RuntimeVersion StdLibRuntimeVersion;
 
+		public string RuntimeMetadataVersion;
+
 		public bool WriteMetadataOnly;
 
 		readonly List<string> conditional_symbols;
@@ -1134,11 +1137,13 @@ namespace Mono.CSharp {
 
 				switch (value.ToLowerInvariant ()) {
 				case "iso-1":
+				case "1":
 					settings.Version = LanguageVersion.ISO_1;
 					return ParseResult.Success;
 				case "default":
 					settings.Version = LanguageVersion.Default;
 					return ParseResult.Success;
+				case "2":
 				case "iso-2":
 					settings.Version = LanguageVersion.ISO_2;
 					return ParseResult.Success;
@@ -1151,12 +1156,18 @@ namespace Mono.CSharp {
 				case "5":
 					settings.Version = LanguageVersion.V_5;
 					return ParseResult.Success;
-				case "future":
-					settings.Version = LanguageVersion.Future;
+				case "6":
+					settings.Version = LanguageVersion.V_6;
+					return ParseResult.Success;
+				case "experimental":
+					settings.Version = LanguageVersion.Experimental;
 					return ParseResult.Success;
+				case "future":
+					report.Warning (8000, 1, "Language version `future' is no longer supported");
+					goto case "6";
 				}
 
-				report.Error (1617, "Invalid -langversion option `{0}'. It must be `ISO-1', `ISO-2', `3', `4', `5', `Default' or `Future'", value);
+				report.Error (1617, "Invalid -langversion option `{0}'. It must be `ISO-1', `ISO-2', Default or value in range 1 to 6", value);
 				return ParseResult.Error;
 
 			case "/codepage":
@@ -1182,6 +1193,15 @@ namespace Mono.CSharp {
 				}
 				return ParseResult.Success;
 
+			case "runtimemetadataversion":
+				if (value.Length == 0) {
+					Error_RequiresArgument (option);
+					return ParseResult.Error;
+				}
+
+				settings.RuntimeMetadataVersion = value;
+				return ParseResult.Success;
+
 			default:
 				return ParseResult.UnknownOption;
 			}