expr: TIP 582 - comments in expressions

Add support for comments in expressions

Signed-off-by: Steve Bennett <steveb@workware.net.au>

1 files changed, 15 insertions, 6 deletions

diff --git a/jim.c b/jim.c
index c253f5c..684905f 100644
--- a/jim.c
+++ b/jim.c
@@ -8810,13 +8810,22 @@ static const struct Jim_ExprOperator Jim_ExprOperators[] = {
 
 static int JimParseExpression(struct JimParserCtx *pc)
 {
-    /* Discard spaces and quoted newline */
-    while (isspace(UCHAR(*pc->p)) || (*(pc->p) == '\\' && *(pc->p + 1) == '\n')) {
-        if (*pc->p == '\n') {
-            pc->linenr++;
+    while (1) {
+        /* Discard spaces and quoted newline */
+        while (isspace(UCHAR(*pc->p)) || (*(pc->p) == '\\' && *(pc->p + 1) == '\n')) {
+            if (*pc->p == '\n') {
+                pc->linenr++;
+            }
+            pc->p++;
+            pc->len--;
         }
-        pc->p++;
-        pc->len--;
+        /* Discard comments */
+        if (*pc->p == '#') {
+            JimParseComment(pc);
+            /* Go back to discarding white space */
+            continue;
+        }
+        break;
     }
 
     /* Common case */