<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#copied {background-color:#ccccff;}
tr.alt #copied {background-color:#bbbbf7;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="5">Commit in <b><tt>metaas/trunk/src/main/antlr/org/asdt/core/internal/antlr</tt></b></td></tr>
<tr><td><tt><a href="#file1">AS3.g3</a></tt> </td><td></td><td align="right" id="added">+40</td><td align="right" id="removed">-14</td><td nowrap="nowrap" align="center">632 -> 633</td></tr>
</table>
<pre class="comment">
improve parser support for E4X query expression syntaxes
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/main/antlr/org/asdt/core/internal/antlr</span><br />
<div class="fileheader"><big><b>AS3.g3</b></big> <small id="info">632 -> 633</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/antlr/org/asdt/core/internal/antlr/AS3.g3 2008-01-25 01:05:39 UTC (rev 632)
+++ trunk/src/main/antlr/org/asdt/core/internal/antlr/AS3.g3 2008-01-27 18:14:56 UTC (rev 633)
@@ -65,6 +65,7 @@
</small></pre><pre class="diff" id="context"> IDENTIFIER; IDENTIFIER_STAR;
DEFAULT_XML_NAMESPACE;
XML_LITERAL; REGEXP_LITERAL;
</pre><pre class="diff" id="added">+ E4X_FILTER;
</pre><pre class="diff" id="context">
VIRTUAL_PLACEHOLDER;
}
</pre><pre class="diff"><small id="info">@@ -684,6 +685,42 @@
</small></pre><pre class="diff" id="context"> -> ^(IDENTIFIER $identifier)
</pre><pre class="diff" id="added">+propertyIdentifier
+ : STAR
+ | ident
+
+
+qualifier
+ : ( propertyIdentifier | reservedNamespace )
+
+
+simpleQualifiedIdentifier
+options {
+ k = 3;
+}
+ : propertyIdentifier
+ | qualifier DBL_COLON propertyIdentifier
+ | qualifier DBL_COLON brackets
+
+
+expressionQualifiedIdentifier
+ : encapsulatedExpression DBL_COLON
+ ( propertyIdentifier
+ | brackets
+ )
+
+
+nonAttributeQualifiedIdentifier
+ : simpleQualifiedIdentifier
+ | expressionQualifiedIdentifier
+
+
+qualifiedIdentifier
+ : E4X_ATTRI brackets
+ | E4X_ATTRI nonAttributeQualifiedIdentifier
+ | nonAttributeQualifiedIdentifier
+
+
</pre><pre class="diff" id="context"> qualifiedIdent
: (namespaceName DBL_COLON)? ident
</pre><pre class="diff"><small id="info">@@ -997,9 +1034,9 @@
</small></pre><pre class="diff" id="context"> postfixExpression
: (primaryExpression -> primaryExpression)
( poi=propOrIdent[root_0, retval.start] -> $poi
</pre><pre class="diff" id="removed">- | DOT e4xExpression
</pre><pre class="diff" id="context"> | (LBRACK expression rb=RBRACK -> ^(ARRAY_ACC $postfixExpression expression)) {demarcate(root_0.getFirstChild()); root_0.getFirstChild().setStopToken((LinkedListToken)$rb);}
</pre><pre class="diff" id="removed">- | E4X_DESC e4xExpression
</pre><pre class="diff" id="added">+ | E4X_DESC qualifiedIdentifier -> ^(E4X_DESC $postfixExpression qualifiedIdentifier)
+ | DOT LPAREN expression RPAREN -> ^(E4X_FILTER $postfixExpression expression)
</pre><pre class="diff" id="context"> | (arguments -> ^(METHOD_CALL $postfixExpression arguments)) {demarcate(root_0.getFirstChild());}
)*
</pre><pre class="diff"><small id="info">@@ -1008,26 +1045,15 @@
</small></pre><pre class="diff" id="context"> )?
</pre><pre class="diff" id="removed">-e4xExpression
- : STAR^
- | e4xAttributeIdentifier
- | e4xFilterPredicate
-
</pre><pre class="diff" id="context">
e4xAttributeIdentifier
</pre><pre class="diff" id="removed">- : E4X_ATTRI
</pre><pre class="diff" id="added">+ : E4X_ATTRI<span id="addedchars">^</span>
</pre><pre class="diff" id="context"> ( qualifiedIdent
| STAR
| LBRACK expression RBRACK
)
</pre><pre class="diff" id="removed">-e4xFilterPredicate
- : LPAREN!
- expression
- RPAREN!
-
-
</pre><pre class="diff" id="context"> primaryExpression
: UNDEFINED
| constant
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.12</small></center>
</body></html>