Merge pull request #3 from rjsamson/master

Fix error stemming from bitwise regex

grammars/elixir.cson

@@ -458,7 +458,30 @@
     'name': 'comment.line.number-sign.elixir'
   }
   {
-    'comment': '\n\t\t\tmatches questionmark-letters.\n\n\t\t\texamples (1st alternation = hex):\n\t\t\t?\\x1     ?\\x61\n\n\t\t\texamples (2nd alternation = octal):\n\t\t\t?\\0      ?\\07     ?\\017\n\n\t\t\texamples (3rd alternation = escaped):\n\t\t\t?\\n      ?\\b\n\n\t\t\texamples (4th alternation = meta-ctrl):\n\t\t\t?\\C-a    ?\\M-a    ?\\C-\\M-\\C-\\M-a\n\n\t\t\texamples (4th alternation = normal):\n\t\t\t?a       ?A       ?0 \n\t\t\t?*       ?"       ?( \n\t\t\t?.       ?#\n\t\t\t\n\t\t\t\n\t\t\tthe negative lookbehind prevents against matching\n\t\t\tp(42.tainted?)\n\t\t\t'
+    'comment': """
+			matches questionmark-letters.
+
+			examples (1st alternation = hex):
+			?\\x1     ?\\x61
+
+			examples (2nd alternation = octal):
+			?\\0      ?\\07     ?\\017
+
+			examples (3rd alternation = escaped):
+			?\\n      ?\\b
+
+			examples (4th alternation = meta-ctrl):
+			?\\C-a    ?\\M-a    ?\\C-\\M-\\C-\\M-a
+
+			examples (4th alternation = normal):
+			?a       ?A       ?0
+			?*       ?"       ?(
+			?.       ?#
+
+
+			the negative lookbehind prevents against matching
+			p(42.tainted?)
+    """
     'match': '(?<!\\w)\\?(\\\\(x\\h{1,2}(?!\\h)\\b|0[0-7]{0,2}(?![0-7])\\b|[^x0MC])|(\\\\[MC]-)+\\w|[^\\s\\\\])'
     'name': 'constant.numeric.elixir'
   }
@@ -488,7 +511,7 @@
     'name': 'keyword.operator.comparison.elixir'
   }
   {
-    'match': '(\\|\\|\\||&&&|^^^|<<<|>>>|~~~)'
+    'match': '(\\|\\|\\||&&&|\\^\\^\\^|<<<|>>>|~~~)'
     'name': 'keyword.operator.bitwise.elixir'
   }
   {