[rkward-cvs] rkward/rkward r.xml,1.13,1.14

[Thomas Friedrichsmeier]

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

Modified Files:
	r.xml 
Log Message:
Correction for = assignment

Index: r.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/r.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** r.xml	12 Sep 2006 14:33:00 -0000	1.13
--- r.xml	12 Sep 2006 14:58:11 -0000	1.14
***************
*** 49,53 ****
  			<!-- The following three lines look worse than they are: If there are any other operators directly before or after -> and <-, this is a syntax error (expections: ->> and <<-) -->
  			<RegExpr attribute="Error" context="#stay" String="([\+\-\*/\^\:\$~!&\|=>@^])([<]{1,2}\-|\-[>]{1,2})"/>
! 			<RegExpr attribute="Error" context="#stay" String="([<]{1,2}\-|\-[>]{1,2})([\+\-\*/\^\:\$~!&\|=<@^])"/>
  			<RegExpr attribute="Error" context="#stay" String="([<]{3}|[>]{3})"/>
  			<RegExpr attribute="Assign" context="#stay" String="[<]{1,2}\-"/>
--- 49,53 ----
  			<!-- The following three lines look worse than they are: If there are any other operators directly before or after -> and <-, this is a syntax error (expections: ->> and <<-) -->
  			<RegExpr attribute="Error" context="#stay" String="([\+\-\*/\^\:\$~!&\|=>@^])([<]{1,2}\-|\-[>]{1,2})"/>
! 			<RegExpr attribute="Error" context="#stay" String="([<]{1,2}\-|\-[>]{1,2})([\+\-\*/\^\:\$~!&\|=<@])"/>
  			<RegExpr attribute="Error" context="#stay" String="([<]{3}|[>]{3})"/>
  			<RegExpr attribute="Assign" context="#stay" String="[<]{1,2}\-"/>
***************
*** 56,60 ****
  			<RegExpr attribute="Error" context="#stay" String="([\+\-\*/\^\:\$~&\|@^])="/>
  			<RegExpr attribute="Error" context="#stay" String="=([\+\-\*/\^\:\$~!<>&\|@^])"/>
! 			<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}|\^|@|\$|~)((?!(\+|\-|\*|/|<=|>=|=|\!=|\||&|:|\^|@|\$|~))|$)"/>
--- 56,60 ----
  			<RegExpr attribute="Error" context="#stay" String="([\+\-\*/\^\:\$~&\|@^])="/>
  			<RegExpr attribute="Error" context="#stay" String="=([\+\-\*/\^\:\$~!<>&\|@^])"/>
! 			<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}|\^|@|\$|~)((?!(\+|\-|\*|/|<=|>=|=|\!=|\||&|:|\^|@|\$|~))|$)"/>
***************
*** 84,88 ****
  			<!-- The following three lines look worse than they are: If there are any other operators directly before or after -> and <-, this is a syntax error (expections: ->> and <<-) -->
  			<RegExpr attribute="Error" context="#stay" String="([\+\-\*/\^\:\$~!&\|=>@^])([<]{1,2}\-|\-[>]{1,2})"/>
! 			<RegExpr attribute="Error" context="#stay" String="([<]{1,2}\-|\-[>]{1,2})([\+\-\*/\^\:\$~!&\|=<@^])"/>
  			<RegExpr attribute="Error" context="#stay" String="([<]{3}|[>]{3})"/>
  			<RegExpr attribute="Assign" context="#stay" String="[<]{1,2}\-"/>
--- 84,88 ----
  			<!-- The following three lines look worse than they are: If there are any other operators directly before or after -> and <-, this is a syntax error (expections: ->> and <<-) -->
  			<RegExpr attribute="Error" context="#stay" String="([\+\-\*/\^\:\$~!&\|=>@^])([<]{1,2}\-|\-[>]{1,2})"/>
! 			<RegExpr attribute="Error" context="#stay" String="([<]{1,2}\-|\-[>]{1,2})([\+\-\*/\^\:\$~!&\|=<@])"/>
  			<RegExpr attribute="Error" context="#stay" String="([<]{3}|[>]{3})"/>
  			<RegExpr attribute="Assign" context="#stay" String="[<]{1,2}\-"/>