diff options
| author | Steve Bennett <steveb@workware.net.au> | 2014-10-11 09:22:47 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2014-10-15 08:22:22 +1000 |
| commit | dd69879b70a1fd4d9665e329f24d50327b21171d (patch) | |
| tree | ef5f6f6b7339f831e7214b2ab82191a46e74f62a /jim.c | |
| parent | 423eafffda751903ab5fb15e42aca7bd55c6d77b (diff) | |
| download | jimtcl-dd69879b70a1fd4d9665e329f24d50327b21171d.zip jimtcl-dd69879b70a1fd4d9665e329f24d50327b21171d.tar.gz jimtcl-dd69879b70a1fd4d9665e329f24d50327b21171d.tar.bz2 | |
Add more tcl compatiblity
- Add wide() function to [expr] (same as int())
- Small error message changes
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'jim.c')
| -rw-r--r-- | jim.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -7549,6 +7549,7 @@ enum /* Functions */ JIM_EXPROP_FUNC_FIRST, /* 59 */ JIM_EXPROP_FUNC_INT = JIM_EXPROP_FUNC_FIRST, + JIM_EXPROP_FUNC_WIDE, JIM_EXPROP_FUNC_ABS, JIM_EXPROP_FUNC_DOUBLE, JIM_EXPROP_FUNC_ROUND, @@ -7556,7 +7557,7 @@ enum JIM_EXPROP_FUNC_SRAND, /* math functions from libm */ - JIM_EXPROP_FUNC_SIN, /* 64 */ + JIM_EXPROP_FUNC_SIN, /* 65 */ JIM_EXPROP_FUNC_COS, JIM_EXPROP_FUNC_TAN, JIM_EXPROP_FUNC_ASIN, @@ -7615,6 +7616,7 @@ static int JimExprOpNumUnary(Jim_Interp *interp, struct JimExprState *e) if ((A->typePtr != &doubleObjType || A->bytes) && JimGetWideNoErr(interp, A, &wA) == JIM_OK) { switch (e->opcode) { case JIM_EXPROP_FUNC_INT: + case JIM_EXPROP_FUNC_WIDE: case JIM_EXPROP_FUNC_ROUND: case JIM_EXPROP_UNARYPLUS: wC = wA; @@ -7639,6 +7641,7 @@ static int JimExprOpNumUnary(Jim_Interp *interp, struct JimExprState *e) else if ((rc = Jim_GetDouble(interp, A, &dA)) == JIM_OK) { switch (e->opcode) { case JIM_EXPROP_FUNC_INT: + case JIM_EXPROP_FUNC_WIDE: wC = dA; break; case JIM_EXPROP_FUNC_ROUND: @@ -8333,6 +8336,7 @@ static const struct Jim_ExprOperator Jim_ExprOperators[] = { OPRINIT("int", 200, 1, JimExprOpNumUnary), + OPRINIT("wide", 200, 1, JimExprOpNumUnary), OPRINIT("abs", 200, 1, JimExprOpNumUnary), OPRINIT("double", 200, 1, JimExprOpNumUnary), OPRINIT("round", 200, 1, JimExprOpNumUnary), @@ -12653,7 +12657,7 @@ static int Jim_AppendCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *a int i; if (argc < 2) { - Jim_WrongNumArgs(interp, 1, argv, "varName ?value value ...?"); + Jim_WrongNumArgs(interp, 1, argv, "varName ?value ...?"); return JIM_ERR; } if (argc == 2) { @@ -12906,7 +12910,7 @@ static int Jim_EvalCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg int rc; if (argc < 2) { - Jim_WrongNumArgs(interp, 1, argv, "script ?...?"); + Jim_WrongNumArgs(interp, 1, argv, "arg ?arg ...?"); return JIM_ERR; } |