Special handling for commas inside functions

Author: joshestein

src/parser.ts

@@ -55,9 +55,16 @@ export function tokenize(str: string) {
   const tokens = [];
   let buffer = '';
   let type = TokenType.UNKNOWN;
+  let parenDepth = 0;
 
   for (const s of str) {
 
+    if (['(', '[', '{'].includes(s)) {
+      parenDepth++;
+    } else if ([')', ']', '}'].includes(s)) {
+      parenDepth--;
+    }
+
     // Handle Strings
     if (s === '"') {
       const newType: TokenType = (((type as TokenType) === TokenType.STR) ? TokenType.UNKNOWN : TokenType.STR);
@@ -71,6 +78,22 @@ export function tokenize(str: string) {
       continue;
     }
 
+    // Special handling for commas
+    if (s === ',') {
+      // If we're in a number and not inside parenthesis include the comma
+      if (type === TokenType.NUM && parenDepth === 0) {
+        buffer += s;
+        continue;
+      }
+      // Otherwise treat it as an operator
+      const token = createToken(buffer, type);
+      if (token) tokens.push(token);
+      tokens.push(new ExprOperator(','));
+      buffer = '';
+      type = TokenType.UNKNOWN;
+      continue;
+    }
+
     const sType = s.match(/[0-9.]/) ? TokenType.NUM :
       IDENTIFIER_SYMBOLS.includes(s) ? TokenType.VAR :
         OPERATOR_SYMBOLS.includes(s) ? TokenType.OP :