vhdlpp: Subprogram class inherits from ScopeBase.

vhdlpp/architec_emit.cc

@@ -21,6 +21,7 @@
 # include  "entity.h"
 # include  "expression.h"
 # include  "sequential.h"
+# include  "subprogram.h"
 # include  "vsignal.h"
 # include  <iostream>
 # include  <typeinfo>

vhdlpp/debug.cc

@@ -23,6 +23,7 @@
 # include  "architec.h"
 # include  "expression.h"
 # include  "parse_types.h"
+# include  "subprogram.h"
 # include  "sequential.h"
 # include  "vsignal.h"
 # include  "vtype.h"

vhdlpp/expression_emit.cc

@@ -22,6 +22,7 @@
 # include  "vtype.h"
 # include  "architec.h"
 # include  "package.h"
+# include  "subprogram.h"
 # include  "parse_types.h"
 # include  <typeinfo>
 # include  <iostream>

vhdlpp/package.cc

@@ -20,6 +20,7 @@
 
 # include  "package.h"
 # include  "entity.h"
+# include  "subprogram.h"
 # include  "parse_misc.h"
 # include  "ivl_assert.h"
 

vhdlpp/package_emit.cc

@@ -19,6 +19,7 @@
  */
 
 # include  "package.h"
+# include  "subprogram.h"
 # include  <iostream>
 # include  "ivl_assert.h"
 

vhdlpp/scope.cc

@@ -20,6 +20,7 @@
 
 # include  "scope.h"
 # include  "package.h"
+# include  "subprogram.h"
 # include  <algorithm>
 # include  <iostream>
 # include  <iterator>

vhdlpp/scope.h

@@ -26,7 +26,6 @@
 # include  "StringHeap.h"
 # include  "entity.h"
 # include  "expression.h"
-# include  "subprogram.h"
 # include  "vsignal.h"
 
 class ActiveScope;

vhdlpp/subprogram.h

@@ -22,15 +22,15 @@
 
 # include  "StringHeap.h"
 # include  "LineInfo.h"
+# include  "scope.h"
 # include  <iostream>
 # include  <list>
 
 class InterfacePort;
-class ScopeBase;
 class SequentialStmt;
 class VType;
 
-class Subprogram : public LineInfo {
+class Subprogram : public LineInfo, public ScopeBase {
 
     public:
       Subprogram(perm_string name, std::list<InterfacePort*>*ports,
@@ -48,6 +48,8 @@ class Subprogram : public LineInfo {
 	// matches this subprogram and that subprogram.
       bool compare_specification(Subprogram*that) const;
 
+      int emit(ostream&out, Entity*ent, Architecture*arc);
+
 	// Emit a definition as it would show up in a package.
       int emit_package(std::ostream&fd) const;