From: Jan P. <jp...@us...> - 2007-05-19 14:55:27
|
Update of /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/core/parser In directory sc8-pr-cvs17:/tmp/cvs-serv20741/src/org/epic/core/parser Modified Files: perl.g Log Message: Merged from 'stable'. Index: perl.g =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/core/parser/perl.g,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- perl.g 14 Apr 2007 16:02:06 -0000 1.18 +++ perl.g 19 May 2007 14:55:23 -0000 1.19 @@ -154,7 +154,7 @@ }; SUBST_OR_MATCH_OR_WORD // this disambiguation rule disfavours EXPRs too much :-( - : { !afterArrow }? ((SUBST_OR_MATCH_OPER | 'x') (WORD_CHAR | ((WS_CHAR)* "=>"))) + : { !afterArrow }? ((SUBST_OR_MATCH_OPER | 'x') (('A'..'Z' | 'a'..'z' | '0'..'9') | ((WS_CHAR)* "=>"))) => { notOper = true; } t1:WORD { $setToken(t1); } | { !afterArrow }? (("tr" | 's' | 'y') ~'}') => SUBST_EXPR { $setType(PerlTokenTypes.SUBST_EXPR); } |