[rkward-cvs] SF.net SVN: rkward: [1958] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 1958
          http://rkward.svn.sourceforge.net/rkward/?rev=1958&view=rev
Author:   tfry
Date:     2007-09-17 06:57:46 -0700 (Mon, 17 Sep 2007)

Log Message:
-----------
correct highlighting for ::: and NA_type_

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/syntax/r.xml
    trunk/rkward/rkward/syntax/rkward.xml

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2007-09-14 12:30:59 UTC (rev 1957)
+++ trunk/rkward/ChangeLog	2007-09-17 13:57:46 UTC (rev 1958)
@@ -1,3 +1,4 @@
+- correct syntax highlighting for ::: and NA_integer_ and others
 - silence some GCC 4.2 warnings
 - fixed: crash when editing a data.frame with logicals (logicals are still mishandled, but less severe)
 - fixed: would not work with R 2.6

Modified: trunk/rkward/rkward/syntax/r.xml
===================================================================
--- trunk/rkward/rkward/syntax/r.xml	2007-09-14 12:30:59 UTC (rev 1957)
+++ trunk/rkward/rkward/syntax/r.xml	2007-09-17 13:57:46 UTC (rev 1958)
@@ -8,7 +8,7 @@
 	R      : http://www.r-project.org/
 	RKWard : http://rkward.sourceforge.net/
 	-->
-<language version="2.01" kateversion="2.5" name="R Script" section="Scripts" extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPL">
+<language version="2.02" kateversion="2.5" name="R Script" section="Scripts" extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPL">
 <highlighting>
 
 	<list name="controls">
@@ -28,6 +28,10 @@
 		<item> FALSE </item>
 		<item> NULL </item>
 		<item> NA </item>
+		<item> NA_integer_ </item>
+		<item> NA_real_ </item>
+		<item> NA_complex_ </item>
+		<item> NA_character_ </item>
 		<item> Inf </item>
 		<item> NaN </item>
 	</list>
@@ -103,8 +107,8 @@
 			<RegExpr attribute="Assign" context="#stay" String="=(?!=)"/>
 
 			<!-- These operators are fine as long as they're followed by something else or end of line. Error otherwise -->
-			<RegExpr attribute="Operator" context="#stay" String="(\+|\-|\*|/|<=|>=|={1,2}|\!=|\|{1,2}|&{1,2}|:{1,2}|\^|@|\$|~)((?!(\+|\-|\*|/|<=|>=|=|\!=|\||&|:|\^|@|\$|~))|$)"/>
-			<RegExpr attribute="Error" context="#stay" String="(\+|\-|\*|/|<=|>=|={1,2}|\!=|\|{1,2}|&{1,2}|:{1,2}|\^|@|\$|~){2,}"/>	
+			<RegExpr attribute="Operator" context="#stay" String="(\+|\-|\*|/|<=|>=|={1,2}|\!=|\|{1,2}|&{1,2}|:{1,3}|\^|@|\$|~)((?!(\+|\-|\*|/|<=|>=|=|\!=|\||&|:|\^|@|\$|~))|$)"/>
+			<RegExpr attribute="Error" context="#stay" String="(\+|\-|\*|/|<=|>=|={1,2}|\!=|\|{1,2}|&{1,2}|:{1,3}|\^|@|\$|~){2,}"/>	
 			<RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
 			
 			<DetectChar attribute="Symbol" context="ctx0" char="{" beginRegion="Brace1" />

Modified: trunk/rkward/rkward/syntax/rkward.xml
===================================================================
--- trunk/rkward/rkward/syntax/rkward.xml	2007-09-14 12:30:59 UTC (rev 1957)
+++ trunk/rkward/rkward/syntax/rkward.xml	2007-09-17 13:57:46 UTC (rev 1958)
@@ -9,7 +9,7 @@
 	R      : http://www.r-project.org/
 	RKWard : http://rkward.sourceforge.net/
 	-->
-<language version="2.01" kateversion="2.5" name="RKWard output" section="Scripts" extensions="" mimetype="" author="P. Ecochard" license="GPL">
+<language version="2.02" kateversion="2.5" name="RKWard output" section="Scripts" extensions="" mimetype="" author="P. Ecochard" license="GPL">
 <highlighting>
 	<list name="controls">
 	<item> for </item>
@@ -28,6 +28,10 @@
 	<item> FALSE </item>
 	<item> NULL </item>
 	<item> NA </item>
+	<item> NA_integer_ </item>
+	<item> NA_real_ </item>
+	<item> NA_complex_ </item>
+	<item> NA_character_ </item>
 	<item> Inf </item>
 	<item> NaN </item>
 	</list>
@@ -127,8 +131,8 @@
 			<RegExpr attribute="Assign" context="#stay" String="=(?!=)"/>
 			
 			<!-- These operators are fine as long as they're followed by something else or end of line. Error otherwise -->
-			<RegExpr attribute="Operator" context="#stay" String="(\+|\-|\*|/|<=|>=|={1,2}|\!=|\|{1,2}|&{1,2}|:{1,2}|\^|@|\$|~)((?!(\+|\-|\*|/|<=|>=|=|\!=|\||&|:|\^|@|\$|~))|$)"/>
-			<RegExpr attribute="Error" context="#stay" String="(\+|\-|\*|/|<=|>=|={1,2}|\!=|\|{1,2}|&{1,2}|:{1,2}|\^|@|\$|~){2,}"/>	
+			<RegExpr attribute="Operator" context="#stay" String="(\+|\-|\*|/|<=|>=|={1,2}|\!=|\|{1,2}|&{1,2}|:{1,3}|\^|@|\$|~)((?!(\+|\-|\*|/|<=|>=|=|\!=|\||&|:|\^|@|\$|~))|$)"/>
+			<RegExpr attribute="Error" context="#stay" String="(\+|\-|\*|/|<=|>=|={1,2}|\!=|\|{1,2}|&{1,2}|:{1,3}|\^|@|\$|~){2,}"/>	
 			<RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
 
 			<!-- Contrary to the normal R Script highlighting, we don't start a region here, but we do go into a command sub-context -->


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