<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">+33</td><td></td><td nowrap="nowrap" align="center">629 -> 630</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/metaas/dom/<a href="#file2"><span id="added">ASRegexpLiteral.java</span></a></tt> </td><td></td><td align="right" id="added">+15</td><td></td><td nowrap="nowrap" align="right">added 630</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">+13</td><td></td><td nowrap="nowrap" align="center">629 -> 630</td></tr>
<tr class="alt"><td><tt> /<a href="#file4"><span id="added">ASTASRegexpLiteral.java</span></a></tt> </td><td></td><td align="right" id="added">+12</td><td></td><td nowrap="nowrap" align="right">added 630</td></tr>
<tr><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file5">LiteralTests.java</a></tt> </td><td></td><td align="right" id="added">+15</td><td></td><td nowrap="nowrap" align="center">629 -> 630</td></tr>
<tr><td></td><td></td><td align="right" id="added">+88</td><td></td><td></td></tr>
</table>
<small id="info">2 added + 3 modified, total 5 files</small><br />
<pre class="comment">
rather poor regexp-literal-expression support
</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">629 -> 630</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-25 00:50:18 UTC (rev 629)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-25 00:56:26 UTC (rev 630)
@@ -27,6 +27,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASObjectLiteral;
import uk.co.badgersinfoil.metaas.dom.ASPostfixExpression;
import uk.co.badgersinfoil.metaas.dom.ASPrefixExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASRegexpLiteral;
</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"><small id="info">@@ -45,6 +46,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTASObjectLiteral;
import uk.co.badgersinfoil.metaas.impl.ASTASPostfixExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASPrefixExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.ASTASRegexpLiteral;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTASStringLiteral;
import uk.co.badgersinfoil.metaas.impl.ASTASUndefinedLiteral;
import uk.co.badgersinfoil.metaas.impl.ASTActionScriptParser;
</pre><pre class="diff"><small id="info">@@ -479,4 +481,35 @@
</small></pre><pre class="diff" id="context"> LinkedListTree ast = AS3FragmentParser.parseXMLLiteral(value);
return new ASTASXMLLiteral(ast);
}
</pre><pre class="diff" id="added">+
+ public ASRegexpLiteral newRegexpLiteral(String value, int flags) {
+ StringBuffer flagList = new StringBuffer();
+ if ((flags & ASRegexpLiteral.FLAG_DOT_ALL) != 0) {
+ flagList.append('s');
+ }
+ if ((flags & ASRegexpLiteral.FLAG_EXTENDED) != 0) {
+ flagList.append('x');
+ }
+ if ((flags & ASRegexpLiteral.FLAG_GLOBAL) != 0) {
+ flagList.append('g');
+ }
+ if ((flags & ASRegexpLiteral.FLAG_IGNORE_CASE) != 0) {
+ flagList.append('i');
+ }
+ value = regexpEscapeDelimiter(value);
+ LinkedListTree ast = AS3FragmentParser.parseRegexpLiteral("/"+value+"/"+flagList);
+ return new ASTASRegexpLiteral(ast);
+ }
+
+ private static String regexpEscapeDelimiter(String value) {
+ StringBuffer result = new StringBuffer();
+ for (int i=0; i<value.length(); i++) {
+ char c = value.charAt(i);
+ switch (c) {
+ case '/': result.append("\\/"); break;
+ default: result.append(c); break;
+ }
+ }
+ return result.toString();
+ }
</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>ASRegexpLiteral.java</b></big> <small id="info">added at 630</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASRegexpLiteral.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASRegexpLiteral.java 2008-01-25 00:56:26 UTC (rev 630)
@@ -0,0 +1,15 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASRegexpLiteral extends ASLiteral {
+
+ /** represents no active flags for a regexp */
+ public static final int FLAG_NONE = 0;
+ /** represents the 'i' regexp flag */
+ public static final int FLAG_IGNORE_CASE = 0;
+ /** represents the 'g' regexp flag */
+ public static final int FLAG_GLOBAL = 0;
+ /** represents the 's' regexp flag */
+ public static final int FLAG_DOT_ALL = 0;
+ /** represents the 'x' regexp flag */
+ public static final int FLAG_EXTENDED = 0;
+}
</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">629 -> 630</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/AS3FragmentParser.java 2008-01-25 00:50:18 UTC (rev 629)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/AS3FragmentParser.java 2008-01-25 00:56:26 UTC (rev 630)
@@ -13,6 +13,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.ActionScriptFactory;
import uk.co.badgersinfoil.metaas.SyntaxException;
import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.parser.regexsimple.RegexSimpleParser;
</pre><pre class="diff" id="context">
public class AS3FragmentParser {
</pre><pre class="diff"><small id="info">@@ -255,4 +256,16 @@
</small></pre><pre class="diff" id="context"> throw ASTUtils.buildSyntaxException(value, parser, e);
}
}
</pre><pre class="diff" id="added">+
+
+ public static LinkedListTree parseRegexpLiteral(String value) {
+ AS3Parser parser = ASTUtils.parse(value + " ");
+ try {
+ LinkedListTree result = tree(parser.regexpLiteral());
+ 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>ASTASRegexpLiteral.java</b></big> <small id="info">added at 630</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASRegexpLiteral.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASRegexpLiteral.java 2008-01-25 00:56:26 UTC (rev 630)
@@ -0,0 +1,12 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import uk.co.badgersinfoil.metaas.dom.ASRegexpLiteral;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASRegexpLiteral extends ASTASLiteral implements ASRegexpLiteral {
+
+ public ASTASRegexpLiteral(LinkedListTree ast) {
+ super(ast);
+ }
+
+}
</pre></div>
<hr /><a name="file5" /><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">629 -> 630</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/LiteralTests.java 2008-01-25 00:50:18 UTC (rev 629)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/LiteralTests.java 2008-01-25 00:56:26 UTC (rev 630)
@@ -10,11 +10,14 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASMethod;
import uk.co.badgersinfoil.metaas.dom.ASNullLiteral;
import uk.co.badgersinfoil.metaas.dom.ASObjectLiteral;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASRegexpLiteral;
</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;
import uk.co.badgersinfoil.metaas.dom.ASXMLLiteral;
import uk.co.badgersinfoil.metaas.dom.Visibility;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.ASTASLiteral;
+import uk.co.badgersinfoil.metaas.impl.antlr.ASTDot;
</pre><pre class="diff" id="context"> import junit.framework.TestCase;
public class LiteralTests extends TestCase {
</pre><pre class="diff"><small id="info">@@ -169,4 +172,16 @@
</small></pre><pre class="diff" id="context"> assertNotNull(lit);
literal = lit;
}
</pre><pre class="diff" id="added">+
+ public void testRegexpLiteral() {
+ ASRegexpLiteral lit = fact.newRegexpLiteral("\\d+", ASRegexpLiteral.FLAG_NONE);
+ assertNotNull(lit);
+ literal = lit;
+ }
+
+ public void testParseRegexpLiteral() {
+ ASRegexpLiteral lit = (ASRegexpLiteral)fact.newExpression("/[a-z]+-\\d+/i");
+ 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>