From e352bea476ebc3ae07d7c584be2092a09c52a3dc Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Mon, 29 Sep 2014 11:41:16 +0200
Subject: [PATCH] vhdlpp: Support for variable declarations in subprograms.

Fixes sorrymsg: "variable_declaration not supported."
---
 vhdlpp/parse.y            | 23 +++++++++++------------
 vhdlpp/subprogram_emit.cc |  6 ++++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/vhdlpp/parse.y b/vhdlpp/parse.y
index 906395f67..0c2314b84 100644
--- a/vhdlpp/parse.y
+++ b/vhdlpp/parse.y
@@ -1813,16 +1813,7 @@ procedure_call_statement
   ;
 
 process_declarative_item
-  : K_variable identifier_list ':' subtype_indication ';'
-      { /* Save the signal declaration in the block_signals map. */
-	for (std::list<perm_string>::iterator cur = $2->begin()
-		   ; cur != $2->end() ; ++cur) {
-	      Variable*sig = new Variable(*cur, $4);
-	      FILE_NAME(sig, @1);
-	      active_scope->bind_name(*cur, sig);
-	}
-	delete $2;
-      }
+  : variable_declaration
   ;
 
 process_declarative_part
@@ -2186,6 +2177,7 @@ subprogram_body /* IEEE 1076-2008 P4.3 */
 	} else if (tmp) {
 	      errormsg(@1, "Subprogram specification for %s doesn't match specification in package header.\n", prog->name().str());
 	}
+	prog->transfer_from(*active_scope);
 	prog->set_program_body($5);
 	active_scope->bind_name(prog->name(), prog);
       }
@@ -2410,8 +2402,15 @@ variable_assignment_statement /* IEEE 1076-2008 P10.6.1 */
 
 variable_declaration /* IEEE 1076-2008 P6.4.2.4 */
   : K_shared_opt K_variable identifier_list ':' subtype_indication ';'
-      { sorrymsg(@2, "variable_declaration not supported.\n"); }
-
+      { /* Save the signal declaration in the block_signals map. */
+	for (std::list<perm_string>::iterator cur = $3->begin()
+		   ; cur != $3->end() ; ++cur) {
+	      Variable*sig = new Variable(*cur, $5);
+	      FILE_NAME(sig, @2);
+	      active_scope->bind_name(*cur, sig);
+	}
+	delete $3;
+      }
   | K_shared_opt K_variable error ';'
       { errormsg(@2, "Syntax error in variable declaration.\n");
 	yyerrok;
diff --git a/vhdlpp/subprogram_emit.cc b/vhdlpp/subprogram_emit.cc
index 402b0a4cd..70a97baba 100644
--- a/vhdlpp/subprogram_emit.cc
+++ b/vhdlpp/subprogram_emit.cc
@@ -60,6 +60,12 @@ int Subprogram::emit_package(ostream&fd) const
 
       fd << ");" << endl;
 
+      for (map<perm_string,Variable*>::const_iterator cur = new_variables_.begin()
+         ; cur != new_variables_.end() ; ++cur) {
+
+        errors += cur->second->emit(fd, NULL, NULL);
+      }
+
       if (statements_) {
 	    for (list<SequentialStmt*>::const_iterator cur = statements_->begin()
 		       ; cur != statements_->end() ; ++cur) {