This is an automated email from the ASF dual-hosted git repository. gregdove pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit c55743a02cd16cfebf5a94d5418f8b8e656dd164 Author: greg-dove <[email protected]> AuthorDate: Thu Jan 2 15:03:34 2020 +1300 Updates to Reflection lib to correspond with cumulative compiler changes. --- .../apache/royale/reflection/CompilationData.as | 6 ++-- .../apache/royale/reflection/getDynamicFields.as | 8 ++--- .../royale/reflection/nativejs/AS3Boolean.as | 2 +- .../apache/royale/reflection/nativejs/AS3Number.as | 36 +++++++++++----------- .../apache/royale/reflection/nativejs/AS3String.as | 2 +- .../apache/royale/reflection/nativejs/AS3Vector.as | 2 +- .../apache/royale/reflection/nativejs/AS3int.as | 2 +- .../apache/royale/reflection/nativejs/AS3uint.as | 2 +- .../utils/getStaticConstantsByConvention.as | 6 ++-- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/CompilationData.as b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/CompilationData.as index d1edf07..1c19817 100644 --- a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/CompilationData.as +++ b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/CompilationData.as @@ -126,13 +126,13 @@ package org.apache.royale.reflection { //class or interface if (inspect.prototype && inspect.prototype.ROYALE_REFLECTION_INFO) { _qName = inspect.prototype.ROYALE_CLASS_INFO.names[0].qName; - _flags = inspect.prototype.ROYALE_REFLECTION_INFO.compileFlags; + _flags = inspect.prototype.ROYALE_COMPILE_FLAGS; _class = inspect as Class; } } else { //instance if (inspect.ROYALE_REFLECTION_INFO) { - _flags = inspect.ROYALE_REFLECTION_INFO.compileFlags; + _flags = inspect.ROYALE_COMPILE_FLAGS; _qName = inspect.ROYALE_CLASS_INFO.names[0].qName; _class = constructor as Class; } @@ -160,7 +160,7 @@ package org.apache.royale.reflection { //check that the prototype chain has the same compile flags var proto:Object = _class.prototype; while (proto && proto.ROYALE_REFLECTION_INFO) { - if (!hasCompilationOption(proto.ROYALE_REFLECTION_INFO.compileFlags, checkFlags)) { + if (!hasCompilationOption(proto.ROYALE_COMPILE_FLAGS, checkFlags)) { return false; } proto = proto.constructor.superClass_; diff --git a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/getDynamicFields.as b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/getDynamicFields.as index 37a70fc..69d439a 100644 --- a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/getDynamicFields.as +++ b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/getDynamicFields.as @@ -66,11 +66,11 @@ package org.apache.royale.reflection { arr = Object.keys(inspect); if (inspect.prototype && inspect.prototype.ROYALE_REFLECTION_INFO) { if (goog.DEBUG) { - if (!CompilationData.hasCompilationOption(inspect.prototype.ROYALE_REFLECTION_INFO.compileFlags, CompilationData.WITH_DEFAULT_INITIALIZERS)) { + if (!CompilationData.hasCompilationOption(inspect.prototype.ROYALE_COMPILE_FLAGS, CompilationData.WITH_DEFAULT_INITIALIZERS)) { trace('[WARN] getDynamicFields can be unreliable for static inspection of ' + inspect.prototype.ROYALE_CLASS_INFO.names[0].qName + ' because it was not compiled with \'js-default-initializers=true\''); } } - var avoidNames:Array = inspect.prototype.ROYALE_REFLECTION_INFO.statics; + var avoidNames:Array = inspect.prototype.ROYALE_INITIAL_STATICS; if (avoidNames) { var temp:Array = []; var l:uint = arr.length; @@ -93,7 +93,7 @@ package org.apache.royale.reflection { if (inspect.ROYALE_REFLECTION_INFO) { const inspectReflect:Object = inspect.ROYALE_REFLECTION_INFO; if (goog.DEBUG) { - if (!CompilationData.hasCompilationOption(inspectReflect.compileFlags, CompilationData.WITH_DEFAULT_INITIALIZERS)) { + if (!CompilationData.hasCompilationOption(inspect.ROYALE_COMPILE_FLAGS, CompilationData.WITH_DEFAULT_INITIALIZERS)) { trace('[WARN] getDynamicFields can be unreliable for ' + inspect.ROYALE_CLASS_INFO.names[0].qName + ' and any ancestor classes that were not compiled with \'js-default-initializers=true\''); warned = true; } @@ -123,7 +123,7 @@ package org.apache.royale.reflection { while (proto) { var protoReflect:Object = proto.ROYALE_REFLECTION_INFO; if (goog.DEBUG && !warned) { - if (protoReflect && !CompilationData.hasCompilationOption(protoReflect.compileFlags, CompilationData.WITH_DEFAULT_INITIALIZERS)) { + if (protoReflect && !CompilationData.hasCompilationOption(proto.ROYALE_COMPILE_FLAGS, CompilationData.WITH_DEFAULT_INITIALIZERS)) { //skip EventDispatcher because we already special-cased it if (proto.ROYALE_CLASS_INFO.names[0].qName != eventDispatcherClassInfo.names[0].qName) { trace('[WARN] getDynamicFields can be unreliable for ' diff --git a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Boolean.as b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Boolean.as index 75b09b7..4a3da17 100644 --- a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Boolean.as +++ b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Boolean.as @@ -35,7 +35,7 @@ package org.apache.royale.reflection.nativejs { return { 'methods':function():Object { return { - 'Boolean':{'parameters':function():Object { return [{'index':1,'optional':true,'type':'*'}]},'type':'','declaredBy':'Boolean'} + 'Boolean':{'parameters':function():Object { return ['*',true]},'type':'','declaredBy':'Boolean'} }; } }; diff --git a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Number.as b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Number.as index 6e2abc7..b1612eb 100644 --- a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Number.as +++ b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Number.as @@ -34,25 +34,25 @@ package org.apache.royale.reflection.nativejs { return { 'methods':function():Object { return { - 'Number':{'parameters':function():Object { return [{'index':1,'optional':true,'type':'*'}]},'type':'','declaredBy':'Number'}, - '|sin':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, + 'Number':{'parameters':function():Object { return ['*',true]},'type':'','declaredBy':'Number'}, + '|sin':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, '|random':{'declaredBy':'Number','type':'Number'}, - '|atan2':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'},{'index':2,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|sqrt':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|cos':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|asin':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|tan':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|floor':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|max':{'parameters':function():Object {return [{'index':1,'optional':true,'type':'Number'},{'index':2,'optional':true,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|abs':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|exp':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|atan':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|round':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|log':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|min':{'parameters':function():Object {return [{'index':1,'optional':true,'type':'Number'},{'index':2,'optional':true,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|acos':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|ceil':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, - '|pow':{'parameters':function():Object {return [{'index':1,'optional':false,'type':'Number'},{'index':2,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'} + '|atan2':{'parameters':function():Object {return ['Number', false,{'index':2,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'}, + '|sqrt':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|cos':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|asin':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|tan':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|floor':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|max':{'parameters':function():Object {return ['Number', true, 'Number', true]},'declaredBy':'Number','type':'Number'}, + '|abs':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|exp':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|atan':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|round':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|log':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|min':{'parameters':function():Object {return ['Number', true, 'Number', true]},'declaredBy':'Number','type':'Number'}, + '|acos':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|ceil':{'parameters':function():Object {return ['Number', false]},'declaredBy':'Number','type':'Number'}, + '|pow':{'parameters':function():Object {return ['Number', false,{'index':2,'optional':false,'type':'Number'}]},'declaredBy':'Number','type':'Number'} }; } }; diff --git a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3String.as b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3String.as index 18fc766..91dbacb 100644 --- a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3String.as +++ b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3String.as @@ -39,7 +39,7 @@ package org.apache.royale.reflection.nativejs { }, 'methods':function():Object { return { - 'String':{'parameters':function():Object { return [{'index':1,'optional':true,'type':'*'}]},'type':'','declaredBy':'String'} + 'String':{ 'parameters':function():Object { return ['*', true]}, 'type':'','declaredBy':'String'} }; } }; diff --git a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Vector.as b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Vector.as index 1717df7..5fe7d96 100644 --- a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Vector.as +++ b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3Vector.as @@ -45,7 +45,7 @@ package org.apache.royale.reflection.nativejs { 'methods':function():Object { var ret:Object = {}; //constructor - ret[typeName] ={'parameters':function():Object {return [{'index':1,'optional':true,'type':'uint'},{'index':2,'optional':true,'type':'Boolean'}]},'type':'','declaredBy': typeName}; + ret[typeName] ={'parameters':function():Object {return ['uint', true, 'Boolean', true]},'type':'','declaredBy': typeName}; return ret; } }; diff --git a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3int.as b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3int.as index be54308..45459d4 100644 --- a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3int.as +++ b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3int.as @@ -38,7 +38,7 @@ package org.apache.royale.reflection.nativejs { return { 'methods':function():Object { return { - 'int':{'parameters':function():Object {return [{'index':1,'optional':true,'type':'*'}]},'type':'','declaredBy':'int'} + 'int':{'parameters':function():Object {return ['*', true]},'type':'','declaredBy':'int'} }; } }; diff --git a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3uint.as b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3uint.as index b0ee990..4e6074f 100644 --- a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3uint.as +++ b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/nativejs/AS3uint.as @@ -38,7 +38,7 @@ package org.apache.royale.reflection.nativejs { return { 'methods':function():Object { return { - 'uint':{'parameters':function():Object { return [{'index':1,'optional':true,'type':'*'}]},'type':'','declaredBy':'uint'} + 'uint':{'parameters':function():Object { return ['*', true]},'type':'','declaredBy':'uint'} }; } }; diff --git a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/utils/getStaticConstantsByConvention.as b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/utils/getStaticConstantsByConvention.as index cc32805..90657a2 100644 --- a/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/utils/getStaticConstantsByConvention.as +++ b/frameworks/projects/Reflection/src/main/royale/org/apache/royale/reflection/utils/getStaticConstantsByConvention.as @@ -67,9 +67,9 @@ package org.apache.royale.reflection.utils var statics:Array; if ( classRef.prototype.ROYALE_REFLECTION_INFO) { if (CompilationData.hasCompilationOption( - classRef.prototype.ROYALE_REFLECTION_INFO.compileFlags, + classRef.prototype.ROYALE_COMPILE_FLAGS, CompilationData.WITH_DEFAULT_INITIALIZERS)) { - statics = classRef.prototype.ROYALE_REFLECTION_INFO.statics + statics = classRef.prototype.ROYALE_INITIAL_STATICS } else { //debug level warning: if (goog.DEBUG) { @@ -81,7 +81,7 @@ package org.apache.royale.reflection.utils statics = Object.keys(classRef); } } else { - statics = ExtraData.hasData(classRef) ? ExtraData.getData(classRef)['ROYALE_REFLECTION_INFO']['statics'] : null; + statics = ExtraData.hasData(classRef) ? ExtraData.getData(classRef)['ROYALE_INITIAL_STATICS'] : null; } if (statics) {
