diff --git a/ets2panda/compiler/lowering/ets/stringConstructorLowering.cpp b/ets2panda/compiler/lowering/ets/stringConstructorLowering.cpp index 244957d3a46c82bb4cb0ccdc9e187d7401db4cc9..cb025027bd14c415a704ef228dd5f17f5801f433 100644 --- a/ets2panda/compiler/lowering/ets/stringConstructorLowering.cpp +++ b/ets2panda/compiler/lowering/ets/stringConstructorLowering.cpp @@ -63,7 +63,7 @@ ir::Expression *ReplaceStringConstructor(public_lib::Context *const ctx, return arg; } - // Case for the constructor: new String(str: NullishType) + // Case for the constructor: new String(str: Object) if (newClassInstExpr->GetSignature()->InternalName() == Signatures::BUILTIN_STRING_FROM_NULLISH_CTOR) { auto *arg = newClassInstExpr->GetArguments()[0]; auto *argType = arg->TsType(); diff --git a/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp b/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp index 7b3722364457f5305030755af5c732af2677a297..3745dca1cb69df114a6ec57b021bbe743dcbf5cb 100644 --- a/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp +++ b/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp @@ -1429,7 +1429,7 @@ void TSDeclGen::ProcessETSTypeReference(const ir::TypeNode *typeAnnotation, cons if (ProcessTypeAnnotationSpecificTypes(checkerType)) { return; } - if (checkerType != nullptr && typeAnnotation->AsETSTypeReference()->Part()->GetIdent()->Name().Is("NullishType")) { + if (checkerType != nullptr && typeAnnotation->AsETSTypeReference()->Part()->GetIdent()->Name().Is("Any")) { OutDts(typeAnnotation->Parent()->IsTSArrayType() ? "(" : ""); GenType(checkerType); OutDts(typeAnnotation->Parent()->IsTSArrayType() ? ")" : ""); diff --git a/ets2panda/scripts/arkui.properties b/ets2panda/scripts/arkui.properties index c765c20cbffa49bd1d7969beb384dbae62c04499..b0af8202bec1d07f3382939fd452a2509007e939 100644 --- a/ets2panda/scripts/arkui.properties +++ b/ets2panda/scripts/arkui.properties @@ -1,3 +1,3 @@ ARKUI_DEV_REPO=https://gitee.com/rri_opensource/koala_projects.git -ARKUI_DEV_BRANCH=panda_rev_8-fix-ani-array-api +ARKUI_DEV_BRANCH=panda_rev_8-remove-nullish-type ARKUI_DEST=koala-sig diff --git a/ets2panda/test/ast/parser/ets/unreachable_fuzz_error.ets b/ets2panda/test/ast/parser/ets/unreachable_fuzz_error.ets index 1b3e35abc03eff8a6367a730582018ae972dd5f8..81b8aca00ec4a458b1f2dd162afd4ad6882428f0 100644 --- a/ets2panda/test/ast/parser/ets/unreachable_fuzz_error.ets +++ b/ets2panda/test/ast/parser/ets/unreachable_fuzz_error.ets @@ -19,14 +19,14 @@ arktest.assert(y[0] == 1) arktest.assert(y[1] == 2) -classtext: string, reviver: ((key: string, value: NullishType) => NullishType) | undefined, type: Type +classtext: string, reviver: ((key: string, value: Any) => Any) | undefined, type: Type /* @@? 16:13 Error TypeError: Unresolved reference z */ /* @@? 22:12 Error SyntaxError: Label must be followed by a loop statement. */ /* @@? 22:18 Error SyntaxError: Unexpected token ','. */ /* @@? 22:20 Error SyntaxError: Unexpected token 'reviver'. */ /* @@? 22:29 Error SyntaxError: Label must be followed by a loop statement. */ -/* @@? 22:91 Error SyntaxError: Unexpected token ','. */ -/* @@? 22:93 Error SyntaxError: Unexpected token 'type'. */ -/* @@? 22:99 Error SyntaxError: Label must be followed by a loop statement. */ +/* @@? 22:75 Error SyntaxError: Unexpected token ','. */ +/* @@? 22:77 Error SyntaxError: Unexpected token 'type'. */ +/* @@? 22:83 Error SyntaxError: Label must be followed by a loop statement. */ /* @@? 33:1 Error SyntaxError: Expected '}', got 'end of stream'. */ diff --git a/ets2panda/test/compiler/ets/generic_override_2-expected.txt b/ets2panda/test/compiler/ets/generic_override_2-expected.txt index d7b122dd9aa2069b6d0539c4143747469afe6339..ef606c683a1ef0e158784600e7343266a41d2e95 100644 --- a/ets2panda/test/compiler/ets/generic_override_2-expected.txt +++ b/ets2panda/test/compiler/ets/generic_override_2-expected.txt @@ -377,7 +377,7 @@ "type": "ETSTypeReferencePart", "name": { "type": "Identifier", - "name": "NullishType", + "name": "Any", "decorators": [], "loc": { "start": { @@ -387,7 +387,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -400,7 +400,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 38, "program": "generic_override_2.ets" } } @@ -413,7 +413,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 38, "program": "generic_override_2.ets" } } @@ -427,7 +427,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 38, "program": "generic_override_2.ets" } } @@ -440,7 +440,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 38, "program": "generic_override_2.ets" } } @@ -460,12 +460,12 @@ "loc": { "start": { "line": 18, - "column": 50, + "column": 42, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 51, + "column": 43, "program": "generic_override_2.ets" } } @@ -473,12 +473,12 @@ "loc": { "start": { "line": 18, - "column": 50, + "column": 42, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 52, + "column": 44, "program": "generic_override_2.ets" } } @@ -486,12 +486,12 @@ "loc": { "start": { "line": 18, - "column": 50, + "column": 42, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 52, + "column": 44, "program": "generic_override_2.ets" } } @@ -507,12 +507,12 @@ "loc": { "start": { "line": 18, - "column": 52, + "column": 44, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 54, + "column": 46, "program": "generic_override_2.ets" } } @@ -531,12 +531,12 @@ "loc": { "start": { "line": 18, - "column": 55, + "column": 47, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 56, + "column": 48, "program": "generic_override_2.ets" } } @@ -544,12 +544,12 @@ "loc": { "start": { "line": 18, - "column": 55, + "column": 47, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -557,12 +557,12 @@ "loc": { "start": { "line": 18, - "column": 55, + "column": 47, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -571,12 +571,12 @@ "loc": { "start": { "line": 18, - "column": 54, + "column": 46, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -584,12 +584,12 @@ "loc": { "start": { "line": 18, - "column": 52, + "column": 44, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -597,12 +597,12 @@ "loc": { "start": { "line": 18, - "column": 52, + "column": 44, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -611,12 +611,12 @@ "loc": { "start": { "line": 18, - "column": 50, + "column": 42, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -629,7 +629,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -643,7 +643,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -656,7 +656,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -673,12 +673,12 @@ "loc": { "start": { "line": 18, - "column": 60, + "column": 52, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 62, + "column": 54, "program": "generic_override_2.ets" } } @@ -700,12 +700,12 @@ "loc": { "start": { "line": 18, - "column": 63, + "column": 55, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 64, + "column": 56, "program": "generic_override_2.ets" } } @@ -713,12 +713,12 @@ "loc": { "start": { "line": 18, - "column": 63, + "column": 55, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 65, + "column": 57, "program": "generic_override_2.ets" } } @@ -726,12 +726,12 @@ "loc": { "start": { "line": 18, - "column": 63, + "column": 55, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 65, + "column": 57, "program": "generic_override_2.ets" } } @@ -747,12 +747,12 @@ "loc": { "start": { "line": 18, - "column": 65, + "column": 57, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 66, + "column": 58, "program": "generic_override_2.ets" } } @@ -760,12 +760,12 @@ "loc": { "start": { "line": 18, - "column": 65, + "column": 57, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -773,12 +773,12 @@ "loc": { "start": { "line": 18, - "column": 65, + "column": 57, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -787,12 +787,12 @@ "loc": { "start": { "line": 18, - "column": 63, + "column": 55, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -801,12 +801,12 @@ "loc": { "start": { "line": 18, - "column": 62, + "column": 54, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -814,12 +814,12 @@ "loc": { "start": { "line": 18, - "column": 60, + "column": 52, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -827,12 +827,12 @@ "loc": { "start": { "line": 18, - "column": 60, + "column": 52, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -985,7 +985,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1002,7 +1002,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1015,7 +1015,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1028,7 +1028,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1041,7 +1041,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1061,7 +1061,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1077,7 +1077,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1097,7 +1097,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1111,7 +1111,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1125,7 +1125,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1138,7 +1138,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1153,7 +1153,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1822,7 +1822,7 @@ "type": "ETSTypeReferencePart", "name": { "type": "Identifier", - "name": "NullishType", + "name": "Any", "decorators": [], "loc": { "start": { @@ -1832,7 +1832,7 @@ }, "end": { "line": 23, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -1845,7 +1845,7 @@ }, "end": { "line": 23, - "column": 46, + "column": 38, "program": "generic_override_2.ets" } } @@ -1858,7 +1858,7 @@ }, "end": { "line": 23, - "column": 46, + "column": 38, "program": "generic_override_2.ets" } } @@ -1872,7 +1872,7 @@ }, "end": { "line": 23, - "column": 46, + "column": 38, "program": "generic_override_2.ets" } } @@ -1885,7 +1885,7 @@ }, "end": { "line": 23, - "column": 46, + "column": 38, "program": "generic_override_2.ets" } } @@ -1905,12 +1905,12 @@ "loc": { "start": { "line": 23, - "column": 50, + "column": 42, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 51, + "column": 43, "program": "generic_override_2.ets" } } @@ -1918,12 +1918,12 @@ "loc": { "start": { "line": 23, - "column": 50, + "column": 42, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 52, + "column": 44, "program": "generic_override_2.ets" } } @@ -1931,12 +1931,12 @@ "loc": { "start": { "line": 23, - "column": 50, + "column": 42, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 52, + "column": 44, "program": "generic_override_2.ets" } } @@ -1952,12 +1952,12 @@ "loc": { "start": { "line": 23, - "column": 52, + "column": 44, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 54, + "column": 46, "program": "generic_override_2.ets" } } @@ -1976,12 +1976,12 @@ "loc": { "start": { "line": 23, - "column": 55, + "column": 47, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 56, + "column": 48, "program": "generic_override_2.ets" } } @@ -1989,12 +1989,12 @@ "loc": { "start": { "line": 23, - "column": 55, + "column": 47, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -2002,12 +2002,12 @@ "loc": { "start": { "line": 23, - "column": 55, + "column": 47, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -2016,12 +2016,12 @@ "loc": { "start": { "line": 23, - "column": 54, + "column": 46, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -2029,12 +2029,12 @@ "loc": { "start": { "line": 23, - "column": 52, + "column": 44, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -2042,12 +2042,12 @@ "loc": { "start": { "line": 23, - "column": 52, + "column": 44, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -2056,12 +2056,12 @@ "loc": { "start": { "line": 23, - "column": 50, + "column": 42, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -2074,7 +2074,7 @@ }, "end": { "line": 23, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -2088,7 +2088,7 @@ }, "end": { "line": 23, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -2101,7 +2101,7 @@ }, "end": { "line": 23, - "column": 58, + "column": 50, "program": "generic_override_2.ets" } } @@ -2118,12 +2118,12 @@ "loc": { "start": { "line": 23, - "column": 60, + "column": 52, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 62, + "column": 54, "program": "generic_override_2.ets" } } @@ -2145,12 +2145,12 @@ "loc": { "start": { "line": 23, - "column": 63, + "column": 55, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 64, + "column": 56, "program": "generic_override_2.ets" } } @@ -2158,12 +2158,12 @@ "loc": { "start": { "line": 23, - "column": 63, + "column": 55, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 65, + "column": 57, "program": "generic_override_2.ets" } } @@ -2171,12 +2171,12 @@ "loc": { "start": { "line": 23, - "column": 63, + "column": 55, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 65, + "column": 57, "program": "generic_override_2.ets" } } @@ -2192,12 +2192,12 @@ "loc": { "start": { "line": 23, - "column": 65, + "column": 57, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 66, + "column": 58, "program": "generic_override_2.ets" } } @@ -2205,12 +2205,12 @@ "loc": { "start": { "line": 23, - "column": 65, + "column": 57, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -2218,12 +2218,12 @@ "loc": { "start": { "line": 23, - "column": 65, + "column": 57, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -2232,12 +2232,12 @@ "loc": { "start": { "line": 23, - "column": 63, + "column": 55, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -2246,12 +2246,12 @@ "loc": { "start": { "line": 23, - "column": 62, + "column": 54, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -2259,12 +2259,12 @@ "loc": { "start": { "line": 23, - "column": 60, + "column": 52, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 69, + "column": 61, "program": "generic_override_2.ets" } } @@ -2272,12 +2272,12 @@ "loc": { "start": { "line": 23, - "column": 60, + "column": 52, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 69, + "column": 61, "program": "generic_override_2.ets" } } @@ -2623,7 +2623,7 @@ "loc": { "start": { "line": 23, - "column": 68, + "column": 60, "program": "generic_override_2.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/generic_override_2.ets b/ets2panda/test/compiler/ets/generic_override_2.ets index b574f303442d8feac63bbe97fa66206b04a51863..50f06a3aba6a530a5533335551cfd5f2396ed70c 100644 --- a/ets2panda/test/compiler/ets/generic_override_2.ets +++ b/ets2panda/test/compiler/ets/generic_override_2.ets @@ -15,12 +15,12 @@ interface PL { then(onFulfilled?: (value: T) => U|PL, - onRejected?: (error: NullishType) => E|PL): PL; + onRejected?: (error: Any) => E|PL): PL; } class P implements PL { then(onFulfilled?: (value: T) => U|PL, - onRejected?: (error: NullishType) => E|PL): PL { + onRejected?: (error: Any) => E|PL): PL { return new P() } } diff --git a/ets2panda/test/runtime/ets/invoke-with-rest.ets b/ets2panda/test/runtime/ets/invoke-with-rest.ets index 714765bd1ae1f75108d6413855088773e3650b26..db6bc82f1b00bbb390ecc4e11cfe4b8f4a930635 100644 --- a/ets2panda/test/runtime/ets/invoke-with-rest.ets +++ b/ets2panda/test/runtime/ets/invoke-with-rest.ets @@ -14,10 +14,10 @@ */ class A { - x: FixedArray + x: FixedArray constructor(x: T) { - this.x = new NullishType[1] - this.x[0] = x as NullishType + this.x = new Any[1] + this.x[0] = x as Any } static $_invoke(first: T, ...items: T[]): A { diff --git a/ets2panda/test/runtime/ets/string_from_nullish.ets b/ets2panda/test/runtime/ets/string_from_any.ets similarity index 97% rename from ets2panda/test/runtime/ets/string_from_nullish.ets rename to ets2panda/test/runtime/ets/string_from_any.ets index e65aa7f70c783a5b389e272f4462939cf308942e..5382086b6865ce7239b109d39fbb3892bc3ddfdc 100644 --- a/ets2panda/test/runtime/ets/string_from_nullish.ets +++ b/ets2panda/test/runtime/ets/string_from_any.ets @@ -14,7 +14,7 @@ */ function main(): int { - let z: NullishType = new Number(1); + let z: Any = new Number(1); let z1 = undefined; let z2 = null; let z3: Object = new String("0");