Changeset 3400 in kBuild for trunk/src/kmk/expreval.c

Timestamp:

Jul 2, 2020 11:53:42 AM (5 years ago)

Author:

bird

Message:

kmk/expreval.c: Build fix. strlen() operator/function

File:

• trunk/src/kmk/expreval.c (modified) (3 diffs)

trunk/src/kmk/expreval.c

@@ -63 +63 @@
  *  operator, omitting isspace. */
 #define EXPR_IS_OP_SEPARATOR_NO_SPACE(a_ch) \
-    (ispunct((a_ch)) && (a_ch) != '@' && (a_ch) != '_'))
+    (ispunct((a_ch)) && (a_ch) != '@' && (a_ch) != '_')
 
 /** Check if @a a_ch is a valid separator for a alphabetical binary operator. */
@@ -995 +995 @@
 
 /**
+ * Performs a strlen() on the simplified/converted string argument.
+ *
+ * @returns Status code.
+ * @param   pThis       The instance.
+ */
+static EXPRRET expr_op_strlen(PEXPR pThis)
+{
+    PEXPRVAR pVar = &pThis->aVars[pThis->iVar];
+
+    expr_var_make_simple_string(pVar);
+    expr_var_assign_num(pVar, strlen(pVar->uVal.psz));
+
+    return kExprRet_Ok;
+}
+
+
+/**
  * Convert to string (simplified and quoted)
  *
@@ -1798 +1815 @@
     EXPR_OP("bool",        90,      1,    expr_op_bool),
     EXPR_OP("num",         90,      1,    expr_op_num),
+    EXPR_OP("strlen",      90,      1,    expr_op_strlen),
     EXPR_OP("str",         90,      1,    expr_op_str),
     EXPR_OP("+",           80,      1,    expr_op_pluss),