Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

exception spec

git-svn-id: http://svn.textmate.org/trunk/Bundles/Standard ML.tmbundle@11751 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  • Loading branch information...
commit ce53e037f83e26ec2a56b857e877ebf20a1a4b6a 1 parent 79d3b39
commonlisp commonlisp authored

Showing 1 changed file with 43 additions and 91 deletions. Show diff stats Hide diff stats

  1. +43 91 Syntaxes/Standard ML.plist
134 Syntaxes/Standard ML.plist
... ... @@ -1,5 +1,5 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  2 +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 3 <plist version="1.0">
4 4 <dict>
5 5 <key>fileTypes</key>
@@ -56,8 +56,32 @@
56 56 </array>
57 57 </dict>
58 58 <dict>
59   - <key>include</key>
60   - <string>#sigexp</string>
  59 + <key>begin</key>
  60 + <string>\b(sig)\b</string>
  61 + <key>captures</key>
  62 + <dict>
  63 + <key>1</key>
  64 + <dict>
  65 + <key>name</key>
  66 + <string>keyword.other.delimiter.ml</string>
  67 + </dict>
  68 + <key>2</key>
  69 + <dict>
  70 + <key>name</key>
  71 + <string>keyword.other.delimiter.ml</string>
  72 + </dict>
  73 + </dict>
  74 + <key>end</key>
  75 + <string>\b(end)\b</string>
  76 + <key>name</key>
  77 + <string>meta.module.sigdec.ml</string>
  78 + <key>patterns</key>
  79 + <array>
  80 + <dict>
  81 + <key>include</key>
  82 + <string>#spec</string>
  83 + </dict>
  84 + </array>
