escaping chars in macro args

csound · Jan 16, 2017 · a42d90e · a42d90e
1 parent 9328274
commit a42d90e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Engine/csound_pre.lex b/Engine/csound_pre.lex
@@ -346,6 +346,7 @@ QNAN		"qnan"[ \t]*\(
                        if (c == ')') {
                          csound->Die(csound, Str("Too few arguments to macro\n"));
                        }
+                       if (c == '\\') c = input(yyscanner);
                        if (UNLIKELY(i > 98)) {
                          csound->Die(csound,
                                      Str("Missing argument terminator\n%.98s"),
@@ -446,6 +447,7 @@ QNAN		"qnan"[ \t]*\(
                        if (c == ')') {
                          csound->Die(csound, Str("Too few arguments to macro\n"));
                        }
+                       if (c == '\\') c = input(yyscanner);
                        if (UNLIKELY(i > 98)) {
                          csound->Die(csound,
                                      Str("Missing argument terminator\n%.98s"),

diff --git a/Engine/csound_prs.lex b/Engine/csound_prs.lex
@@ -288,6 +288,9 @@ NM              [nm]
                        if (c == ')') {
                          csound->Die(csound, Str("Too few arguments to macro\n"));
                        }
+                       if (c == '\\') {
+                         c = input(yyscanner);
+                       }
                        if (UNLIKELY(i > 98)) {
                          csound->Die(csound,
                                      Str("Missing argument terminator\n%.98s"),
@@ -388,6 +391,7 @@ NM              [nm]
                        if (c == ')') {
                          csound->Die(csound, Str("Too few arguments to macro\n"));
                        }
+                       if (c == '\\') c = input(yyscanner);
                        if (UNLIKELY(i > 98)) {
                          csound->Die(csound,
                                      Str("Missing argument terminator\n%.98s"),