Rename basic_block coersion method to to_basic_block. Add to_hier_block2 and to_top_block.

basic_block was renamed because the number of guile generic methods on
basic_block was getting large and confusing.  to_hier_block2 and
to_top_block were added to support coercion to those types in guile
(and python).  This change simplifies the handling of "connect" in guile.

11 files changed, 41 insertions, 17 deletions

diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.cc b/gnuradio-core/src/lib/runtime/gr_basic_block.cc
index 2fa1066cb..0e0dad16b 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.cc
+++ b/gnuradio-core/src/lib/runtime/gr_basic_block.cc
@@ -56,7 +56,7 @@ gr_basic_block::~gr_basic_block()
 }
 
 gr_basic_block_sptr 
-gr_basic_block::basic_block()
+gr_basic_block::to_basic_block()
 {
     return shared_from_this();
 }
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.h b/gnuradio-core/src/lib/runtime/gr_basic_block.h
index b8797fdc6..d059a4bd3 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_basic_block.h
@@ -81,7 +81,7 @@ public:
     std::string name() const { return d_name; }
     gr_io_signature_sptr input_signature() const  { return d_input_signature; }
     gr_io_signature_sptr output_signature() const { return d_output_signature; }
-    gr_basic_block_sptr basic_block(); // Needed for Python type coercion
+    gr_basic_block_sptr to_basic_block(); // Needed for Python/Guile type coercion
 
     /*!
      * \brief Confirm that ninputs and noutputs is an acceptable combination.
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.i b/gnuradio-core/src/lib/runtime/gr_basic_block.i
index f1de9e08a..9b360e5ab 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.i
+++ b/gnuradio-core/src/lib/runtime/gr_basic_block.i
@@ -40,7 +40,7 @@ public:
     gr_io_signature_sptr input_signature() const;
     gr_io_signature_sptr output_signature() const;
     long unique_id() const;
-    gr_basic_block_sptr basic_block();
+    gr_basic_block_sptr to_basic_block();
     bool check_topology (int ninputs, int noutputs);
 };
 
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.cc b/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
index e3a25e1a8..d6e317136 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
+++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
@@ -61,6 +61,11 @@ gr_hier_block2::self()
   return shared_from_this();
 }
 
+gr_hier_block2_sptr
+gr_hier_block2::to_hier_block2()
+{
+  return cast_to_hier_block2_sptr(shared_from_this());
+}
 
 void 
 gr_hier_block2::connect(gr_basic_block_sptr block)
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.h b/gnuradio-core/src/lib/runtime/gr_hier_block2.h
index f50b1cb94..0a40c36b7 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.h
+++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.h
@@ -147,6 +147,8 @@ public:
   // This is a public method for ease of code organization, but should be
   // ignored by the user.
   gr_flat_flowgraph_sptr flatten() const;
+
+  gr_hier_block2_sptr to_hier_block2(); // Needed for Python/Guile type coercion
 };
 
 inline gr_hier_block2_sptr cast_to_hier_block2_sptr(gr_basic_block_sptr block) {
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.i b/gnuradio-core/src/lib/runtime/gr_hier_block2.i
index a62f50e84..1b974fd6b 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.i
+++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.i
@@ -57,4 +57,6 @@ public:
   void disconnect_all();
   void lock();
   void unlock();
+
+  gr_hier_block2_sptr to_hier_block2(); // Needed for Python/Guile type coercion
 };
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.cc b/gnuradio-core/src/lib/runtime/gr_top_block.cc
index 09e46dfbb..f341525c0 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.cc
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.cc
@@ -95,3 +95,9 @@ gr_top_block::dump()
 {
   d_impl->dump();
 }
+
+gr_top_block_sptr
+gr_top_block::to_top_block()
+{
+  return cast_to_top_block_sptr(shared_from_this());
+}
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.h b/gnuradio-core/src/lib/runtime/gr_top_block.h
index 8052954e3..ed244cb7c 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.h
@@ -105,6 +105,13 @@ public:
    * Displays flattened flowgraph edges and block connectivity
    */
   void dump();
+
+  gr_top_block_sptr to_top_block(); // Needed for Python/Guile type coercion
 };
 
+inline gr_top_block_sptr cast_to_top_block_sptr(gr_basic_block_sptr block) {
+  return boost::dynamic_pointer_cast<gr_top_block, gr_basic_block>(block);
+}
+
+
 #endif /* INCLUDED_GR_TOP_BLOCK_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.i b/gnuradio-core/src/lib/runtime/gr_top_block.i
index 579ef8f70..d9adf1e18 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.i
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.i
@@ -47,6 +47,8 @@ public:
   void lock();
   void unlock() throw (std::runtime_error);
   void dump();
