Permalink
Browse files

Falcon: Finished abstracting the syntax of an MXML document behind a …

…complete set of interfaces (IMXMLData, IMXMLTagData, IMXMLTagAttributeData, etc.) The other parts of the compiler now access the MXML document only through these interfaces rather than through the concrete classes.

git-svn-id: https://svn.apache.org/repos/asf/flex/falcon/trunk@1454275 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 71312b7 commit 658d9832c07623907ca22ad5b29c746911bd0ecb Gordon Smith committed Mar 8, 2013
Showing with 1,264 additions and 819 deletions.
  1. +2 −2 compiler/src/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java
  2. +6 −6 compiler/src/org/apache/flex/compiler/internal/parsing/as/IncludeHandler.java
  3. +15 −15 compiler/src/org/apache/flex/compiler/internal/parsing/mxml/BalancingMXMLProcessor.java
  4. +16 −16 compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLScopeBuilder.java
  5. +23 −22 compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLTagDataDepth.java
  6. +5 −5 compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLTagDataPayload.java
  7. +5 −5 compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLUnitDataIterator.java
  8. +2 −2 compiler/src/org/apache/flex/compiler/internal/scopes/MXMLFileScope.java
  9. +6 −6 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java
  10. +10 −10 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
  11. +2 −2 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeferredInstanceNode.java
  12. +2 −2 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLEventSpecifierNode.java
  13. +3 −3 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLExpressionNodeBase.java
  14. +10 −10 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFileNode.java
  15. +6 −6 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLMetadataNode.java
  16. +2 −2 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelPropertyNode.java
  17. +28 −28 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java
  18. +2 −2 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPrivateNode.java
  19. +5 −5 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java
  20. +6 −6 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLScriptNode.java
  21. +2 −2 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLSpecifierNodeBase.java
  22. +2 −2 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleNode.java
  23. +2 −2 compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLListNode.java
  24. +31 −30 compiler/src/org/apache/flex/compiler/internal/tree/mxml/XMLBuilder.java
  25. +33 −3 compiler/src/org/apache/flex/compiler/mxml/IMXMLData.java
  26. +3 −3 compiler/src/org/apache/flex/compiler/mxml/IMXMLDatabindingData.java
  27. +33 −0 compiler/src/org/apache/flex/compiler/mxml/IMXMLDatabindingValue.java
  28. +5 −4 compiler/src/org/apache/flex/compiler/mxml/IMXMLEntityData.java
  29. +33 −0 compiler/src/org/apache/flex/compiler/mxml/IMXMLEntityValue.java
  30. +31 −0 compiler/src/org/apache/flex/compiler/mxml/IMXMLInstructionData.java
  31. +39 −0 compiler/src/org/apache/flex/compiler/mxml/IMXMLNamespaceAttributeData.java
  32. +110 −5 compiler/src/org/apache/flex/compiler/mxml/IMXMLTagAttributeData.java
  33. +43 −0 compiler/src/org/apache/flex/compiler/mxml/IMXMLTagAttributeValue.java
  34. +36 −0 compiler/src/org/apache/flex/compiler/mxml/IMXMLTagBlobData.java
  35. +166 −15 compiler/src/org/apache/flex/compiler/mxml/IMXMLTagData.java
  36. +112 −55 compiler/src/org/apache/flex/compiler/mxml/IMXMLTextData.java
  37. +28 −0 compiler/src/org/apache/flex/compiler/mxml/IMXMLTextValue.java
  38. +165 −0 compiler/src/org/apache/flex/compiler/mxml/IMXMLUnitData.java
  39. +57 −85 compiler/src/org/apache/flex/compiler/mxml/MXMLData.java
  40. +2 −18 compiler/src/org/apache/flex/compiler/mxml/MXMLDatabindingData.java
  41. +3 −2 compiler/src/org/apache/flex/compiler/mxml/MXMLDatabindingValue.java
  42. +5 −4 compiler/src/org/apache/flex/compiler/mxml/MXMLEntityValue.java
  43. +2 −2 compiler/src/org/apache/flex/compiler/mxml/MXMLInstructionData.java
  44. +7 −10 compiler/src/org/apache/flex/compiler/mxml/MXMLNamespaceAttributeData.java
  45. +31 −79 compiler/src/org/apache/flex/compiler/mxml/MXMLTagAttributeData.java
  46. +4 −4 compiler/src/org/apache/flex/compiler/mxml/MXMLTagAttributeValue.java
  47. +3 −2 compiler/src/org/apache/flex/compiler/mxml/MXMLTagBlobData.java
  48. +66 −182 compiler/src/org/apache/flex/compiler/mxml/MXMLTagData.java
  49. +11 −32 compiler/src/org/apache/flex/compiler/mxml/MXMLTextData.java
  50. +3 −2 compiler/src/org/apache/flex/compiler/mxml/MXMLTextValue.java
  51. +34 −115 compiler/src/org/apache/flex/compiler/mxml/MXMLUnitData.java
  52. +2 −2 compiler/src/org/apache/flex/compiler/problems/MXMLUnexpectedDatabindingProblem.java
  53. +2 −2 compiler/src/org/apache/flex/compiler/problems/MXMLUnexpectedTextProblem.java
  54. +2 −2 compiler/src/org/apache/flex/compiler/problems/MXMLXMLRequireContentProblem.java
