From 2af35040cc92537fd7e43d23a0b3ea0e10d6d7a2 Mon Sep 17 00:00:00 2001
From: Pawel Szostek <pawel.szostek@cern.ch>
Date: Thu, 31 Mar 2011 15:22:55 +0200
Subject: [PATCH] Fix constructs sequence in bison file for VHDL

---
 vhdlpp/parse.y | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/vhdlpp/parse.y b/vhdlpp/parse.y
index 2cf077eaf..2ceec9511 100644
--- a/vhdlpp/parse.y
+++ b/vhdlpp/parse.y
@@ -362,24 +362,6 @@ component_specification
       }
   ;
 
-configuration_declaration
-  : K_configuration IDENTIFIER K_of IDENTIFIER K_is
-  configuration_declarative_part
-  block_configuration
-  K_end K_configuration_opt identifier_opt ';'
-     {
-  if(design_entities.find(lex_strings.make($4)) == design_entities.end())
-      errormsg(@4, "Couldn't find entity %s used in configuration declaration", $4);
-  //choose_architecture_for_entity();
-  sorrymsg(@1, "Configuration declaration is not yet supported.\n");
-     }
-  | K_configuration error K_end K_configuration_opt identifier_opt ';'
-      { errormsg(@2, "Too many errors, giving up on configuration declaration.\n");
-    if($5) delete $5;
-    yyerrok;
-      }
-  ;
-
 concurrent_signal_assignment_statement
   : name LEQ waveform ';'
       { ExpName*name = dynamic_cast<ExpName*> ($1);
@@ -402,6 +384,24 @@ concurrent_statement
   : component_instantiation_statement
   | concurrent_signal_assignment_statement
   ;
+
+configuration_declaration
+  : K_configuration IDENTIFIER K_of IDENTIFIER K_is
+  configuration_declarative_part
+  block_configuration
+  K_end K_configuration_opt identifier_opt ';'
+     {
+  if(design_entities.find(lex_strings.make($4)) == design_entities.end())
+      errormsg(@4, "Couldn't find entity %s used in configuration declaration", $4);
+  //choose_architecture_for_entity();
+  sorrymsg(@1, "Configuration declaration is not yet supported.\n");
+     }
+  | K_configuration error K_end K_configuration_opt identifier_opt ';'
+      { errormsg(@2, "Too many errors, giving up on configuration declaration.\n");
+    if($5) delete $5;
+    yyerrok;
+      }
+  ;
 //TODO: this list is only a sketch. It must be filled out later
 configuration_declarative_item
   : use_clause