Miscellaneous TextMate syntax patches

diff --git a/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage b/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage
index 130688047f3c92be55010abaece217f4d034202c..fcc5f483e61159de728b59e355fbb33fa8bdc616 100644 (file)
--- a/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage
+++ b/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage
@@ -20,52 +20,157 @@
                <dict>
                        <key>captures</key>
                        <dict>
-                               <key>3</key>
+                               <key>1</key>
                                <dict>
                                        <key>name</key>
                                        <string>keyword.colon.factor</string>
                                </dict>
-                               <key>4</key>
+                               <key>2</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>entity.name.function.factor</string>
+                               </dict>
+                               <key>3</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>comment.stack-effect.factor</string>
+                               </dict>
+                       </dict>
+                       <key>match</key>
+                       <string>^(:)\s+([^\s]+)\s+(\(\s.*\))?</string>
+                       <key>name</key>
+                       <string>definition.word.factor</string>
+               </dict>
+               <dict>
+                       <key>captures</key>
+                       <dict>
+                               <key>1</key>
                                <dict>
                                        <key>name</key>
                                        <string>keyword.colon.factor</string>
                                </dict>
-                               <key>5</key>
+                               <key>2</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>entity.name.method.factor</string>
+                               </dict>
+                               <key>3</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>comment.stack-effect.factor</string>
+                               </dict>
+                       </dict>
+                       <key>match</key>
+                       <string>^(C:)\s+([^\s]+)\s+(\(\s.*\))?</string>
+                       <key>name</key>
+                       <string>definition.word.class.factor</string>
+               </dict>
+               <dict>
+                       <key>captures</key>
+                       <dict>
+                               <key>1</key>
                                <dict>
                                        <key>name</key>
                                        <string>keyword.colon.factor</string>
                                </dict>
-                               <key>6</key>
+                               <key>2</key>
                                <dict>
                                        <key>name</key>
                                        <string>entity.name.class.factor</string>
                                </dict>
-                               <key>7</key>
+                               <key>3</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>entity.name.method.factor</string>
+                               </dict>
+                               <key>4</key>
                                <dict>
                                        <key>name</key>
                                        <string>comment.stack-effect.factor</string>
                                </dict>
                        </dict>
                        <key>match</key>
-                       <string>^(((M:)\s+[^\s]+)|(:)|(C:))\s*([^\s]+)\s*(\(\s.*\))?</string>
+                       <string>^(M:)\s+([^\s]+)\s+([^\s]+)\s+(\(\s.*\))?</string>
                        <key>name</key>
-                       <string>definition.word.factor</string>
+                       <string>definition.word.method.factor</string>
+               </dict>
+               <dict>
+                       <key>captures</key>
+                       <dict>
+                               <key>1</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>keyword.colon.factor</string>
+                               </dict>
+                               <key>3</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>entity.name.generic.factor</string>
+                               </dict>
+                               <key>4</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>comment.stack-effect.factor</string>
+                               </dict>
+                       </dict>
+                       <key>match</key>
+                       <string>^(G(ENERIC)?:)\s+([^\s]+)\s+(\(\s.*\))?</string>
+                       <key>name</key>
+                       <string>definition.word.generic.factor</string>
+               </dict>
+               <dict>
+                       <key>captures</key>
+                       <dict>
+                               <key>1</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>storage.type.factor</string>
+                               </dict>
+                               <key>2</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>entity.name.class.factor</string>
+                               </dict>
+                       </dict>
+                       <key>match</key>
+                       <string>^(TUPLE:)\s+([^\s]+)\s+(([^\s]+)+)</string>
+                       <key>name</key>
+                       <string>meta.class.factor</string>
                </dict>
                <dict>
                        <key>match</key>
-                       <string>\b(drop|2drop|3drop|nip|2nip|dup|2dup|3dup|dupd|over|pick|tuck|swap|rot|-rot|2swap|swapd|&gt;r|r&gt;)\b</string>
+                       <string>\b(drop|2drop|3drop|keep|nip|2nip|dup|2dup|3dup|dupd|get|over|pick|tuck|swap|rot|-rot|set|slip|2swap|swapd|&gt;r|r&gt;)\s</string>
                        <key>name</key>
                        <string>keyword.control.stack.factor</string>
                </dict>
                <dict>
                        <key>match</key>
-                       <string>\b(if|when|unless)\*?\s+</string>
+                       <string>\b(if|when|unless)\*?\s</string>
                        <key>name</key>
                        <string>keyword.control.flow.factor</string>
                </dict>
+               <dict>
+                       <key>captures</key>
+                       <dict>
+                               <key>1</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>keyword.control.using.factor</string>
+                               </dict>
+                               <key>2</key>
+                               <dict>
+                                       <key>name</key>
+                                       <string>constant.namespace.factor</string>
+                               </dict>
+                       </dict>
+                       <key>match</key>
+                       <string>^(USING:)\s+(([^\s]+(\s)+)+);</string>
+                       <key>name</key>
+                       <string>meta.control.namespace.factor</string>
+               </dict>
                <dict>
                        <key>match</key>
-                       <string>\b(f|t)\s+</string>
+                       <string>\b(f|t)\s</string>
                        <key>name</key>
                        <string>constant.language.factor</string>
                </dict>
@@ -77,19 +182,25 @@
                </dict>
                <dict>
                        <key>match</key>
-                       <string>\b(BIN:|HEX:|OCT:)?\s+-?\d+\s+</string>
+                       <string>\b((BIN:|OCT:)\s+)?-?\d+\s</string>
                        <key>name</key>
                        <string>constant.numeric.integer.factor</string>
                </dict>
                <dict>
                        <key>match</key>
-                       <string>\b-?+\d+\.\d+(E(\+|-)\d+)?\s+</string>
+                       <string>\bHEX:\s+-?[\dA-Fa-f]+\s</string>
+                       <key>name</key>
+                       <string>constant.numeric.hexadecimal.integer.factor</string>
+               </dict>
+               <dict>
+                       <key>match</key>
+                       <string>\b-?+\d+\.\d+(E(\+|-)\d+)?\s</string>
                        <key>name</key>
                        <string>constant.numeric.float.factor</string>
                </dict>
                <dict>
                        <key>match</key>
-                       <string>\b-?\d+/-?\d+\s+</string>
+                       <string>\b-?\d+/-?\d+\s</string>
                        <key>name</key>
                        <string>constant.numeric.rational.factor</string>
                </dict>
@@ -110,7 +221,7 @@
                </dict>
                <dict>
                        <key>match</key>
-                       <string>inline</string>
+                       <string>inline|foldable</string>
                        <key>name</key>
                        <string>storage.modifier.factor</string>
                </dict>
@@ -124,9 +235,9 @@
                </dict>
                <dict>
                        <key>begin</key>
-                       <string>\(\s+</string>
+                       <string>\(\s</string>
                        <key>end</key>
-                       <string>\s+\)</string>
+                       <string>\s\)</string>
                        <key>name</key>
                        <string>comment.parens.factor</string>
                </dict>
@@ -134,7 +245,7 @@
                        <key>match</key>
                        <string>\b[A-Z]+:\s+[^\s]+(\s|$)</string>
                        <key>name</key>
-                       <string>meta.postpone.factor</string>
+                       <string>keyword.control.postpone.factor</string>
                </dict>
        </array>
        <key>repository</key>