@@ -99,7 +99,7 @@
import org.apache.flex.compiler.internal.tree.as.VariableNode;
import org.apache.flex.compiler.internal.tree.as.metadata.MetaTagsNode;
import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.mxml.MXMLTextData;
+import org.apache.flex.compiler.mxml.IMXMLTextData;
import org.apache.flex.compiler.problems.AttributesNotAllowedOnPackageDefinitionProblem;
import org.apache.flex.compiler.problems.CanNotInsertSemicolonProblem;
import org.apache.flex.compiler.problems.EmbedInitialValueProblem;
@@ -500,7 +500,7 @@ private static ICompilerProblem genericParserProblem(String path, int start, int
*/
public static ScopedBlockNode parseInlineScript(
final IFileNodeAccumulator fileNodeAccumulator,
- final MXMLTextData mxmlTextData,
+ final IMXMLTextData mxmlTextData,
final Collection<ICompilerProblem> problems,
final ASScope containingScope,
final IProjectConfigVariables variables,
@@ -31,7 +31,7 @@
import org.apache.flex.compiler.filespecs.IFileSpecification;
import org.apache.flex.compiler.internal.parsing.mxml.MXMLScopeBuilder;
import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.mxml.MXMLUnitData;
+import org.apache.flex.compiler.mxml.IMXMLUnitData;
import org.apache.flex.compiler.projects.IASProject;
import org.apache.flex.compiler.units.ICompilationUnit;
import org.apache.flex.utils.FilenameNormalization;
@@ -228,7 +228,7 @@ public static IncludeHandler createForASTBuilding(
/**
* True if this {@code IncludeHandler} tracks not only {@link ASToken} but
- * also {@link MXMLUnitData}. This flag tells {@link #onNextToken(ASToken)}
+ * also {@link IMXMLUnitData}. This flag tells {@link #onNextToken(ASToken)}
* not to check whether {@code currentNode.tokenEnd} increases
* monotonically. Before CMP-1490 is fixed, this is a workaround for
* CMP-1368.
@@ -510,13 +510,13 @@ protected void onNextToken(ASToken token)
/**
* Update the {@code IncludeHandler}'s current offset counter with the next
- * {@code MXMLUnitData}
+ * {@code IMXMLUnitData}
*
- * @param unitData Next {@code MXMLUnitData} object.
+ * @param unitData Next {@code IMXMLUnitData} object.
*/
- public void onNextMXMLUnitData(final MXMLUnitData unitData)
+ public void onNextMXMLUnitData(final IMXMLUnitData unitData)
{
- assert unitData != null : "MXMLUnitData can't be null.";
+ assert unitData != null : "IMXMLUnitData can't be null.";
hasMXMLUnits = true;
if (currentNode != null)
@@ -28,14 +28,14 @@
import org.apache.flex.compiler.common.PrefixMap;
import org.apache.flex.compiler.filespecs.IFileSpecification;
-import org.apache.flex.compiler.mxml.MXMLData;
-import org.apache.flex.compiler.mxml.MXMLTagData;
-import org.apache.flex.compiler.mxml.MXMLUnitData;
+import org.apache.flex.compiler.mxml.IMXMLData;
+import org.apache.flex.compiler.mxml.IMXMLTagData;
+import org.apache.flex.compiler.mxml.IMXMLUnitData;
import org.apache.flex.compiler.problems.ICompilerProblem;
/**
* The BalancingMXMLProcessor performs a balancing operation over a collection of
- * {@link MXMLTagData} objects. It looks for un-balanced MXML and attempts to
+ * {@link IMXMLTagData} objects. It looks for un-balanced MXML and attempts to
* add open and close tags in order to create a well-formed, or better-formed, DOM.
*
* The method used is to track tags by their depth, and going from inside out, to check for matches
@@ -60,17 +60,17 @@ public BalancingMXMLProcessor(IFileSpecification specification, Collection<IComp
* Initialize our balancing structures from a full MXMLUnitData array.
* @param data the array to use to populate our balancing structures
*/
- public void initialize(MXMLUnitData[] data) {
+ public void initialize(IMXMLUnitData[] data) {
int index = 0;
for(int i = 0; i < data.length; i++) {
- if(data[i] instanceof MXMLTagData) {
- if(!((MXMLTagData)data[i]).isEmptyTag()) {
- if( ((MXMLTagData)data[i]).isOpenTag()) {
- addOpenTag((MXMLTagData)data[i], index);
+ if(data[i] instanceof IMXMLTagData) {
+ if(!((IMXMLTagData)data[i]).isEmptyTag()) {
+ if( ((IMXMLTagData)data[i]).isOpenTag()) {
+ addOpenTag((IMXMLTagData)data[i], index);
index++;
} else {
index--;
- addCloseTag((MXMLTagData)data[i], index);
+ addCloseTag((IMXMLTagData)data[i], index);
}
}
}
@@ -81,7 +81,7 @@ public final void setFileSpecification(IFileSpecification specification) {
spec = specification;
}
- public MXMLUnitData[] balance(MXMLUnitData[] data, MXMLData mxmlData, Map<MXMLTagData, PrefixMap> map) {
+ public IMXMLUnitData[] balance(IMXMLUnitData[] data, IMXMLData mxmlData, Map<IMXMLTagData, PrefixMap> map) {
ArrayList<MXMLTagDataPayload> payload = new ArrayList<MXMLTagDataPayload>();
for(int i = depths.size() - 1; i >= 0 ; i--) {
boolean b = depths.get(i).balance(payload, map, mxmlData, data, problems, spec);
@@ -92,13 +92,13 @@ public final void setFileSpecification(IFileSpecification specification) {
Collections.sort(payload, Collections.reverseOrder());
if(payload.size() > 0) {
wasRepaired = true; // If any payload returned, then that also means repairing occurred
- List<MXMLUnitData> newTags = new ArrayList<MXMLUnitData>(Arrays.asList(data));
+ List<IMXMLUnitData> newTags = new ArrayList<IMXMLUnitData>(Arrays.asList(data));
for(int i = payload.size() - 1; i >=0; i--) {
MXMLTagDataPayload tokenPayload = payload.get(i);
newTags.add(tokenPayload.getPosition(), tokenPayload.getTagData());
}
- return newTags.toArray(new MXMLUnitData[0]);
+ return newTags.toArray(new IMXMLUnitData[0]);
}
return data;
}
@@ -127,12 +127,12 @@ private final MXMLTagDataDepth getDepth(int depth) {
return dep;
}
- public void addOpenTag(MXMLTagData openTag, int depth) {
+ public void addOpenTag(IMXMLTagData openTag, int depth) {
MXMLTagDataDepth dep = getDepth(depth);
dep.addOpenTag(openTag);
}
- public void addCloseTag(MXMLTagData closeTag, int depth) {
+ public void addCloseTag(IMXMLTagData closeTag, int depth) {
MXMLTagDataDepth dep = getDepth(depth);
dep.addCloseTag(closeTag);
}
@@ -56,14 +56,14 @@
import org.apache.flex.compiler.internal.workspaces.Workspace;
import org.apache.flex.compiler.mxml.IMXMLData;
import org.apache.flex.compiler.mxml.IMXMLTagAttributeData;
-import org.apache.flex.compiler.mxml.IMXMLTextData.TextType;
import org.apache.flex.compiler.mxml.IMXMLLanguageConstants;
+import org.apache.flex.compiler.mxml.IMXMLTagAttributeValue;
import org.apache.flex.compiler.mxml.IMXMLTagData;
+import org.apache.flex.compiler.mxml.IMXMLTextData;
+import org.apache.flex.compiler.mxml.IMXMLTextData.TextType;
import org.apache.flex.compiler.mxml.IMXMLTypeConstants;
-import org.apache.flex.compiler.mxml.MXMLNamespaceAttributeData;
-import org.apache.flex.compiler.mxml.MXMLTagAttributeValue;
-import org.apache.flex.compiler.mxml.MXMLTextData;
-import org.apache.flex.compiler.mxml.MXMLUnitData;
+import org.apache.flex.compiler.mxml.IMXMLNamespaceAttributeData;
+import org.apache.flex.compiler.mxml.IMXMLUnitData;
import org.apache.flex.compiler.problems.ICompilerProblem;
import org.apache.flex.compiler.problems.MXMLLibraryTagNotTheFirstChildProblem;
import com.google.common.collect.ImmutableSet;
@@ -269,14 +269,14 @@ private void processDefinitionTag(IMXMLTagData definitionTag)
int nameEnd = -1;
for (IMXMLTagAttributeData attr : definitionTagAttrs)
{
- if ((!(attr instanceof MXMLNamespaceAttributeData)) && (attr.hasValue()))
+ if ((!(attr instanceof IMXMLNamespaceAttributeData)) && (attr.hasValue()))
{
if ((attr.getURI() == null) && (ATTRIBUTE_NAME.equals(attr.getName())))
{
if (definitionName == null)
{
definitionName = attr.getRawValue();
- MXMLTagAttributeValue[] values = attr.getValues();
+ IMXMLTagAttributeValue[] values = attr.getValues();
nameStart = values[0].getAbsoluteStart() + 1; //attr.getValueStart();
nameEnd = values[values.length - 1].getAbsoluteEnd() - 1; // attr.getValueEnd();
}
@@ -324,7 +324,7 @@ private void processDefinitionTag(IMXMLTagData definitionTag)
private void processTag(IMXMLTagData tag)
{
- includeHandler.onNextMXMLUnitData((MXMLUnitData)tag);
+ includeHandler.onNextMXMLUnitData((IMXMLUnitData)tag);
boolean recurse = true;
@@ -489,11 +489,11 @@ private void processScriptTag(IMXMLTagData scriptTag)
else
{
final List<ScopedBlockNode> nodes = new ArrayList<ScopedBlockNode>(2);
- for (MXMLUnitData unit = scriptTag.getFirstChildUnit(); unit != null; unit = unit.getNextSiblingUnit())
+ for (IMXMLUnitData unit = scriptTag.getFirstChildUnit(); unit != null; unit = unit.getNextSiblingUnit())
{
- if (unit instanceof MXMLTextData)
+ if (unit instanceof IMXMLTextData)
{
- final MXMLTextData mxmlTextData = (MXMLTextData)unit;
+ final IMXMLTextData mxmlTextData = (IMXMLTextData)unit;
if (mxmlTextData.getTextType() != TextType.WHITESPACE)
{
final EnumSet<PostProcessStep> postProcess = EnumSet.of(
@@ -526,11 +526,11 @@ private void processMetadataTag(IMXMLTagData metadataTag)
{
assert fileScope.isMetadataTag(metadataTag);
- for (MXMLUnitData unit = metadataTag.getFirstChildUnit(); unit != null; unit = unit.getNextSiblingUnit())
+ for (IMXMLUnitData unit = metadataTag.getFirstChildUnit(); unit != null; unit = unit.getNextSiblingUnit())
{
- if (unit instanceof MXMLTextData)
+ if (unit instanceof IMXMLTextData)
{
- final MXMLTextData mxmlTextData = (MXMLTextData)unit;
+ final IMXMLTextData mxmlTextData = (IMXMLTextData)unit;
if (mxmlTextData.getTextType() != TextType.WHITESPACE)
{
MetaTagsNode metaTagNodes = ASParser.parseMetadata(project.getWorkspace(), mxmlTextData.getCompilableText(),
@@ -584,14 +584,14 @@ private void processComponentTag(IMXMLTagData componentTag)
int nameEnd = -1;
for (IMXMLTagAttributeData attr : definitionTagAttrs)
{
- if ((!(attr instanceof MXMLNamespaceAttributeData)) && (attr.hasValue()))
+ if ((!(attr instanceof IMXMLNamespaceAttributeData)) && (attr.hasValue()))
{
if ((attr.getURI() == null) && (attr.getName().equals("className")))
{
if (className == null)
{
className = attr.getRawValue();
- MXMLTagAttributeValue[] values = attr.getValues();
+ IMXMLTagAttributeValue[] values = attr.getValues();
nameStart = values[0].getAbsoluteStart() + 1; //attr.getValueStart();
nameEnd = values[values.length - 1].getAbsoluteEnd() - 1; // attr.getValueEnd();
}
@@ -28,10 +28,11 @@
import org.apache.flex.compiler.common.PrefixMap;
import org.apache.flex.compiler.filespecs.IFileSpecification;
-import org.apache.flex.compiler.mxml.MXMLData;
-import org.apache.flex.compiler.mxml.MXMLTagAttributeData;
+import org.apache.flex.compiler.mxml.IMXMLData;
+import org.apache.flex.compiler.mxml.IMXMLTagData;
+import org.apache.flex.compiler.mxml.IMXMLTagAttributeData;
+import org.apache.flex.compiler.mxml.IMXMLUnitData;
import org.apache.flex.compiler.mxml.MXMLTagData;
-import org.apache.flex.compiler.mxml.MXMLUnitData;
import org.apache.flex.compiler.parsing.MXMLTokenTypes;
import org.apache.flex.compiler.problems.ICompilerProblem;
import org.apache.flex.compiler.problems.SyntaxProblem;
@@ -44,12 +45,12 @@
*/
class MXMLTagDataDepth {
- private static final MXMLTagAttributeData[] MXML_TAG_ATTRIBUTE_DATAS = new MXMLTagAttributeData[0];
+ private static final IMXMLTagAttributeData[] MXML_TAG_ATTRIBUTE_DATAS = new IMXMLTagAttributeData[0];
- final class MXMLTagDataComparator implements Comparator<MXMLTagData> {
+ final class MXMLTagDataComparator implements Comparator<IMXMLTagData> {
@Override
- public final int compare(final MXMLTagData o1, final MXMLTagData o2)
+ public final int compare(final IMXMLTagData o1, final IMXMLTagData o2)
{
if(o1.getIndex() == o2.getIndex()) return 0;
if(o1.getIndex() < o2.getIndex()) return -1;
@@ -81,7 +82,7 @@ public String getRawAttributeValue(String attributeName)
}
@Override
- public MXMLTagAttributeData[] getAttributeDatas()
+ public IMXMLTagAttributeData[] getAttributeDatas()
{
//return empty array since our value for children is null
return MXML_TAG_ATTRIBUTE_DATAS;
@@ -96,29 +97,29 @@ public boolean isImplicit()
private MXMLTagDataDepth parent;
- private ArrayList<MXMLTagData> openTags;
- private FastStack<MXMLTagData> closeTags;
+ private ArrayList<IMXMLTagData> openTags;
+ private FastStack<IMXMLTagData> closeTags;
private int depth;
public MXMLTagDataDepth(int depth) {
this.depth = depth;
- openTags = new ArrayList<MXMLTagData>();
- closeTags = new FastStack<MXMLTagData>();
+ openTags = new ArrayList<IMXMLTagData>();
+ closeTags = new FastStack<IMXMLTagData>();
}
/**
* Adds an open tag to our list of tags we are tracking
- * @param openTag the {@link MXMLTagData} that is open
+ * @param openTag the {@link IMXMLTagData} that is open
*/
- public final void addOpenTag(final MXMLTagData openTag) {
+ public final void addOpenTag(final IMXMLTagData openTag) {
openTags.add(openTag);
}
/**
* Adds a close tag to our list of tags we are tracking
- * @param closeTag the {@link MXMLTagData} that is close
+ * @param closeTag the {@link IMXMLTagData} that is close
*/
- public final void addCloseTag(final MXMLTagData closeTag) {
+ public final void addCloseTag(final IMXMLTagData closeTag) {
closeTags.push(closeTag);
}
@@ -151,20 +152,20 @@ final void ensureOrder() {
* did_repair = ret | !payload.isEmpty()
*
*/
- public final boolean balance(List<MXMLTagDataPayload> payload, Map<MXMLTagData, PrefixMap> prefixMap, MXMLData mxmlData, MXMLUnitData[] data, Collection<ICompilerProblem> problems, IFileSpecification fileSpec) {
+ public final boolean balance(List<MXMLTagDataPayload> payload, Map<IMXMLTagData, PrefixMap> prefixMap, IMXMLData mxmlData, IMXMLUnitData[] data, Collection<ICompilerProblem> problems, IFileSpecification fileSpec) {
ensureOrder();
final int size = openTags.size();
boolean didNonPayloadRepair = false;
for(int i = 0; i < size; i++) {
- MXMLTagData openTag = openTags.get(i);
+ IMXMLTagData openTag = openTags.get(i);
if(!closeTags.isEmpty()) {
- final MXMLTagData closeTag = closeTags.peek();
+ final IMXMLTagData closeTag = closeTags.peek();
if(closeTag.getName().compareTo(openTag.getName()) != 0) {
//let's determine where to end, and then move all of our tags to our parent
int insertOffset = -1;
while(!closeTags.isEmpty()) {
- final MXMLTagData pop = closeTags.pop();
+ final IMXMLTagData pop = closeTags.pop();
if(pop.getName().compareTo(openTag.getName()) != 0) {
insertOffset = pop.getIndex();
if(parent != null) {
@@ -192,7 +193,7 @@ public final boolean balance(List<MXMLTagDataPayload> payload, Map<MXMLTagData,
{
// we have an open with no matching close, so let's just make
// it an empty tag. CMP-916
- openTag.setEmptyTag();
+ ((MXMLTagData)openTag).setEmptyTag();
didNonPayloadRepair = true; // note a repair, so we can alert caller
problems.add(produceProblemFromToken(openTag, fileSpec));
// TODO: below (line 230) the old code used to make up a new fake tag and
@@ -221,7 +222,7 @@ public final boolean balance(List<MXMLTagDataPayload> payload, Map<MXMLTagData,
int pos = openTag.getIndex();
int tokenSize = data.length;
while(pos < tokenSize) {
- MXMLUnitData currToken = data[pos];
+ IMXMLUnitData currToken = data[pos];
if(currToken instanceof MXMLTagData && !((MXMLTagData)currToken).hasExplicitCloseTag()) {
problems.add(new SyntaxProblem(currToken, ((MXMLTagData)currToken).getName()));
FakeMXMLTagData fakeMXMLTagData = new FakeMXMLTagData((MXMLTagData)currToken, true);
@@ -248,7 +249,7 @@ public final boolean balance(List<MXMLTagDataPayload> payload, Map<MXMLTagData,
return didNonPayloadRepair;
}
- private ICompilerProblem produceProblemFromToken(MXMLTagData tagData, IFileSpecification fileSpec)
+ private ICompilerProblem produceProblemFromToken(IMXMLTagData tagData, IFileSpecification fileSpec)
{
return new SyntaxProblem(tagData, tagData.getName());
}
@@ -19,7 +19,7 @@
package org.apache.flex.compiler.internal.parsing.mxml;
-import org.apache.flex.compiler.mxml.MXMLTagData;
+import org.apache.flex.compiler.mxml.IMXMLTagData;
/**
* This class stores the new MXMLTagData object, as well as the index
@@ -28,19 +28,19 @@
*/
class MXMLTagDataPayload implements Comparable<MXMLTagDataPayload>{
- private MXMLTagData tagData;
+ private IMXMLTagData tagData;
private int offset;
- public MXMLTagDataPayload(MXMLTagData token, int position) {
+ public MXMLTagDataPayload(IMXMLTagData token, int position) {
offset = position;
tagData = token;
}
/**
- * @return the {@link MXMLTagData} that should be inserted into its parent
+ * @return the {@link IMXMLTagData} that should be inserted into its parent
* MXMLData object
*/
- public MXMLTagData getTagData() {
+ public IMXMLTagData getTagData() {
return tagData;
}
Oops, something went wrong.

0 comments on commit 658d983

Please sign in to comment.