diff --git a/ets2panda/compiler/lowering/ets/stringConstructorLowering.cpp b/ets2panda/compiler/lowering/ets/stringConstructorLowering.cpp index 19429df0d398b643db4f3ef3cbe98c62a4bdd47d..7ae1908b9cd169d5ce4466b2344055bbfa1b1fb2 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 e685df218f6891aecc7572668937e0e09e754313..f4ecb83328907c81d2a5e0744fe58a383ff5cb71 100644 --- a/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp +++ b/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp @@ -1675,7 +1675,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/linter/docs/rules-cn/recipe350.md b/ets2panda/linter/docs/rules-cn/recipe350.md index f28e758abddae553171cddcb30855d1e2ac177a5..64a870d23a15172742f97cce8f67afe1a8af5852 100644 --- a/ets2panda/linter/docs/rules-cn/recipe350.md +++ b/ets2panda/linter/docs/rules-cn/recipe350.md @@ -49,7 +49,7 @@ let baseInstance: BaseClass = new BaseClass(); let array = new Array(); array.push(baseInstance); let task = new taskpool.Task(testFunc, array); -taskpool.execute(task).then((res: NullishType):void => { +taskpool.execute(task).then((res: Any):void => { console.info('task res is: ' + res) }); ``` diff --git a/ets2panda/linter/docs/rules-cn/recipe351.md b/ets2panda/linter/docs/rules-cn/recipe351.md index bd95ad170bf09a2c8c853d24a2d72d2666db1e8f..469e1adc16a9622efd1147d6dc7e079449582d01 100644 --- a/ets2panda/linter/docs/rules-cn/recipe351.md +++ b/ets2panda/linter/docs/rules-cn/recipe351.md @@ -56,7 +56,7 @@ let buffer1: ArrayBuffer = new ArrayBuffer(16); let view1: Uint8Array = new Uint8Array(buffer1); let task: taskpool.Task = new taskpool.Task(testTransfer, view, view1); -taskpool.execute(task).then((res: NullishType):void => { +taskpool.execute(task).then((res: Any):void => { console.info('test result: ' + res); }).catch((e: Error): void => { console.error('test catch: ' + e); 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 e95c91f1a869f7801276f492c4b95b09c955b6ea..c17c377b4e4fc6cabfd25f4047594b62cc48b661 100644 --- a/ets2panda/test/compiler/ets/generic_override_2-expected.txt +++ b/ets2panda/test/compiler/ets/generic_override_2-expected.txt @@ -369,7 +369,7 @@ "type": "ETSTypeReferencePart", "name": { "type": "Identifier", - "name": "NullishType", + "name": "Any", "loc": { "start": { "line": 18, @@ -378,7 +378,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -391,7 +391,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -404,7 +404,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -417,7 +417,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -430,7 +430,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -449,12 +449,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" } } @@ -462,12 +462,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" } } @@ -475,12 +475,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" } } @@ -495,12 +495,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" } } @@ -518,12 +518,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" } } @@ -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": 56, + "column": 48, "program": "generic_override_2.ets" } } @@ -558,12 +558,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" } } @@ -571,12 +571,12 @@ "loc": { "start": { "line": 18, - "column": 52, + "column": 44, "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": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -598,12 +598,12 @@ "loc": { "start": { "line": 18, - "column": 50, + "column": 42, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -616,7 +616,7 @@ }, "end": { "line": 18, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -629,7 +629,7 @@ }, "end": { "line": 18, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -642,7 +642,7 @@ }, "end": { "line": 18, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -658,12 +658,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" } } @@ -684,12 +684,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" } } @@ -697,12 +697,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" } } @@ -710,12 +710,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" } } @@ -730,12 +730,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" } } @@ -743,12 +743,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" } } @@ -756,12 +756,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" } } @@ -770,12 +770,12 @@ "loc": { "start": { "line": 18, - "column": 63, + "column": 55, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 66, + "column": 58, "program": "generic_override_2.ets" } } @@ -784,12 +784,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" } } @@ -797,12 +797,12 @@ "loc": { "start": { "line": 18, - "column": 60, + "column": 52, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -810,12 +810,12 @@ "loc": { "start": { "line": 18, - "column": 60, + "column": 52, "program": "generic_override_2.ets" }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -964,7 +964,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -980,7 +980,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -993,7 +993,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -1006,7 +1006,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -1019,7 +1019,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -1038,7 +1038,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -1054,7 +1054,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -1073,7 +1073,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -1087,7 +1087,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -1101,7 +1101,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -1114,7 +1114,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -1128,7 +1128,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 60, "program": "generic_override_2.ets" } } @@ -1783,7 +1783,7 @@ "type": "ETSTypeReferencePart", "name": { "type": "Identifier", - "name": "NullishType", + "name": "Any", "loc": { "start": { "line": 23, @@ -1792,7 +1792,7 @@ }, "end": { "line": 23, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -1805,7 +1805,7 @@ }, "end": { "line": 23, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -1818,7 +1818,7 @@ }, "end": { "line": 23, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -1831,7 +1831,7 @@ }, "end": { "line": 23, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -1844,7 +1844,7 @@ }, "end": { "line": 23, - "column": 45, + "column": 37, "program": "generic_override_2.ets" } } @@ -1863,12 +1863,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" } } @@ -1876,12 +1876,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" } } @@ -1889,12 +1889,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" } } @@ -1909,12 +1909,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" } } @@ -1932,12 +1932,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" } } @@ -1945,12 +1945,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" } } @@ -1958,12 +1958,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" } } @@ -1972,12 +1972,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" } } @@ -1985,12 +1985,12 @@ "loc": { "start": { "line": 23, - "column": 52, + "column": 44, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -1998,12 +1998,12 @@ "loc": { "start": { "line": 23, - "column": 52, + "column": 44, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -2012,12 +2012,12 @@ "loc": { "start": { "line": 23, - "column": 50, + "column": 42, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -2030,7 +2030,7 @@ }, "end": { "line": 23, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -2043,7 +2043,7 @@ }, "end": { "line": 23, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -2056,7 +2056,7 @@ }, "end": { "line": 23, - "column": 57, + "column": 49, "program": "generic_override_2.ets" } } @@ -2072,12 +2072,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" } } @@ -2098,12 +2098,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" } } @@ -2111,12 +2111,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" } } @@ -2124,12 +2124,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" } } @@ -2144,12 +2144,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" } } @@ -2157,12 +2157,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" } } @@ -2170,12 +2170,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" } } @@ -2184,12 +2184,12 @@ "loc": { "start": { "line": 23, - "column": 63, + "column": 55, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 66, + "column": 58, "program": "generic_override_2.ets" } } @@ -2198,12 +2198,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" } } @@ -2211,12 +2211,12 @@ "loc": { "start": { "line": 23, - "column": 60, + "column": 52, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -2224,12 +2224,12 @@ "loc": { "start": { "line": 23, - "column": 60, + "column": 52, "program": "generic_override_2.ets" }, "end": { "line": 23, - "column": 67, + "column": 59, "program": "generic_override_2.ets" } } @@ -2569,7 +2569,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");