You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/09/10 22:16:15 UTC
[royale-compiler] branch develop updated (87e4ffc -> 7700af4)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from 87e4ffc accidentally changed project files in commit 0b28687e40304eaba3185331a170225c16307b2e
new eaf1e32 fix NPE on write-only properties
new 7700af4 SWF compiler was not differentiating between warnings and errors
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/royale/compiler/clients/MXMLC.java | 7 ++++---
.../compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java | 6 ++++--
2 files changed, 8 insertions(+), 5 deletions(-)
[royale-compiler] 02/02: SWF compiler was not differentiating
between warnings and errors
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 7700af48731706e740b0a6e42ece08a2885bd1a8
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Sep 10 14:53:39 2018 -0700
SWF compiler was not differentiating between warnings and errors
---
.../src/main/java/org/apache/royale/compiler/clients/MXMLC.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java b/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
index 8e4268d..497997e 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
@@ -121,9 +121,10 @@ public class MXMLC implements FlexTool
// Therefore the following enum values must be non-negative.
SUCCESS(0),
PRINT_HELP(1),
- FAILED_WITH_ERRORS(2),
- FAILED_WITH_EXCEPTIONS(3),
- FAILED_WITH_CONFIG_ERRORS(4);
+ FAILED_WITH_PROBLEMS(2),
+ FAILED_WITH_ERRORS(3),
+ FAILED_WITH_EXCEPTIONS(4),
+ FAILED_WITH_CONFIG_ERRORS(5);
ExitCode(int code)
{
[royale-compiler] 01/02: fix NPE on write-only properties
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit eaf1e32df22752e00ddbc7d758835ec6f325b25d
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Sep 10 14:34:44 2018 -0700
fix NPE on write-only properties
---
.../compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
index 9e6ae09..569d36e 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
@@ -722,11 +722,13 @@ abstract class MXMLClassReferenceNodeBase extends MXMLNodeBase implements IMXMLC
{
// Non-whitespace may be the value of a default property.
IVariableDefinition defaultPropertyDefinition = getDefaultPropertyDefinition(builder);
+ IVariableDefinition getterDefinition = (defaultPropertyDefinition instanceof ISetterDefinition) ?
+ ((ISetterDefinition)defaultPropertyDefinition).resolveCorrespondingAccessor(builder.getProject()) :null;
if (defaultPropertyDefinition != null &&
(defaultPropertyDefinition.getTypeAsDisplayString().equals(IASLanguageConstants.String) ||
(defaultPropertyDefinition.getMetaTagByName(IMetaAttributeConstants.ATTRIBUTE_RICHTEXTCONTENT) != null) ||
- (defaultPropertyDefinition instanceof ISetterDefinition &&
- ((ISetterDefinition)defaultPropertyDefinition).resolveCorrespondingAccessor(builder.getProject()).getMetaTagByName(IMetaAttributeConstants.ATTRIBUTE_RICHTEXTCONTENT) != null)))
+ (getterDefinition != null &&
+ (getterDefinition.getMetaTagByName(IMetaAttributeConstants.ATTRIBUTE_RICHTEXTCONTENT) != null))))
{
MXMLSpecifierNodeBase childNode =
createSpecifierNode(builder, defaultPropertyDefinition.getBaseName());