[pure-lang-svn] SF.net SVN: pure-lang: [277] pure/trunk

[<ag...@us...>]

Revision: 277
          http://pure-lang.svn.sourceforge.net/pure-lang/?rev=277&view=rev
Author:   agraef
Date:     2008-06-21 14:43:52 -0700 (Sat, 21 Jun 2008)

Log Message:
-----------
Cosmetic changes, all modes now highlight catch/throw.

Modified Paths:
--------------
    pure/trunk/ChangeLog
    pure/trunk/etc/pure-mode.el.in
    pure/trunk/etc/pure.lang
    pure/trunk/etc/pure.vim
    pure/trunk/etc/pure.xml

Modified: pure/trunk/ChangeLog
===================================================================
--- pure/trunk/ChangeLog	2008-06-21 13:18:27 UTC (rev 276)
+++ pure/trunk/ChangeLog	2008-06-21 21:43:52 UTC (rev 277)
@@ -1,5 +1,8 @@
 2008-06-21  Albert Graef  <Dr....@t-...>
 
+	* etc/pure-mode.el.in, etc/pure.vim, etc/pure.xml, etc/pure.lang:
+	Cosmetic changes, all modes now highlight catch/throw.
+
 	* lib/prelude.pure: Fixed a glitch in the definition of foldr1
 	which caused list elements to be processed in the wrong order.
 

Modified: pure/trunk/etc/pure-mode.el.in
===================================================================
--- pure/trunk/etc/pure-mode.el.in	2008-06-21 13:18:27 UTC (rev 276)
+++ pure/trunk/etc/pure-mode.el.in	2008-06-21 21:43:52 UTC (rev 277)
@@ -161,6 +161,7 @@
 ;    (list pure-prompt-regexp 0 'font-lock-preprocessor-face t)
    (list pure-msg-regexp 0 'font-lock-warning-face t)
    (list "::\\([A-Za-z_][A-Za-z_0-9]*\\)" 1 'font-lock-type-face)
+   (list "\\<\\(catch\\|throw\\)\\>" 0 'font-lock-builtin-face)
    (list
     (concat "\\<\\("
 	    "case\\|e\\(lse\\|nd\\|xtern\\)\\|i\\(f\\|nfix[lr]?\\)\\|let\\|"
@@ -174,6 +175,7 @@
   (list
    (list "^#!.*" 0 'font-lock-comment-face t)
    (list "::\\([A-Za-z_][A-Za-z_0-9]*\\)" 1 'font-lock-type-face)
+   (list "\\<\\(catch\\|throw\\)\\>" 0 'font-lock-builtin-face)
    (list
     (concat "\\<\\("
 	    "case\\|e\\(lse\\|nd\\|xtern\\)\\|i\\(f\\|nfix[lr]?\\)\\|let\\|"

Modified: pure/trunk/etc/pure.lang
===================================================================
--- pure/trunk/etc/pure.lang	2008-06-21 13:18:27 UTC (rev 276)
+++ pure/trunk/etc/pure.lang	2008-06-21 21:43:52 UTC (rev 277)
@@ -7,6 +7,9 @@
 $KW_LIST(kwa)=infix infixl infixr prefix postfix nullary case else end extern
 if let of otherwise then using when with
 
+# These aren't really keywords but we want them to stick out anyway.
+$KW_LIST(kwb)=catch throw
+
 # Type identifiers used as tags and in extern declarations.
 $KW_LIST(kwc)=bigint bool char short int long double expr string pointer void
 

Modified: pure/trunk/etc/pure.vim
===================================================================
--- pure/trunk/etc/pure.vim	2008-06-21 13:18:27 UTC (rev 276)
+++ pure/trunk/etc/pure.vim	2008-06-21 21:43:52 UTC (rev 277)
@@ -35,8 +35,9 @@
 syn keyword pureKeyword	infix infixl infixr prefix postfix nullary
 syn keyword pureKeyword	case else end extern if let of otherwise then
 syn keyword pureKeyword	using when with
-syn keyword pureIdentifier bigint bool char short int long double
-syn keyword pureIdentifier expr string pointer void
+syn keyword pureSpecial catch throw
+syn keyword pureType bigint bool char short int long double
+syn keyword pureType expr string pointer void
 
 syn match   pureNumber	         "\<[0-9]*\>"
 syn match   pureHexNumber	 "\<0[Xx][0-9A-Fa-f]*\>"
@@ -68,6 +69,8 @@
   HiLink pureSpecialCharacter	Special
   HiLink pureNumber		Number
   HiLink pureHexNumber		Number
+  HiLink pureType		Type
+  HiLink pureSpecial		Identifier
   HiLink pureIdentifier		Identifier
   HiLink pureCommentError	Error
   HiLink pureString		String

Modified: pure/trunk/etc/pure.xml
===================================================================
--- pure/trunk/etc/pure.xml	2008-06-21 13:18:27 UTC (rev 276)
+++ pure/trunk/etc/pure.xml	2008-06-21 21:43:52 UTC (rev 277)
@@ -22,6 +22,10 @@
       <item> when </item>
       <item> with </item>
     </list>
+    <list name="special">
+      <item> catch </item>
+      <item> throw </item>
+    </list>
     <list name="types">
       <item> bigint </item>
       <item> bool </item>
@@ -38,7 +42,8 @@
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
-        <keyword attribute="Conid" context="#stay" String="types"/>
+        <keyword attribute="Function" context="#stay" String="special"/>
+        <keyword attribute="Type" context="#stay" String="types"/>
         <RegExpr attribute="Normal Text" context="#stay" String="[A-Za-z_][A-Za-z0-9_]*"/>
         <RegExpr attribute="Number" context="#stay" String="0x[A-Za-z0-9]+"/>
         <Float attribute="Number" context="#stay"/>
@@ -59,7 +64,8 @@
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal" />
       <itemData name="Keyword"     defStyleNum="dsKeyword" />
-      <itemData name="Conid"       defStyleNum="dsDataType"/>
+      <itemData name="Function"    defStyleNum="dsFunction"/>
+      <itemData name="Type"        defStyleNum="dsDataType"/>
       <itemData name="Number"      defStyleNum="dsDecVal" />
       <itemData name="String"      defStyleNum="dsString" />
       <itemData name="Comment"     defStyleNum="dsComment" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.