Lands #41, ... identifier

KronicDeth · Nov 10, 2014 · 928b487 · 928b487
2 parents c9dbf83 + 0132dea
commit 928b487
Show file tree

Hide file tree

Showing 6 changed files with 308 additions and 309 deletions.
diff --git a/screenshots/Color Settings.png b/screenshots/Color Settings.png
diff --git a/src/org/elixir_lang/Elixir.flex b/src/org/elixir_lang/Elixir.flex
@@ -315,7 +315,7 @@ INTEGER = {BINARY_INTEGER} | {DECIMAL_INTEGER} | {HEXADECIMAL_INTEGER} | {OCTAL_
 IDENTIFIER_END = [?!]
 IDENTIFIER_MIDDLE = [0-9a-zA-Z_]
 IDENTIFIER_START = [a-z_]
-IDENTIFIER = {IDENTIFIER_START} {IDENTIFIER_MIDDLE}* {IDENTIFIER_END}?
+IDENTIFIER = ({IDENTIFIER_START} {IDENTIFIER_MIDDLE}* {IDENTIFIER_END}? | "...")
 
 /*
  * Interpolation

diff --git a/src/org/elixir_lang/ElixirFlexLexer.java b/src/org/elixir_lang/ElixirFlexLexer.java