From 522d0276630d843944e57522f96e2613913452cd Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Wed, 7 Jun 2017 18:00:00 +0200
Subject: [PATCH] [mcs] Better detection of null operator inside conditional
 expression. Fixes #57232

---
 mcs/mcs/cs-tokenizer.cs      | 3 ++-
 mcs/tests/gtest-409.cs       | 5 +++++
 mcs/tests/ver-il-net_4_x.xml | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mcs/mcs/cs-tokenizer.cs b/mcs/mcs/cs-tokenizer.cs
index 505173cb4f9..1be3309b1bf 100644
--- a/mcs/mcs/cs-tokenizer.cs
+++ b/mcs/mcs/cs-tokenizer.cs
@@ -1325,7 +1325,8 @@ namespace Mono.CSharp
 			}
 
 			if (d == '.') {
-				return Token.INTERR_OPERATOR;
+				d = reader.Peek ();
+				return d >= '0' && d <= '9' ? Token.INTERR : Token.INTERR_OPERATOR;
 			}
 
 			if (d != ' ') {
diff --git a/mcs/tests/gtest-409.cs b/mcs/tests/gtest-409.cs
index d8fee033830..8db59d7e48d 100644
--- a/mcs/tests/gtest-409.cs
+++ b/mcs/tests/gtest-409.cs
@@ -170,6 +170,11 @@ public class ConditionalParsing
 		var t = (Int32)sbyte.MaxValue;
 	}
 
+	void Test_22 (bool args)
+	{
+		var x = args ?.2f : -.2f;
+	}
+
 	static void Helper<T> (T arg)
 	{
 	}
diff --git a/mcs/tests/ver-il-net_4_x.xml b/mcs/tests/ver-il-net_4_x.xml
index e2b6cd90558..fe7d9733555 100644
--- a/mcs/tests/ver-il-net_4_x.xml
+++ b/mcs/tests/ver-il-net_4_x.xml
@@ -14651,6 +14651,9 @@
       <method name="Void Test_21()" attrs="129">
         <size>5</size>
       </method>
+      <method name="Void Test_22(Boolean)" attrs="129">
+        <size>24</size>
+      </method>
     </type>
   </test>
   <test name="gtest-410.cs">
-- 
2.25.1