61 85 </dict>
62 86 <dict>
63 87 <key>match</key>
@@ -176,7 +200,7 @@
176 200 </dict>
177 201 </dict>
178 202 <key>end</key>
179   - <string>(?==|:|:&gt;|\()</string>
  203 + <string>(?==|:|\()</string>
180 204 <key>name</key>
181 205 <string>meta.module.dec.ml</string>
182 206 </dict>
@@ -194,7 +218,7 @@
194 218 </dict>
195 219 <dict>
196 220 <key>begin</key>
197   - <string>\b(eqtype|type)\s+([a-zA-Z][a-zA-Z0-9'_]*)\s+=</string>
  221 + <string>\s*(type|eqtype) .* =</string>
198 222 <key>captures</key>
199 223 <dict>
200 224 <key>1</key>
@@ -209,11 +233,18 @@
209 233 </dict>
210 234 </dict>
211 235 <key>end</key>
212   - <string>(?==|end|fun|structure|functor|val|type|eqtype|where|datatype|exception)</string>
  236 + <string>$</string>
213 237 <key>name</key>
214 238 <string>meta.typeabbrev.ml</string>
215 239 <key>patterns</key>
216   - <array/>
  240 + <array>
  241 + <dict>
  242 + <key>match</key>
  243 + <string>(([a-zA-Z0-9\.\* ]|(\-&gt;))*)</string>
  244 + <key>name</key>
  245 + <string>meta.typeexp.ml</string>
  246 + </dict>
  247 + </array>
217 248 </dict>
218 249 </array>
219 250 <key>repository</key>
@@ -261,44 +292,6 @@
261 292 </dict>
262 293 </array>
263 294 </dict>
264   - <key>sigexp</key>
265   - <dict>
266   - <key>patterns</key>
267   - <array>
268   - <dict>
269   - <key>begin</key>
270   - <string>\b(sig)\b</string>
271   - <key>captures</key>
272   - <dict>
273   - <key>1</key>
274   - <dict>
275   - <key>name</key>
276   - <string>keyword.other.delimiter.ml</string>
277   - </dict>
278   - <key>2</key>
279   - <dict>
280   - <key>name</key>
281   - <string>keyword.other.delimiter.ml</string>
282   - </dict>
283   - </dict>
284   - <key>end</key>
285   - <string>\b(end)\b</string>
286   - <key>name</key>
287   - <string>meta.module.sigdec.ml</string>
288   - <key>patterns</key>
289   - <array>
290   - <dict>
291   - <key>include</key>
292   - <string>#comments</string>
293   - </dict>
294   - <dict>
295   - <key>include</key>
296   - <string>#spec</string>
297   - </dict>
298   - </array>
299   - </dict>
300   - </array>
301   - </dict>
302 295 <key>spec</key>
303 296 <dict>
304 297 <key>patterns</key>
@@ -318,13 +311,13 @@
318 311 </dict>
319 312 </dict>
320 313 <key>match</key>
321   - <string>\b(type)\s+([a-zA-Z][a-zA-Z0-9'_]*)</string>
  314 + <string>\b(exception|type)\s+([a-zA-Z][a-zA-Z0-9'_]*)</string>
322 315 <key>name</key>
323 316 <string>meta.spec.ml.type</string>
324 317 </dict>
325 318 <dict>
326 319 <key>begin</key>
327   - <string>\b(datatype)\s+(\(.*\))?\s*([a-zA-Z][a-zA-Z0-9'_]*)\s*(?==)</string>
  320 + <string>\b(datatype)\s+([a-zA-Z][a-zA-Z0-9'_]*)\s*(?==)</string>
328 321 <key>captures</key>
329 322 <dict>
330 323 <key>1</key>
@@ -332,14 +325,14 @@
332 325 <key>name</key>
333 326 <string>keyword.other.ml</string>
334 327 </dict>
335   - <key>3</key>
  328 + <key>2</key>
336 329 <dict>
337 330 <key>name</key>
338 331 <string>entity.name.type.datatype.ml</string>
339 332 </dict>
340 333 </dict>
341 334 <key>end</key>
342   - <string>(?=val|type|eqtype|datatype|structure|include|\(\*)</string>
  335 + <string>(?=val|type|eqtype|datatype|structure|include|exception)</string>
343 336 <key>name</key>
344 337 <string>meta.spec.ml.datatype</string>
345 338 <key>patterns</key>
@@ -420,27 +413,6 @@
420 413 </dict>
421 414 <dict>
422 415 <key>begin</key>
423   - <string>\b(exception)\s*(\w+)\s*</string>
424   - <key>captures</key>
425   - <dict>
426   - <key>1</key>
427   - <dict>
428   - <key>name</key>
429   - <string>keyword.other.ml</string>
430   - </dict>
431   - <key>2</key>
432   - <dict>
433   - <key>name</key>
434   - <string>entity.name.type.exception.ml</string>
435   - </dict>
436   - </dict>
437   - <key>end</key>
438   - <string>(?=val|type|eqtype|datatype|structure|include|exception|end)</string>
439   - <key>name</key>
440   - <string>meta.spec.ml.exception</string>
441   - </dict>
442   - <dict>
443   - <key>begin</key>
444 416 <string>\b(structure)\s*(\w+)\s*:</string>
445 417 <key>captures</key>
446 418 <dict>
@@ -456,37 +428,17 @@
456 428 </dict>
457 429 </dict>
458 430 <key>end</key>
459   - <string>(?=val|type|eqtype|datatype|structure|include|exception|end)</string>
  431 + <string>(?=val|type|eqtype|datatype|structure|include)</string>
460 432 <key>name</key>
461 433 <string>meta.spec.ml.structure</string>
462 434 <key>patterns</key>
463 435 <array>
464 436 <dict>
465 437 <key>match</key>
466   - <string>\b(sharing type)\b</string>
467   - <key>name</key>
468   - <string>keyword.other.ml</string>
469   - </dict>
470   - <dict>
471   - <key>match</key>
472 438 <string>\b(sharing)\b</string>
473 439 <key>name</key>
474 440 <string>keyword.other.ml</string>
475 441 </dict>
476   - <dict>
477   - <key>match</key>
478   - <string>\b(where)\b</string>
479   - <key>name</key>
480   - <string>keyword.other.ml</string>
481   - </dict>
482   - <dict>
483   - <key>include</key>
484   - <string>#sigexp</string>
485   - </dict>
486   - <dict>
487   - <key>include</key>
488   - <string>#comments</string>
489   - </dict>
490 442 </array>
491 443 </dict>
492 444 <dict>

0 comments on commit ce53e03

Please sign in to comment.
Something went wrong with that request. Please try again.