luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Generalizing implementation for more Ruby versions.

This commit is contained in:
Matthias Koefferlein 2023-12-28 22:42:49 +01:00
parent 775c331bae
commit 0b64241e13
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rba/rba/rba.cc
View File

@ -176,7 +176,7 @@ static VALUE
get_kwarg (const gsi::ArgType &atype, VALUE kwargs) get_kwarg (const gsi::ArgType &atype, VALUE kwargs)
{ {
if (kwargs != Qnil) { if (kwargs != Qnil) {
return rb_hash_lookup2 (kwargs, rb_id2sym (rb_intern (atype.spec ()->name ().c_str ())), Qundef); return rb_hash_lookup2 (kwargs, ID2SYM (rb_intern (atype.spec ()->name ().c_str ())), Qundef);
} else { } else {
return Qundef; return Qundef;
} }
@ -332,17 +332,17 @@ private:
if (argc >= nargs) { if (argc >= nargs) {
// no more arguments to consider // no more arguments to consider
return argc == nargs && (kwargs == Qnil || rb_hash_size_num (kwargs) == 0); return argc == nargs && (kwargs == Qnil || RHASH_SIZE (kwargs) == 0);
} }
if (kwargs != Qnil) { if (kwargs != Qnil) {
int nkwargs = int (rb_hash_size_num (kwargs)); int nkwargs = int (RHASH_SIZE (kwargs));
int kwargs_taken = 0; int kwargs_taken = 0;
while (argc < nargs) { while (argc < nargs) {
const gsi::ArgType &atype = m->begin_arguments () [argc]; const gsi::ArgType &atype = m->begin_arguments () [argc];
VALUE rb_arg = rb_hash_lookup2 (kwargs, rb_id2sym (rb_intern (atype.spec ()->name ().c_str ())), Qnil); VALUE rb_arg = rb_hash_lookup2 (kwargs, ID2SYM (rb_intern (atype.spec ()->name ().c_str ())), Qnil);
if (rb_arg == Qnil) { if (rb_arg == Qnil) {
if (! atype.spec ()->has_default ()) { if (! atype.spec ()->has_default ()) {
return false; return false;
@ -1053,7 +1053,7 @@ push_args (gsi::SerialArgs &arglist, const gsi::MethodBase *meth, VALUE *argv, i
{ {
int iarg = 0; int iarg = 0;
int kwargs_taken = 0; int kwargs_taken = 0;
int nkwargs = kwargs == Qnil ? 0 : int (rb_hash_size_num (kwargs)); int nkwargs = kwargs == Qnil ? 0 : int (RHASH_SIZE (kwargs));
try { try {
@ -1195,7 +1195,7 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
} else if (meth->smt () != gsi::MethodBase::None) { } else if (meth->smt () != gsi::MethodBase::None) {
if (kwargs != Qnil && rb_hash_size_num (kwargs) > 0) { if (kwargs != Qnil && RHASH_SIZE (kwargs) > 0) {
throw tl::Exception (tl::to_string (tr ("Keyword arguments not permitted"))); throw tl::Exception (tl::to_string (tr ("Keyword arguments not permitted")));
} }
@ -1203,7 +1203,7 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
} else if (meth->is_signal ()) { } else if (meth->is_signal ()) {
if (kwargs != Qnil && rb_hash_size_num (kwargs) > 0) { if (kwargs != Qnil && RHASH_SIZE (kwargs) > 0) {
throw tl::Exception (tl::to_string (tr ("Keyword arguments not permitted on events"))); throw tl::Exception (tl::to_string (tr ("Keyword arguments not permitted on events")));
} }
@ -1253,7 +1253,7 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
// calling an iterator method without block -> deliver an enumerator using "to_enum" // calling an iterator method without block -> deliver an enumerator using "to_enum"
if (kwargs != Qnil && rb_hash_size_num (kwargs) > 0) { if (kwargs != Qnil && RHASH_SIZE (kwargs) > 0) {
throw tl::Exception (tl::to_string (tr ("Keyword arguments not permitted on enumerators"))); throw tl::Exception (tl::to_string (tr ("Keyword arguments not permitted on enumerators")));
} }