diff options
Diffstat (limited to 'Source/Modules/r.cxx')
| -rw-r--r-- | Source/Modules/r.cxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 749797c78..64583175b 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -300,7 +300,7 @@ public: Printf(stderr, "<memberfunctionHandler> %s %s\n", Getattr(n, "name"), Getattr(n, "type")); - member_name = Getattr(n, "name"); + member_name = Getattr(n, "sym:name"); processing_class_member_function = 1; int status = Language::memberfunctionHandler(n); processing_class_member_function = 0; @@ -1603,6 +1603,16 @@ void R::dispatchFunction(Node *n) { j == 0 ? "" : " && ", j+1); } + else if (DohStrcmp(tm,"integer")==0) { + Printf(f->code, "%s(is.integer(argv[[%d]]) || is.numeric(argv[[%d]]))", + j == 0 ? "" : " && ", + j+1, j+1); + } + else if (DohStrcmp(tm,"character")==0) { + Printf(f->code, "%sis.character(argv[[%d]])", + j == 0 ? "" : " && ", + j+1); + } else { Printf(f->code, "%sextends(argtypes[%d], '%s')", j == 0 ? "" : " && ", @@ -1617,7 +1627,10 @@ void R::dispatchFunction(Node *n) { } } if (cur_args != -1) { - Printv(f->code, "}", NIL); + Printf(f->code, "} else {\n" + "stop(\"cannot find overloaded function for %s with argtypes (\"," + "toString(argtypes),\")\");\n" + "}", sfname); } Printv(f->code, ";\nf(...)", NIL); Printv(f->code, ";\n}", NIL); |