[E-p-i-c-commits] org.epic.perleditor/src/org/epic/core/parser perl.g, 1.8.2.3, 1.8.2.4

[Jan P. <jp...@us...>]

Update of /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/core/parser
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8069/src/org/epic/core/parser

Modified Files:
      Tag: stable
	perl.g 
Log Message:
Fixed bug [ 1574555 ] sub format { ... } breaks syntax highlighting.

Index: perl.g
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/core/parser/perl.g,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- perl.g	25 Sep 2006 18:01:41 -0000	1.8.2.3
+++ perl.g	15 Oct 2006 12:32:15 -0000	1.8.2.4
@@ -308,6 +308,7 @@
 FORMAT_STMT
 	: { format }? "="
 	{
+		format = false;
 		getParent().expectFormatEnd();
 	};
 
@@ -402,7 +403,7 @@
 		if ("use".equals(str)) $setType(PerlTokenTypes.KEYWORD_USE);
 		else if ("sub".equals(str)) { afterSub = proto = true; $setType(PerlTokenTypes.KEYWORD_SUB); }
 		else if ("package".equals(str)) { $setType(PerlTokenTypes.KEYWORD_PACKAGE); }
-		else if ("format".equals(str)) { format = true; $setType(PerlTokenTypes.KEYWORD_FORMAT); }
+		else if ("format".equals(str) && !afterSub) { format = true; $setType(PerlTokenTypes.KEYWORD_FORMAT); }
 		else if ("__END__".equals(str)) { $setType(Token.EOF_TYPE); }
 		else if ("__DATA__".equals(str)) { $setType(Token.EOF_TYPE); }
 		else if (!afterSub)