Changeset 143

Timestamp:

11/17/08 16:46:49 (3 years ago)

Author:

phil

Message:

updates numeric literals in n3

Location:

tools/trunk/N3.tmbundle

Files:

• info.plist (modified) (1 diff)
• Snippets/SELECT.tmSnippet (modified) (1 diff)
• Syntaxes/n3.tmLanguage (modified) (6 diffs)

tools/trunk/N3.tmbundle/info.plist

@@ -27 +27 @@
                 <string>14B865F3-9262-4316-BAF5-E82AD0A17B98</string>
                 <string>6D706691-7729-415C-A559-65D4467334AE</string>
-                <string>ED69C653-5E33-4E6C-815E-8115009A9FA7</string>
         </array>
         <key>uuid</key>

tools/trunk/N3.tmbundle/Snippets/SELECT.tmSnippet

@@ -14 +14 @@
         <string>source.sparql</string>
         <key>tabTrigger</key>
-        <string>SELECT</string>
+        <string>SELECT, select</string>
         <key>uuid</key>
         <string>3AF7D2AC-4600-4E8D-AFCE-61EBC287E0E9</string>

tools/trunk/N3.tmbundle/Syntaxes/n3.tmLanguage

@@ -59 +59 @@
                 <dict>
                         <key>begin</key>
-                        <string>([a-zA-Z0-9\:\-_]+|\[\]|&lt;[^ \&gt;]*&gt;)\s*</string>
+                        <string>([a-zA-Z0-9\:\-_]+|\[\s*\]|&lt;[^ \&gt;]*&gt;)\s*</string>
                         <key>beginCaptures</key>
                         <dict>
@@ -70 +70 @@
                         <key>end</key>
                         <string>\.</string>
+                        <key>name</key>
+                        <string>meta.statement.n3</string>
+                        <key>patterns</key>
+                        <array>
+                                <dict>
+                                        <key>include</key>
+                                        <string>#comment</string>
+                                </dict>
+                                <dict>
+                                        <key>include</key>
+                                        <string>#PredObjM</string>
+                                </dict>
+                        </array>
+                </dict>
+                <dict>
+                        <key>begin</key>
+                        <string>(\[[^\]])\s*</string>
+                        <key>beginCaptures</key>
+                        <dict>
+                                <key>1</key>
+                                <dict>
+                                        <key>name</key>
+                                        <string>meta.statement.subject.n3</string>
+                                </dict>
+                        </dict>
+                        <key>end</key>
+                        <string>(?&lt;=[^\[])(])</string>
+                        <key>endCaptures</key>
+                        <dict>
+                                <key>1</key>
+                                <dict>
+                                        <key>name</key>
+                                        <string>meta.statement.subject.n3</string>
+                                </dict>
+                        </dict>
                         <key>name</key>
                         <string>meta.statement.n3</string>
@@ -123 +158 @@
                                 <dict>
                                         <key>include</key>
+                                        <string>#numberliteral</string>
+                                </dict>
+                                <dict>
+                                        <key>include</key>
                                         <string>#anonObj</string>
                                 </dict>
@@ -169 +208 @@
                         <key>name</key>
                         <string>comment.line.number-sign.n3</string>
+                </dict>
+                <key>numberliteral</key>
+                <dict>
+                        <key>captures</key>
+                        <dict>
+                                <key>1</key>
+                                <dict>
+                                        <key>name</key>
+                                        <string>meta.statement.object.literal.n3</string>
+                                </dict>
+                                <key>2</key>
+                                <dict>
+                                        <key>name</key>
+                                        <string>constant</string>
+                                </dict>
+                        </dict>
+                        <key>match</key>
+                        <string>([+-]?[0-9\.]+(?:e[+-]?[0-9]+)?)</string>
+                        <key>name</key>
+                        <string>meta.statement.object.literal.n3</string>
                 </dict>
                 <key>objlistM</key>
@@ -252 +311 @@
                         </dict>
                         <key>match</key>
-                        <string>(".*?[^\\]")(\^\^(?:[a-zA-z\-\:_]+|&lt;.*?&gt;)|@[a-z]+)?\s*</string>
+                        <string>(".*?[^\\]"|"")(\^\^(?:[a-zA-z\-\:_]+|&lt;.*?&gt;)|(?:@[a-z-]+))\s*</string>
                         <key>name</key>
                         <string>meta.statement.object.literal.n3</string>
@@ -259 +318 @@
                 <dict>
                         <key>match</key>
-                        <string>&lt;(([a-zA-Z][0-9a-zA-Z]*:)?/{0,2}[0-9a-zA-Z;/?:@&amp;=,+$\.\-_!~*()%]+)?(\#[0-9a-zA-Z;/?:@&amp;=+$\.\-_!~*%]+)?&gt;</string>
+                        <string>&lt;(([a-zA-Z][0-9a-zA-Z]*:)?/{0,2}[0-9a-zA-Z;/?:@&amp;=,+$\.\-_!~*()%]+)?(\#[0-9a-zA-Z;/?:@&amp;=+$\.\-_!~*%]*)?&gt;</string>
                         <key>name</key>
                         <string>meta.tag</string>