#603: whitespace escape in character literals

ignatov · May 24, 2015 · 69fc0c6 · 69fc0c6
1 parent d36848a
commit 69fc0c6
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 16 deletions.
diff --git a/gen/org/intellij/erlang/parser/_ErlangLexer.java b/gen/org/intellij/erlang/parser/_ErlangLexer.java
diff --git a/src/org/intellij/erlang/parser/Erlang.flex b/src/org/intellij/erlang/parser/Erlang.flex
@@ -33,7 +33,8 @@ CommentLine = "%"[^\r\n]*
 ModuleDocComment = {ModuleDocCommentLine} {ModuleDocCommentLine}*
 FunctionDocComment = {FunctionDocCommentLine} {FunctionDocCommentLine}*
 Comment = {CommentLine} {CommentLine}*
-Whitespace = ([ \t\n] | {ControlCharacter})+
+WhitespaceChar = [ \t\n] | {ControlCharacter}
+Whitespace = {WhitespaceChar}+
 ErlangUppercase = [A-Z]
 ErlangLowercase = [a-z]
 ErlangLetter = {ErlangUppercase} | {ErlangLowercase}
@@ -54,7 +55,7 @@ ControlName = [@A-Z\[\\\]\^_] /* this is the octal range \100 - \137 */
 ControlEscape = \\ \^ {ControlName}
 EscapeSequence = \\\" | "\\b" | "\\d" | "\\e" | "\\f" | "\\n" | "\\r" | "\\s" | "\\t" | "\\v" | "\\'" | "\\\\" | "\\[" | "\\{" | "\\]" | "\\}" | "\\`" | "\\$" | "\\=" | "\\%" | "\\," | "\\." | "\\_" | {ControlEscape} | {OctalEscape}
 
-CharLiteralChar = {InputCharacter} | {EscapeSequence}
+CharLiteralChar = {InputCharacter} | {EscapeSequence} | (\\ {WhitespaceChar})
 CharLiteral = \$ {CharLiteralChar} | \$
 
 /* Without the \\\" at the start the lexer won't find it, for unknown reasons */

diff --git a/testData/parser/WhitespaceEscapeInCharLiterals.erl b/testData/parser/WhitespaceEscapeInCharLiterals.erl
@@ -0,0 +1,6 @@
+space() ->
+  $\ .
+
+newline() ->
+  $\
+.
diff --git a/testData/parser/WhitespaceEscapeInCharLiterals.txt b/testData/parser/WhitespaceEscapeInCharLiterals.txt
@@ -0,0 +1,27 @@
+ERL_FILE
+  ERL_FUNCTION
+    ERL_FUNCTION_CLAUSE
+      ERL_Q_ATOM
+        ERL_ATOM
+          PsiElement(atom_name)('space')
+      ERL_ARGUMENT_DEFINITION_LIST
+        PsiElement(()('(')
+        PsiElement())(')')
+      ERL_CLAUSE_BODY
+        PsiElement(->)('->')
+        ERL_MAX_EXPRESSION
+          PsiElement(char)('$\ ')
+    PsiElement(.)('.')
+  ERL_FUNCTION
+    ERL_FUNCTION_CLAUSE
+      ERL_Q_ATOM
+        ERL_ATOM
+          PsiElement(atom_name)('newline')
+      ERL_ARGUMENT_DEFINITION_LIST
+        PsiElement(()('(')
+        PsiElement())(')')
+      ERL_CLAUSE_BODY
+        PsiElement(->)('->')
+        ERL_MAX_EXPRESSION
+          PsiElement(char)('$\\n')
+    PsiElement(.)('.')
diff --git a/tests/org/intellij/erlang/parser/ErlangParserTest.java b/tests/org/intellij/erlang/parser/ErlangParserTest.java
@@ -91,4 +91,5 @@ public ErlangParserTest() {
   public void testMacrosHacks()       { doTest(true, false); }
   public void testMacrosUnderscore()  { doTest(true, false); }
   public void testComprehensionsRecovery() { doTest(true, true); }
+  public void testWhitespaceEscapeInCharLiterals() { doTest(true, false); }
 }