diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-11-16 16:19:54 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-11-16 16:19:54 (GMT) |
| commit | 2bf2abcb4f1c88fbddc3ce4d5800c438851aaf95 (patch) | |
| tree | b9d6e4c30112049fb102fc3f80bfe43375e5d21a /generic/tclCmdIL.c | |
| parent | a5e261f15f06a283ad8a648611f1a9eb5b8127e1 (diff) | |
| parent | 10dd9595a33e80ac7ab8ae5ff11b6b6ef3059b20 (diff) | |
| download | tcl-2bf2abcb4f1c88fbddc3ce4d5800c438851aaf95.zip tcl-2bf2abcb4f1c88fbddc3ce4d5800c438851aaf95.tar.gz tcl-2bf2abcb4f1c88fbddc3ce4d5800c438851aaf95.tar.bz2 | |
3587651 Fix [info functions] and Tcl_ListMathFuncs().
Diffstat (limited to 'generic/tclCmdIL.c')
| -rw-r--r-- | generic/tclCmdIL.c | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 7be017d..155e8e4 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -1492,19 +1492,42 @@ InfoFunctionsCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { - const char *pattern; + Tcl_Obj *script; + int code; - if (objc == 1) { - pattern = NULL; - } else if (objc == 2) { - pattern = TclGetString(objv[1]); - } else { + if (objc > 2) { Tcl_WrongNumArgs(interp, 1, objv, "?pattern?"); return TCL_ERROR; } - Tcl_SetObjResult(interp, Tcl_ListMathFuncs(interp, pattern)); - return TCL_OK; + script = Tcl_NewStringObj( +" ::apply [::list {{pattern *}} {\n" +" ::set cmds {}\n" +" ::foreach cmd [::info commands ::tcl::mathfunc::$pattern] {\n" +" ::lappend cmds [::namespace tail $cmd]\n" +" }\n" +" ::foreach cmd [::info commands tcl::mathfunc::$pattern] {\n" +" ::set cmd [::namespace tail $cmd]\n" +" ::if {$cmd ni $cmds} {\n" +" ::lappend cmds $cmd\n" +" }\n" +" }\n" +" ::return $cmds\n" +" } [::namespace current]] ", -1); + + if (objc == 2) { + Tcl_Obj *arg = Tcl_NewListObj(1, &(objv[1])); + + Tcl_AppendObjToObj(script, arg); + Tcl_DecrRefCount(arg); + } + + Tcl_IncrRefCount(script); + code = Tcl_EvalObjEx(interp, script, 0); + + Tcl_DecrRefCount(script); + + return code; } /* |