Fix #543: Clojure: fix char literal double quote

bobbylight · Jun 9, 2024 · 329b3c6 · 329b3c6
1 parent 99de6f0
commit 329b3c6
Show file tree

Hide file tree

Showing 6 changed files with 1,736 additions and 1,610 deletions.
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenMaker.flex b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenMaker.flex
@@ -239,7 +239,7 @@ EscapedSourceCharacter				    = ("u"{HexDigit}{HexDigit}{HexDigit}{HexDigit})
 Escape							        = ("\\"(([btnfr\"'\\])|([0123]{OctalDigit}?{OctalDigit}?)|({OctalDigit}{OctalDigit}?)|{EscapedSourceCharacter}))
 AnyCharacterButDoubleQuoteOrBackSlash	= ([^\\\"\n])
 StringLiteralStart                      = ([\"])
-CharLiteral                        		= ("\\."|"\\space"|"\\tab"|"\\newline")
+CharLiteral                        		= (\\.|"\\space"|"\\tab"|"\\newline")
 AnyCharacter                            = ([.]*)
 Separator								= ([\(\)\{\}\[\]])
 NonSeparator						= ([^\t\f\r\n\ \(\)\{\}\[\]\;\,\.\=\>\<\!\~\?\:\+\-\*\/\&\|\^\%\"\'])
@@ -251,8 +251,8 @@ WhiteSpace				= ([ \t\f])
 
 IntegerHelper1				= (({NonzeroDigit}{Digit}*)|"0")
 IntegerHelper2				= ("0"(([xX]{HexDigit}+)|({OctalDigit}*)))
-IntegerLiteral				= ({IntegerHelper1}[lL]?)
-HexLiteral				= ({IntegerHelper2}[lL]?)
+IntegerLiteral				= ([-]?{IntegerHelper1}[lL]?)
+HexLiteral				= ([-]?{IntegerHelper2}[lL]?)
 FloatHelper1				= ([fFdD]?)
 FloatHelper2				= ([eE][+-]?{Digit}+{FloatHelper1})
 FloatLiteral1				= ({Digit}+"."({FloatHelper1}|{FloatHelper2}|{Digit}+({FloatHelper1}|{FloatHelper2})))