[rkward-cvs] rkward/rkward r-syntax-test.R,1.1,1.2 r.xml,1.7,1.8

[Arne Henningsen]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16243

Modified Files:
	r-syntax-test.R r.xml 
Log Message:
names of arguments (Identifier) are now correctly highlighted even if they contain numerals: this can now be tested with the r-syntax-test.R file

Index: r-syntax-test.R
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/r-syntax-test.R,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** r-syntax-test.R	4 Aug 2006 20:54:16 -0000	1.1
--- r-syntax-test.R	4 Aug 2006 21:14:51 -0000	1.2
***************
*** 40,43 ****
--- 40,45 ----
  silent=FALSE)
  
+ myList <- list( a = 1, a2 = 2, a2_b = 3 )
+ 
  x <- 1
  print ("hi", quote=(x==1))

Index: r.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/r.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** r.xml	4 Aug 2006 20:52:09 -0000	1.7
--- r.xml	4 Aug 2006 21:14:51 -0000	1.8
***************
*** 84,88 ****
              <!-- no need to define brace end here, as we've already jumped to ctx0 at the brace start -->
  
! 	    <RegExpr attribute="Identifier" context="#stay" String="[a-zA-Z_\.]+[\s]*=(?=[^=])"/>
           </context>
  
--- 84,88 ----
              <!-- no need to define brace end here, as we've already jumped to ctx0 at the brace start -->
  
! 	    <RegExpr attribute="Identifier" context="#stay" String="[a-zA-Z_\.][0-9a-zA-Z_\.]*[\s]*=(?=[^=])"/>
           </context>