Update of /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/core/parser
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14939/src/org/epic/core/parser
Modified Files:
perl.g
Log Message:
Fixed bug [ 1888190 ] subs that start with "tr_" break the Outline.
Index: perl.g
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/core/parser/perl.g,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- perl.g 30 Jan 2008 22:24:40 -0000 1.24
+++ perl.g 10 Feb 2008 20:47:37 -0000 1.25
@@ -167,7 +167,7 @@
SUBST_OR_MATCH_OR_WORD // this disambiguation rule disfavours EXPRs too much :-(
: { !afterArrow }? ((SUBST_OR_MATCH_OPER | 'x') (('A'..'Z' | 'a'..'z' | '0'..'9') | ((WS_CHAR)* "=>")))
=> { notOper = true; } t1:WORD { $setToken(t1); }
- | { !afterArrow }? (("tr" | 's' | 'y') ~'}')
+ | { !afterArrow && !afterSub }? (("tr" | 's' | 'y') ~'}')
=> SUBST_EXPR { $setType(PerlTokenTypes.SUBST_EXPR); }
| { !afterArrow || afterDArrow }? (("qq" | "qx" | "qw" | "qr" | 'm' | 'q') ~('a'..'z' | '0'..'9' | '_' | '}' | '\r' | '\n' | ' '))
=> MATCH_EXPR { $setType(PerlTokenTypes.MATCH_EXPR); }
|