From 1587c08a8814f96f3baa1713a08b05c5edc89084 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
Date: Sun, 4 Mar 2007 20:56:12 +0000
Subject: [PATCH] pack all embedded stataments in blocks update
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

2007-03-04  Jürg Billeter  <j@bitron.ch>

	* vala/parser.y: pack all embedded stataments in blocks
	* vala/vala.h: update

svn path=/trunk/; revision=221
---
 vala/ChangeLog     |  5 +++++
 vala/vala/parser.y | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 vala/vala/vala.h   |  1 +
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/vala/ChangeLog b/vala/ChangeLog
index 4346b09..ffc7b84 100644
--- a/vala/ChangeLog
+++ b/vala/ChangeLog
@@ -1,5 +1,10 @@
 2007-03-04  Jürg Billeter  <j@bitron.ch>
 
+	* vala/parser.y: pack all embedded stataments in blocks
+	* vala/vala.h: update
+
+2007-03-04  Jürg Billeter  <j@bitron.ch>
+
 	* vala/valasemanticanalyzer.vala: check for inherited properties in
 	  construct formal parameters
 
diff --git a/vala/vala/parser.y b/vala/vala/parser.y
index 635fe32..57c5a78 100644
--- a/vala/vala/parser.y
+++ b/vala/vala/parser.y
@@ -1225,17 +1225,65 @@ expression
 
 statement
 	: declaration_statement
-	| embedded_statement
+	| block
+	| empty_statement
+	| expression_statement
+	| selection_statement
+	| iteration_statement
+	| jump_statement
+	| lock_statement
 	;
 
 embedded_statement
 	: block
 	| empty_statement
+	  {
+		ValaSourceReference *src = src(@1);
+		$$ = VALA_STATEMENT (vala_block_new (src));
+		vala_block_add_statement (VALA_BLOCK ($$), $1);
+		g_object_unref ($1);
+		g_object_unref (src);
+	  }
 	| expression_statement
+	  {
+		ValaSourceReference *src = src(@1);
+		$$ = VALA_STATEMENT (vala_block_new (src));
+		vala_block_add_statement (VALA_BLOCK ($$), $1);
+		g_object_unref ($1);
+		g_object_unref (src);
+	  }
 	| selection_statement
+	  {
+		ValaSourceReference *src = src(@1);
+		$$ = VALA_STATEMENT (vala_block_new (src));
+		vala_block_add_statement (VALA_BLOCK ($$), $1);
+		g_object_unref ($1);
+		g_object_unref (src);
+	  }
 	| iteration_statement
+	  {
+		ValaSourceReference *src = src(@1);
+		$$ = VALA_STATEMENT (vala_block_new (src));
+		vala_block_add_statement (VALA_BLOCK ($$), $1);
+		g_object_unref ($1);
+		g_object_unref (src);
+	  }
 	| jump_statement
+	  {
+		ValaSourceReference *src = src(@1);
+		$$ = VALA_STATEMENT (vala_block_new (src));
+		vala_block_add_statement (VALA_BLOCK ($$), $1);
+		g_object_unref ($1);
+		g_object_unref (src);
+	  }
 	| lock_statement
+	  {
+		ValaSourceReference *src = src(@1);
+		$$ = VALA_STATEMENT (vala_block_new (src));
+		vala_block_add_statement (VALA_BLOCK ($$), $1);
+		g_object_unref ($1);
+		g_object_unref (src);
+	  }
 	;
 
 block
diff --git a/vala/vala/vala.h b/vala/vala/vala.h
index b474f08..d01ecaa 100644
--- a/vala/vala/vala.h
+++ b/vala/vala/vala.h
@@ -15,6 +15,7 @@
 #include <vala/valaconstant.h>
 #include <vala/valaconstructor.h>
 #include <vala/valacontinuestatement.h>
+#include <vala/valacreationmethod.h>
 #include <vala/valadeclarationstatement.h>
 #include <vala/valadestructor.h>
 #include <vala/valadostatement.h>
-- 
2.7.4