<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</tt></b></td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/<a href="#file1">ActionScriptFactory.java</a></tt> </td><td></td><td align="right" id="added">+7</td><td></td><td nowrap="nowrap" align="center">626 -> 627</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/metaas/dom/<a href="#file2"><span id="added">ASXMLLiteral.java</span></a></tt> </td><td></td><td align="right" id="added">+5</td><td></td><td nowrap="nowrap" align="right">added 627</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file3">AS3FragmentParser.java</a></tt> </td><td></td><td align="right" id="added">+11</td><td></td><td nowrap="nowrap" align="center">626 -> 627</td></tr>
<tr class="alt"><td><tt> /<a href="#file4"><span id="added">ASTASXMLLiteral.java</span></a></tt> </td><td></td><td align="right" id="added">+11</td><td></td><td nowrap="nowrap" align="right">added 627</td></tr>
<tr><td><tt> /<a href="#file5">ExpressionBuilder.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td></td><td nowrap="nowrap" align="center">626 -> 627</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file6">LiteralTests.java</a></tt> </td><td></td><td align="right" id="added">+13</td><td></td><td nowrap="nowrap" align="center">626 -> 627</td></tr>
<tr><td></td><td></td><td align="right" id="added">+49</td><td></td><td></td></tr>
</table>
<small id="info">2 added + 4 modified, total 6 files</small><br />
<pre class="comment">
rather poor support for xml-literal-expression
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader"><big><b>ActionScriptFactory.java</b></big> <small id="info">626 -> 627</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-21 23:05:56 UTC (rev 626)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-22 21:38:25 UTC (rev 627)
@@ -30,6 +30,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASStringLiteral;
import uk.co.badgersinfoil.metaas.dom.ASIntegerLiteral;
import uk.co.badgersinfoil.metaas.dom.ASUndefinedLiteral;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASXMLLiteral;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.AS3FragmentParser;
import uk.co.badgersinfoil.metaas.impl.ASTASArrayAccessExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASArrayLiteral;
</pre><pre class="diff"><small id="info">@@ -52,6 +53,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTBuilder;
import uk.co.badgersinfoil.metaas.impl.ASTStatementList;
import uk.co.badgersinfoil.metaas.impl.ASTUtils;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.ASTASXMLLiteral;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ExpressionBuilder;
import uk.co.badgersinfoil.metaas.impl.TokenBuilder;
import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListToken;
</pre><pre class="diff"><small id="info">@@ -472,4 +474,9 @@
</small></pre><pre class="diff" id="context"> LinkedListTree ast = ASTBuilder.newObjectLiteral();
return new ASTASObjectLiteral(ast);
}
</pre><pre class="diff" id="added">+
+ public ASXMLLiteral newXMLLiteral(String value) {
+ LinkedListTree ast = AS3FragmentParser.parseXMLLiteral(value);
+ return new ASTASXMLLiteral(ast);
+ }
</pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname" id="added">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/dom</span><br />
<div class="fileheader" id="added"><big><b>ASXMLLiteral.java</b></big> <small id="info">added at 627</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASXMLLiteral.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASXMLLiteral.java 2008-01-22 21:38:25 UTC (rev 627)
@@ -0,0 +1,5 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASXMLLiteral extends ASLiteral {
+
+}
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>AS3FragmentParser.java</b></big> <small id="info">626 -> 627</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/AS3FragmentParser.java 2008-01-21 23:05:56 UTC (rev 626)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/AS3FragmentParser.java 2008-01-22 21:38:25 UTC (rev 627)
@@ -244,4 +244,15 @@
</small></pre><pre class="diff" id="context"> throw new SyntaxException("invalid identifier "+ActionScriptFactory.str(value), e);
}
}
</pre><pre class="diff" id="added">+
+ public static LinkedListTree parseXMLLiteral(String value) {
+ AS3Parser parser = ASTUtils.parse(value+" ");
+ try {
+ LinkedListTree result = tree(parser.xmlLiteral());
+ parser.endOfFile();
+ return result;
+ } catch (RecognitionException e) {
+ throw ASTUtils.buildSyntaxException(value, parser, e);
+ }
+ }
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname" id="added">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader" id="added"><big><b>ASTASXMLLiteral.java</b></big> <small id="info">added at 627</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASXMLLiteral.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASXMLLiteral.java 2008-01-22 21:38:25 UTC (rev 627)
@@ -0,0 +1,11 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import uk.co.badgersinfoil.metaas.dom.ASXMLLiteral;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASXMLLiteral extends ASTASLiteral implements ASXMLLiteral {
+
+ public ASTASXMLLiteral(LinkedListTree ast) {
+ super(ast);
+ }
+}
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>ExpressionBuilder.java</b></big> <small id="info">626 -> 627</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ExpressionBuilder.java 2008-01-21 23:05:56 UTC (rev 626)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ExpressionBuilder.java 2008-01-22 21:38:25 UTC (rev 627)
@@ -82,6 +82,8 @@
</small></pre><pre class="diff" id="context"> return new ASTASArrayLiteral(ast);
case AS3Parser.OBJECT_LITERAL:
return new ASTASObjectLiteral(ast);
</pre><pre class="diff" id="added">+ case AS3Parser.XML_LITERAL:
+ return new ASTASXMLLiteral(ast);
</pre><pre class="diff" id="context"> default:
throw new IllegalArgumentException("unhandled expression node type: "+ASTUtils.tokenName(ast));
}
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname">metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader"><big><b>LiteralTests.java</b></big> <small id="info">626 -> 627</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/LiteralTests.java 2008-01-21 23:05:56 UTC (rev 626)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/LiteralTests.java 2008-01-22 21:38:25 UTC (rev 627)
@@ -13,6 +13,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASStringLiteral;
import uk.co.badgersinfoil.metaas.dom.ASIntegerLiteral;
import uk.co.badgersinfoil.metaas.dom.ASUndefinedLiteral;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASXMLLiteral;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.Visibility;
import junit.framework.TestCase;
</pre><pre class="diff"><small id="info">@@ -156,4 +157,16 @@
</small></pre><pre class="diff" id="context"> ASAssignmentExpression expr = (ASAssignmentExpression)fact.newExpression("test = {foo:2}");
literal = (ASLiteral)expr.getRightSubexpression();
}
</pre><pre class="diff" id="added">+
+ public void testXMLLiteral() {
+ ASXMLLiteral lit = fact.newXMLLiteral("<hello>world</hello>");
+ assertNotNull(lit);
+ literal = lit;
+ }
+
+ public void testParseXMLLiteral() {
+ ASXMLLiteral lit = (ASXMLLiteral)fact.newExpression("<hello>world</hello>");
+ assertNotNull(lit);
+ literal = lit;
+ }
</pre><pre class="diff" id="context"> }
</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>