X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fcs-parser.jay;h=9550f25894bb4ac941e4e0ca82ac9f9eb372d09d;hb=968c2830f973d10a72e5d2907c42744331116299;hp=587379855bddd982932b279f01b20bc1b95ab17e;hpb=f3864951f7ee66532b2a0e637f42583011ebe852;p=mono.git

diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index 587379855bd..9550f25894b 100755
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -3037,7 +3037,7 @@ switch_sections
 switch_section
 	: switch_labels
 	  {
-		current_block = new Block (current_block, lexer.Location, lexer.Location);
+		current_block = current_block.CreateSwitchBlock (lexer.Location);
 	  }
  	  statement_list 
 	  {
@@ -3128,7 +3128,7 @@ for_statement
 
 			foreach (VariableDeclaration decl in var_declarators){
 
-				VariableInfo vi;
+				LocalInfo vi;
 
 				vi = current_block.AddVariable (
 					type, decl.identifier, current_local_parameters, decl.Location);
@@ -3235,7 +3235,7 @@ foreach_statement
 		Block foreach_block = new Block (current_block, Block.Flags.Implicit);
 		LocalVariableReference v = null;
 		Location l = lexer.Location;
-		VariableInfo vi;
+		LocalInfo vi;
 
 		vi = foreach_block.AddVariable ((Expression) $3, (string) $4, current_local_parameters, l);
 		if (vi != null) {
@@ -3512,7 +3512,7 @@ fixed_statement
 
 		for (int i = 0; i < top; i++){
 			Pair p = (Pair) list [i];
-			VariableInfo v;
+			LocalInfo v;
 
 			v = current_block.AddVariable (type, (string) p.First,current_local_parameters, l);
 			if (v == null)
@@ -3589,7 +3589,7 @@ using_statement
 
 			foreach (VariableDeclaration decl in var_declarators){
 
-				VariableInfo vi	= current_block.AddVariable (
+				LocalInfo vi	= current_block.AddVariable (
 					type, decl.identifier, 
 					current_local_parameters, decl.Location);
 				if (vi == null)