add-escaping

Signed-off-by: yaacov <kobi.zamir@gmail.com>

Author: yaacov

v6/cmd/tsl/printer.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"strconv"
 	"time"
 
 	"github.com/yaacov/tree-search-language/v6/pkg/tsl"
@@ -36,12 +37,30 @@ func (p *ASTPrinter) Print(node *tsl.TSLNode, level int) {
 		p.printArray(node, level)
 	case tsl.KindTimestampLiteral:
 		p.printTimestamp(node, level)
+	case tsl.KindStringLiteral:
+		p.printString(node, level)
 	default:
 		// Leaf nodes
 		p.printIndented(level, "[%s]: %v\n", t.String(), node.Value())
 	}
 }
 
+// printString formats and prints string values with escaped special characters
+func (p *ASTPrinter) printString(node *tsl.TSLNode, level int) {
+	str, ok := node.Value().(string)
+	if !ok {
+		p.printIndented(level, "[%s]: %v\n", node.Type().String(), node.Value())
+		return
+	}
+
+	// Use Go's built-in escaping functionality
+	quoted := strconv.Quote(str)
+	// Remove the surrounding quotes to get just the escaped string
+	escaped := quoted[1 : len(quoted)-1]
+
+	p.printIndented(level, "[%s]: %s\n", node.Type().String(), escaped)
+}
+
 func (p *ASTPrinter) printBinaryOp(node *tsl.TSLNode, level int) {
 	v := node.Value().(tsl.TSLExpressionOp)
 

v6/pkg/parser/tsl_lexer.l

@@ -28,13 +28,44 @@ int check_date_formats(char *s) {
     return 0;
 }
 
+/* Process escaped characters in a string */
+char* process_escapes(char* text, int len) {
+    char* result = malloc(len + 1);
+    int i, j = 0;
+    
+    for (i = 0; i < len; i++) {
+        if (text[i] == '\\' && i + 1 < len) {
+            i++; // Skip backslash
+            switch (text[i]) {
+                case 'n': result[j++] = '\n'; break;
+                case 't': result[j++] = '\t'; break;
+                case 'r': result[j++] = '\r'; break;
+                case 'b': result[j++] = '\b'; break;
+                case 'f': result[j++] = '\f'; break;
+                case '\\': result[j++] = '\\'; break;
+                case '\'': result[j++] = '\''; break;
+                case '\"': result[j++] = '\"'; break;
+                case '`': result[j++] = '`'; break;
+                default: result[j++] = text[i]; break;
+            }
+        } else {
+            result[j++] = text[i];
+        }
+    }
+    result[j] = '\0';
+    return result;
+}
+
 /* Strip quotes and process string */
 char* strip_quotes(char* text, int offset) {
-    int len = strlen(text);
-    char *s = malloc(len - 1);
-    strncpy(s, text + offset, len - (offset * 2));
-    s[len - (offset * 2)] = '\0';
-    return s;
+    int len = strlen(text) - (offset * 2);
+    char *raw = malloc(len + 1);
+    strncpy(raw, text + offset, len);
+    raw[len] = '\0';
+    
+    char *processed = process_escapes(raw, len);
+    free(raw);
+    return processed;
 }
 %}
 
@@ -110,23 +141,23 @@ NUMBER_WITH_SUFFIX ({INTEGER}|{DECIMAL}){SIZE_SUFFIX}
 {NUMBER_WITH_SUFFIX}        { yylval.str = strdup(yytext); return NUMERIC_LITERAL; }
 
     /* String literals and identifiers */
-'[^']*'                    {
+'([^'\\]|\\.)*'           {
                             char *s = strip_quotes(yytext, 1);
                             int token = check_date_formats(s);
                             if (token) return token;
                             yylval.str = s;
                             return STRING_LITERAL;
                            }
 
-\"[^"]*\"                  {
+\"([^"\\]|\\.)*\"         {
                             char *s = strip_quotes(yytext, 1);
                             int token = check_date_formats(s);
                             if (token) return token;
                             yylval.str = s;
                             return STRING_LITERAL;
                            }
 
-`[^`]*`                    {
+`([^`\\]|\\.)*`           {
                             char *s = strip_quotes(yytext, 1);
                             int token = check_date_formats(s);
                             if (token) return token;