Another cool one: void as C++ return value is translated to returning self for Ruby.

This commit is contained in:
Matthias Koefferlein 2020-08-31 23:44:02 +02:00
parent 4c127b4644
commit 5608327899
6 changed files with 61 additions and 9 deletions

View File

@ -284,7 +284,7 @@ void LayoutToNetlist::connect_impl (const db::ShapeCollection &a, const db::Shap
m_conn.connect (dla.layer (), dlb.layer ());
}
void LayoutToNetlist::connect_global_impl (const db::ShapeCollection &l, const std::string &gn)
size_t LayoutToNetlist::connect_global_impl (const db::ShapeCollection &l, const std::string &gn)
{
if (m_netlist_extracted) {
throw tl::Exception (tl::to_string (tr ("The netlist has already been extracted")));
@ -297,7 +297,7 @@ void LayoutToNetlist::connect_global_impl (const db::ShapeCollection &l, const s
db::DeepLayer dl = deep_layer_of (l);
m_dlrefs.insert (dl);
m_conn.connect_global (dl.layer (), gn);
return m_conn.connect_global (dl.layer (), gn);
}
const std::string &LayoutToNetlist::global_net_name (size_t id) const

View File

@ -398,18 +398,18 @@ public:
* @brief Connects the given layer with a global net with the given name
* Returns the global net ID
*/
void connect_global (const db::Region &l, const std::string &gn)
size_t connect_global (const db::Region &l, const std::string &gn)
{
connect_global_impl (l, gn);
return connect_global_impl (l, gn);
}
/**
* @brief Connects the given text layer with a global net with the given name
* Returns the global net ID
*/
void connect_global (const db::Texts &l, const std::string &gn)
size_t connect_global (const db::Texts &l, const std::string &gn)
{
connect_global_impl (l, gn);
return connect_global_impl (l, gn);
}
/**
@ -872,7 +872,7 @@ private:
db::properties_id_type make_netname_propid (db::Layout &ly, const tl::Variant &netname_prop, const db::Net &net) const;
db::CellMapping make_cell_mapping_into (db::Layout &layout, db::Cell &cell, const std::vector<const db::Net *> *nets, bool with_device_cells);
void connect_impl (const db::ShapeCollection &a, const db::ShapeCollection &b);
void connect_global_impl (const db::ShapeCollection &l, const std::string &gn);
size_t connect_global_impl (const db::ShapeCollection &l, const std::string &gn);
// implementation of NetlistManipulationCallbacks
virtual size_t link_net_to_parent_circuit (const Net *subcircuit_net, Circuit *parent_circuit, const DCplxTrans &trans);

View File

@ -357,12 +357,12 @@ Class<db::LayoutToNetlist> decl_dbLayoutToNetlist ("db", "LayoutToNetlist",
"\n"
"This variant has been introduced in version 0.27.\n"
) +
gsi::method ("connect_global", (void (db::LayoutToNetlist::*) (const db::Region &, const std::string &)) &db::LayoutToNetlist::connect_global, gsi::arg ("l"), gsi::arg ("global_net_name"),
gsi::method ("connect_global", (size_t (db::LayoutToNetlist::*) (const db::Region &, const std::string &)) &db::LayoutToNetlist::connect_global, gsi::arg ("l"), gsi::arg ("global_net_name"),
"@brief Defines a connection of the given layer with a global net.\n"
"This method returns the ID of the global net. Use \\global_net_name to get "
"the name back from the ID."
) +
gsi::method ("connect_global", (void (db::LayoutToNetlist::*) (const db::Texts &, const std::string &)) &db::LayoutToNetlist::connect_global, gsi::arg ("l"), gsi::arg ("global_net_name"),
gsi::method ("connect_global", (size_t (db::LayoutToNetlist::*) (const db::Texts &, const std::string &)) &db::LayoutToNetlist::connect_global, gsi::arg ("l"), gsi::arg ("global_net_name"),
"@brief Defines a connection of the given text layer with a global net.\n"
"This method returns the ID of the global net. Use \\global_net_name to get "
"the name back from the ID."

View File

@ -278,6 +278,29 @@ event._manage
and pointers/references and also supports "out" parameters.
</p>
<h3>"void" as return value</h3>
<p>
While a "void" return value indicates "no return value" in C++, this concept is not
common in Ruby. Ruby methods will always return the last value generated in
a method.
</p>
<p>
For consistency, KLayout's Ruby binding returns "self" from methods in this
case. This allows chaining of methods in many cases and fosters compact code:
</p>
<pre>// C++
class A {
public:
virtual void f() { ... }
virtual void g() { ... }
};
# Ruby
a = A::new.f.g</pre>
<h3>References and pointers to simple types (FixNum, Float, String)</h3>
<p>

View File

@ -887,6 +887,15 @@ method_name_from_id (int mid, VALUE self)
return cls_decl->name () + "::" + mt->name (mid);
}
static gsi::ArgType create_void_type ()
{
gsi::ArgType at;
at.init<void> ();
return at;
}
static gsi::ArgType s_void_type = create_void_type ();
VALUE
method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
{
@ -1077,8 +1086,15 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
}
} else if (meth->ret_type () == s_void_type) {
// simple, yet magical :)
return self;
} else {
ret = pop_arg (meth->ret_type (), p, retlist, heap);
}
}

View File

@ -777,6 +777,19 @@ class DBPolygon_TestClass < TestBase
end
def test_voidMethodsReturnSelf
hull = [ RBA::Point::new(0, 0), RBA::Point::new(6000, 0),
RBA::Point::new(6000, 3000), RBA::Point::new(0, 3000) ]
hole1 = [ RBA::Point::new(1000, 1000), RBA::Point::new(2000, 1000),
RBA::Point::new(2000, 2000), RBA::Point::new(1000, 2000) ]
hole2 = [ RBA::Point::new(3000, 1000), RBA::Point::new(4000, 1000),
RBA::Point::new(4000, 2000), RBA::Point::new(3000, 2000) ]
poly = RBA::Polygon::new(hull).insert_hole(hole1).insert_hole(hole2)
assert_equal(poly.to_s, "(0,0;0,3000;6000,3000;6000,0/1000,1000;2000,1000;2000,2000;1000,2000/3000,1000;4000,1000;4000,2000;3000,2000)")
end
end
load("test_epilogue.rb")