<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>asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd</tt></b></td></tr>
<tr><td><tt><a href="#file1">BaseCodegenContext.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr class="alt"><td><tt><a href="#file2">CodegenContext.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr><td><tt><a href="#file3">MappingCodeGenerator.java</a></tt> </td><td></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr class="alt"><td><tt><a href="#file4">MappingComponent.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr><td><tt>components/<a href="#file5">AbstractMappingComponent.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr class="alt"><td><tt> /<a href="#file6">AbstractParticleComponent.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr><td><tt> /<a href="#file7">ChoiceMappingComponent.java</a></tt> </td><td></td><td align="right" id="added">+7</td><td align="right" id="removed">-7</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr class="alt"><td><tt> /<a href="#file8">ElementDeclarationComponent.java</a></tt> </td><td></td><td align="right" id="added">+8</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr><td><tt> /<a href="#file9">ElementDeclarationReferenceComponent.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr class="alt"><td><tt> /<a href="#file10">MultiplyOccuringParticleComponent.java</a></tt> </td><td></td><td align="right" id="added">+6</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr><td><tt> /<a href="#file11">OptionallyOccuringParticleComponent.java</a></tt> </td><td></td><td align="right" id="added">+9</td><td align="right" id="removed">-9</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr class="alt"><td><tt> /<a href="#file12">SequenceMappingComponent.java</a></tt> </td><td></td><td align="right" id="added">+6</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center">197 -> 198</td></tr>
<tr><td></td><td></td><td align="right" id="added">+49</td><td align="right" id="removed">-47</td><td></td></tr>
</table>
<small id="info">12 modified files</small><br />
<pre class="comment">
account for metaas API change (ASExpression->Expression)
and add missing setCurrentTargetParentElementExpr() in ElementDeclarationComponent
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd</span><br />
<div class="fileheader"><big><b>BaseCodegenContext.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/BaseCodegenContext.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/BaseCodegenContext.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -11,7 +11,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.ActionScriptFactory;
import uk.co.badgersinfoil.metaas.ActionScriptProject;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASMethod;
import uk.co.badgersinfoil.metaas.dom.StatementContainer;
</pre><pre class="diff"><small id="info">@@ -139,7 +139,7 @@
</small></pre><pre class="diff" id="context"> return mapComp.createFunction(this, component);
}
</pre><pre class="diff" id="removed">- public <span id="removedchars">AS</span>Expression createExpression(XSDConcreteComponent component) {
</pre><pre class="diff" id="added">+ public Expression createExpression(XSDConcreteComponent component) {
</pre><pre class="diff" id="context"> MappingComponent mapComp = componentFor(component);
return mapComp.createExpression(this, component);
}
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd</span><br />
<div class="fileheader"><big><b>CodegenContext.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/CodegenContext.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/CodegenContext.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -3,7 +3,7 @@
</small></pre><pre class="diff" id="context"> import org.eclipse.xsd.XSDConcreteComponent;
import uk.co.badgersinfoil.metaas.ActionScriptFactory;
import uk.co.badgersinfoil.metaas.ActionScriptProject;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASMethod;
import uk.co.badgersinfoil.metaas.dom.StatementContainer;
</pre><pre class="diff"><small id="info">@@ -60,7 +60,7 @@
</small></pre><pre class="diff" id="context">
public MappingFunctionStore getMappingFunctionStore();
</pre><pre class="diff" id="removed">- public <span id="removedchars">AS</span>Expression createExpression(XSDConcreteComponent component);
</pre><pre class="diff" id="added">+ public Expression createExpression(XSDConcreteComponent component);
</pre><pre class="diff" id="context">
public String toVariableName(String baseName);
}
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd</span><br />
<div class="fileheader"><big><b>MappingCodeGenerator.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/MappingCodeGenerator.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/MappingCodeGenerator.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -61,7 +61,7 @@
</small></pre><pre class="diff" id="context"> public MarshalBuilder getMarshalerBuilder() {
return marshalerBuilder;
}
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> public MappingFunction marshalMethodFor(XSDConcreteComponent component) {
context.pushAttrScope();
context.setCurrentRole(CodegenRole.MARSHAL);
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd</span><br />
<div class="fileheader"><big><b>MappingComponent.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/MappingComponent.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/MappingComponent.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -6,7 +6,7 @@
</small></pre><pre class="diff" id="context">
import org.eclipse.xsd.XSDConcreteComponent;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASMethod;
public interface MappingComponent {
</pre><pre class="diff"><small id="info">@@ -19,7 +19,7 @@
</small></pre><pre class="diff" id="context"> public MappingFunction functionFor(CodegenContext context, XSDConcreteComponent component);
public MappingFunction createFunctionRef(CodegenContext context, XSDConcreteComponent component);
public ASMethod createFunction(CodegenContext context, XSDConcreteComponent component);
</pre><pre class="diff" id="removed">- public <span id="removedchars">AS</span>Expression createExpression(CodegenContext context, XSDConcreteComponent component);
</pre><pre class="diff" id="added">+ public Expression createExpression(CodegenContext context, XSDConcreteComponent component);
</pre><pre class="diff" id="context"> public ASCompilationUnit createType(CodegenContext context, XSDConcreteComponent component);
public String variableNameFor(CodegenContext context, XSDConcreteComponent component);
}
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader"><big><b>AbstractMappingComponent.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/AbstractMappingComponent.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/AbstractMappingComponent.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -12,7 +12,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.TypeDescriptor;
import uk.co.badgersinfoil.asxsd.XSDUtils;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASMethod;
</pre><pre class="diff"><small id="info">@@ -64,7 +64,7 @@
</small></pre><pre class="diff" id="context"> throw new RuntimeException(getClass().getName()+" does not suppport operation createType(role="+role+") at "+XSDUtils.path(component));
}
</pre><pre class="diff" id="removed">- public <span id="removedchars">AS</span>Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="added">+ public Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="context"> XSDConcreteComponent component)
{
CodegenRole role = context.getCurrentRole();
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader"><big><b>AbstractParticleComponent.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/AbstractParticleComponent.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/AbstractParticleComponent.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -10,7 +10,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.CodegenRole;
import uk.co.badgersinfoil.asxsd.TypeDescriptor;
import uk.co.badgersinfoil.asxsd.XSDUtils;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context">
public abstract class AbstractParticleComponent extends AbstractMappingComponent {
</pre><pre class="diff"><small id="info">@@ -61,7 +61,7 @@
</small></pre><pre class="diff" id="context">
protected abstract void generateCodeFor(CodegenContext context, XSDParticle particle);
</pre><pre class="diff" id="removed">- public <span id="removedchars">AS</span>Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="added">+ public Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="context"> XSDConcreteComponent component)
{
CodegenRole role = context.getCurrentRole();
</pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader"><big><b>ChoiceMappingComponent.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/ChoiceMappingComponent.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/ChoiceMappingComponent.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -25,7 +25,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASArg;
import uk.co.badgersinfoil.metaas.dom.ASClassType;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASMethod;
import uk.co.badgersinfoil.metaas.dom.StatementContainer;
import uk.co.badgersinfoil.metaas.dom.Visibility;
</pre><pre class="diff"><small id="info">@@ -89,7 +89,7 @@
</small></pre><pre class="diff" id="context"> private static StatementContainer detectElementContentUnmarshal(CodegenContext context, XSDParticleContent partContent, StatementContainer code) {
context.pushAttrScope();
context.setCurrentRole(CodegenRole.UNMARSHAL_DETECT);
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression detect = context.createExpression(partContent);
</pre><pre class="diff" id="added">+ Expression detect = context.createExpression(partContent);
</pre><pre class="diff" id="context"> context.popAttrScope();
return code.newIf(detect);
}
</pre><pre class="diff"><small id="info">@@ -213,7 +213,7 @@
</small></pre><pre class="diff" id="context"> return qname;
}
</pre><pre class="diff" id="removed">- public <span id="removedchars">AS</span>Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="added">+ public Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="context"> XSDConcreteComponent component)
{
CodegenRole role = context.getCurrentRole();
</pre><pre class="diff"><small id="info">@@ -225,9 +225,9 @@
</small></pre><pre class="diff" id="context"> return fact.newExpression("false");
}
Iterator i = particles.iterator();
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression detect = context.createExpression((XSDConcreteComponent)i.next());
</pre><pre class="diff" id="added">+ Expression detect = context.createExpression((XSDConcreteComponent)i.next());
</pre><pre class="diff" id="context"> while (i.hasNext()) {
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression rhs = context.createExpression((XSDConcreteComponent)i.next());
</pre><pre class="diff" id="added">+ Expression rhs = context.createExpression((XSDConcreteComponent)i.next());
</pre><pre class="diff" id="context"> detect = fact.newOrExpression(detect, rhs);
}
return detect;
</pre><pre class="diff"><small id="info">@@ -239,9 +239,9 @@
</small></pre><pre class="diff" id="context"> return fact.newExpression("false");
}
Iterator i = particles.iterator();
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression detect = context.createExpression((XSDConcreteComponent)i.next());
</pre><pre class="diff" id="added">+ Expression detect = context.createExpression((XSDConcreteComponent)i.next());
</pre><pre class="diff" id="context"> while (i.hasNext()) {
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression rhs = context.createExpression((XSDConcreteComponent)i.next());
</pre><pre class="diff" id="added">+ Expression rhs = context.createExpression((XSDConcreteComponent)i.next());
</pre><pre class="diff" id="context"> detect = fact.newOrExpression(detect, rhs);
}
return detect;
</pre></div>
<hr /><a name="file8" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader"><big><b>ElementDeclarationComponent.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/ElementDeclarationComponent.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/ElementDeclarationComponent.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -24,7 +24,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASArg;
import uk.co.badgersinfoil.metaas.dom.ASClassType;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASField;
import uk.co.badgersinfoil.metaas.dom.ASMethod;
import uk.co.badgersinfoil.metaas.dom.StatementContainer;
</pre><pre class="diff"><small id="info">@@ -89,7 +89,7 @@
</small></pre><pre class="diff" id="context"> return component instanceof XSDElementDeclaration;
}
</pre><pre class="diff" id="removed">- public <span id="removedchars">AS</span>Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="added">+ public Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="context"> XSDConcreteComponent component)
{
CodegenRole role = context.getCurrentRole();
</pre><pre class="diff"><small id="info">@@ -97,8 +97,8 @@
</small></pre><pre class="diff" id="context"> ActionScriptFactory fact = context.getFactory();
if (role == CodegenRole.UNMARSHAL_DETECT) {
String acc = (String)context.getAttribute("element-access-expression");
</pre><pre class="diff" id="removed">- ASExpression elementAccess = fact.newExpression(acc+".name()");
- ASExpression qname = fact.newExpression("new QName("+ActionScriptFactory.str(elementDecl.getTargetNamespace())+", "+ActionScriptFactory.str(elementDecl.getName())+")");
</pre><pre class="diff" id="added">+ Expression elementAccess = fact.newExpression(acc+".name()");
+ Expression qname = fact.newExpression("new QName("+ActionScriptFactory.str(elementDecl.getTargetNamespace())+", "+ActionScriptFactory.str(elementDecl.getName())+")");
</pre><pre class="diff" id="context"> return fact.newEqualsExpression(elementAccess, qname);
}
if (role == CodegenRole.MARSHAL_DETECT) {
</pre><pre class="diff"><small id="info">@@ -261,14 +261,16 @@
</small></pre><pre class="diff" id="context"> ASMethod meth = clazz.newMethod(methodName, Visibility.PUBLIC, typeName);
builder.buildMethodParams(meth, elementDecl);
meth.setStatic(true);
</pre><pre class="diff" id="removed">- meth.addStmt("var _result:XML = <"+elementDecl.getName()+"/>");
</pre><pre class="diff" id="added">+ String resultParentElementExpr = "_result";
+ meth.addStmt("var "+resultParentElementExpr+":XML = <"+elementDecl.getName()+"/>");
+ MarshalBuilder.setCurrentTargetParentElementExpr(context, resultParentElementExpr);
</pre><pre class="diff" id="context"> context.pushAttrScope();
setCurrentFuctionElement(context, elementDecl);
context.setCurrentMethodCode(meth);
MarshalBuilder.setCurrentSourceExpr(context, ((ASArg)meth.getArgs().get(0)).getName());
context.generateCode(elementDecl);
context.popAttrScope();
</pre><pre class="diff" id="removed">- meth.addStmt("return _result");
</pre><pre class="diff" id="added">+ meth.newReturn(resultParentElementExpr);
</pre><pre class="diff" id="context"> return meth;
}
throw new IllegalArgumentException(getClass().getName() + " does not support role "+role);
</pre></div>
<hr /><a name="file9" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader"><big><b>ElementDeclarationReferenceComponent.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/ElementDeclarationReferenceComponent.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/ElementDeclarationReferenceComponent.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -8,7 +8,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.MarshalBuilder;
import uk.co.badgersinfoil.asxsd.TypeDescriptor;
import uk.co.badgersinfoil.asxsd.UnmarshalBuilder;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.StatementContainer;
public class ElementDeclarationReferenceComponent extends AbstractMappingComponent {
</pre><pre class="diff"><small id="info">@@ -53,7 +53,7 @@
</small></pre><pre class="diff" id="context"> return context.variableNameFor(resolve(component));
}
</pre><pre class="diff" id="removed">- public <span id="removedchars">AS</span>Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="added">+ public Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="context"> XSDConcreteComponent component)
{
return context.createExpression(resolve(component));
</pre></div>
<hr /><a name="file10" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader"><big><b>MultiplyOccuringParticleComponent.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/MultiplyOccuringParticleComponent.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/MultiplyOccuringParticleComponent.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -18,7 +18,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASClassType;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
import uk.co.badgersinfoil.metaas.dom.ASConstants;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASField;
import uk.co.badgersinfoil.metaas.dom.StatementContainer;
import uk.co.badgersinfoil.metaas.dom.Visibility;
</pre><pre class="diff"><small id="info">@@ -70,9 +70,9 @@
</small></pre><pre class="diff" id="context"> MappingFunction unmarshaler = context.functionFor(content);
block.addStmt(fieldAccess + "= new Array()");
ActionScriptFactory fact = context.getFactory();
</pre><pre class="diff" id="removed">- ASExpression childLimit = fact.newExpression("_seq<_children.length()");
- ASExpression detect = detect(context, content);
- ASExpression conditional = fact.newAndExpression(childLimit, detect);
</pre><pre class="diff" id="added">+ Expression childLimit = fact.newExpression("_seq<_children.length()");
+ Expression detect = detect(context, content);
+ Expression conditional = fact.newAndExpression(childLimit, detect);
</pre><pre class="diff" id="context"> block = block.newWhile(conditional);
block.addStmt(fieldAccess + ".push(" + unmarshaler.appliedTo(accessExpr) + ")");
} else if (role == CodegenRole.MARSHAL) {
</pre><pre class="diff"><small id="info">@@ -103,12 +103,12 @@
</small></pre><pre class="diff" id="context"> }
}
</pre><pre class="diff" id="removed">- private <span id="removedchars">AS</span>Expression detect(CodegenContext context,
</pre><pre class="diff" id="added">+ private Expression detect(CodegenContext context,
</pre><pre class="diff" id="context"> XSDParticleContent content)
{
context.pushAttrScope();
context.setCurrentRole(CodegenRole.UNMARSHAL_DETECT);
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression detect = context.createExpression(content);
</pre><pre class="diff" id="added">+ Expression detect = context.createExpression(content);
</pre><pre class="diff" id="context"> context.popAttrScope();
return detect;
}
</pre></div>
<hr /><a name="file11" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader"><big><b>OptionallyOccuringParticleComponent.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/OptionallyOccuringParticleComponent.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/OptionallyOccuringParticleComponent.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -12,7 +12,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.MarshalBuilder;
import uk.co.badgersinfoil.asxsd.TypeDescriptor;
import uk.co.badgersinfoil.metaas.ActionScriptFactory;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.StatementContainer;
</pre><pre class="diff"><small id="info">@@ -32,7 +32,7 @@
</small></pre><pre class="diff" id="context"> context.popAttrScope();
} else if (role == CodegenRole.MARSHAL) {
StatementContainer containingBlock = context.getCurrentMethodCode();
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression detectExpr= marshalDetectExpr(context, content);
</pre><pre class="diff" id="added">+ Expression detectExpr= marshalDetectExpr(context, content);
</pre><pre class="diff" id="context"> StatementContainer ifBlock = containingBlock.newIf(detectExpr);
context.pushAttrScope();
String src = MarshalBuilder.getCurrentSourceExpr(context);
</pre><pre class="diff"><small id="info">@@ -61,29 +61,29 @@
</small></pre><pre class="diff" id="context"> StatementContainer block)
{
ActionScriptFactory fact = context.getFactory();
</pre><pre class="diff" id="removed">- ASExpression childLimit = fact.newExpression("_seq<_children.length()");
- ASExpression detect = unmarshalDetectExpr(context, content);
- ASExpression conditional = fact.newAndExpression(childLimit, detect);
</pre><pre class="diff" id="added">+ Expression childLimit = fact.newExpression("_seq<_children.length()");
+ Expression detect = unmarshalDetectExpr(context, content);
+ Expression conditional = fact.newAndExpression(childLimit, detect);
</pre><pre class="diff" id="context"> // TODO: don't strictly need to test that there are remaining elements if we know there should be mandatory elements following this optional one,
return block.newIf(conditional);
}
</pre><pre class="diff" id="removed">- private <span id="removedchars">AS</span>Expression unmarshalDetectExpr(CodegenContext context,
</pre><pre class="diff" id="added">+ private Expression unmarshalDetectExpr(CodegenContext context,
</pre><pre class="diff" id="context"> XSDParticleContent content)
{
context.pushAttrScope();
context.setCurrentRole(CodegenRole.UNMARSHAL_DETECT);
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression detect = context.createExpression(content);
</pre><pre class="diff" id="added">+ Expression detect = context.createExpression(content);
</pre><pre class="diff" id="context"> context.popAttrScope();
return detect;
}
</pre><pre class="diff" id="removed">- private <span id="removedchars">AS</span>Expression marshalDetectExpr(CodegenContext context,
</pre><pre class="diff" id="added">+ private Expression marshalDetectExpr(CodegenContext context,
</pre><pre class="diff" id="context"> XSDParticleContent content)
{
context.pushAttrScope();
context.setCurrentRole(CodegenRole.MARSHAL_DETECT);
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression detect = context.createExpression(content);
</pre><pre class="diff" id="added">+ Expression detect = context.createExpression(content);
</pre><pre class="diff" id="context"> context.popAttrScope();
return detect;
}
</pre></div>
<hr /><a name="file12" /><div class="file">
<span class="pathname">asxsd/trunk/src/main/java/uk/co/badgersinfoil/asxsd/components</span><br />
<div class="fileheader"><big><b>SequenceMappingComponent.java</b></big> <small id="info">197 -> 198</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/SequenceMappingComponent.java 2008-02-16 16:49:03 UTC (rev 197)
+++ trunk/src/main/java/uk/co/badgersinfoil/asxsd/components/SequenceMappingComponent.java 2008-02-16 16:51:39 UTC (rev 198)
@@ -14,7 +14,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.asxsd.CodegenRole;
import uk.co.badgersinfoil.asxsd.XSDUtils;
import uk.co.badgersinfoil.metaas.ActionScriptFactory;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.<span id="removedchars">AS</span>Expression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Expression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.StatementContainer;
public class SequenceMappingComponent extends AbstractMappingComponent {
</pre><pre class="diff"><small id="info">@@ -53,7 +53,7 @@
</small></pre><pre class="diff" id="context"> }
}
</pre><pre class="diff" id="removed">- public <span id="removedchars">AS</span>Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="added">+ public Expression createExpression(CodegenContext context,
</pre><pre class="diff" id="context"> XSDConcreteComponent component)
{
CodegenRole role = context.getCurrentRole();
</pre><pre class="diff"><small id="info">@@ -65,10 +65,10 @@
</small></pre><pre class="diff" id="context"> return fact.newExpression("false");
}
Iterator i=particles.iterator();
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression detect = context.createExpression((XSDParticle)i.next());
</pre><pre class="diff" id="added">+ Expression detect = context.createExpression((XSDParticle)i.next());
</pre><pre class="diff" id="context"> while (i.hasNext()) {
XSDParticle part = (XSDParticle)i.next();
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression rhs = context.createExpression(part);
</pre><pre class="diff" id="added">+ Expression rhs = context.createExpression(part);
</pre><pre class="diff" id="context"> detect = fact.newOrExpression(detect, rhs);
if (XSDUtils.isRequiredToAppear(part)) {
// Don't need to check for other
</pre><pre class="diff"><small id="info">@@ -83,10 +83,10 @@
</small></pre><pre class="diff" id="context"> return fact.newExpression("false");
}
Iterator i = particles.iterator();
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression detect = context.createExpression((XSDParticle)i.next());
</pre><pre class="diff" id="added">+ Expression detect = context.createExpression((XSDParticle)i.next());
</pre><pre class="diff" id="context"> while (i.hasNext()) {
XSDParticle part = (XSDParticle)i.next();
</pre><pre class="diff" id="removed">- <span id="removedchars">AS</span>Expression rhs = context.createExpression(part);
</pre><pre class="diff" id="added">+ Expression rhs = context.createExpression(part);
</pre><pre class="diff" id="context"> detect = fact.newOrExpression(detect, rhs);
if (XSDUtils.isRequiredToAppear(part)) {
// Don't need to check for other
</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>