From fe320b4e1602332d69ea8f96c09ca3112efa862a Mon Sep 17 00:00:00 2001
From: Benjamin Pollack <benjamin.pollack@gmail.com>
Date: Fri, 8 Sep 2006 06:50:46 +0000
Subject: [PATCH] Fixed several syntax errors in TextMate definition and added
 recognition for CHAR: and string escapes

---
 .../Syntaxes/Factor.tmLanguage                | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage b/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage
index 9b3993046c..2d96b618f1 100644
--- a/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage
+++ b/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage
@@ -58,16 +58,22 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(if|when|unless)\*?</string>
+			<string>\b(if|when|unless)\*?\s+</string>
 			<key>name</key>
 			<string>keyword.control.flow.factor</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\s+(f|t)\s+</string>
+			<string>\b(f|t)\s+</string>
 			<key>name</key>
 			<string>constant.language.factor</string>
 		</dict>
+		<dict>
+			<key>match</key>
+			<string>\bCHAR:\s+[^\s]\s+</string>
+			<key>name</key>
+			<string>constant.character.factor</string>
+		</dict>
 		<dict>
 			<key>match</key>
 			<string>\b(BIN:|HEX:|OCT:)?\s+-?\d+\s+</string>
@@ -93,6 +99,13 @@
 			<string>"</string>
 			<key>name</key>
 			<string>string.quoted.double.factor</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#escaped_characters</string>
+				</dict>
+			</array>
 		</dict>
 		<dict>
 			<key>match</key>
@@ -117,6 +130,27 @@
 			<string>comment.parens.factor</string>
 		</dict>
 	</array>
+	<key>repository</key>
+	<dict>
+		<key>escaped_characters</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\\(\\|[abefnprtv'"?]|[0-3]\d{,2}|[4-7]\d?|x[a-fA-F0-9]{,2})</string>
+					<key>name</key>
+					<string>constant.character.escape.factor</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\\.</string>
+					<key>name</key>
+					<string>invalid.illegal.unknown-escape.factor</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 	<key>scopeName</key>
 	<string>source.factor</string>
 	<key>uuid</key>