From 755e37edaadd8f67cca77ca993af0b3e15baf146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Kr=C3=BCger?= <mkrueger@xamarin.com>
Date: Fri, 4 Jan 2013 13:43:21 +0100
Subject: [PATCH] Fixed try catch statement position + failing test.

---
 ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs    | 2 +-
 ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay   | 2 +-
 ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs | 2 +-
 ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs    | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
index a306d0c005..2097b3cc0b 100644
--- a/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
+++ b/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
@@ -9056,7 +9056,7 @@ void case_903()
 void case_904()
 #line 6041 "cs-parser.jay"
 {
-		yyVal = new TryFinally (new TryCatch ((Block) yyVals[-3+yyTop], (List<Catch>) yyVals[-2+yyTop], Location.Null, true), (Block) yyVals[0+yyTop], GetLocation (yyVals[-4+yyTop]));
+		yyVal = new TryFinally (new TryCatch ((Block) yyVals[-3+yyTop], (List<Catch>) yyVals[-2+yyTop], GetLocation (yyVals[-4+yyTop]), true), (Block) yyVals[0+yyTop], GetLocation (yyVals[-4+yyTop]));
 		lbag.AddStatement (yyVal, GetLocation (yyVals[-1+yyTop]));
 	  }
 
diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay b/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay
index fb348caba1..e13dbec23b 100644
--- a/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay
+++ b/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay
@@ -6039,7 +6039,7 @@ try_statement
 	  }
 	| TRY block catch_clauses FINALLY block
 	  {
-		$$ = new TryFinally (new TryCatch ((Block) $2, (List<Catch>) $3, Location.Null, true), (Block) $5, GetLocation ($1));
+		$$ = new TryFinally (new TryCatch ((Block) $2, (List<Catch>) $3, GetLocation ($1), true), (Block) $5, GetLocation ($1));
 		lbag.AddStatement ($$, GetLocation ($4));
 	  }
 	| TRY block error
diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
index 11de45c233..475d973cf6 100644
--- a/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
+++ b/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
@@ -1572,7 +1572,7 @@ namespace Mono.CSharp
 #endif
 			number_pos = 0;
 			var loc = Location;
-//			bool hasLeadingDot = c == '.';
+			bool hasLeadingDot = c == '.';
 
 			if (c >= '0' && c <= '9'){
 				if (c == '0'){
diff --git a/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs b/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs
index 6714f7c17b..5094472e72 100644
--- a/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs
+++ b/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs
@@ -2076,8 +2076,8 @@ namespace Mono.CSharp {
 		static int id;
 		public int ID = id++;
 
-//		static int clone_id_counter;
-//		int clone_id;
+		static int clone_id_counter;
+		int clone_id;
 #endif
 
 //		int assignable_slots;
@@ -2396,7 +2396,7 @@ namespace Mono.CSharp {
 		{
 			Block target = (Block) t;
 #if DEBUG
-//			target.clone_id = clone_id_counter++;
+			target.clone_id = clone_id_counter++;
 #endif
 
 			clonectx.AddBlockMap (this, target);