[rkward-cvs] rkward/rkward r.xml,1.6,1.7

[Arne Henningsen]

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

Modified Files:
	r.xml 
Log Message:
some non-legal combinations of operators are now marked as errors

Index: r.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/r.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** r.xml	2 Aug 2006 17:28:58 -0000	1.6
--- r.xml	4 Aug 2006 20:52:09 -0000	1.7
***************
*** 41,44 ****
--- 41,46 ----
              <Float attribute="Float" context="#stay"/>
              <Int attribute="Int" context="#stay"/>
+ 	    <RegExpr attribute="Error" context="#stay" String="[+\-*]="/>
+ 	    <RegExpr attribute="Error" context="#stay" String="=[+\-*]"/>
              <RegExpr attribute="Keyword" context="#stay" String="[a-zA-Z_]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
              <RegExpr attribute="Keyword" context="#stay" String="\.[a-zA-Z_\.]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
***************
*** 48,52 ****
              <RegExpr attribute="Assign" context="#stay" String="[<]{1,2}\-"/>
              <RegExpr attribute="Assign" context="#stay" String="\-[>]{1,2}"/>
!             <RegExpr attribute="Assign" context="#stay" String="[^=!><]=[^=!><]"/>
              <AnyChar attribute="Operator" context="#stay" String="+-*/^:$~!&|=><@"/>
              <RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
--- 50,54 ----
              <RegExpr attribute="Assign" context="#stay" String="[<]{1,2}\-"/>
              <RegExpr attribute="Assign" context="#stay" String="\-[>]{1,2}"/>
! 	    <RegExpr attribute="Assign" context="#stay" String="[^=!><+\-*]=[^=!><+\-*]"/>
              <AnyChar attribute="Operator" context="#stay" String="+-*/^:$~!&|=><@"/>
              <RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
***************
*** 66,69 ****
--- 68,73 ----
              <Float attribute="Float" context="#stay"/>
              <Int attribute="Int" context="#stay"/>
+ 	    <RegExpr attribute="Error" context="#stay" String="[+\-*]="/>
+ 	    <RegExpr attribute="Error" context="#stay" String="=[+\-*]"/>
  	    <RegExpr attribute="Keyword" context="#stay" String="[a-zA-Z_]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
  	    <RegExpr attribute="Keyword" context="#stay" String="\.[a-zA-Z_\.]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
***************
*** 96,100 ****
           <itemData name="Normal Text" defStyleNum="dsNormal"/>
           <itemData name="Keyword" defStyleNum="dsKeyword"/>
!          <itemData name="Identifier" defStyleNum="dsNormal" color="#aa0000" selColor="#dd0000" bold="0" italic="0"/>
           <itemData name="Types" defStyleNum="dsDataType"/>
           <itemData name="String" defStyleNum="dsString"/>
--- 100,104 ----
           <itemData name="Normal Text" defStyleNum="dsNormal"/>
           <itemData name="Keyword" defStyleNum="dsKeyword"/>
!          <itemData name="Identifier" defStyleNum="dsNormal" color="#880000" selColor="#dd0000" bold="0" italic="0"/>
           <itemData name="Types" defStyleNum="dsDataType"/>
           <itemData name="String" defStyleNum="dsString"/>
***************
*** 104,107 ****
--- 108,112 ----
           <itemData name="Control Structure" defStyleNum="dsNormal" color="#0000ff" selColor="#00ff00"/>
           <itemData name="Reserved Words" defStyleNum="dsOthers"/>
+ 	 <itemData name="Error" defStyleNum="dsNormal" color="#ff9900" selColor="#0066ff" bold="1" italic="0"/>
           <itemData name="Operator" defStyleNum="dsNormal"  color="#aa5500" selColor="#000077" bold="0" italic="0"/>
           <itemData name="String Char"  defStyleNum="dsChar"/>