From d78f481079a4ad0dfe985326fb54772d4675dcdd Mon Sep 17 00:00:00 2001 From: Thakee Nathees Date: Sat, 22 May 2021 04:39:00 +0530 Subject: [PATCH] wren_core.wren.inc backslash characters escaped (#1023) --- src/vm/wren_core.wren | 2 +- src/vm/wren_core.wren.inc | 13 ++++++------- util/wren_to_c_string.py | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/vm/wren_core.wren b/src/vm/wren_core.wren index e1192b8d..f073062c 100644 --- a/src/vm/wren_core.wren +++ b/src/vm/wren_core.wren @@ -480,4 +480,4 @@ class ClassAttributes { _methods = methods } toString { "attributes:%(_attributes) methods:%(_methods)" } -} \ No newline at end of file +} diff --git a/src/vm/wren_core.wren.inc b/src/vm/wren_core.wren.inc index b4f7e1a8..be296cdf 100644 --- a/src/vm/wren_core.wren.inc +++ b/src/vm/wren_core.wren.inc @@ -238,11 +238,11 @@ static const char* coreModuleSource = " return result\n" " }\n" "\n" -" trim() { trim_(\"\t\r\n \", true, true) }\n" +" trim() { trim_(\"\\t\\r\\n \", true, true) }\n" " trim(chars) { trim_(chars, true, true) }\n" -" trimEnd() { trim_(\"\t\r\n \", false, true) }\n" +" trimEnd() { trim_(\"\\t\\r\\n \", false, true) }\n" " trimEnd(chars) { trim_(chars, false, true) }\n" -" trimStart() { trim_(\"\t\r\n \", true, false) }\n" +" trimStart() { trim_(\"\\t\\r\\n \", true, false) }\n" " trimStart(chars) { trim_(chars, true, false) }\n" "\n" " trim_(chars, trimStart, trimEnd) {\n" @@ -441,18 +441,18 @@ static const char* coreModuleSource = "\n" "class System {\n" " static print() {\n" -" writeString_(\"\n\")\n" +" writeString_(\"\\n\")\n" " }\n" "\n" " static print(obj) {\n" " writeObject_(obj)\n" -" writeString_(\"\n\")\n" +" writeString_(\"\\n\")\n" " return obj\n" " }\n" "\n" " static printAll(sequence) {\n" " for (object in sequence) writeObject_(object)\n" -" writeString_(\"\n\")\n" +" writeString_(\"\\n\")\n" " }\n" "\n" " static write(obj) {\n" @@ -483,4 +483,3 @@ static const char* coreModuleSource = " }\n" " toString { \"attributes:%(_attributes) methods:%(_methods)\" }\n" "}\n"; - diff --git a/util/wren_to_c_string.py b/util/wren_to_c_string.py index 8129882f..0f0a7c53 100755 --- a/util/wren_to_c_string.py +++ b/util/wren_to_c_string.py @@ -22,6 +22,7 @@ static const char* {1}ModuleSource = def wren_to_c_string(input_path, wren_source_lines, module): wren_source = "" for line in wren_source_lines: + line = line.replace("\\", "\\\\") line = line.replace('"', "\\\"") line = line.replace("\n", "\\n\"") if wren_source: wren_source += "\n"