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

[tfry at users.sourceforge.net]

Revision: 997
          http://svn.sourceforge.net/rkward/?rev=997&view=rev
Author:   tfry
Date:     2006-12-07 06:44:52 -0800 (Thu, 07 Dec 2006)

Log Message:
-----------
Detect single quotes as well as double quotes

Modified Paths:
--------------
    trunk/rkward/rkward/syntax/r-syntax-test.R
    trunk/rkward/rkward/syntax/r.xml
    trunk/rkward/rkward/syntax/rkward.xml

Modified: trunk/rkward/rkward/syntax/r-syntax-test.R
===================================================================
--- trunk/rkward/rkward/syntax/r-syntax-test.R	2006-12-06 18:37:18 UTC (rev 996)
+++ trunk/rkward/rkward/syntax/r-syntax-test.R	2006-12-07 14:44:52 UTC (rev 997)
@@ -45,5 +45,6 @@
 
 x <- 1
 print ("hi", quote=(x==1))
+cat ("normal quote", 'single quoted', "with escapes \"\'", 'with escapes 2 \'\"')
 
 cat( "\nNo Errors!\n" )

Modified: trunk/rkward/rkward/syntax/r.xml
===================================================================
--- trunk/rkward/rkward/syntax/r.xml	2006-12-06 18:37:18 UTC (rev 996)
+++ trunk/rkward/rkward/syntax/r.xml	2006-12-07 14:44:52 UTC (rev 997)
@@ -60,6 +60,7 @@
 
 		<context attribute="String" lineEndContext="#stay" name="string">
 			<DetectChar attribute="String" context="#pop" char="""/>
+			<DetectChar attribute="String" context="#pop" char="'"/>
 			<HlCStringChar attribute="String Char" context="#stay"/>
 		</context>
 
@@ -69,6 +70,7 @@
 		<!-- This context is not really used, but contains the common rules -->
 		<context name="CommonRules" lineEndContext="#stay" attribute="Normal Text" >
 			<DetectChar attribute="String" context="string" char="""/>
+			<DetectChar attribute="String" context="string" char="'"/>
 			<keyword attribute="Control Structure" context="#stay" String="controls"/>
 			<keyword attribute="Reserved Words" context="#stay" String="words"/>
 			<Float attribute="Float" context="#stay"/>

Modified: trunk/rkward/rkward/syntax/rkward.xml
===================================================================
--- trunk/rkward/rkward/syntax/rkward.xml	2006-12-06 18:37:18 UTC (rev 996)
+++ trunk/rkward/rkward/syntax/rkward.xml	2006-12-07 14:44:52 UTC (rev 997)
@@ -73,6 +73,7 @@
 		<context attribute="String" lineEndContext="#stay" name="string">
 			<IncludeRules context="CommandContinuationCheck"/>
 			<DetectChar attribute="String" context="#pop" char="""/>
+			<DetectChar attribute="String" context="#pop" char="'"/>
 			<HlCStringChar attribute="String Char" context="#stay"/>
 		</context>
 
@@ -91,6 +92,7 @@
 		<!-- This context is not really used, but contains the common rules -->
 		<context attribute="Normal Text" name="CommonRules" lineEndContext="#stay">
 			<DetectChar attribute="String" context="string" char="""/>
+			<DetectChar attribute="String" context="string" char="'"/>
 			<keyword attribute="Control Structure" context="#stay" String="controls"/>
 			<keyword attribute="Reserved Words" context="#stay" String="words"/>
 			<Float attribute="Float" context="#stay"/>


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