+
+  gr_top_block_sptr to_top_block(); // Needed for Python/Guile type coercion
 };
 
 #ifdef SWIGPYTHON
diff --git a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
index f2256da1b..370f8a9d9 100644
--- a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
+++ b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
@@ -66,7 +66,7 @@ class hier_block2(object):
             raise ValueError, ("connect requires at least one endpoint; %d provided." % (len (points),))
 	else:
 	    if len(points) == 1:
-		self._hb.connect(points[0].basic_block())
+		self._hb.connect(points[0].to_basic_block())
 	    else:
 		for i in range (1, len (points)):
         	    self._connect(points[i-1], points[i])
@@ -74,11 +74,11 @@ class hier_block2(object):
     def _connect(self, src, dst):
         (src_block, src_port) = self._coerce_endpoint(src)
         (dst_block, dst_port) = self._coerce_endpoint(dst)
-        self._hb.connect(src_block.basic_block(), src_port,
-                         dst_block.basic_block(), dst_port)
+        self._hb.connect(src_block.to_basic_block(), src_port,
+                         dst_block.to_basic_block(), dst_port)
 
     def _coerce_endpoint(self, endp):
-        if hasattr(endp, 'basic_block'):
+        if hasattr(endp, 'to_basic_block'):
             return (endp, 0)
         else:
             if hasattr(endp, "__getitem__") and len(endp) == 2:
@@ -100,7 +100,7 @@ class hier_block2(object):
             raise ValueError, ("disconnect requires at least two endpoints; %d provided." % (len (points),))
         else:
             if len (points) == 1:
-                self._hb.disconnect(points[0].basic_block())
+                self._hb.disconnect(points[0].to_basic_block())
             else:
                 for i in range (1, len (points)):
                     self._disconnect(points[i-1], points[i])
@@ -108,6 +108,6 @@ class hier_block2(object):
     def _disconnect(self, src, dst):
         (src_block, src_port) = self._coerce_endpoint(src)
         (dst_block, dst_port) = self._coerce_endpoint(dst)
-        self._hb.disconnect(src_block.basic_block(), src_port,
-                            dst_block.basic_block(), dst_port)
+        self._hb.disconnect(src_block.to_basic_block(), src_port,
+                            dst_block.to_basic_block(), dst_port)
 
diff --git a/gnuradio-core/src/python/gnuradio/gr/top_block.py b/gnuradio-core/src/python/gnuradio/gr/top_block.py
index 59bb0438f..8fe5303c8 100644
--- a/gnuradio-core/src/python/gnuradio/gr/top_block.py
+++ b/gnuradio-core/src/python/gnuradio/gr/top_block.py
@@ -118,7 +118,7 @@ class top_block(object):
             raise ValueError, ("connect requires at least one endpoint; %d provided." % (len (points),))
 	else:
 	    if len(points) == 1:
-		self._tb.connect(points[0].basic_block())
+		self._tb.connect(points[0].to_basic_block())
 	    else:
 		for i in range (1, len (points)):
         	    self._connect(points[i-1], points[i])
@@ -126,11 +126,11 @@ class top_block(object):
     def _connect(self, src, dst):
         (src_block, src_port) = self._coerce_endpoint(src)
         (dst_block, dst_port) = self._coerce_endpoint(dst)
-        self._tb.connect(src_block.basic_block(), src_port,
-                         dst_block.basic_block(), dst_port)
+        self._tb.connect(src_block.to_basic_block(), src_port,
+                         dst_block.to_basic_block(), dst_port)
 
     def _coerce_endpoint(self, endp):
-        if hasattr(endp, 'basic_block'):
+        if hasattr(endp, 'to_basic_block'):
             return (endp, 0)
         else:
             if hasattr(endp, "__getitem__") and len(endp) == 2:
@@ -146,7 +146,7 @@ class top_block(object):
             raise ValueError, ("disconnect requires at least two endpoints; %d provided." % (len (points),))
         else:
             if len(points) == 1:
-                self._tb.disconnect(points[0].basic_block())
+                self._tb.disconnect(points[0].to_basic_block())
             else:
                 for i in range (1, len (points)):
                     self._disconnect(points[i-1], points[i])
@@ -154,6 +154,6 @@ class top_block(object):
     def _disconnect(self, src, dst):
         (src_block, src_port) = self._coerce_endpoint(src)
         (dst_block, dst_port) = self._coerce_endpoint(dst)
-        self._tb.disconnect(src_block.basic_block(), src_port,
-                            dst_block.basic_block(), dst_port)
+        self._tb.disconnect(src_block.to_basic_block(), src_port,
+                            dst_block.to_basic_block(), dst_port)