Permalink
Browse files

Support for type parameters nested to an arbitrary depth

  • Loading branch information...
1 parent 31d98f1 commit 17856ced9e1ee7f9dbcf3af2093cc4a623f0c983 @djspiewak committed Apr 24, 2009
Showing with 11 additions and 4 deletions.
  1. +11 −4 scala.xml
View
@@ -68,10 +68,10 @@
<!-- symbol literals -->
<SEQ_REGEXP HASH_CHAR="'" TYPE="LABEL">'[0-9a-zA-Z&gt;&lt;=+]([0-9a-zA-Z&gt;&lt;=+]|_[0-9a-zA-Z&gt;&lt;=+])*</SEQ_REGEXP>
- <!-- type params between bracket pairs with -->
- <!-- nested ones within (griba2010@ya.com) -->
- <SEQ_REGEXP HASH_CHAR="[" TYPE="LITERAL3"
- >\[[^\[\]]*(\[[^\[\]]*(\[[^\[\]]*\][^\[\]]*)*\][^\[\]]*)*\]</SEQ_REGEXP>
+ <SPAN MATCH_TYPE="LITERAL3" DELEGATE="TYPE_PARAMS">
+ <BEGIN>[</BEGIN>
+ <END>]</END>
+ </SPAN>
<!-- type constraints (griba2010@ya.com) -->
<SEQ_REGEXP HASH_CHAR="&lt;" TYPE="LITERAL2"
@@ -263,6 +263,13 @@
</KEYWORDS>
</RULES>
+ <RULES SET="TYPE_PARAMS" DEFAULT="LITERAL3">
+ <SPAN MATCH_TYPE="LITERAL3" DELEGATE="TYPE_PARAMS">
+ <BEGIN>[</BEGIN>
+ <END>]</END>
+ </SPAN>
+ </RULES>
+
<RULES SET="PATTERN" DEFAULT="NULL" IGNORE_CASE="FALSE">
<IMPORT DELEGATE="PRIMARY"/>

0 comments on commit 17856ce

Please sign in to comment.