From 407adc3707d93e2f253d96e1d91420303e32ac27 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 4 Feb 2016 06:27:33 -0500 Subject: [PATCH 01/13] starting to flesh out numeric literal types --- src/compiler/checker.ts | 46 ++++++++++++++++++++++++++++++++++++++- src/compiler/emitter.ts | 1 + src/compiler/parser.ts | 24 +++++++++++++++++++- src/compiler/types.ts | 15 ++++++++++++- src/compiler/utilities.ts | 1 + src/services/utilities.ts | 1 + 6 files changed, 85 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6a42dc43d5159..90c3454c090cd 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -188,6 +188,9 @@ namespace ts { const unionTypes: Map = {}; const intersectionTypes: Map = {}; const stringLiteralTypes: Map = {}; + const numericLiteralTypes: Map = {}; + const NaNLiteralType = numericLiteralTypes[NaN] = createType(TypeFlags.NumericLiteral) as NumericLiteralType; + NaNLiteralType.number = NaN; const resolutionTargets: TypeSystemEntity[] = []; const resolutionResults: boolean[] = []; @@ -2019,6 +2022,10 @@ namespace ts { else if (type.flags & TypeFlags.StringLiteral) { writer.writeStringLiteral(`"${escapeString((type).text)}"`); } + else if (type.flags & TypeFlags.NumericLiteral) { + // TODO (weswig): Preserve input number formatting + writer.writeNumericLiteral((type as NumericLiteralType).number.toString()); + } else { // Should never get here // { ... } @@ -5095,6 +5102,20 @@ namespace ts { return type; } + function getNumericLiteralTypeForText(text: string): NumericLiteralType { + const num = parseFloat(text); + if (typeof num !== "number") { + return NaNLiteralType; + } + if (hasProperty(numericLiteralTypes, num.toString())) { + return numericLiteralTypes[num]; + } + + const type = numericLiteralTypes[num] = createType(TypeFlags.NumericLiteral) as NumericLiteralType; + type.number = num; + return type; + } + function getTypeFromStringLiteralTypeNode(node: StringLiteralTypeNode): Type { const links = getNodeLinks(node); if (!links.resolvedType) { @@ -5103,6 +5124,14 @@ namespace ts { return links.resolvedType; } + function getTypeFromNumericLiteralTypeNode(node: NumericLiteralTypeNode): Type { + const links = getNodeLinks(node); + if (!links.resolvedType) { + links.resolvedType = getNumericLiteralTypeForText(node.text); + } + return links.resolvedType; + } + function getTypeFromJSDocVariadicType(node: JSDocVariadicType): Type { const links = getNodeLinks(node); if (!links.resolvedType) { @@ -5166,6 +5195,8 @@ namespace ts { return getTypeFromThisTypeNode(node); case SyntaxKind.StringLiteralType: return getTypeFromStringLiteralTypeNode(node); + case SyntaxKind.NumericLiteralType: + return getTypeFromNumericLiteralTypeNode(node as NumericLiteralTypeNode); case SyntaxKind.TypeReference: case SyntaxKind.JSDocTypeReference: return getTypeFromTypeReference(node); @@ -5815,8 +5846,9 @@ namespace ts { return result; } } - if (source.flags & TypeFlags.StringLiteral && target === stringType) return Ternary.True; + if (isStringLiteralType(source) && target === stringType) return Ternary.True; + if (isNumericLiteralType(source) && (target === numberType || target.flags & TypeFlags.Enum)) return Ternary.True; if (relation === assignableRelation || relation === comparableRelation) { if (isTypeAny(source)) return Ternary.True; if (source === numberType && target.flags & TypeFlags.Enum) return Ternary.True; @@ -6716,6 +6748,10 @@ namespace ts { return type.flags & TypeFlags.StringLiteral; } + function isNumericLiteralType(type: Type) { + return type.flags & TypeFlags.NumericLiteral; + } + /** * Check if a Type was written as a tuple type literal. * Prefer using isTupleLikeType() unless the use of `elementTypes` is required. @@ -8687,6 +8723,10 @@ namespace ts { function contextualTypeIsStringLiteralType(type: Type): boolean { return !!(type.flags & TypeFlags.Union ? forEach((type).types, isStringLiteralType) : isStringLiteralType(type)); } + + function contextualTypeIsNumericLiteralType(type: Type): boolean { + return !!(type.flags & TypeFlags.Union ? forEach((type).types, isNumericLiteralType) : isNumericLiteralType(type)); + } // Return true if the given contextual type is a tuple-like type function contextualTypeIsTupleLikeType(type: Type): boolean { @@ -12411,6 +12451,10 @@ namespace ts { function checkNumericLiteral(node: LiteralExpression): Type { // Grammar checking checkGrammarNumericLiteral(node); + const contextualType = getContextualType(node); + if (contextualType && contextualTypeIsNumericLiteralType(contextualType)) { + return getNumericLiteralTypeForText(node.text); + } return numberType; } diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index a1f02f520d80b..20e2dbf3d5924 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -5939,6 +5939,7 @@ const _super = (function (geti, seti) { return; case SyntaxKind.NumberKeyword: + case SyntaxKind.NumericLiteralType: write("Number"); return; diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 89e1404e43a05..fe03366ebf0d3 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1895,6 +1895,10 @@ namespace ts { return parseLiteralLikeNode(SyntaxKind.StringLiteralType, /*internName*/ true); } + function parseNumericLiteralTypeNode(): NumericLiteralTypeNode { + return parseLiteralLikeNode(SyntaxKind.NumericLiteralType, /*internName*/false) as NumericLiteralTypeNode; + } + function parseLiteralNode(internName?: boolean): LiteralExpression { return parseLiteralLikeNode(token, internName); } @@ -1926,7 +1930,7 @@ namespace ts { // never get a token like this. Instead, we would get 00 and 9 as two separate tokens. // We also do not need to check for negatives because any prefix operator would be part of a // parent unary expression. - if (node.kind === SyntaxKind.NumericLiteral + if ((node.kind === SyntaxKind.NumericLiteral || node.kind === SyntaxKind.NumericLiteralType) && sourceText.charCodeAt(tokenPos) === CharacterCodes._0 && isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { @@ -2360,6 +2364,18 @@ namespace ts { return token === SyntaxKind.DotToken ? undefined : node; } + function parseSignedNumericLiteral(): NumericLiteralTypeNode { + nextToken(); + parseExpected(SyntaxKind.NumericLiteral, undefined, /*shouldAdvance*/false); + return parseNumericLiteralTypeNode(); + } + + function parseMinusSignedNumericLiteral(): NumericLiteralTypeNode { + const node = parseSignedNumericLiteral(); + node.text = `-${node.text}`; + return node; + } + function parseNonArrayType(): TypeNode { switch (token) { case SyntaxKind.AnyKeyword: @@ -2373,6 +2389,8 @@ namespace ts { return node || parseTypeReference(); case SyntaxKind.StringLiteral: return parseStringLiteralTypeNode(); + case SyntaxKind.NumericLiteral: + return parseNumericLiteralTypeNode(); case SyntaxKind.VoidKeyword: case SyntaxKind.NullKeyword: return parseTokenNode(); @@ -2393,6 +2411,10 @@ namespace ts { return parseTupleType(); case SyntaxKind.OpenParenToken: return parseParenthesizedType(); + case SyntaxKind.PlusToken: + return parseSignedNumericLiteral(); + case SyntaxKind.MinusToken: + return parseMinusSignedNumericLiteral(); default: return parseTypeReference(); } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index d0d411a710eb3..ddd890a164022 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -210,6 +210,7 @@ namespace ts { ParenthesizedType, ThisType, StringLiteralType, + NumericLiteralType, // Binding patterns ObjectBindingPattern, ArrayBindingPattern, @@ -782,6 +783,11 @@ namespace ts { _stringLiteralTypeBrand: any; } + // @kind(SyntaxKind.NumericLiteralTypeNode) + export interface NumericLiteralTypeNode extends LiteralLikeNode, TypeNode { + _numericLiteralTypeBrand: any; + } + // @kind(SyntaxKind.StringLiteral) export interface StringLiteral extends LiteralExpression { _stringLiteralBrand: any; @@ -1826,6 +1832,7 @@ namespace ts { writePunctuation(text: string): void; writeSpace(text: string): void; writeStringLiteral(text: string): void; + writeNumericLiteral(text: string): void; writeParameter(text: string): void; writeSymbol(text: string, symbol: Symbol): void; writeLine(): void; @@ -2163,6 +2170,7 @@ namespace ts { ESSymbol = 0x01000000, // Type of symbol primitive introduced in ES6 ThisType = 0x02000000, // This type ObjectLiteralPatternWithComputedProperties = 0x04000000, // Object literal type implied by binding pattern has computed properties + NumericLiteral = 0x80000000, // Numeric literal types are specific numbers - just as string literal types are specific strings /* @internal */ Nullable = Undefined | Null, @@ -2171,7 +2179,7 @@ namespace ts { /* @internal */ Primitive = String | Number | Boolean | ESSymbol | Void | Undefined | Null | StringLiteral | Enum, StringLike = String | StringLiteral, - NumberLike = Number | Enum, + NumberLike = Number | Enum | NumericLiteral, ObjectType = Class | Interface | Reference | Tuple | Anonymous, UnionOrIntersection = Union | Intersection, StructuredType = ObjectType | Union | Intersection, @@ -2203,6 +2211,11 @@ namespace ts { text: string; // Text of string literal } + // Numeric literal types (TypeFlags.NumericLiteral) + export interface NumericLiteralType extends Type { + number: number; + } + // Object types (TypeFlags.ObjectType) export interface ObjectType extends Type { } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index b6c681e5f03bb..6f61a88376ccd 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -58,6 +58,7 @@ namespace ts { writePunctuation: writeText, writeSpace: writeText, writeStringLiteral: writeText, + writeNumericLiteral: writeText, writeParameter: writeText, writeSymbol: writeText, diff --git a/src/services/utilities.ts b/src/services/utilities.ts index 270c7d85d45bf..a81aeae0deebd 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -675,6 +675,7 @@ namespace ts { writePunctuation: text => writeKind(text, SymbolDisplayPartKind.punctuation), writeSpace: text => writeKind(text, SymbolDisplayPartKind.space), writeStringLiteral: text => writeKind(text, SymbolDisplayPartKind.stringLiteral), + writeNumericLiteral: text => writeKind(text, SymbolDisplayPartKind.numericLiteral), writeParameter: text => writeKind(text, SymbolDisplayPartKind.parameterName), writeSymbol, writeLine, From 87cc46e757eafb54b8706a2054e1d92fcb0869cb Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 4 Feb 2016 15:33:59 -0500 Subject: [PATCH 02/13] Preserve numeric literal formatting when definining numeric literal types --- src/compiler/checker.ts | 26 +++++++++++++++++++------- src/compiler/diagnosticMessages.json | 4 ++++ src/compiler/parser.ts | 17 ++++++++++++----- src/compiler/scanner.ts | 2 +- src/compiler/types.ts | 1 + 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 90c3454c090cd..8ea9445701ca7 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2023,8 +2023,7 @@ namespace ts { writer.writeStringLiteral(`"${escapeString((type).text)}"`); } else if (type.flags & TypeFlags.NumericLiteral) { - // TODO (weswig): Preserve input number formatting - writer.writeNumericLiteral((type as NumericLiteralType).number.toString()); + writer.writeNumericLiteral((type as NumericLiteralType).text); } else { // Should never get here @@ -5103,16 +5102,18 @@ namespace ts { } function getNumericLiteralTypeForText(text: string): NumericLiteralType { - const num = parseFloat(text); + // Use +(string) rather than Number(string) to be consistient with what we use in the parser + const num = +(text); if (typeof num !== "number") { return NaNLiteralType; } - if (hasProperty(numericLiteralTypes, num.toString())) { - return numericLiteralTypes[num]; + if (hasProperty(numericLiteralTypes, text)) { + return numericLiteralTypes[text]; } - const type = numericLiteralTypes[num] = createType(TypeFlags.NumericLiteral) as NumericLiteralType; + const type = numericLiteralTypes[text] = createType(TypeFlags.NumericLiteral) as NumericLiteralType; type.number = num; + type.text = text; return type; } @@ -5848,7 +5849,11 @@ namespace ts { } if (isStringLiteralType(source) && target === stringType) return Ternary.True; - if (isNumericLiteralType(source) && (target === numberType || target.flags & TypeFlags.Enum)) return Ternary.True; + + if (isNumericLiteralType(source)) { + if (isNumericLiteralType(target)) return isNumericLiteralEquivalentTo(source as NumericLiteralType, target as NumericLiteralType); + if (target === numberType || target.flags & TypeFlags.Enum) return Ternary.True; + } if (relation === assignableRelation || relation === comparableRelation) { if (isTypeAny(source)) return Ternary.True; if (source === numberType && target.flags & TypeFlags.Enum) return Ternary.True; @@ -5985,9 +5990,16 @@ namespace ts { } } } + if (isNumericLiteralType(source) && isNumericLiteralType(target)) { + return isNumericLiteralEquivalentTo(source as NumericLiteralType, target as NumericLiteralType); + } return Ternary.False; } + function isNumericLiteralEquivalentTo(source: NumericLiteralType, target: NumericLiteralType) { + return source.number === target.number ? Ternary.True : Ternary.False; + } + // Check if a property with the given name is known anywhere in the given type. In an object type, a property // is considered known if the object type is empty and the check is for assignability, if the object type has // index signatures, or if the property is actually declared in the object type. In a union or intersection diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 4988e2091b601..2ccb3e5167491 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1751,6 +1751,10 @@ "category": "Error", "code": 2533 }, + "Numeric literal expected.": { + "category": "Error", + "code": 2540 + }, "JSX element attributes type '{0}' may not be a union type.": { "category": "Error", "code": 2600 diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index fe03366ebf0d3..bb2f1d0766da5 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1895,10 +1895,6 @@ namespace ts { return parseLiteralLikeNode(SyntaxKind.StringLiteralType, /*internName*/ true); } - function parseNumericLiteralTypeNode(): NumericLiteralTypeNode { - return parseLiteralLikeNode(SyntaxKind.NumericLiteralType, /*internName*/false) as NumericLiteralTypeNode; - } - function parseLiteralNode(internName?: boolean): LiteralExpression { return parseLiteralLikeNode(token, internName); } @@ -1907,11 +1903,22 @@ namespace ts { return parseLiteralLikeNode(token, /*internName*/ false); } + function parseNumericLiteralTypeNode(): NumericLiteralTypeNode { + const node = createNode(SyntaxKind.NumericLiteralType) as NumericLiteralTypeNode; + // Get token text rather than value, this way number formatting is preserved + const text = scanner.getTokenText(); + node.text = text; + return finishLiteralLikeNode(node); + } + function parseLiteralLikeNode(kind: SyntaxKind, internName: boolean): LiteralLikeNode { const node = createNode(kind); const text = scanner.getTokenValue(); node.text = internName ? internIdentifier(text) : text; + return finishLiteralLikeNode(node); + } + function finishLiteralLikeNode(node: T) { if (scanner.hasExtendedUnicodeEscape()) { node.hasExtendedUnicodeEscape = true; } @@ -2366,7 +2373,7 @@ namespace ts { function parseSignedNumericLiteral(): NumericLiteralTypeNode { nextToken(); - parseExpected(SyntaxKind.NumericLiteral, undefined, /*shouldAdvance*/false); + parseExpected(SyntaxKind.NumericLiteral, Diagnostics.Numeric_literal_expected, /*shouldAdvance*/false); return parseNumericLiteralTypeNode(); } diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts index 8979814a7a2a6..03c7a73619937 100644 --- a/src/compiler/scanner.ts +++ b/src/compiler/scanner.ts @@ -176,7 +176,7 @@ namespace ts { "&=": SyntaxKind.AmpersandEqualsToken, "|=": SyntaxKind.BarEqualsToken, "^=": SyntaxKind.CaretEqualsToken, - "@": SyntaxKind.AtToken, + "@": SyntaxKind.AtToken }; /* diff --git a/src/compiler/types.ts b/src/compiler/types.ts index ddd890a164022..c57c84a8e7004 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2214,6 +2214,7 @@ namespace ts { // Numeric literal types (TypeFlags.NumericLiteral) export interface NumericLiteralType extends Type { number: number; + text: string; } // Object types (TypeFlags.ObjectType) From d143390612f4deec5abf625f1f41240874279a7c Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 18 Feb 2016 14:51:03 -0500 Subject: [PATCH 03/13] stub --- src/compiler/checker.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 8ea9445701ca7..e9cb71b4eff57 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5852,7 +5852,10 @@ namespace ts { if (isNumericLiteralType(source)) { if (isNumericLiteralType(target)) return isNumericLiteralEquivalentTo(source as NumericLiteralType, target as NumericLiteralType); - if (target === numberType || target.flags & TypeFlags.Enum) return Ternary.True; + if (target === numberType) return Ternary.True; + if (target.flags & TypeFlags.Enum) { + //TODO: If enum numeric value = numeric literal value, then true, else false + } } if (relation === assignableRelation || relation === comparableRelation) { if (isTypeAny(source)) return Ternary.True; From 4f4e381898d5748552b438148005706bf502732d Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 11 Mar 2016 03:17:29 -0500 Subject: [PATCH 04/13] handful of test cases to work with --- .../numericLiteral/InfinityLiteralTypes.ts | 39 ++++++++++ .../numericLiteral/NaNLiteralTypes.ts | 21 +++++ .../negativeNumericLiteralTypes.ts | 77 +++++++++++++++++++ .../numericLiteral/numericLiteralTypes.ts | 64 +++++++++++++++ 4 files changed, 201 insertions(+) create mode 100644 tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts create mode 100644 tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts create mode 100644 tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts create mode 100644 tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts diff --git a/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts new file mode 100644 index 0000000000000..b096b19c2bf5e --- /dev/null +++ b/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts @@ -0,0 +1,39 @@ +interface PositiveInfinityMember { + member: Infinity +} + +interface NegativeInfinityMember { + member: -Infinity +} + +invertInfinity(x: -Infinity): Infinity; +invertInfinity(x: Infinity): -Infinity +function invertInfinity(x: number): number { + return -x; +} + +let a: PositiveInfinityMember; +let b: NegativeInfinityMember; + +a = {member: Infinity}; +b = {member: -Infinity} + +let c: -Infinity = invertInfinity(a.member); +let d: Infinity = invertInfinity(b.member); + +let x = c + d; +declare function stillNumber(x: number): boolean; +stillNumber(c); +stillNumber(d); + +declare function isInfinity(x: number): x is (Infinity | -Infinity) { + return x !== x; +} + +let y: number; +if (isInfinity(y)) { + let a: (Infinity | -Infinity) = y; +} +else { + let b: number = y; +} \ No newline at end of file diff --git a/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts new file mode 100644 index 0000000000000..96855147cfb78 --- /dev/null +++ b/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts @@ -0,0 +1,21 @@ +interface NaNMember { + member: NaN +} + +let x: NaNMember; +x = {member: NaN} + +declare function stillNumber(x: number): boolean; +stillNumber(x.member); + +declare function isNaN(x: number): x is NaN { + return x !== x; +} + +let y: number; +if (isNaN(y)) { + let a: NaN = y; +} +else { + let b: number = y; +} diff --git a/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts new file mode 100644 index 0000000000000..959bf0f0513dd --- /dev/null +++ b/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts @@ -0,0 +1,77 @@ +interface NumericMember { + member: 255; +} + +interface HexMember { + member: 0xFF; +} + +interface OctalMember { + member: 0o377; +} + +interface NumberMember { + member: number; +} + +var a: NumericMember; +var b: HexMember; +var c: OctalMember; +var d: NumberMember; + +a = b = c = {member: 2.55e2}; + +d = a; +d = b; +d = c; + +interface NegativeNumericMember { + member: -255; +} + +interface NegativeHexMember { + member: -0xFF; +} + +interface NegativeOctalMember { + member: -0o377; +} + +var na: NegativeNumericMember; +var nb: NegativeHexMember; +var nc: NegativeOctalMember; + +na = nb = nc = {member: -2.55e2}; + +d = na; +d = nb; +d = nc; + +// All asignments should fail after this point +na = a; + +a = na; + +nb = b; + +b = nb; + +nc = c; + +c = nc; + +type True = 1; +type False = 0; + +function isTrue(x: True | False): x is True { + return !!x; +} + +let x: True | False; + +if (isTrue(x)) { + let y: False = x; +} +else { + let z: True = x; +} diff --git a/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts new file mode 100644 index 0000000000000..57d968946fee0 --- /dev/null +++ b/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts @@ -0,0 +1,64 @@ +interface NumericMember { + member: 255; +} + +interface HexMember { + member: 0xFF; +} + +interface OctalMember { + member: 0o377; +} + +interface NumberMember { + member: number; +} + +var a: NumericMember; +var b: HexMember; +var c: OctalMember; +var d: NumberMember; + +a = b = c = {member: 2.55e2}; + +d = a; +d = b; +d = c; + +interface NegativeNumericMember { + member: -255; +} + +interface NegativeHexMember { + member: -0xFF; +} + +interface NegativeOctalMember { + member: -0o377; +} + +var na: NegativeNumericMember; +var nb: NegativeHexMember; +var nc: NegativeOctalMember; + +na = nb = nc = {member: -2.55e2}; + +d = na; +d = nb; +d = nc; + +type True = 1; +type False = 0; + +function isTrue(x: True | False): x is True { + return !!x; +} + +let x: True | False; + +if (isTrue(x)) { + let y: True = x; +} +else { + let z: False = x; +} From a4f278975e1a7432a050be159bfeef0c25b25e87 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 11 Mar 2016 04:34:47 -0500 Subject: [PATCH 05/13] Build in NaN and Infinity --- src/compiler/checker.ts | 94 +++++++++++++++++-- src/compiler/parser.ts | 4 + src/lib/es5.d.ts | 3 - .../numericLiteral/InfinityLiteralTypes.ts | 8 +- .../numericLiteral/NaNLiteralTypes.ts | 3 +- .../negativeNumericLiteralTypes.ts | 3 +- .../numericLiteral/numericLiteralTypes.ts | 3 +- 7 files changed, 98 insertions(+), 20 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e9cb71b4eff57..a8b1ff9322fca 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -58,6 +58,10 @@ namespace ts { const undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined"); undefinedSymbol.declarations = []; + const NaNSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.TypeAlias | SymbolFlags.Transient, (NaN).toString()); + NaNSymbol.declarations = []; + const InfinitySymbol = createSymbol(SymbolFlags.Property | SymbolFlags.TypeAlias | SymbolFlags.Transient, (Infinity).toString()); + InfinitySymbol.declarations = []; const argumentsSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "arguments"); const checker: TypeChecker = { @@ -189,8 +193,8 @@ namespace ts { const intersectionTypes: Map = {}; const stringLiteralTypes: Map = {}; const numericLiteralTypes: Map = {}; - const NaNLiteralType = numericLiteralTypes[NaN] = createType(TypeFlags.NumericLiteral) as NumericLiteralType; - NaNLiteralType.number = NaN; + const NaNLiteralType = getNumericLiteralTypeForText(NaN.toString()); + const InfinityLiteralType = getNumericLiteralTypeForText(Infinity.toString()); const resolutionTargets: TypeSystemEntity[] = []; const resolutionResults: boolean[] = []; @@ -310,7 +314,9 @@ namespace ts { } const builtinGlobals: SymbolTable = { - [undefinedSymbol.name]: undefinedSymbol + [undefinedSymbol.name]: undefinedSymbol, + [NaNSymbol.name]: NaNSymbol, + [InfinitySymbol.name]: InfinitySymbol, }; initializeTypeChecker(); @@ -11833,8 +11839,21 @@ namespace ts { const operandType = checkExpression(node.operand); switch (node.operator) { case SyntaxKind.PlusToken: + if (operandType.flags & TypeFlags.NumericLiteral) { + return operandType; + } case SyntaxKind.MinusToken: + if (operandType.flags & TypeFlags.NumericLiteral) { + const litType = operandType as NumericLiteralType; + const newNumber = -litType.number; + return getNumericLiteralTypeForText(newNumber.toString()); + } case SyntaxKind.TildeToken: + if (operandType.flags & TypeFlags.NumericLiteral) { + const litType = operandType as NumericLiteralType; + const newNumber = ~litType.number; + return getNumericLiteralTypeForText(newNumber.toString()); + } if (maybeTypeOfKind(operandType, TypeFlags.ESSymbol)) { error(node.operand, Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, tokenToString(node.operator)); } @@ -11842,7 +11861,18 @@ namespace ts { case SyntaxKind.ExclamationToken: return booleanType; case SyntaxKind.PlusPlusToken: + if (operandType.flags & TypeFlags.NumericLiteral) { + const litType = operandType as NumericLiteralType; + const newNumber = litType.number + 1; + return getNumericLiteralTypeForText(newNumber.toString()); + } + // Intentional fallthrough case SyntaxKind.MinusMinusToken: + if (operandType.flags & TypeFlags.NumericLiteral) { + const litType = operandType as NumericLiteralType; + const newNumber = litType.number - 1; + return getNumericLiteralTypeForText(newNumber.toString()); + } const ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type); if (ok) { @@ -11858,6 +11888,9 @@ namespace ts { function checkPostfixUnaryExpression(node: PostfixUnaryExpression): Type { const operandType = checkExpression(node.operand); + if (operandType.flags & TypeFlags.NumericLiteral) { + return operandType; + } const ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type); if (ok) { @@ -12094,27 +12127,59 @@ namespace ts { let rightType = checkExpression(right, contextualMapper); switch (operator) { case SyntaxKind.AsteriskToken: - case SyntaxKind.AsteriskAsteriskToken: case SyntaxKind.AsteriskEqualsToken: + if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { + const newNumber = (leftType as NumericLiteralType).number * (rightType as NumericLiteralType).number; + return getNumericLiteralTypeForText(newNumber.toString()); + } + case SyntaxKind.AsteriskAsteriskToken: case SyntaxKind.AsteriskAsteriskEqualsToken: + if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { + const newNumber = (leftType as NumericLiteralType).number ** (rightType as NumericLiteralType).number; + return getNumericLiteralTypeForText(newNumber.toString()); + } case SyntaxKind.SlashToken: case SyntaxKind.SlashEqualsToken: + if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { + const newNumber = (leftType as NumericLiteralType).number / (rightType as NumericLiteralType).number; + return getNumericLiteralTypeForText(newNumber.toString()); + } case SyntaxKind.PercentToken: case SyntaxKind.PercentEqualsToken: + if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { + const newNumber = (leftType as NumericLiteralType).number % (rightType as NumericLiteralType).number; + return getNumericLiteralTypeForText(newNumber.toString()); + } case SyntaxKind.MinusToken: case SyntaxKind.MinusEqualsToken: - case SyntaxKind.LessThanLessThanToken: - case SyntaxKind.LessThanLessThanEqualsToken: - case SyntaxKind.GreaterThanGreaterThanToken: - case SyntaxKind.GreaterThanGreaterThanEqualsToken: - case SyntaxKind.GreaterThanGreaterThanGreaterThanToken: - case SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken: + if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { + const newNumber = (leftType as NumericLiteralType).number - (rightType as NumericLiteralType).number; + return getNumericLiteralTypeForText(newNumber.toString()); + } case SyntaxKind.BarToken: case SyntaxKind.BarEqualsToken: + if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { + const newNumber = (leftType as NumericLiteralType).number | (rightType as NumericLiteralType).number; + return getNumericLiteralTypeForText(newNumber.toString()); + } case SyntaxKind.CaretToken: case SyntaxKind.CaretEqualsToken: + if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { + const newNumber = (leftType as NumericLiteralType).number ^ (rightType as NumericLiteralType).number; + return getNumericLiteralTypeForText(newNumber.toString()); + } case SyntaxKind.AmpersandToken: case SyntaxKind.AmpersandEqualsToken: + if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { + const newNumber = (leftType as NumericLiteralType).number & (rightType as NumericLiteralType).number; + return getNumericLiteralTypeForText(newNumber.toString()); + } + case SyntaxKind.LessThanLessThanToken: + case SyntaxKind.LessThanLessThanEqualsToken: + case SyntaxKind.GreaterThanGreaterThanToken: + case SyntaxKind.GreaterThanGreaterThanEqualsToken: + case SyntaxKind.GreaterThanGreaterThanGreaterThanToken: + case SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken: // TypeScript 1.0 spec (April 2014): 4.19.1 // These operators require their operands to be of type Any, the Number primitive type, // or an enum type. Operands of an enum type are treated @@ -12147,6 +12212,11 @@ namespace ts { return numberType; case SyntaxKind.PlusToken: case SyntaxKind.PlusEqualsToken: + if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { + // TODO (weswig): add case for when 1 side is a string literal type and the other is a numeric literal, then cast as appropriate + const newNumber = (leftType as NumericLiteralType).number + (rightType as NumericLiteralType).number; + return getNumericLiteralTypeForText(newNumber.toString()); + } // TypeScript 1.0 spec (April 2014): 4.19.2 // The binary + operator requires both operands to be of the Number primitive type or an enum type, // or at least one of the operands to be of type Any or the String primitive type. @@ -17323,6 +17393,10 @@ namespace ts { addToSymbolTable(globals, builtinGlobals, Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0); getSymbolLinks(undefinedSymbol).type = undefinedType; + getSymbolLinks(NaNSymbol).type = NaNLiteralType; + getSymbolLinks(NaNSymbol).declaredType = NaNLiteralType; + getSymbolLinks(InfinitySymbol).type = InfinityLiteralType; + getSymbolLinks(InfinitySymbol).declaredType = InfinityLiteralType; getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments"); getSymbolLinks(unknownSymbol).type = unknownType; diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index bb2f1d0766da5..ad765ef383a6a 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2373,6 +2373,10 @@ namespace ts { function parseSignedNumericLiteral(): NumericLiteralTypeNode { nextToken(); + // Since we don't allow reference types after a `-` (other than Infinity), we special case it here + if (token == SyntaxKind.Identifier && scanner.getTokenText() === (Infinity).toString()) { + return parseNumericLiteralTypeNode(); + } parseExpected(SyntaxKind.NumericLiteral, Diagnostics.Numeric_literal_expected, /*shouldAdvance*/false); return parseNumericLiteralTypeNode(); } diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts index 17916d5548e12..d1329ed9a876b 100644 --- a/src/lib/es5.d.ts +++ b/src/lib/es5.d.ts @@ -2,9 +2,6 @@ /// ECMAScript APIs ///////////////////////////// -declare const NaN: number; -declare const Infinity: number; - /** * Evaluates JavaScript code and executes it. * @param x A String value that contains valid JavaScript code. diff --git a/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts index b096b19c2bf5e..6fe5f1cf30ab3 100644 --- a/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts +++ b/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts @@ -6,8 +6,8 @@ interface NegativeInfinityMember { member: -Infinity } -invertInfinity(x: -Infinity): Infinity; -invertInfinity(x: Infinity): -Infinity +function invertInfinity(x: -Infinity): Infinity; +function invertInfinity(x: Infinity): -Infinity; function invertInfinity(x: number): number { return -x; } @@ -26,7 +26,7 @@ declare function stillNumber(x: number): boolean; stillNumber(c); stillNumber(d); -declare function isInfinity(x: number): x is (Infinity | -Infinity) { +/*declare function isInfinity(x: number): x is (Infinity | -Infinity) { return x !== x; } @@ -36,4 +36,4 @@ if (isInfinity(y)) { } else { let b: number = y; -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts index 96855147cfb78..b28a9463abdd6 100644 --- a/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts +++ b/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts @@ -8,7 +8,7 @@ x = {member: NaN} declare function stillNumber(x: number): boolean; stillNumber(x.member); -declare function isNaN(x: number): x is NaN { +/*function isNaN(x: number): x is NaN { return x !== x; } @@ -19,3 +19,4 @@ if (isNaN(y)) { else { let b: number = y; } +*/ \ No newline at end of file diff --git a/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts index 959bf0f0513dd..f88065373f0ce 100644 --- a/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts +++ b/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts @@ -60,7 +60,7 @@ nc = c; c = nc; -type True = 1; +/*type True = 1; type False = 0; function isTrue(x: True | False): x is True { @@ -75,3 +75,4 @@ if (isTrue(x)) { else { let z: True = x; } +*/ \ No newline at end of file diff --git a/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts index 57d968946fee0..1cc747653d15e 100644 --- a/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts +++ b/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts @@ -47,7 +47,7 @@ d = na; d = nb; d = nc; -type True = 1; +/*type True = 1; type False = 0; function isTrue(x: True | False): x is True { @@ -62,3 +62,4 @@ if (isTrue(x)) { else { let z: False = x; } +*/ \ No newline at end of file From d80fbe53fc310551be09d546e55e44aff38c8911 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 11 Mar 2016 05:32:39 -0500 Subject: [PATCH 06/13] change parsing a bit to make minuses better, broke some stuff in the process --- src/compiler/checker.ts | 31 +++++++++++++++++++++++++++++++ src/compiler/parser.ts | 26 ++++++++++++-------------- src/compiler/types.ts | 9 +++++++++ 3 files changed, 52 insertions(+), 14 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a8b1ff9322fca..0b4ec5f138736 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5139,6 +5139,31 @@ namespace ts { return links.resolvedType; } + function getTypeFromTypeUnaryPrefixNode(node: TypeUnaryPrefix): NumericLiteralType { + const type = getTypeFromNumericLiteralTypeNode(node.operand) as NumericLiteralType; + if (node.operator === SyntaxKind.MinusToken) { + const text = "-"+type.text; + if (hasProperty(numericLiteralTypes, text)) { + return numericLiteralTypes[text]; + } + + const newType = numericLiteralTypes[text] = createType(TypeFlags.NumericLiteral) as NumericLiteralType; + newType.number = -type.number; + newType.text = text; + + return newType; + } + return type; + } + + function getTypeFromTypeUnaryPrefix(node: TypeUnaryPrefix): Type { + const links = getNodeLinks(node); + if (!links.resolvedType) { + links.resolvedType = getTypeFromTypeUnaryPrefixNode(node); + } + return links.resolvedType; + } + function getTypeFromJSDocVariadicType(node: JSDocVariadicType): Type { const links = getNodeLinks(node); if (!links.resolvedType) { @@ -5204,6 +5229,8 @@ namespace ts { return getTypeFromStringLiteralTypeNode(node); case SyntaxKind.NumericLiteralType: return getTypeFromNumericLiteralTypeNode(node as NumericLiteralTypeNode); + case SyntaxKind.TypeUnaryPrefix: + return getTypeFromTypeUnaryPrefix(node as TypeUnaryPrefix); case SyntaxKind.TypeReference: case SyntaxKind.JSDocTypeReference: return getTypeFromTypeReference(node); @@ -8898,6 +8925,10 @@ namespace ts { case SyntaxKind.JsxAttribute: case SyntaxKind.JsxSpreadAttribute: return getContextualTypeForJsxAttribute(parent); + case SyntaxKind.PrefixUnaryExpression: + if ((parent as PrefixUnaryExpression).operator === SyntaxKind.MinusToken) { + return getContextualType(parent as PrefixUnaryExpression); + } } return undefined; } diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index ad765ef383a6a..8b4b70c251c51 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -112,6 +112,8 @@ namespace ts { case SyntaxKind.TypeReference: return visitNode(cbNode, (node).typeName) || visitNodes(cbNodes, (node).typeArguments); + case SyntaxKind.TypeUnaryPrefix: + return visitNode(cbNode, (node).operand); case SyntaxKind.TypePredicate: return visitNode(cbNode, (node).parameterName) || visitNode(cbNode, (node).type); @@ -2371,20 +2373,17 @@ namespace ts { return token === SyntaxKind.DotToken ? undefined : node; } - function parseSignedNumericLiteral(): NumericLiteralTypeNode { + // We can't just add a `-` to the text of the literal, as this breaks on hex and octal literals (and returns NaN) + function parseSignedNumericLiteral(): TypeUnaryPrefix { + const node = createNode(SyntaxKind.TypeUnaryPrefix) as TypeUnaryPrefix; + node.operator = token; nextToken(); - // Since we don't allow reference types after a `-` (other than Infinity), we special case it here - if (token == SyntaxKind.Identifier && scanner.getTokenText() === (Infinity).toString()) { - return parseNumericLiteralTypeNode(); + // Since we don't allow reference types after a `-` or `+` (other than Infinity), we special case it here + if (!(token == SyntaxKind.Identifier && scanner.getTokenText() === (Infinity).toString())) { + parseExpected(SyntaxKind.NumericLiteral, Diagnostics.Numeric_literal_expected, /*shouldAdvance*/false); } - parseExpected(SyntaxKind.NumericLiteral, Diagnostics.Numeric_literal_expected, /*shouldAdvance*/false); - return parseNumericLiteralTypeNode(); - } - - function parseMinusSignedNumericLiteral(): NumericLiteralTypeNode { - const node = parseSignedNumericLiteral(); - node.text = `-${node.text}`; - return node; + node.operand = parseNumericLiteralTypeNode(); + return finishNode(node); } function parseNonArrayType(): TypeNode { @@ -2423,9 +2422,8 @@ namespace ts { case SyntaxKind.OpenParenToken: return parseParenthesizedType(); case SyntaxKind.PlusToken: - return parseSignedNumericLiteral(); case SyntaxKind.MinusToken: - return parseMinusSignedNumericLiteral(); + return parseSignedNumericLiteral(); default: return parseTypeReference(); } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index c57c84a8e7004..f70e67ce46c8b 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -211,6 +211,7 @@ namespace ts { ThisType, StringLiteralType, NumericLiteralType, + TypeUnaryPrefix, // Binding patterns ObjectBindingPattern, ArrayBindingPattern, @@ -818,10 +819,18 @@ namespace ts { // @kind(SyntaxKind.PrefixUnaryExpression) export interface PrefixUnaryExpression extends IncrementExpression { + _prefixUnaryExpressionBrand: any; operator: SyntaxKind; operand: UnaryExpression; } + // @kind(SyntaxKind.TypeUnaryPrefix) + export interface TypeUnaryPrefix extends TypeNode { + _typeUnaryPrefixBrand: any; + operator: SyntaxKind; + operand: NumericLiteralTypeNode; + } + // @kind(SyntaxKind.PostfixUnaryExpression) export interface PostfixUnaryExpression extends IncrementExpression { operand: LeftHandSideExpression; From 74fe1ef8638e5b76bde9f17ed31cacb557ced439 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 11 Mar 2016 05:43:53 -0500 Subject: [PATCH 07/13] Remove NaN/Infinity from testing libs --- tests/cases/conformance/decorators/1.0lib-noErrors.ts | 3 --- tests/lib/lib.d.ts | 3 --- 2 files changed, 6 deletions(-) diff --git a/tests/cases/conformance/decorators/1.0lib-noErrors.ts b/tests/cases/conformance/decorators/1.0lib-noErrors.ts index 6966e3e70d07d..8c1449f123732 100644 --- a/tests/cases/conformance/decorators/1.0lib-noErrors.ts +++ b/tests/cases/conformance/decorators/1.0lib-noErrors.ts @@ -20,9 +20,6 @@ and limitations under the License. /// ECMAScript APIs ///////////////////////////// -declare var NaN: number; -declare var Infinity: number; - /** * Evaluates JavaScript code and executes it. * @param x A String value that contains valid JavaScript code. diff --git a/tests/lib/lib.d.ts b/tests/lib/lib.d.ts index fd4c05da220a7..11245658e3d06 100644 --- a/tests/lib/lib.d.ts +++ b/tests/lib/lib.d.ts @@ -19,9 +19,6 @@ and limitations under the License. /// ECMAScript APIs ///////////////////////////// -declare var NaN: number; -declare var Infinity: number; - /** * Evaluates JavaScript code and executes it. * @param x A String value that contains valid JavaScript code. From 2afea633f88e5ea77a932bec9ea01a19cb1d21b0 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 11 Mar 2016 06:14:03 -0500 Subject: [PATCH 08/13] fix tests --- .../negativeNumericLiteralTypes.ts | 43 +++++++++++++++++++ .../numericLiteral/numericLiteralTypes.ts | 18 ++++++++ 2 files changed, 61 insertions(+) diff --git a/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts index f88065373f0ce..76491208d81f8 100644 --- a/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts +++ b/tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts @@ -60,6 +60,49 @@ nc = c; c = nc; +na = {member: 42}; + +nb = {member: 42}; + +nc = {member: 42}; + +a = {member: 42}; + +b = {member: 42}; + +c = {member: 42}; + +na = {member: -42}; + +nb = {member: -42}; + +nc = {member: -42}; + +a = {member: -42}; + +b = {member: -42}; + +c = {member: -42}; + +const zero: 0 = 0; +const one: 1 = 1; +let two: 2 = 2; +const three: 3 = 3; +const four: 4 = 4; +const ten: 10 = 10; +const twenty: 20 = 20; +two = one * one; +two = one ** zero; +two = one / one; +two = one % twenty; +two = one + zero; +two = one - zero; +two = one & one; +two = one ^ zero; +two = one | one; +two = (((two ** two) - four) + (ten * two)) % three / two; + + /*type True = 1; type False = 0; diff --git a/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts index 1cc747653d15e..d9bba66631e90 100644 --- a/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts +++ b/tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts @@ -47,6 +47,24 @@ d = na; d = nb; d = nc; +const zero: 0 = 0; +let one: 1 = 1; +const two: 2 = 2; +const three: 3 = 3; +const four: 4 = 4; +const ten: 10 = 10; +const twenty: 20 = 20; +one = one * one; +one = one ** zero; +one = one / one; +one = one % twenty; +one = one + zero; +one = one - zero; +one = one & one; +one = one ^ zero; +one = one | one; +one = (((two ** two) - four) + (ten * two)) % three / two; + /*type True = 1; type False = 0; From ba552ccf718995493026f29af092ad4d2ccf6069 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 11 Mar 2016 06:38:03 -0500 Subject: [PATCH 09/13] first look at baseline changes from numeric types --- tests/baselines/reference/1.0lib-noErrors.js | 3 - .../reference/1.0lib-noErrors.symbols | 1527 ++++++++++++++--- .../baselines/reference/1.0lib-noErrors.types | 6 - .../reference/InfinityLiteralTypes.js | 65 + .../reference/InfinityLiteralTypes.symbols | 95 + .../reference/InfinityLiteralTypes.types | 106 ++ tests/baselines/reference/NaNLiteralTypes.js | 40 + .../reference/NaNLiteralTypes.symbols | 40 + .../baselines/reference/NaNLiteralTypes.types | 43 + .../baselines/reference/moduleScoping.symbols | 2 +- tests/baselines/reference/moduleScoping.types | 8 +- .../negativeNumericLiteralTypes.errors.txt | 214 +++ .../reference/negativeNumericLiteralTypes.js | 191 +++ .../noImplicitAnyIndexingSuppressed.symbols | 2 +- .../noImplicitAnyIndexingSuppressed.types | 4 +- .../reference/numericLiteralTypes.js | 134 ++ .../reference/numericLiteralTypes.symbols | 206 +++ .../reference/numericLiteralTypes.types | 259 +++ ...emplateStringWithEmbeddedUnaryPlus.symbols | 2 +- .../templateStringWithEmbeddedUnaryPlus.types | 4 +- ...lateStringWithEmbeddedUnaryPlusES6.symbols | 4 + ...mplateStringWithEmbeddedUnaryPlusES6.types | 4 +- .../reference/underscoreTest1.symbols | 4 +- .../baselines/reference/underscoreTest1.types | 6 +- ...ariableDeclarationInStrictMode1.errors.txt | 2 +- 25 files changed, 2692 insertions(+), 279 deletions(-) create mode 100644 tests/baselines/reference/InfinityLiteralTypes.js create mode 100644 tests/baselines/reference/InfinityLiteralTypes.symbols create mode 100644 tests/baselines/reference/InfinityLiteralTypes.types create mode 100644 tests/baselines/reference/NaNLiteralTypes.js create mode 100644 tests/baselines/reference/NaNLiteralTypes.symbols create mode 100644 tests/baselines/reference/NaNLiteralTypes.types create mode 100644 tests/baselines/reference/negativeNumericLiteralTypes.errors.txt create mode 100644 tests/baselines/reference/negativeNumericLiteralTypes.js create mode 100644 tests/baselines/reference/numericLiteralTypes.js create mode 100644 tests/baselines/reference/numericLiteralTypes.symbols create mode 100644 tests/baselines/reference/numericLiteralTypes.types diff --git a/tests/baselines/reference/1.0lib-noErrors.js b/tests/baselines/reference/1.0lib-noErrors.js index 1dcfa9743b2b8..91bc2fdbc59e5 100644 --- a/tests/baselines/reference/1.0lib-noErrors.js +++ b/tests/baselines/reference/1.0lib-noErrors.js @@ -20,9 +20,6 @@ and limitations under the License. /// ECMAScript APIs ///////////////////////////// -declare var NaN: number; -declare var Infinity: number; - /** * Evaluates JavaScript code and executes it. * @param x A String value that contains valid JavaScript code. diff --git a/tests/baselines/reference/1.0lib-noErrors.symbols b/tests/baselines/reference/1.0lib-noErrors.symbols index adedbdb9aa2dc..37ae16a8628a1 100644 --- a/tests/baselines/reference/1.0lib-noErrors.symbols +++ b/tests/baselines/reference/1.0lib-noErrors.symbols @@ -20,19 +20,13 @@ and limitations under the License. /// ECMAScript APIs ///////////////////////////// -declare var NaN: number; ->NaN : Symbol(NaN, Decl(1.0lib-noErrors.ts, 21, 11)) - -declare var Infinity: number; ->Infinity : Symbol(Infinity, Decl(1.0lib-noErrors.ts, 22, 11)) - /** * Evaluates JavaScript code and executes it. * @param x A String value that contains valid JavaScript code. */ declare function eval(x: string): any; ->eval : Symbol(eval, Decl(1.0lib-noErrors.ts, 22, 29)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 28, 22)) +>eval : Symbol(eval, Decl(1.0lib-noErrors.ts, 0, 0)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 25, 22)) /** * Converts A string to an integer. @@ -42,70 +36,71 @@ declare function eval(x: string): any; * All other strings are considered decimal. */ declare function parseInt(s: string, radix?: number): number; ->parseInt : Symbol(parseInt, Decl(1.0lib-noErrors.ts, 28, 38)) ->s : Symbol(s, Decl(1.0lib-noErrors.ts, 37, 26)) ->radix : Symbol(radix, Decl(1.0lib-noErrors.ts, 37, 36)) +>parseInt : Symbol(parseInt, Decl(1.0lib-noErrors.ts, 25, 38)) +>s : Symbol(s, Decl(1.0lib-noErrors.ts, 34, 26)) +>radix : Symbol(radix, Decl(1.0lib-noErrors.ts, 34, 36)) /** * Converts a string to a floating-point number. * @param string A string that contains a floating-point number. */ declare function parseFloat(string: string): number; ->parseFloat : Symbol(parseFloat, Decl(1.0lib-noErrors.ts, 37, 61)) ->string : Symbol(string, Decl(1.0lib-noErrors.ts, 43, 28)) +>parseFloat : Symbol(parseFloat, Decl(1.0lib-noErrors.ts, 34, 61)) +>string : Symbol(string, Decl(1.0lib-noErrors.ts, 40, 28)) /** * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a number). * @param number A numeric value. */ declare function isNaN(number: number): boolean; ->isNaN : Symbol(isNaN, Decl(1.0lib-noErrors.ts, 43, 52)) ->number : Symbol(number, Decl(1.0lib-noErrors.ts, 49, 23)) +>isNaN : Symbol(isNaN, Decl(1.0lib-noErrors.ts, 40, 52)) +>number : Symbol(number, Decl(1.0lib-noErrors.ts, 46, 23)) /** * Determines whether a supplied number is finite. * @param number Any numeric value. */ declare function isFinite(number: number): boolean; ->isFinite : Symbol(isFinite, Decl(1.0lib-noErrors.ts, 49, 48)) ->number : Symbol(number, Decl(1.0lib-noErrors.ts, 55, 26)) +>isFinite : Symbol(isFinite, Decl(1.0lib-noErrors.ts, 46, 48)) +>number : Symbol(number, Decl(1.0lib-noErrors.ts, 52, 26)) /** * Gets the unencoded version of an encoded Uniform Resource Identifier (URI). * @param encodedURI A value representing an encoded URI. */ declare function decodeURI(encodedURI: string): string; ->decodeURI : Symbol(decodeURI, Decl(1.0lib-noErrors.ts, 55, 51)) ->encodedURI : Symbol(encodedURI, Decl(1.0lib-noErrors.ts, 61, 27)) +>decodeURI : Symbol(decodeURI, Decl(1.0lib-noErrors.ts, 52, 51)) +>encodedURI : Symbol(encodedURI, Decl(1.0lib-noErrors.ts, 58, 27)) /** * Gets the unencoded version of an encoded component of a Uniform Resource Identifier (URI). * @param encodedURIComponent A value representing an encoded URI component. */ declare function decodeURIComponent(encodedURIComponent: string): string; ->decodeURIComponent : Symbol(decodeURIComponent, Decl(1.0lib-noErrors.ts, 61, 55)) ->encodedURIComponent : Symbol(encodedURIComponent, Decl(1.0lib-noErrors.ts, 67, 36)) +>decodeURIComponent : Symbol(decodeURIComponent, Decl(1.0lib-noErrors.ts, 58, 55)) +>encodedURIComponent : Symbol(encodedURIComponent, Decl(1.0lib-noErrors.ts, 64, 36)) /** * Encodes a text string as a valid Uniform Resource Identifier (URI) * @param uri A value representing an encoded URI. */ declare function encodeURI(uri: string): string; ->encodeURI : Symbol(encodeURI, Decl(1.0lib-noErrors.ts, 67, 73)) ->uri : Symbol(uri, Decl(1.0lib-noErrors.ts, 73, 27)) +>encodeURI : Symbol(encodeURI, Decl(1.0lib-noErrors.ts, 64, 73)) +>uri : Symbol(uri, Decl(1.0lib-noErrors.ts, 70, 27)) /** * Encodes a text string as a valid component of a Uniform Resource Identifier (URI). * @param uriComponent A value representing an encoded URI component. */ declare function encodeURIComponent(uriComponent: string): string; ->encodeURIComponent : Symbol(encodeURIComponent, Decl(1.0lib-noErrors.ts, 73, 48)) ->uriComponent : Symbol(uriComponent, Decl(1.0lib-noErrors.ts, 79, 36)) +>encodeURIComponent : Symbol(encodeURIComponent, Decl(1.0lib-noErrors.ts, 70, 48)) +>uriComponent : Symbol(uriComponent, Decl(1.0lib-noErrors.ts, 76, 36)) interface PropertyDescriptor { ->PropertyDescriptor : Symbol(PropertyDescriptor, Decl(1.0lib-noErrors.ts, 79, 66)) +>PropertyDescriptor : Symbol(PropertyDescriptor, Decl(1.0lib-noErrors.ts, 76, 66)) configurable?: boolean; +<<<<<<< ours >configurable : Symbol(PropertyDescriptor.configurable, Decl(1.0lib-noErrors.ts, 81, 30)) enumerable?: boolean; @@ -123,21 +118,41 @@ interface PropertyDescriptor { set?(v: any): void; >set : Symbol(PropertyDescriptor.set, Decl(1.0lib-noErrors.ts, 86, 16)) >v : Symbol(v, Decl(1.0lib-noErrors.ts, 87, 9)) +======= +>configurable : Symbol(configurable, Decl(1.0lib-noErrors.ts, 78, 30)) + + enumerable?: boolean; +>enumerable : Symbol(enumerable, Decl(1.0lib-noErrors.ts, 79, 27)) + + value?: any; +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 80, 25)) + + writable?: boolean; +>writable : Symbol(writable, Decl(1.0lib-noErrors.ts, 81, 16)) + + get?(): any; +>get : Symbol(get, Decl(1.0lib-noErrors.ts, 82, 23)) + + set?(v: any): void; +>set : Symbol(set, Decl(1.0lib-noErrors.ts, 83, 16)) +>v : Symbol(v, Decl(1.0lib-noErrors.ts, 84, 9)) +>>>>>>> theirs } interface PropertyDescriptorMap { ->PropertyDescriptorMap : Symbol(PropertyDescriptorMap, Decl(1.0lib-noErrors.ts, 88, 1)) +>PropertyDescriptorMap : Symbol(PropertyDescriptorMap, Decl(1.0lib-noErrors.ts, 85, 1)) [s: string]: PropertyDescriptor; ->s : Symbol(s, Decl(1.0lib-noErrors.ts, 91, 5)) ->PropertyDescriptor : Symbol(PropertyDescriptor, Decl(1.0lib-noErrors.ts, 79, 66)) +>s : Symbol(s, Decl(1.0lib-noErrors.ts, 88, 5)) +>PropertyDescriptor : Symbol(PropertyDescriptor, Decl(1.0lib-noErrors.ts, 76, 66)) } interface Object { ->Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 92, 1), Decl(1.0lib-noErrors.ts, 129, 11)) +>Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 89, 1), Decl(1.0lib-noErrors.ts, 126, 11)) /** The initial value of Object.prototype.constructor is the standard built-in Object constructor. */ constructor: Function; +<<<<<<< ours >constructor : Symbol(Object.constructor, Decl(1.0lib-noErrors.ts, 94, 18)) >Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) @@ -153,59 +168,92 @@ interface Object { valueOf(): Object; >valueOf : Symbol(Object.valueOf, Decl(1.0lib-noErrors.ts, 102, 29)) >Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 92, 1), Decl(1.0lib-noErrors.ts, 129, 11)) +======= +>constructor : Symbol(constructor, Decl(1.0lib-noErrors.ts, 91, 18)) +>Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) + + /** Returns a string representation of an object. */ + toString(): string; +>toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 93, 26)) + + /** Returns a date converted to a string using the current locale. */ + toLocaleString(): string; +>toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 96, 23)) + + /** Returns the primitive value of the specified object. */ + valueOf(): Object; +>valueOf : Symbol(valueOf, Decl(1.0lib-noErrors.ts, 99, 29)) +>Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 89, 1), Decl(1.0lib-noErrors.ts, 126, 11)) +>>>>>>> theirs /** * Determines whether an object has a property with the specified name. * @param v A property name. */ hasOwnProperty(v: string): boolean; +<<<<<<< ours >hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(1.0lib-noErrors.ts, 105, 22)) >v : Symbol(v, Decl(1.0lib-noErrors.ts, 111, 19)) +======= +>hasOwnProperty : Symbol(hasOwnProperty, Decl(1.0lib-noErrors.ts, 102, 22)) +>v : Symbol(v, Decl(1.0lib-noErrors.ts, 108, 19)) +>>>>>>> theirs /** * Determines whether an object exists in another object's prototype chain. * @param v Another object whose prototype chain is to be checked. */ isPrototypeOf(v: Object): boolean; +<<<<<<< ours >isPrototypeOf : Symbol(Object.isPrototypeOf, Decl(1.0lib-noErrors.ts, 111, 39)) >v : Symbol(v, Decl(1.0lib-noErrors.ts, 117, 18)) >Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 92, 1), Decl(1.0lib-noErrors.ts, 129, 11)) +======= +>isPrototypeOf : Symbol(isPrototypeOf, Decl(1.0lib-noErrors.ts, 108, 39)) +>v : Symbol(v, Decl(1.0lib-noErrors.ts, 114, 18)) +>Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 89, 1), Decl(1.0lib-noErrors.ts, 126, 11)) +>>>>>>> theirs /** * Determines whether a specified property is enumerable. * @param v A property name. */ propertyIsEnumerable(v: string): boolean; +<<<<<<< ours >propertyIsEnumerable : Symbol(Object.propertyIsEnumerable, Decl(1.0lib-noErrors.ts, 117, 38)) >v : Symbol(v, Decl(1.0lib-noErrors.ts, 123, 25)) +======= +>propertyIsEnumerable : Symbol(propertyIsEnumerable, Decl(1.0lib-noErrors.ts, 114, 38)) +>v : Symbol(v, Decl(1.0lib-noErrors.ts, 120, 25)) +>>>>>>> theirs } /** * Provides functionality common to all JavaScript objects. */ declare var Object: { ->Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 92, 1), Decl(1.0lib-noErrors.ts, 129, 11)) +>Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 89, 1), Decl(1.0lib-noErrors.ts, 126, 11)) new (value?: any): Object; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 130, 9)) ->Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 92, 1), Decl(1.0lib-noErrors.ts, 129, 11)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 127, 9)) +>Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 89, 1), Decl(1.0lib-noErrors.ts, 126, 11)) (): any; (value: any): any; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 132, 5)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 129, 5)) /** A reference to the prototype for a class of objects. */ prototype: Object; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 132, 22)) ->Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 92, 1), Decl(1.0lib-noErrors.ts, 129, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 129, 22)) +>Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 89, 1), Decl(1.0lib-noErrors.ts, 126, 11)) /** * Returns the prototype of an object. * @param o The object that references the prototype. */ getPrototypeOf(o: any): any; ->getPrototypeOf : Symbol(getPrototypeOf, Decl(1.0lib-noErrors.ts, 135, 22)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 141, 19)) +>getPrototypeOf : Symbol(getPrototypeOf, Decl(1.0lib-noErrors.ts, 132, 22)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 138, 19)) /** * Gets the own property descriptor of the specified object. @@ -214,10 +262,10 @@ declare var Object: { * @param p Name of the property. */ getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor; ->getOwnPropertyDescriptor : Symbol(getOwnPropertyDescriptor, Decl(1.0lib-noErrors.ts, 141, 32)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 149, 29)) ->p : Symbol(p, Decl(1.0lib-noErrors.ts, 149, 36)) ->PropertyDescriptor : Symbol(PropertyDescriptor, Decl(1.0lib-noErrors.ts, 79, 66)) +>getOwnPropertyDescriptor : Symbol(getOwnPropertyDescriptor, Decl(1.0lib-noErrors.ts, 138, 32)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 146, 29)) +>p : Symbol(p, Decl(1.0lib-noErrors.ts, 146, 36)) +>PropertyDescriptor : Symbol(PropertyDescriptor, Decl(1.0lib-noErrors.ts, 76, 66)) /** * Returns the names of the own properties of an object. The own properties of an object are those that are defined directly @@ -225,8 +273,8 @@ declare var Object: { * @param o Object that contains the own properties. */ getOwnPropertyNames(o: any): string[]; ->getOwnPropertyNames : Symbol(getOwnPropertyNames, Decl(1.0lib-noErrors.ts, 149, 68)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 156, 24)) +>getOwnPropertyNames : Symbol(getOwnPropertyNames, Decl(1.0lib-noErrors.ts, 146, 68)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 153, 24)) /** * Creates an object that has the specified prototype, and that optionally contains specified properties. @@ -234,10 +282,10 @@ declare var Object: { * @param properties JavaScript object that contains one or more property descriptors. */ create(o: any, properties?: PropertyDescriptorMap): any; ->create : Symbol(create, Decl(1.0lib-noErrors.ts, 156, 42)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 163, 11)) ->properties : Symbol(properties, Decl(1.0lib-noErrors.ts, 163, 18)) ->PropertyDescriptorMap : Symbol(PropertyDescriptorMap, Decl(1.0lib-noErrors.ts, 88, 1)) +>create : Symbol(create, Decl(1.0lib-noErrors.ts, 153, 42)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 160, 11)) +>properties : Symbol(properties, Decl(1.0lib-noErrors.ts, 160, 18)) +>PropertyDescriptorMap : Symbol(PropertyDescriptorMap, Decl(1.0lib-noErrors.ts, 85, 1)) /** * Adds a property to an object, or modifies attributes of an existing property. @@ -246,11 +294,11 @@ declare var Object: { * @param attributes Descriptor for the property. It can be for a data property or an accessor property. */ defineProperty(o: any, p: string, attributes: PropertyDescriptor): any; ->defineProperty : Symbol(defineProperty, Decl(1.0lib-noErrors.ts, 163, 60)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 171, 19)) ->p : Symbol(p, Decl(1.0lib-noErrors.ts, 171, 26)) ->attributes : Symbol(attributes, Decl(1.0lib-noErrors.ts, 171, 37)) ->PropertyDescriptor : Symbol(PropertyDescriptor, Decl(1.0lib-noErrors.ts, 79, 66)) +>defineProperty : Symbol(defineProperty, Decl(1.0lib-noErrors.ts, 160, 60)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 168, 19)) +>p : Symbol(p, Decl(1.0lib-noErrors.ts, 168, 26)) +>attributes : Symbol(attributes, Decl(1.0lib-noErrors.ts, 168, 37)) +>PropertyDescriptor : Symbol(PropertyDescriptor, Decl(1.0lib-noErrors.ts, 76, 66)) /** * Adds one or more properties to an object, and/or modifies attributes of existing properties. @@ -258,73 +306,73 @@ declare var Object: { * @param properties JavaScript object that contains one or more descriptor objects. Each descriptor object describes a data property or an accessor property. */ defineProperties(o: any, properties: PropertyDescriptorMap): any; ->defineProperties : Symbol(defineProperties, Decl(1.0lib-noErrors.ts, 171, 75)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 178, 21)) ->properties : Symbol(properties, Decl(1.0lib-noErrors.ts, 178, 28)) ->PropertyDescriptorMap : Symbol(PropertyDescriptorMap, Decl(1.0lib-noErrors.ts, 88, 1)) +>defineProperties : Symbol(defineProperties, Decl(1.0lib-noErrors.ts, 168, 75)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 175, 21)) +>properties : Symbol(properties, Decl(1.0lib-noErrors.ts, 175, 28)) +>PropertyDescriptorMap : Symbol(PropertyDescriptorMap, Decl(1.0lib-noErrors.ts, 85, 1)) /** * Prevents the modification of attributes of existing properties, and prevents the addition of new properties. * @param o Object on which to lock the attributes. */ seal(o: any): any; ->seal : Symbol(seal, Decl(1.0lib-noErrors.ts, 178, 69)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 184, 9)) +>seal : Symbol(seal, Decl(1.0lib-noErrors.ts, 175, 69)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 181, 9)) /** * Prevents the modification of existing property attributes and values, and prevents the addition of new properties. * @param o Object on which to lock the attributes. */ freeze(o: any): any; ->freeze : Symbol(freeze, Decl(1.0lib-noErrors.ts, 184, 22)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 190, 11)) +>freeze : Symbol(freeze, Decl(1.0lib-noErrors.ts, 181, 22)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 187, 11)) /** * Prevents the addition of new properties to an object. * @param o Object to make non-extensible. */ preventExtensions(o: any): any; ->preventExtensions : Symbol(preventExtensions, Decl(1.0lib-noErrors.ts, 190, 24)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 196, 22)) +>preventExtensions : Symbol(preventExtensions, Decl(1.0lib-noErrors.ts, 187, 24)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 193, 22)) /** * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object. * @param o Object to test. */ isSealed(o: any): boolean; ->isSealed : Symbol(isSealed, Decl(1.0lib-noErrors.ts, 196, 35)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 202, 13)) +>isSealed : Symbol(isSealed, Decl(1.0lib-noErrors.ts, 193, 35)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 199, 13)) /** * Returns true if existing property attributes and values cannot be modified in an object, and new properties cannot be added to the object. * @param o Object to test. */ isFrozen(o: any): boolean; ->isFrozen : Symbol(isFrozen, Decl(1.0lib-noErrors.ts, 202, 30)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 208, 13)) +>isFrozen : Symbol(isFrozen, Decl(1.0lib-noErrors.ts, 199, 30)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 205, 13)) /** * Returns a value that indicates whether new properties can be added to an object. * @param o Object to test. */ isExtensible(o: any): boolean; ->isExtensible : Symbol(isExtensible, Decl(1.0lib-noErrors.ts, 208, 30)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 214, 17)) +>isExtensible : Symbol(isExtensible, Decl(1.0lib-noErrors.ts, 205, 30)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 211, 17)) /** * Returns the names of the enumerable properties and methods of an object. * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object. */ keys(o: any): string[]; ->keys : Symbol(keys, Decl(1.0lib-noErrors.ts, 214, 34)) ->o : Symbol(o, Decl(1.0lib-noErrors.ts, 220, 9)) +>keys : Symbol(keys, Decl(1.0lib-noErrors.ts, 211, 34)) +>o : Symbol(o, Decl(1.0lib-noErrors.ts, 217, 9)) } /** * Creates a new function. */ interface Function { ->Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) +>Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) /** * Calls the function, substituting the specified object for the this value of the function, and the specified array for the arguments of the function. @@ -332,9 +380,15 @@ interface Function { * @param argArray A set of arguments to be passed to the function. */ apply(thisArg: any, argArray?: any): any; +<<<<<<< ours >apply : Symbol(Function.apply, Decl(1.0lib-noErrors.ts, 226, 20)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 232, 10)) >argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 232, 23)) +======= +>apply : Symbol(apply, Decl(1.0lib-noErrors.ts, 223, 20)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 229, 10)) +>argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 229, 23)) +>>>>>>> theirs /** * Calls a method of an object, substituting another object for the current object. @@ -342,9 +396,15 @@ interface Function { * @param argArray A list of arguments to be passed to the method. */ call(thisArg: any, ...argArray: any[]): any; +<<<<<<< ours >call : Symbol(Function.call, Decl(1.0lib-noErrors.ts, 232, 45)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 239, 9)) >argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 239, 22)) +======= +>call : Symbol(call, Decl(1.0lib-noErrors.ts, 229, 45)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 236, 9)) +>argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 236, 22)) +>>>>>>> theirs /** * For a given function, creates a bound function that has the same body as the original function. @@ -353,6 +413,7 @@ interface Function { * @param argArray A list of arguments to be passed to the new function. */ bind(thisArg: any, ...argArray: any[]): any; +<<<<<<< ours >bind : Symbol(Function.bind, Decl(1.0lib-noErrors.ts, 239, 48)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 247, 9)) >argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 247, 22)) @@ -370,72 +431,118 @@ interface Function { caller: Function; >caller : Symbol(Function.caller, Decl(1.0lib-noErrors.ts, 253, 19)) >Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) +======= +>bind : Symbol(bind, Decl(1.0lib-noErrors.ts, 236, 48)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 244, 9)) +>argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 244, 22)) + + prototype: any; +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 244, 48)) + + length: number; +>length : Symbol(length, Decl(1.0lib-noErrors.ts, 246, 19)) + + // Non-standard extensions + arguments: any; +>arguments : Symbol(arguments, Decl(1.0lib-noErrors.ts, 247, 19)) + + caller: Function; +>caller : Symbol(caller, Decl(1.0lib-noErrors.ts, 250, 19)) +>Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) +>>>>>>> theirs } declare var Function: { ->Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) +>Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) /** * Creates a new function. * @param args A list of arguments the function accepts. */ new (...args: string[]): Function; ->args : Symbol(args, Decl(1.0lib-noErrors.ts, 262, 9)) ->Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) +>args : Symbol(args, Decl(1.0lib-noErrors.ts, 259, 9)) +>Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) (...args: string[]): Function; ->args : Symbol(args, Decl(1.0lib-noErrors.ts, 263, 5)) ->Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) +>args : Symbol(args, Decl(1.0lib-noErrors.ts, 260, 5)) +>Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) prototype: Function; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 263, 34)) ->Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 260, 34)) +>Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) } interface IArguments { ->IArguments : Symbol(IArguments, Decl(1.0lib-noErrors.ts, 265, 1)) +>IArguments : Symbol(IArguments, Decl(1.0lib-noErrors.ts, 262, 1)) [index: number]: any; ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 268, 5)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 265, 5)) length: number; +<<<<<<< ours >length : Symbol(IArguments.length, Decl(1.0lib-noErrors.ts, 268, 25)) callee: Function; >callee : Symbol(IArguments.callee, Decl(1.0lib-noErrors.ts, 269, 19)) >Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) +======= +>length : Symbol(length, Decl(1.0lib-noErrors.ts, 265, 25)) + + callee: Function; +>callee : Symbol(callee, Decl(1.0lib-noErrors.ts, 266, 19)) +>Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) +>>>>>>> theirs } interface String { ->String : Symbol(String, Decl(1.0lib-noErrors.ts, 271, 1), Decl(1.0lib-noErrors.ts, 429, 11)) +>String : Symbol(String, Decl(1.0lib-noErrors.ts, 268, 1), Decl(1.0lib-noErrors.ts, 426, 11)) /** Returns a string representation of a string. */ toString(): string; +<<<<<<< ours >toString : Symbol(String.toString, Decl(1.0lib-noErrors.ts, 273, 18)) +======= +>toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 270, 18)) +>>>>>>> theirs /** * Returns the character at the specified index. * @param pos The zero-based index of the desired character. */ charAt(pos: number): string; +<<<<<<< ours >charAt : Symbol(String.charAt, Decl(1.0lib-noErrors.ts, 275, 23)) >pos : Symbol(pos, Decl(1.0lib-noErrors.ts, 281, 11)) +======= +>charAt : Symbol(charAt, Decl(1.0lib-noErrors.ts, 272, 23)) +>pos : Symbol(pos, Decl(1.0lib-noErrors.ts, 278, 11)) +>>>>>>> theirs /** * Returns the Unicode value of the character at the specified location. * @param index The zero-based index of the desired character. If there is no character at the specified index, NaN is returned. */ charCodeAt(index: number): number; +<<<<<<< ours >charCodeAt : Symbol(String.charCodeAt, Decl(1.0lib-noErrors.ts, 281, 32)) >index : Symbol(index, Decl(1.0lib-noErrors.ts, 287, 15)) +======= +>charCodeAt : Symbol(charCodeAt, Decl(1.0lib-noErrors.ts, 278, 32)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 284, 15)) +>>>>>>> theirs /** * Returns a string that contains the concatenation of two or more strings. * @param strings The strings to append to the end of the string. */ concat(...strings: string[]): string; +<<<<<<< ours >concat : Symbol(String.concat, Decl(1.0lib-noErrors.ts, 287, 38)) >strings : Symbol(strings, Decl(1.0lib-noErrors.ts, 293, 11)) +======= +>concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 284, 38)) +>strings : Symbol(strings, Decl(1.0lib-noErrors.ts, 290, 11)) +>>>>>>> theirs /** * Returns the position of the first occurrence of a substring. @@ -443,9 +550,15 @@ interface String { * @param position The index at which to begin searching the String object. If omitted, search starts at the beginning of the string. */ indexOf(searchString: string, position?: number): number; +<<<<<<< ours >indexOf : Symbol(String.indexOf, Decl(1.0lib-noErrors.ts, 293, 41)) >searchString : Symbol(searchString, Decl(1.0lib-noErrors.ts, 300, 12)) >position : Symbol(position, Decl(1.0lib-noErrors.ts, 300, 33)) +======= +>indexOf : Symbol(indexOf, Decl(1.0lib-noErrors.ts, 290, 41)) +>searchString : Symbol(searchString, Decl(1.0lib-noErrors.ts, 297, 12)) +>position : Symbol(position, Decl(1.0lib-noErrors.ts, 297, 33)) +>>>>>>> theirs /** * Returns the last occurrence of a substring in the string. @@ -453,34 +566,56 @@ interface String { * @param position The index at which to begin searching. If omitted, the search begins at the end of the string. */ lastIndexOf(searchString: string, position?: number): number; +<<<<<<< ours >lastIndexOf : Symbol(String.lastIndexOf, Decl(1.0lib-noErrors.ts, 300, 61)) >searchString : Symbol(searchString, Decl(1.0lib-noErrors.ts, 307, 16)) >position : Symbol(position, Decl(1.0lib-noErrors.ts, 307, 37)) +======= +>lastIndexOf : Symbol(lastIndexOf, Decl(1.0lib-noErrors.ts, 297, 61)) +>searchString : Symbol(searchString, Decl(1.0lib-noErrors.ts, 304, 16)) +>position : Symbol(position, Decl(1.0lib-noErrors.ts, 304, 37)) +>>>>>>> theirs /** * Determines whether two strings are equivalent in the current locale. * @param that String to compare to target string */ localeCompare(that: string): number; +<<<<<<< ours >localeCompare : Symbol(String.localeCompare, Decl(1.0lib-noErrors.ts, 307, 65)) >that : Symbol(that, Decl(1.0lib-noErrors.ts, 313, 18)) +======= +>localeCompare : Symbol(localeCompare, Decl(1.0lib-noErrors.ts, 304, 65)) +>that : Symbol(that, Decl(1.0lib-noErrors.ts, 310, 18)) +>>>>>>> theirs /** * Matches a string with a regular expression, and returns an array containing the results of that search. * @param regexp A variable name or string literal containing the regular expression pattern and flags. */ match(regexp: string): string[]; +<<<<<<< ours >match : Symbol(String.match, Decl(1.0lib-noErrors.ts, 313, 40), Decl(1.0lib-noErrors.ts, 319, 36)) >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 319, 10)) +======= +>match : Symbol(match, Decl(1.0lib-noErrors.ts, 310, 40), Decl(1.0lib-noErrors.ts, 316, 36)) +>regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 316, 10)) +>>>>>>> theirs /** * Matches a string with a regular expression, and returns an array containing the results of that search. * @param regexp A regular expression object that contains the regular expression pattern and applicable flags. */ match(regexp: RegExp): string[]; +<<<<<<< ours >match : Symbol(String.match, Decl(1.0lib-noErrors.ts, 313, 40), Decl(1.0lib-noErrors.ts, 319, 36)) >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 325, 10)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) +======= +>match : Symbol(match, Decl(1.0lib-noErrors.ts, 310, 40), Decl(1.0lib-noErrors.ts, 316, 36)) +>regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 322, 10)) +>RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) +>>>>>>> theirs /** * Replaces text in a string, using a regular expression or search string. @@ -488,9 +623,15 @@ interface String { * @param replaceValue A String object or string literal containing the text to replace for every successful match of rgExp in stringObj. */ replace(searchValue: string, replaceValue: string): string; +<<<<<<< ours >replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63)) >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 332, 12)) >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 332, 32)) +======= +>replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) +>searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 329, 12)) +>replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 329, 32)) +>>>>>>> theirs /** * Replaces text in a string, using a regular expression or search string. @@ -498,11 +639,19 @@ interface String { * @param replaceValue A function that returns the replacement text. */ replace(searchValue: string, replaceValue: (substring: string, ...args: any[]) => string): string; +<<<<<<< ours >replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63)) >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 339, 12)) >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 339, 32)) >substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 339, 48)) >args : Symbol(args, Decl(1.0lib-noErrors.ts, 339, 66)) +======= +>replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) +>searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 336, 12)) +>replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 336, 32)) +>substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 336, 48)) +>args : Symbol(args, Decl(1.0lib-noErrors.ts, 336, 66)) +>>>>>>> theirs /** * Replaces text in a string, using a regular expression or search string. @@ -510,10 +659,17 @@ interface String { * @param replaceValue A String object or string literal containing the text to replace for every successful match of rgExp in stringObj. */ replace(searchValue: RegExp, replaceValue: string): string; +<<<<<<< ours >replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63)) >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 346, 12)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 346, 32)) +======= +>replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) +>searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 343, 12)) +>RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) +>replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 343, 32)) +>>>>>>> theirs /** * Replaces text in a string, using a regular expression or search string. @@ -521,29 +677,49 @@ interface String { * @param replaceValue A function that returns the replacement text. */ replace(searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string; +<<<<<<< ours >replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63)) >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 353, 12)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 353, 32)) >substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 353, 48)) >args : Symbol(args, Decl(1.0lib-noErrors.ts, 353, 66)) +======= +>replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) +>searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 350, 12)) +>RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) +>replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 350, 32)) +>substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 350, 48)) +>args : Symbol(args, Decl(1.0lib-noErrors.ts, 350, 66)) +>>>>>>> theirs /** * Finds the first substring match in a regular expression search. * @param regexp The regular expression pattern and applicable flags. */ search(regexp: string): number; +<<<<<<< ours >search : Symbol(String.search, Decl(1.0lib-noErrors.ts, 353, 102), Decl(1.0lib-noErrors.ts, 359, 35)) >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 359, 11)) +======= +>search : Symbol(search, Decl(1.0lib-noErrors.ts, 350, 102), Decl(1.0lib-noErrors.ts, 356, 35)) +>regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 356, 11)) +>>>>>>> theirs /** * Finds the first substring match in a regular expression search. * @param regexp The regular expression pattern and applicable flags. */ search(regexp: RegExp): number; +<<<<<<< ours >search : Symbol(String.search, Decl(1.0lib-noErrors.ts, 353, 102), Decl(1.0lib-noErrors.ts, 359, 35)) >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 365, 11)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) +======= +>search : Symbol(search, Decl(1.0lib-noErrors.ts, 350, 102), Decl(1.0lib-noErrors.ts, 356, 35)) +>regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 362, 11)) +>RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) +>>>>>>> theirs /** * Returns a section of a string. @@ -552,9 +728,15 @@ interface String { * If this value is not specified, the substring continues to the end of stringObj. */ slice(start?: number, end?: number): string; +<<<<<<< ours >slice : Symbol(String.slice, Decl(1.0lib-noErrors.ts, 365, 35)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 373, 10)) >end : Symbol(end, Decl(1.0lib-noErrors.ts, 373, 25)) +======= +>slice : Symbol(slice, Decl(1.0lib-noErrors.ts, 362, 35)) +>start : Symbol(start, Decl(1.0lib-noErrors.ts, 370, 10)) +>end : Symbol(end, Decl(1.0lib-noErrors.ts, 370, 25)) +>>>>>>> theirs /** * Split a string into substrings using the specified separator and return them as an array. @@ -562,9 +744,15 @@ interface String { * @param limit A value used to limit the number of elements returned in the array. */ split(separator: string, limit?: number): string[]; +<<<<<<< ours >split : Symbol(String.split, Decl(1.0lib-noErrors.ts, 373, 48), Decl(1.0lib-noErrors.ts, 380, 55)) >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 380, 10)) >limit : Symbol(limit, Decl(1.0lib-noErrors.ts, 380, 28)) +======= +>split : Symbol(split, Decl(1.0lib-noErrors.ts, 370, 48), Decl(1.0lib-noErrors.ts, 377, 55)) +>separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 377, 10)) +>limit : Symbol(limit, Decl(1.0lib-noErrors.ts, 377, 28)) +>>>>>>> theirs /** * Split a string into substrings using the specified separator and return them as an array. @@ -572,10 +760,17 @@ interface String { * @param limit A value used to limit the number of elements returned in the array. */ split(separator: RegExp, limit?: number): string[]; +<<<<<<< ours >split : Symbol(String.split, Decl(1.0lib-noErrors.ts, 373, 48), Decl(1.0lib-noErrors.ts, 380, 55)) >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 387, 10)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) >limit : Symbol(limit, Decl(1.0lib-noErrors.ts, 387, 28)) +======= +>split : Symbol(split, Decl(1.0lib-noErrors.ts, 370, 48), Decl(1.0lib-noErrors.ts, 377, 55)) +>separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 384, 10)) +>RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) +>limit : Symbol(limit, Decl(1.0lib-noErrors.ts, 384, 28)) +>>>>>>> theirs /** * Returns the substring at the specified location within a String object. @@ -584,6 +779,7 @@ interface String { * If end is omitted, the characters from start through the end of the original string are returned. */ substring(start: number, end?: number): string; +<<<<<<< ours >substring : Symbol(String.substring, Decl(1.0lib-noErrors.ts, 387, 55)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 395, 14)) >end : Symbol(end, Decl(1.0lib-noErrors.ts, 395, 28)) @@ -611,6 +807,35 @@ interface String { /** Returns the length of a String object. */ length: number; >length : Symbol(String.length, Decl(1.0lib-noErrors.ts, 410, 19)) +======= +>substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 384, 55)) +>start : Symbol(start, Decl(1.0lib-noErrors.ts, 392, 14)) +>end : Symbol(end, Decl(1.0lib-noErrors.ts, 392, 28)) + + /** Converts all the alphabetic characters in a string to lowercase. */ + toLowerCase(): string; +>toLowerCase : Symbol(toLowerCase, Decl(1.0lib-noErrors.ts, 392, 51)) + + /** Converts all alphabetic characters to lowercase, taking into account the host environment's current locale. */ + toLocaleLowerCase(): string; +>toLocaleLowerCase : Symbol(toLocaleLowerCase, Decl(1.0lib-noErrors.ts, 395, 26)) + + /** Converts all the alphabetic characters in a string to uppercase. */ + toUpperCase(): string; +>toUpperCase : Symbol(toUpperCase, Decl(1.0lib-noErrors.ts, 398, 32)) + + /** Returns a string where all alphabetic characters have been converted to uppercase, taking into account the host environment's current locale. */ + toLocaleUpperCase(): string; +>toLocaleUpperCase : Symbol(toLocaleUpperCase, Decl(1.0lib-noErrors.ts, 401, 26)) + + /** Removes the leading and trailing white space and line terminator characters from a string. */ + trim(): string; +>trim : Symbol(trim, Decl(1.0lib-noErrors.ts, 404, 32)) + + /** Returns the length of a String object. */ + length: number; +>length : Symbol(length, Decl(1.0lib-noErrors.ts, 407, 19)) +>>>>>>> theirs // IE extensions /** @@ -619,140 +844,167 @@ interface String { * @param length The number of characters to include in the returned substring. */ substr(from: number, length?: number): string; +<<<<<<< ours >substr : Symbol(String.substr, Decl(1.0lib-noErrors.ts, 413, 19)) >from : Symbol(from, Decl(1.0lib-noErrors.ts, 421, 11)) >length : Symbol(length, Decl(1.0lib-noErrors.ts, 421, 24)) +======= +>substr : Symbol(substr, Decl(1.0lib-noErrors.ts, 410, 19)) +>from : Symbol(from, Decl(1.0lib-noErrors.ts, 418, 11)) +>length : Symbol(length, Decl(1.0lib-noErrors.ts, 418, 24)) +>>>>>>> theirs [index: number]: string; ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 423, 5)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 420, 5)) } /** * Allows manipulation and formatting of text strings and determination and location of substrings within strings. */ declare var String: { ->String : Symbol(String, Decl(1.0lib-noErrors.ts, 271, 1), Decl(1.0lib-noErrors.ts, 429, 11)) +>String : Symbol(String, Decl(1.0lib-noErrors.ts, 268, 1), Decl(1.0lib-noErrors.ts, 426, 11)) new (value?: any): String; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 430, 9)) ->String : Symbol(String, Decl(1.0lib-noErrors.ts, 271, 1), Decl(1.0lib-noErrors.ts, 429, 11)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 427, 9)) +>String : Symbol(String, Decl(1.0lib-noErrors.ts, 268, 1), Decl(1.0lib-noErrors.ts, 426, 11)) (value?: any): string; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 431, 5)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 428, 5)) prototype: String; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 431, 26)) ->String : Symbol(String, Decl(1.0lib-noErrors.ts, 271, 1), Decl(1.0lib-noErrors.ts, 429, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 428, 26)) +>String : Symbol(String, Decl(1.0lib-noErrors.ts, 268, 1), Decl(1.0lib-noErrors.ts, 426, 11)) fromCharCode(...codes: number[]): string; ->fromCharCode : Symbol(fromCharCode, Decl(1.0lib-noErrors.ts, 432, 22)) ->codes : Symbol(codes, Decl(1.0lib-noErrors.ts, 433, 17)) +>fromCharCode : Symbol(fromCharCode, Decl(1.0lib-noErrors.ts, 429, 22)) +>codes : Symbol(codes, Decl(1.0lib-noErrors.ts, 430, 17)) } interface Boolean { ->Boolean : Symbol(Boolean, Decl(1.0lib-noErrors.ts, 434, 1), Decl(1.0lib-noErrors.ts, 438, 11)) +>Boolean : Symbol(Boolean, Decl(1.0lib-noErrors.ts, 431, 1), Decl(1.0lib-noErrors.ts, 435, 11)) } declare var Boolean: { ->Boolean : Symbol(Boolean, Decl(1.0lib-noErrors.ts, 434, 1), Decl(1.0lib-noErrors.ts, 438, 11)) +>Boolean : Symbol(Boolean, Decl(1.0lib-noErrors.ts, 431, 1), Decl(1.0lib-noErrors.ts, 435, 11)) new (value?: any): Boolean; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 439, 9)) ->Boolean : Symbol(Boolean, Decl(1.0lib-noErrors.ts, 434, 1), Decl(1.0lib-noErrors.ts, 438, 11)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 436, 9)) +>Boolean : Symbol(Boolean, Decl(1.0lib-noErrors.ts, 431, 1), Decl(1.0lib-noErrors.ts, 435, 11)) (value?: any): boolean; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 440, 5)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 437, 5)) prototype: Boolean; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 440, 27)) ->Boolean : Symbol(Boolean, Decl(1.0lib-noErrors.ts, 434, 1), Decl(1.0lib-noErrors.ts, 438, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 437, 27)) +>Boolean : Symbol(Boolean, Decl(1.0lib-noErrors.ts, 431, 1), Decl(1.0lib-noErrors.ts, 435, 11)) } interface Number { ->Number : Symbol(Number, Decl(1.0lib-noErrors.ts, 442, 1), Decl(1.0lib-noErrors.ts, 471, 11)) +>Number : Symbol(Number, Decl(1.0lib-noErrors.ts, 439, 1), Decl(1.0lib-noErrors.ts, 468, 11)) /** * Returns a string representation of an object. * @param radix Specifies a radix for converting numeric values to strings. This value is only used for numbers. */ toString(radix?: number): string; +<<<<<<< ours >toString : Symbol(Number.toString, Decl(1.0lib-noErrors.ts, 444, 18)) >radix : Symbol(radix, Decl(1.0lib-noErrors.ts, 449, 13)) +======= +>toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 441, 18)) +>radix : Symbol(radix, Decl(1.0lib-noErrors.ts, 446, 13)) +>>>>>>> theirs /** * Returns a string representing a number in fixed-point notation. * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive. */ toFixed(fractionDigits?: number): string; +<<<<<<< ours >toFixed : Symbol(Number.toFixed, Decl(1.0lib-noErrors.ts, 449, 37)) >fractionDigits : Symbol(fractionDigits, Decl(1.0lib-noErrors.ts, 455, 12)) +======= +>toFixed : Symbol(toFixed, Decl(1.0lib-noErrors.ts, 446, 37)) +>fractionDigits : Symbol(fractionDigits, Decl(1.0lib-noErrors.ts, 452, 12)) +>>>>>>> theirs /** * Returns a string containing a number represented in exponential notation. * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive. */ toExponential(fractionDigits?: number): string; +<<<<<<< ours >toExponential : Symbol(Number.toExponential, Decl(1.0lib-noErrors.ts, 455, 45)) >fractionDigits : Symbol(fractionDigits, Decl(1.0lib-noErrors.ts, 461, 18)) +======= +>toExponential : Symbol(toExponential, Decl(1.0lib-noErrors.ts, 452, 45)) +>fractionDigits : Symbol(fractionDigits, Decl(1.0lib-noErrors.ts, 458, 18)) +>>>>>>> theirs /** * Returns a string containing a number represented either in exponential or fixed-point notation with a specified number of digits. * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive. */ toPrecision(precision?: number): string; +<<<<<<< ours >toPrecision : Symbol(Number.toPrecision, Decl(1.0lib-noErrors.ts, 461, 51)) >precision : Symbol(precision, Decl(1.0lib-noErrors.ts, 467, 16)) +======= +>toPrecision : Symbol(toPrecision, Decl(1.0lib-noErrors.ts, 458, 51)) +>precision : Symbol(precision, Decl(1.0lib-noErrors.ts, 464, 16)) +>>>>>>> theirs } /** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */ declare var Number: { ->Number : Symbol(Number, Decl(1.0lib-noErrors.ts, 442, 1), Decl(1.0lib-noErrors.ts, 471, 11)) +>Number : Symbol(Number, Decl(1.0lib-noErrors.ts, 439, 1), Decl(1.0lib-noErrors.ts, 468, 11)) new (value?: any): Number; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 472, 9)) ->Number : Symbol(Number, Decl(1.0lib-noErrors.ts, 442, 1), Decl(1.0lib-noErrors.ts, 471, 11)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 469, 9)) +>Number : Symbol(Number, Decl(1.0lib-noErrors.ts, 439, 1), Decl(1.0lib-noErrors.ts, 468, 11)) (value?: any): number; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 473, 5)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 470, 5)) prototype: Number; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 473, 26)) ->Number : Symbol(Number, Decl(1.0lib-noErrors.ts, 442, 1), Decl(1.0lib-noErrors.ts, 471, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 470, 26)) +>Number : Symbol(Number, Decl(1.0lib-noErrors.ts, 439, 1), Decl(1.0lib-noErrors.ts, 468, 11)) /** The largest number that can be represented in JavaScript. Equal to approximately 1.79E+308. */ MAX_VALUE: number; ->MAX_VALUE : Symbol(MAX_VALUE, Decl(1.0lib-noErrors.ts, 474, 22)) +>MAX_VALUE : Symbol(MAX_VALUE, Decl(1.0lib-noErrors.ts, 471, 22)) /** The closest number to zero that can be represented in JavaScript. Equal to approximately 5.00E-324. */ MIN_VALUE: number; ->MIN_VALUE : Symbol(MIN_VALUE, Decl(1.0lib-noErrors.ts, 477, 22)) +>MIN_VALUE : Symbol(MIN_VALUE, Decl(1.0lib-noErrors.ts, 474, 22)) /** * A value that is not a number. * In equality comparisons, NaN does not equal any value, including itself. To test whether a value is equivalent to NaN, use the isNaN function. */ NaN: number; ->NaN : Symbol(NaN, Decl(1.0lib-noErrors.ts, 480, 22)) +>NaN : Symbol(NaN, Decl(1.0lib-noErrors.ts, 477, 22)) /** * A value that is less than the largest negative number that can be represented in JavaScript. * JavaScript displays NEGATIVE_INFINITY values as -infinity. */ NEGATIVE_INFINITY: number; ->NEGATIVE_INFINITY : Symbol(NEGATIVE_INFINITY, Decl(1.0lib-noErrors.ts, 486, 16)) +>NEGATIVE_INFINITY : Symbol(NEGATIVE_INFINITY, Decl(1.0lib-noErrors.ts, 483, 16)) /** * A value greater than the largest number that can be represented in JavaScript. * JavaScript displays POSITIVE_INFINITY values as infinity. */ POSITIVE_INFINITY: number; ->POSITIVE_INFINITY : Symbol(POSITIVE_INFINITY, Decl(1.0lib-noErrors.ts, 492, 30)) +>POSITIVE_INFINITY : Symbol(POSITIVE_INFINITY, Decl(1.0lib-noErrors.ts, 489, 30)) } interface Math { ->Math : Symbol(Math, Decl(1.0lib-noErrors.ts, 499, 1), Decl(1.0lib-noErrors.ts, 610, 11)) +>Math : Symbol(Math, Decl(1.0lib-noErrors.ts, 496, 1), Decl(1.0lib-noErrors.ts, 607, 11)) /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */ E: number; +<<<<<<< ours >E : Symbol(Math.E, Decl(1.0lib-noErrors.ts, 501, 16)) /** The natural logarithm of 10. */ @@ -782,6 +1034,37 @@ interface Math { /** The square root of 2. */ SQRT2: number; >SQRT2 : Symbol(Math.SQRT2, Decl(1.0lib-noErrors.ts, 515, 20)) +======= +>E : Symbol(E, Decl(1.0lib-noErrors.ts, 498, 16)) + + /** The natural logarithm of 10. */ + LN10: number; +>LN10 : Symbol(LN10, Decl(1.0lib-noErrors.ts, 500, 14)) + + /** The natural logarithm of 2. */ + LN2: number; +>LN2 : Symbol(LN2, Decl(1.0lib-noErrors.ts, 502, 17)) + + /** The base-2 logarithm of e. */ + LOG2E: number; +>LOG2E : Symbol(LOG2E, Decl(1.0lib-noErrors.ts, 504, 16)) + + /** The base-10 logarithm of e. */ + LOG10E: number; +>LOG10E : Symbol(LOG10E, Decl(1.0lib-noErrors.ts, 506, 18)) + + /** Pi. This is the ratio of the circumference of a circle to its diameter. */ + PI: number; +>PI : Symbol(PI, Decl(1.0lib-noErrors.ts, 508, 19)) + + /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */ + SQRT1_2: number; +>SQRT1_2 : Symbol(SQRT1_2, Decl(1.0lib-noErrors.ts, 510, 15)) + + /** The square root of 2. */ + SQRT2: number; +>SQRT2 : Symbol(SQRT2, Decl(1.0lib-noErrors.ts, 512, 20)) +>>>>>>> theirs /** * Returns the absolute value of a number (the value without regard to whether it is positive or negative). @@ -789,32 +1072,52 @@ interface Math { * @param x A numeric expression for which the absolute value is needed. */ abs(x: number): number; +<<<<<<< ours >abs : Symbol(Math.abs, Decl(1.0lib-noErrors.ts, 517, 18)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 523, 8)) +======= +>abs : Symbol(abs, Decl(1.0lib-noErrors.ts, 514, 18)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 520, 8)) +>>>>>>> theirs /** * Returns the arc cosine (or inverse cosine) of a number. * @param x A numeric expression. */ acos(x: number): number; +<<<<<<< ours >acos : Symbol(Math.acos, Decl(1.0lib-noErrors.ts, 523, 27)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 528, 9)) +======= +>acos : Symbol(acos, Decl(1.0lib-noErrors.ts, 520, 27)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 525, 9)) +>>>>>>> theirs /** * Returns the arcsine of a number. * @param x A numeric expression. */ asin(x: number): number; +<<<<<<< ours >asin : Symbol(Math.asin, Decl(1.0lib-noErrors.ts, 528, 28)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 533, 9)) +======= +>asin : Symbol(asin, Decl(1.0lib-noErrors.ts, 525, 28)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 530, 9)) +>>>>>>> theirs /** * Returns the arctangent of a number. * @param x A numeric expression for which the arctangent is needed. */ atan(x: number): number; +<<<<<<< ours >atan : Symbol(Math.atan, Decl(1.0lib-noErrors.ts, 533, 28)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 538, 9)) +======= +>atan : Symbol(atan, Decl(1.0lib-noErrors.ts, 530, 28)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 535, 9)) +>>>>>>> theirs /** * Returns the angle (in radians) from the X axis to a point (y,x). @@ -822,65 +1125,106 @@ interface Math { * @param x A numeric expression representing the cartesian x-coordinate. */ atan2(y: number, x: number): number; +<<<<<<< ours >atan2 : Symbol(Math.atan2, Decl(1.0lib-noErrors.ts, 538, 28)) >y : Symbol(y, Decl(1.0lib-noErrors.ts, 544, 10)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 544, 20)) +======= +>atan2 : Symbol(atan2, Decl(1.0lib-noErrors.ts, 535, 28)) +>y : Symbol(y, Decl(1.0lib-noErrors.ts, 541, 10)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 541, 20)) +>>>>>>> theirs /** * Returns the smallest number greater than or equal to its numeric argument. * @param x A numeric expression. */ ceil(x: number): number; +<<<<<<< ours >ceil : Symbol(Math.ceil, Decl(1.0lib-noErrors.ts, 544, 40)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 549, 9)) +======= +>ceil : Symbol(ceil, Decl(1.0lib-noErrors.ts, 541, 40)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 546, 9)) +>>>>>>> theirs /** * Returns the cosine of a number. * @param x A numeric expression that contains an angle measured in radians. */ cos(x: number): number; +<<<<<<< ours >cos : Symbol(Math.cos, Decl(1.0lib-noErrors.ts, 549, 28)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 554, 8)) +======= +>cos : Symbol(cos, Decl(1.0lib-noErrors.ts, 546, 28)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 551, 8)) +>>>>>>> theirs /** * Returns e (the base of natural logarithms) raised to a power. * @param x A numeric expression representing the power of e. */ exp(x: number): number; +<<<<<<< ours >exp : Symbol(Math.exp, Decl(1.0lib-noErrors.ts, 554, 27)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 559, 8)) +======= +>exp : Symbol(exp, Decl(1.0lib-noErrors.ts, 551, 27)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 556, 8)) +>>>>>>> theirs /** * Returns the greatest number less than or equal to its numeric argument. * @param x A numeric expression. */ floor(x: number): number; +<<<<<<< ours >floor : Symbol(Math.floor, Decl(1.0lib-noErrors.ts, 559, 27)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 564, 10)) +======= +>floor : Symbol(floor, Decl(1.0lib-noErrors.ts, 556, 27)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 561, 10)) +>>>>>>> theirs /** * Returns the natural logarithm (base e) of a number. * @param x A numeric expression. */ log(x: number): number; +<<<<<<< ours >log : Symbol(Math.log, Decl(1.0lib-noErrors.ts, 564, 29)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 569, 8)) +======= +>log : Symbol(log, Decl(1.0lib-noErrors.ts, 561, 29)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 566, 8)) +>>>>>>> theirs /** * Returns the larger of a set of supplied numeric expressions. * @param values Numeric expressions to be evaluated. */ max(...values: number[]): number; +<<<<<<< ours >max : Symbol(Math.max, Decl(1.0lib-noErrors.ts, 569, 27)) >values : Symbol(values, Decl(1.0lib-noErrors.ts, 574, 8)) +======= +>max : Symbol(max, Decl(1.0lib-noErrors.ts, 566, 27)) +>values : Symbol(values, Decl(1.0lib-noErrors.ts, 571, 8)) +>>>>>>> theirs /** * Returns the smaller of a set of supplied numeric expressions. * @param values Numeric expressions to be evaluated. */ min(...values: number[]): number; +<<<<<<< ours >min : Symbol(Math.min, Decl(1.0lib-noErrors.ts, 574, 37)) >values : Symbol(values, Decl(1.0lib-noErrors.ts, 579, 8)) +======= +>min : Symbol(min, Decl(1.0lib-noErrors.ts, 571, 37)) +>values : Symbol(values, Decl(1.0lib-noErrors.ts, 576, 8)) +>>>>>>> theirs /** * Returns the value of a base expression taken to a specified power. @@ -888,6 +1232,7 @@ interface Math { * @param y The exponent value of the expression. */ pow(x: number, y: number): number; +<<<<<<< ours >pow : Symbol(Math.pow, Decl(1.0lib-noErrors.ts, 579, 37)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 585, 8)) >y : Symbol(y, Decl(1.0lib-noErrors.ts, 585, 18)) @@ -895,50 +1240,80 @@ interface Math { /** Returns a pseudorandom number between 0 and 1. */ random(): number; >random : Symbol(Math.random, Decl(1.0lib-noErrors.ts, 585, 38)) +======= +>pow : Symbol(pow, Decl(1.0lib-noErrors.ts, 576, 37)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 582, 8)) +>y : Symbol(y, Decl(1.0lib-noErrors.ts, 582, 18)) + + /** Returns a pseudorandom number between 0 and 1. */ + random(): number; +>random : Symbol(random, Decl(1.0lib-noErrors.ts, 582, 38)) +>>>>>>> theirs /** * Returns a supplied numeric expression rounded to the nearest number. * @param x The value to be rounded to the nearest number. */ round(x: number): number; +<<<<<<< ours >round : Symbol(Math.round, Decl(1.0lib-noErrors.ts, 587, 21)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 592, 10)) +======= +>round : Symbol(round, Decl(1.0lib-noErrors.ts, 584, 21)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 589, 10)) +>>>>>>> theirs /** * Returns the sine of a number. * @param x A numeric expression that contains an angle measured in radians. */ sin(x: number): number; +<<<<<<< ours >sin : Symbol(Math.sin, Decl(1.0lib-noErrors.ts, 592, 29)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 597, 8)) +======= +>sin : Symbol(sin, Decl(1.0lib-noErrors.ts, 589, 29)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 594, 8)) +>>>>>>> theirs /** * Returns the square root of a number. * @param x A numeric expression. */ sqrt(x: number): number; +<<<<<<< ours >sqrt : Symbol(Math.sqrt, Decl(1.0lib-noErrors.ts, 597, 27)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 602, 9)) +======= +>sqrt : Symbol(sqrt, Decl(1.0lib-noErrors.ts, 594, 27)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 599, 9)) +>>>>>>> theirs /** * Returns the tangent of a number. * @param x A numeric expression that contains an angle measured in radians. */ tan(x: number): number; +<<<<<<< ours >tan : Symbol(Math.tan, Decl(1.0lib-noErrors.ts, 602, 28)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 607, 8)) +======= +>tan : Symbol(tan, Decl(1.0lib-noErrors.ts, 599, 28)) +>x : Symbol(x, Decl(1.0lib-noErrors.ts, 604, 8)) +>>>>>>> theirs } /** An intrinsic object that provides basic mathematics functionality and constants. */ declare var Math: Math; ->Math : Symbol(Math, Decl(1.0lib-noErrors.ts, 499, 1), Decl(1.0lib-noErrors.ts, 610, 11)) ->Math : Symbol(Math, Decl(1.0lib-noErrors.ts, 499, 1), Decl(1.0lib-noErrors.ts, 610, 11)) +>Math : Symbol(Math, Decl(1.0lib-noErrors.ts, 496, 1), Decl(1.0lib-noErrors.ts, 607, 11)) +>Math : Symbol(Math, Decl(1.0lib-noErrors.ts, 496, 1), Decl(1.0lib-noErrors.ts, 607, 11)) /** Enables basic storage and retrieval of dates and times. */ interface Date { ->Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 610, 23), Decl(1.0lib-noErrors.ts, 766, 11)) +>Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 607, 23), Decl(1.0lib-noErrors.ts, 763, 11)) /** Returns a string representation of a date. The format of the string depends on the locale. */ toString(): string; +<<<<<<< ours >toString : Symbol(Date.toString, Decl(1.0lib-noErrors.ts, 613, 16)) /** Returns a date as a string value. */ @@ -1036,30 +1411,144 @@ interface Date { /** Gets the difference in minutes between the time on the local computer and Universal Coordinated Time (UTC). */ getTimezoneOffset(): number; >getTimezoneOffset : Symbol(Date.getTimezoneOffset, Decl(1.0lib-noErrors.ts, 661, 33)) +======= +>toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 610, 16)) + + /** Returns a date as a string value. */ + toDateString(): string; +>toDateString : Symbol(toDateString, Decl(1.0lib-noErrors.ts, 612, 23)) + + /** Returns a time as a string value. */ + toTimeString(): string; +>toTimeString : Symbol(toTimeString, Decl(1.0lib-noErrors.ts, 614, 27)) + + /** Returns a value as a string value appropriate to the host environment's current locale. */ + toLocaleString(): string; +>toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 616, 27)) + + /** Returns a date as a string value appropriate to the host environment's current locale. */ + toLocaleDateString(): string; +>toLocaleDateString : Symbol(toLocaleDateString, Decl(1.0lib-noErrors.ts, 618, 29)) + + /** Returns a time as a string value appropriate to the host environment's current locale. */ + toLocaleTimeString(): string; +>toLocaleTimeString : Symbol(toLocaleTimeString, Decl(1.0lib-noErrors.ts, 620, 33)) + + /** Returns the stored time value in milliseconds since midnight, January 1, 1970 UTC. */ + valueOf(): number; +>valueOf : Symbol(valueOf, Decl(1.0lib-noErrors.ts, 622, 33)) + + /** Gets the time value in milliseconds. */ + getTime(): number; +>getTime : Symbol(getTime, Decl(1.0lib-noErrors.ts, 624, 22)) + + /** Gets the year, using local time. */ + getFullYear(): number; +>getFullYear : Symbol(getFullYear, Decl(1.0lib-noErrors.ts, 626, 22)) + + /** Gets the year using Universal Coordinated Time (UTC). */ + getUTCFullYear(): number; +>getUTCFullYear : Symbol(getUTCFullYear, Decl(1.0lib-noErrors.ts, 628, 26)) + + /** Gets the month, using local time. */ + getMonth(): number; +>getMonth : Symbol(getMonth, Decl(1.0lib-noErrors.ts, 630, 29)) + + /** Gets the month of a Date object using Universal Coordinated Time (UTC). */ + getUTCMonth(): number; +>getUTCMonth : Symbol(getUTCMonth, Decl(1.0lib-noErrors.ts, 632, 23)) + + /** Gets the day-of-the-month, using local time. */ + getDate(): number; +>getDate : Symbol(getDate, Decl(1.0lib-noErrors.ts, 634, 26)) + + /** Gets the day-of-the-month, using Universal Coordinated Time (UTC). */ + getUTCDate(): number; +>getUTCDate : Symbol(getUTCDate, Decl(1.0lib-noErrors.ts, 636, 22)) + + /** Gets the day of the week, using local time. */ + getDay(): number; +>getDay : Symbol(getDay, Decl(1.0lib-noErrors.ts, 638, 25)) + + /** Gets the day of the week using Universal Coordinated Time (UTC). */ + getUTCDay(): number; +>getUTCDay : Symbol(getUTCDay, Decl(1.0lib-noErrors.ts, 640, 21)) + + /** Gets the hours in a date, using local time. */ + getHours(): number; +>getHours : Symbol(getHours, Decl(1.0lib-noErrors.ts, 642, 24)) + + /** Gets the hours value in a Date object using Universal Coordinated Time (UTC). */ + getUTCHours(): number; +>getUTCHours : Symbol(getUTCHours, Decl(1.0lib-noErrors.ts, 644, 23)) + + /** Gets the minutes of a Date object, using local time. */ + getMinutes(): number; +>getMinutes : Symbol(getMinutes, Decl(1.0lib-noErrors.ts, 646, 26)) + + /** Gets the minutes of a Date object using Universal Coordinated Time (UTC). */ + getUTCMinutes(): number; +>getUTCMinutes : Symbol(getUTCMinutes, Decl(1.0lib-noErrors.ts, 648, 25)) + + /** Gets the seconds of a Date object, using local time. */ + getSeconds(): number; +>getSeconds : Symbol(getSeconds, Decl(1.0lib-noErrors.ts, 650, 28)) + + /** Gets the seconds of a Date object using Universal Coordinated Time (UTC). */ + getUTCSeconds(): number; +>getUTCSeconds : Symbol(getUTCSeconds, Decl(1.0lib-noErrors.ts, 652, 25)) + + /** Gets the milliseconds of a Date, using local time. */ + getMilliseconds(): number; +>getMilliseconds : Symbol(getMilliseconds, Decl(1.0lib-noErrors.ts, 654, 28)) + + /** Gets the milliseconds of a Date object using Universal Coordinated Time (UTC). */ + getUTCMilliseconds(): number; +>getUTCMilliseconds : Symbol(getUTCMilliseconds, Decl(1.0lib-noErrors.ts, 656, 30)) + + /** Gets the difference in minutes between the time on the local computer and Universal Coordinated Time (UTC). */ + getTimezoneOffset(): number; +>getTimezoneOffset : Symbol(getTimezoneOffset, Decl(1.0lib-noErrors.ts, 658, 33)) +>>>>>>> theirs /** * Sets the date and time value in the Date object. * @param time A numeric value representing the number of elapsed milliseconds since midnight, January 1, 1970 GMT. */ setTime(time: number): number; +<<<<<<< ours >setTime : Symbol(Date.setTime, Decl(1.0lib-noErrors.ts, 663, 32)) >time : Symbol(time, Decl(1.0lib-noErrors.ts, 668, 12)) +======= +>setTime : Symbol(setTime, Decl(1.0lib-noErrors.ts, 660, 32)) +>time : Symbol(time, Decl(1.0lib-noErrors.ts, 665, 12)) +>>>>>>> theirs /** * Sets the milliseconds value in the Date object using local time. * @param ms A numeric value equal to the millisecond value. */ setMilliseconds(ms: number): number; +<<<<<<< ours >setMilliseconds : Symbol(Date.setMilliseconds, Decl(1.0lib-noErrors.ts, 668, 34)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 673, 20)) +======= +>setMilliseconds : Symbol(setMilliseconds, Decl(1.0lib-noErrors.ts, 665, 34)) +>ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 670, 20)) +>>>>>>> theirs /** * Sets the milliseconds value in the Date object using Universal Coordinated Time (UTC). * @param ms A numeric value equal to the millisecond value. */ setUTCMilliseconds(ms: number): number; +<<<<<<< ours >setUTCMilliseconds : Symbol(Date.setUTCMilliseconds, Decl(1.0lib-noErrors.ts, 673, 40)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 678, 23)) +======= +>setUTCMilliseconds : Symbol(setUTCMilliseconds, Decl(1.0lib-noErrors.ts, 670, 40)) +>ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 675, 23)) +>>>>>>> theirs /** * Sets the seconds value in the Date object using local time. @@ -1067,9 +1556,15 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setSeconds(sec: number, ms?: number): number; +<<<<<<< ours >setSeconds : Symbol(Date.setSeconds, Decl(1.0lib-noErrors.ts, 678, 43)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 685, 15)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 685, 27)) +======= +>setSeconds : Symbol(setSeconds, Decl(1.0lib-noErrors.ts, 675, 43)) +>sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 682, 15)) +>ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 682, 27)) +>>>>>>> theirs /** * Sets the seconds value in the Date object using Universal Coordinated Time (UTC). @@ -1077,9 +1572,15 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setUTCSeconds(sec: number, ms?: number): number; +<<<<<<< ours >setUTCSeconds : Symbol(Date.setUTCSeconds, Decl(1.0lib-noErrors.ts, 685, 49)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 691, 18)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 691, 30)) +======= +>setUTCSeconds : Symbol(setUTCSeconds, Decl(1.0lib-noErrors.ts, 682, 49)) +>sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 688, 18)) +>ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 688, 30)) +>>>>>>> theirs /** * Sets the minutes value in the Date object using local time. @@ -1088,10 +1589,17 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setMinutes(min: number, sec?: number, ms?: number): number; +<<<<<<< ours >setMinutes : Symbol(Date.setMinutes, Decl(1.0lib-noErrors.ts, 691, 52)) >min : Symbol(min, Decl(1.0lib-noErrors.ts, 698, 15)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 698, 27)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 698, 41)) +======= +>setMinutes : Symbol(setMinutes, Decl(1.0lib-noErrors.ts, 688, 52)) +>min : Symbol(min, Decl(1.0lib-noErrors.ts, 695, 15)) +>sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 695, 27)) +>ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 695, 41)) +>>>>>>> theirs /** * Sets the minutes value in the Date object using Universal Coordinated Time (UTC). @@ -1100,10 +1608,17 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setUTCMinutes(min: number, sec?: number, ms?: number): number; +<<<<<<< ours >setUTCMinutes : Symbol(Date.setUTCMinutes, Decl(1.0lib-noErrors.ts, 698, 63)) >min : Symbol(min, Decl(1.0lib-noErrors.ts, 705, 18)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 705, 30)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 705, 44)) +======= +>setUTCMinutes : Symbol(setUTCMinutes, Decl(1.0lib-noErrors.ts, 695, 63)) +>min : Symbol(min, Decl(1.0lib-noErrors.ts, 702, 18)) +>sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 702, 30)) +>ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 702, 44)) +>>>>>>> theirs /** * Sets the hour value in the Date object using local time. @@ -1113,11 +1628,19 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setHours(hours: number, min?: number, sec?: number, ms?: number): number; +<<<<<<< ours >setHours : Symbol(Date.setHours, Decl(1.0lib-noErrors.ts, 705, 66)) >hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 713, 13)) >min : Symbol(min, Decl(1.0lib-noErrors.ts, 713, 27)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 713, 41)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 713, 55)) +======= +>setHours : Symbol(setHours, Decl(1.0lib-noErrors.ts, 702, 66)) +>hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 710, 13)) +>min : Symbol(min, Decl(1.0lib-noErrors.ts, 710, 27)) +>sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 710, 41)) +>ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 710, 55)) +>>>>>>> theirs /** * Sets the hours value in the Date object using Universal Coordinated Time (UTC). @@ -1127,27 +1650,45 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setUTCHours(hours: number, min?: number, sec?: number, ms?: number): number; +<<<<<<< ours >setUTCHours : Symbol(Date.setUTCHours, Decl(1.0lib-noErrors.ts, 713, 77)) >hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 721, 16)) >min : Symbol(min, Decl(1.0lib-noErrors.ts, 721, 30)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 721, 44)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 721, 58)) +======= +>setUTCHours : Symbol(setUTCHours, Decl(1.0lib-noErrors.ts, 710, 77)) +>hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 718, 16)) +>min : Symbol(min, Decl(1.0lib-noErrors.ts, 718, 30)) +>sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 718, 44)) +>ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 718, 58)) +>>>>>>> theirs /** * Sets the numeric day-of-the-month value of the Date object using local time. * @param date A numeric value equal to the day of the month. */ setDate(date: number): number; +<<<<<<< ours >setDate : Symbol(Date.setDate, Decl(1.0lib-noErrors.ts, 721, 80)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 726, 12)) +======= +>setDate : Symbol(setDate, Decl(1.0lib-noErrors.ts, 718, 80)) +>date : Symbol(date, Decl(1.0lib-noErrors.ts, 723, 12)) +>>>>>>> theirs /** * Sets the numeric day of the month in the Date object using Universal Coordinated Time (UTC). * @param date A numeric value equal to the day of the month. */ setUTCDate(date: number): number; +<<<<<<< ours >setUTCDate : Symbol(Date.setUTCDate, Decl(1.0lib-noErrors.ts, 726, 34)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 731, 15)) +======= +>setUTCDate : Symbol(setUTCDate, Decl(1.0lib-noErrors.ts, 723, 34)) +>date : Symbol(date, Decl(1.0lib-noErrors.ts, 728, 15)) +>>>>>>> theirs /** * Sets the month value in the Date object using local time. @@ -1155,9 +1696,15 @@ interface Date { * @param date A numeric value representing the day of the month. If this value is not supplied, the value from a call to the getDate method is used. */ setMonth(month: number, date?: number): number; +<<<<<<< ours >setMonth : Symbol(Date.setMonth, Decl(1.0lib-noErrors.ts, 731, 37)) >month : Symbol(month, Decl(1.0lib-noErrors.ts, 737, 13)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 737, 27)) +======= +>setMonth : Symbol(setMonth, Decl(1.0lib-noErrors.ts, 728, 37)) +>month : Symbol(month, Decl(1.0lib-noErrors.ts, 734, 13)) +>date : Symbol(date, Decl(1.0lib-noErrors.ts, 734, 27)) +>>>>>>> theirs /** * Sets the month value in the Date object using Universal Coordinated Time (UTC). @@ -1165,9 +1712,15 @@ interface Date { * @param date A numeric value representing the day of the month. If it is not supplied, the value from a call to the getUTCDate method is used. */ setUTCMonth(month: number, date?: number): number; +<<<<<<< ours >setUTCMonth : Symbol(Date.setUTCMonth, Decl(1.0lib-noErrors.ts, 737, 51)) >month : Symbol(month, Decl(1.0lib-noErrors.ts, 743, 16)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 743, 30)) +======= +>setUTCMonth : Symbol(setUTCMonth, Decl(1.0lib-noErrors.ts, 734, 51)) +>month : Symbol(month, Decl(1.0lib-noErrors.ts, 740, 16)) +>date : Symbol(date, Decl(1.0lib-noErrors.ts, 740, 30)) +>>>>>>> theirs /** * Sets the year of the Date object using local time. @@ -1176,10 +1729,17 @@ interface Date { * @param date A numeric value equal for the day of the month. */ setFullYear(year: number, month?: number, date?: number): number; +<<<<<<< ours >setFullYear : Symbol(Date.setFullYear, Decl(1.0lib-noErrors.ts, 743, 54)) >year : Symbol(year, Decl(1.0lib-noErrors.ts, 750, 16)) >month : Symbol(month, Decl(1.0lib-noErrors.ts, 750, 29)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 750, 45)) +======= +>setFullYear : Symbol(setFullYear, Decl(1.0lib-noErrors.ts, 740, 54)) +>year : Symbol(year, Decl(1.0lib-noErrors.ts, 747, 16)) +>month : Symbol(month, Decl(1.0lib-noErrors.ts, 747, 29)) +>date : Symbol(date, Decl(1.0lib-noErrors.ts, 747, 45)) +>>>>>>> theirs /** * Sets the year value in the Date object using Universal Coordinated Time (UTC). @@ -1188,6 +1748,7 @@ interface Date { * @param date A numeric value equal to the day of the month. */ setUTCFullYear(year: number, month?: number, date?: number): number; +<<<<<<< ours >setUTCFullYear : Symbol(Date.setUTCFullYear, Decl(1.0lib-noErrors.ts, 750, 69)) >year : Symbol(year, Decl(1.0lib-noErrors.ts, 757, 19)) >month : Symbol(month, Decl(1.0lib-noErrors.ts, 757, 32)) @@ -1205,44 +1766,63 @@ interface Date { toJSON(key?: any): string; >toJSON : Symbol(Date.toJSON, Decl(1.0lib-noErrors.ts, 761, 26)) >key : Symbol(key, Decl(1.0lib-noErrors.ts, 763, 11)) +======= +>setUTCFullYear : Symbol(setUTCFullYear, Decl(1.0lib-noErrors.ts, 747, 69)) +>year : Symbol(year, Decl(1.0lib-noErrors.ts, 754, 19)) +>month : Symbol(month, Decl(1.0lib-noErrors.ts, 754, 32)) +>date : Symbol(date, Decl(1.0lib-noErrors.ts, 754, 48)) + + /** Returns a date converted to a string using Universal Coordinated Time (UTC). */ + toUTCString(): string; +>toUTCString : Symbol(toUTCString, Decl(1.0lib-noErrors.ts, 754, 72)) + + /** Returns a date as a string value in ISO format. */ + toISOString(): string; +>toISOString : Symbol(toISOString, Decl(1.0lib-noErrors.ts, 756, 26)) + + /** Used by the JSON.stringify method to enable the transformation of an object's data for JavaScript Object Notation (JSON) serialization. */ + toJSON(key?: any): string; +>toJSON : Symbol(toJSON, Decl(1.0lib-noErrors.ts, 758, 26)) +>key : Symbol(key, Decl(1.0lib-noErrors.ts, 760, 11)) +>>>>>>> theirs } declare var Date: { ->Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 610, 23), Decl(1.0lib-noErrors.ts, 766, 11)) +>Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 607, 23), Decl(1.0lib-noErrors.ts, 763, 11)) new (): Date; ->Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 610, 23), Decl(1.0lib-noErrors.ts, 766, 11)) +>Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 607, 23), Decl(1.0lib-noErrors.ts, 763, 11)) new (value: number): Date; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 768, 9)) ->Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 610, 23), Decl(1.0lib-noErrors.ts, 766, 11)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 765, 9)) +>Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 607, 23), Decl(1.0lib-noErrors.ts, 763, 11)) new (value: string): Date; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 769, 9)) ->Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 610, 23), Decl(1.0lib-noErrors.ts, 766, 11)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 766, 9)) +>Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 607, 23), Decl(1.0lib-noErrors.ts, 763, 11)) new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date; ->year : Symbol(year, Decl(1.0lib-noErrors.ts, 770, 9)) ->month : Symbol(month, Decl(1.0lib-noErrors.ts, 770, 22)) ->date : Symbol(date, Decl(1.0lib-noErrors.ts, 770, 37)) ->hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 770, 52)) ->minutes : Symbol(minutes, Decl(1.0lib-noErrors.ts, 770, 68)) ->seconds : Symbol(seconds, Decl(1.0lib-noErrors.ts, 770, 86)) ->ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 770, 104)) ->Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 610, 23), Decl(1.0lib-noErrors.ts, 766, 11)) +>year : Symbol(year, Decl(1.0lib-noErrors.ts, 767, 9)) +>month : Symbol(month, Decl(1.0lib-noErrors.ts, 767, 22)) +>date : Symbol(date, Decl(1.0lib-noErrors.ts, 767, 37)) +>hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 767, 52)) +>minutes : Symbol(minutes, Decl(1.0lib-noErrors.ts, 767, 68)) +>seconds : Symbol(seconds, Decl(1.0lib-noErrors.ts, 767, 86)) +>ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 767, 104)) +>Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 607, 23), Decl(1.0lib-noErrors.ts, 763, 11)) (): string; prototype: Date; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 771, 15)) ->Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 610, 23), Decl(1.0lib-noErrors.ts, 766, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 768, 15)) +>Date : Symbol(Date, Decl(1.0lib-noErrors.ts, 607, 23), Decl(1.0lib-noErrors.ts, 763, 11)) /** * Parses a string containing a date, and returns the number of milliseconds between that date and midnight, January 1, 1970. * @param s A date string */ parse(s: string): number; ->parse : Symbol(parse, Decl(1.0lib-noErrors.ts, 772, 20)) ->s : Symbol(s, Decl(1.0lib-noErrors.ts, 777, 10)) +>parse : Symbol(parse, Decl(1.0lib-noErrors.ts, 769, 20)) +>s : Symbol(s, Decl(1.0lib-noErrors.ts, 774, 10)) /** * Returns the number of milliseconds between midnight, January 1, 1970 Universal Coordinated Time (UTC) (or GMT) and the specified date. @@ -1255,26 +1835,27 @@ declare var Date: { * @param ms An number from 0 to 999 that specifies the milliseconds. */ UTC(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number; ->UTC : Symbol(UTC, Decl(1.0lib-noErrors.ts, 777, 29)) ->year : Symbol(year, Decl(1.0lib-noErrors.ts, 788, 8)) ->month : Symbol(month, Decl(1.0lib-noErrors.ts, 788, 21)) ->date : Symbol(date, Decl(1.0lib-noErrors.ts, 788, 36)) ->hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 788, 51)) ->minutes : Symbol(minutes, Decl(1.0lib-noErrors.ts, 788, 67)) ->seconds : Symbol(seconds, Decl(1.0lib-noErrors.ts, 788, 85)) ->ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 788, 103)) +>UTC : Symbol(UTC, Decl(1.0lib-noErrors.ts, 774, 29)) +>year : Symbol(year, Decl(1.0lib-noErrors.ts, 785, 8)) +>month : Symbol(month, Decl(1.0lib-noErrors.ts, 785, 21)) +>date : Symbol(date, Decl(1.0lib-noErrors.ts, 785, 36)) +>hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 785, 51)) +>minutes : Symbol(minutes, Decl(1.0lib-noErrors.ts, 785, 67)) +>seconds : Symbol(seconds, Decl(1.0lib-noErrors.ts, 785, 85)) +>ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 785, 103)) now(): number; ->now : Symbol(now, Decl(1.0lib-noErrors.ts, 788, 125)) +>now : Symbol(now, Decl(1.0lib-noErrors.ts, 785, 125)) } interface RegExpExecArray { ->RegExpExecArray : Symbol(RegExpExecArray, Decl(1.0lib-noErrors.ts, 790, 1)) +>RegExpExecArray : Symbol(RegExpExecArray, Decl(1.0lib-noErrors.ts, 787, 1)) [index: number]: string; ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 793, 5)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 790, 5)) length: number; +<<<<<<< ours >length : Symbol(RegExpExecArray.length, Decl(1.0lib-noErrors.ts, 793, 28)) index: number; @@ -1402,26 +1983,162 @@ interface RegExpExecArray { >currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 821, 67)) >array : Symbol(array, Decl(1.0lib-noErrors.ts, 821, 89)) >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 821, 114)) +======= +>length : Symbol(length, Decl(1.0lib-noErrors.ts, 790, 28)) + + index: number; +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 791, 19)) + + input: string; +>input : Symbol(input, Decl(1.0lib-noErrors.ts, 793, 18)) + + toString(): string; +>toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 794, 18)) + + toLocaleString(): string; +>toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 796, 23)) + + concat(...items: string[][]): string[]; +>concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 797, 29)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 798, 11)) + + join(separator?: string): string; +>join : Symbol(join, Decl(1.0lib-noErrors.ts, 798, 43)) +>separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 799, 9)) + + pop(): string; +>pop : Symbol(pop, Decl(1.0lib-noErrors.ts, 799, 37)) + + push(...items: string[]): number; +>push : Symbol(push, Decl(1.0lib-noErrors.ts, 800, 18)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 801, 9)) + + reverse(): string[]; +>reverse : Symbol(reverse, Decl(1.0lib-noErrors.ts, 801, 37)) + + shift(): string; +>shift : Symbol(shift, Decl(1.0lib-noErrors.ts, 802, 24)) + + slice(start?: number, end?: number): string[]; +>slice : Symbol(slice, Decl(1.0lib-noErrors.ts, 803, 20)) +>start : Symbol(start, Decl(1.0lib-noErrors.ts, 804, 10)) +>end : Symbol(end, Decl(1.0lib-noErrors.ts, 804, 25)) + + sort(compareFn?: (a: string, b: string) => number): string[]; +>sort : Symbol(sort, Decl(1.0lib-noErrors.ts, 804, 50)) +>compareFn : Symbol(compareFn, Decl(1.0lib-noErrors.ts, 805, 9)) +>a : Symbol(a, Decl(1.0lib-noErrors.ts, 805, 22)) +>b : Symbol(b, Decl(1.0lib-noErrors.ts, 805, 32)) + + splice(start: number): string[]; +>splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 805, 65), Decl(1.0lib-noErrors.ts, 806, 36)) +>start : Symbol(start, Decl(1.0lib-noErrors.ts, 806, 11)) + + splice(start: number, deleteCount: number, ...items: string[]): string[]; +>splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 805, 65), Decl(1.0lib-noErrors.ts, 806, 36)) +>start : Symbol(start, Decl(1.0lib-noErrors.ts, 807, 11)) +>deleteCount : Symbol(deleteCount, Decl(1.0lib-noErrors.ts, 807, 25)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 807, 46)) + + unshift(...items: string[]): number; +>unshift : Symbol(unshift, Decl(1.0lib-noErrors.ts, 807, 77)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 808, 12)) + + indexOf(searchElement: string, fromIndex?: number): number; +>indexOf : Symbol(indexOf, Decl(1.0lib-noErrors.ts, 808, 40)) +>searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 810, 12)) +>fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 810, 34)) + + lastIndexOf(searchElement: string, fromIndex?: number): number; +>lastIndexOf : Symbol(lastIndexOf, Decl(1.0lib-noErrors.ts, 810, 63)) +>searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 811, 16)) +>fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 811, 38)) + + every(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): boolean; +>every : Symbol(every, Decl(1.0lib-noErrors.ts, 811, 67)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 812, 10)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 812, 23)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 812, 37)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 812, 52)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 812, 81)) + + some(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): boolean; +>some : Symbol(some, Decl(1.0lib-noErrors.ts, 812, 106)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 813, 9)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 813, 22)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 813, 36)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 813, 51)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 813, 80)) + + forEach(callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any): void; +>forEach : Symbol(forEach, Decl(1.0lib-noErrors.ts, 813, 105)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 814, 12)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 814, 25)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 814, 39)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 814, 54)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 814, 80)) + + map(callbackfn: (value: string, index: number, array: string[]) => any, thisArg?: any): any[]; +>map : Symbol(map, Decl(1.0lib-noErrors.ts, 814, 102)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 815, 8)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 815, 21)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 815, 35)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 815, 50)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 815, 75)) + + filter(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): string[]; +>filter : Symbol(filter, Decl(1.0lib-noErrors.ts, 815, 98)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 816, 11)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 816, 24)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 816, 38)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 816, 53)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 816, 82)) + + reduce(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: string[]) => any, initialValue?: any): any; +>reduce : Symbol(reduce, Decl(1.0lib-noErrors.ts, 816, 108)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 817, 11)) +>previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 817, 24)) +>currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 817, 43)) +>currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 817, 62)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 817, 84)) +>initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 817, 109)) + + reduceRight(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: string[]) => any, initialValue?: any): any; +>reduceRight : Symbol(reduceRight, Decl(1.0lib-noErrors.ts, 817, 135)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 818, 16)) +>previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 818, 29)) +>currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 818, 48)) +>currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 818, 67)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 818, 89)) +>initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 818, 114)) +>>>>>>> theirs } interface RegExp { ->RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) +>RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) /** * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search. * @param string The String object or string literal on which to perform the search. */ exec(string: string): RegExpExecArray; +<<<<<<< ours >exec : Symbol(RegExp.exec, Decl(1.0lib-noErrors.ts, 825, 18)) >string : Symbol(string, Decl(1.0lib-noErrors.ts, 830, 9)) >RegExpExecArray : Symbol(RegExpExecArray, Decl(1.0lib-noErrors.ts, 790, 1)) +======= +>exec : Symbol(exec, Decl(1.0lib-noErrors.ts, 822, 18)) +>string : Symbol(string, Decl(1.0lib-noErrors.ts, 827, 9)) +>RegExpExecArray : Symbol(RegExpExecArray, Decl(1.0lib-noErrors.ts, 787, 1)) +>>>>>>> theirs /** * Returns a Boolean value that indicates whether or not a pattern exists in a searched string. * @param string String on which to perform the search. */ test(string: string): boolean; +<<<<<<< ours >test : Symbol(RegExp.test, Decl(1.0lib-noErrors.ts, 830, 42)) >string : Symbol(string, Decl(1.0lib-noErrors.ts, 836, 9)) @@ -1448,199 +2165,234 @@ interface RegExp { compile(): RegExp; >compile : Symbol(RegExp.compile, Decl(1.0lib-noErrors.ts, 850, 22)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) +======= +>test : Symbol(test, Decl(1.0lib-noErrors.ts, 827, 42)) +>string : Symbol(string, Decl(1.0lib-noErrors.ts, 833, 9)) + + /** Returns a copy of the text of the regular expression pattern. Read-only. The rgExp argument is a Regular expression object. It can be a variable name or a literal. */ + source: string; +>source : Symbol(source, Decl(1.0lib-noErrors.ts, 833, 34)) + + /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */ + global: boolean; +>global : Symbol(global, Decl(1.0lib-noErrors.ts, 836, 19)) + + /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */ + ignoreCase: boolean; +>ignoreCase : Symbol(ignoreCase, Decl(1.0lib-noErrors.ts, 839, 20)) + + /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */ + multiline: boolean; +>multiline : Symbol(multiline, Decl(1.0lib-noErrors.ts, 842, 24)) + + lastIndex: number; +>lastIndex : Symbol(lastIndex, Decl(1.0lib-noErrors.ts, 845, 23)) + + // Non-standard extensions + compile(): RegExp; +>compile : Symbol(compile, Decl(1.0lib-noErrors.ts, 847, 22)) +>RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) +>>>>>>> theirs } declare var RegExp: { ->RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) +>RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) new (pattern: string, flags?: string): RegExp; ->pattern : Symbol(pattern, Decl(1.0lib-noErrors.ts, 856, 9)) ->flags : Symbol(flags, Decl(1.0lib-noErrors.ts, 856, 25)) ->RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) +>pattern : Symbol(pattern, Decl(1.0lib-noErrors.ts, 853, 9)) +>flags : Symbol(flags, Decl(1.0lib-noErrors.ts, 853, 25)) +>RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) (pattern: string, flags?: string): RegExp; ->pattern : Symbol(pattern, Decl(1.0lib-noErrors.ts, 857, 5)) ->flags : Symbol(flags, Decl(1.0lib-noErrors.ts, 857, 21)) ->RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) +>pattern : Symbol(pattern, Decl(1.0lib-noErrors.ts, 854, 5)) +>flags : Symbol(flags, Decl(1.0lib-noErrors.ts, 854, 21)) +>RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) // Non-standard extensions $1: string; ->$1 : Symbol($1, Decl(1.0lib-noErrors.ts, 857, 46)) +>$1 : Symbol($1, Decl(1.0lib-noErrors.ts, 854, 46)) $2: string; ->$2 : Symbol($2, Decl(1.0lib-noErrors.ts, 860, 15)) +>$2 : Symbol($2, Decl(1.0lib-noErrors.ts, 857, 15)) $3: string; ->$3 : Symbol($3, Decl(1.0lib-noErrors.ts, 861, 15)) +>$3 : Symbol($3, Decl(1.0lib-noErrors.ts, 858, 15)) $4: string; ->$4 : Symbol($4, Decl(1.0lib-noErrors.ts, 862, 15)) +>$4 : Symbol($4, Decl(1.0lib-noErrors.ts, 859, 15)) $5: string; ->$5 : Symbol($5, Decl(1.0lib-noErrors.ts, 863, 15)) +>$5 : Symbol($5, Decl(1.0lib-noErrors.ts, 860, 15)) $6: string; ->$6 : Symbol($6, Decl(1.0lib-noErrors.ts, 864, 15)) +>$6 : Symbol($6, Decl(1.0lib-noErrors.ts, 861, 15)) $7: string; ->$7 : Symbol($7, Decl(1.0lib-noErrors.ts, 865, 15)) +>$7 : Symbol($7, Decl(1.0lib-noErrors.ts, 862, 15)) $8: string; ->$8 : Symbol($8, Decl(1.0lib-noErrors.ts, 866, 15)) +>$8 : Symbol($8, Decl(1.0lib-noErrors.ts, 863, 15)) $9: string; ->$9 : Symbol($9, Decl(1.0lib-noErrors.ts, 867, 15)) +>$9 : Symbol($9, Decl(1.0lib-noErrors.ts, 864, 15)) lastMatch: string; ->lastMatch : Symbol(lastMatch, Decl(1.0lib-noErrors.ts, 868, 15)) +>lastMatch : Symbol(lastMatch, Decl(1.0lib-noErrors.ts, 865, 15)) } interface Error { ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) name: string; +<<<<<<< ours >name : Symbol(Error.name, Decl(1.0lib-noErrors.ts, 872, 17)) message: string; >message : Symbol(Error.message, Decl(1.0lib-noErrors.ts, 873, 17)) +======= +>name : Symbol(name, Decl(1.0lib-noErrors.ts, 869, 17)) + + message: string; +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 870, 17)) +>>>>>>> theirs } declare var Error: { ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) new (message?: string): Error; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 877, 9)) ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 874, 9)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) (message?: string): Error; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 878, 5)) ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 875, 5)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) prototype: Error; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 878, 30)) ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 875, 30)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) } interface EvalError extends Error { ->EvalError : Symbol(EvalError, Decl(1.0lib-noErrors.ts, 880, 1), Decl(1.0lib-noErrors.ts, 884, 11)) ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>EvalError : Symbol(EvalError, Decl(1.0lib-noErrors.ts, 877, 1), Decl(1.0lib-noErrors.ts, 881, 11)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) } declare var EvalError: { ->EvalError : Symbol(EvalError, Decl(1.0lib-noErrors.ts, 880, 1), Decl(1.0lib-noErrors.ts, 884, 11)) +>EvalError : Symbol(EvalError, Decl(1.0lib-noErrors.ts, 877, 1), Decl(1.0lib-noErrors.ts, 881, 11)) new (message?: string): EvalError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 885, 9)) ->EvalError : Symbol(EvalError, Decl(1.0lib-noErrors.ts, 880, 1), Decl(1.0lib-noErrors.ts, 884, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 882, 9)) +>EvalError : Symbol(EvalError, Decl(1.0lib-noErrors.ts, 877, 1), Decl(1.0lib-noErrors.ts, 881, 11)) (message?: string): EvalError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 886, 5)) ->EvalError : Symbol(EvalError, Decl(1.0lib-noErrors.ts, 880, 1), Decl(1.0lib-noErrors.ts, 884, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 883, 5)) +>EvalError : Symbol(EvalError, Decl(1.0lib-noErrors.ts, 877, 1), Decl(1.0lib-noErrors.ts, 881, 11)) prototype: EvalError; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 886, 34)) ->EvalError : Symbol(EvalError, Decl(1.0lib-noErrors.ts, 880, 1), Decl(1.0lib-noErrors.ts, 884, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 883, 34)) +>EvalError : Symbol(EvalError, Decl(1.0lib-noErrors.ts, 877, 1), Decl(1.0lib-noErrors.ts, 881, 11)) } interface RangeError extends Error { ->RangeError : Symbol(RangeError, Decl(1.0lib-noErrors.ts, 888, 1), Decl(1.0lib-noErrors.ts, 892, 11)) ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>RangeError : Symbol(RangeError, Decl(1.0lib-noErrors.ts, 885, 1), Decl(1.0lib-noErrors.ts, 889, 11)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) } declare var RangeError: { ->RangeError : Symbol(RangeError, Decl(1.0lib-noErrors.ts, 888, 1), Decl(1.0lib-noErrors.ts, 892, 11)) +>RangeError : Symbol(RangeError, Decl(1.0lib-noErrors.ts, 885, 1), Decl(1.0lib-noErrors.ts, 889, 11)) new (message?: string): RangeError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 893, 9)) ->RangeError : Symbol(RangeError, Decl(1.0lib-noErrors.ts, 888, 1), Decl(1.0lib-noErrors.ts, 892, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 890, 9)) +>RangeError : Symbol(RangeError, Decl(1.0lib-noErrors.ts, 885, 1), Decl(1.0lib-noErrors.ts, 889, 11)) (message?: string): RangeError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 894, 5)) ->RangeError : Symbol(RangeError, Decl(1.0lib-noErrors.ts, 888, 1), Decl(1.0lib-noErrors.ts, 892, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 891, 5)) +>RangeError : Symbol(RangeError, Decl(1.0lib-noErrors.ts, 885, 1), Decl(1.0lib-noErrors.ts, 889, 11)) prototype: RangeError; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 894, 35)) ->RangeError : Symbol(RangeError, Decl(1.0lib-noErrors.ts, 888, 1), Decl(1.0lib-noErrors.ts, 892, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 891, 35)) +>RangeError : Symbol(RangeError, Decl(1.0lib-noErrors.ts, 885, 1), Decl(1.0lib-noErrors.ts, 889, 11)) } interface ReferenceError extends Error { ->ReferenceError : Symbol(ReferenceError, Decl(1.0lib-noErrors.ts, 896, 1), Decl(1.0lib-noErrors.ts, 900, 11)) ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>ReferenceError : Symbol(ReferenceError, Decl(1.0lib-noErrors.ts, 893, 1), Decl(1.0lib-noErrors.ts, 897, 11)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) } declare var ReferenceError: { ->ReferenceError : Symbol(ReferenceError, Decl(1.0lib-noErrors.ts, 896, 1), Decl(1.0lib-noErrors.ts, 900, 11)) +>ReferenceError : Symbol(ReferenceError, Decl(1.0lib-noErrors.ts, 893, 1), Decl(1.0lib-noErrors.ts, 897, 11)) new (message?: string): ReferenceError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 901, 9)) ->ReferenceError : Symbol(ReferenceError, Decl(1.0lib-noErrors.ts, 896, 1), Decl(1.0lib-noErrors.ts, 900, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 898, 9)) +>ReferenceError : Symbol(ReferenceError, Decl(1.0lib-noErrors.ts, 893, 1), Decl(1.0lib-noErrors.ts, 897, 11)) (message?: string): ReferenceError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 902, 5)) ->ReferenceError : Symbol(ReferenceError, Decl(1.0lib-noErrors.ts, 896, 1), Decl(1.0lib-noErrors.ts, 900, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 899, 5)) +>ReferenceError : Symbol(ReferenceError, Decl(1.0lib-noErrors.ts, 893, 1), Decl(1.0lib-noErrors.ts, 897, 11)) prototype: ReferenceError; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 902, 39)) ->ReferenceError : Symbol(ReferenceError, Decl(1.0lib-noErrors.ts, 896, 1), Decl(1.0lib-noErrors.ts, 900, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 899, 39)) +>ReferenceError : Symbol(ReferenceError, Decl(1.0lib-noErrors.ts, 893, 1), Decl(1.0lib-noErrors.ts, 897, 11)) } interface SyntaxError extends Error { ->SyntaxError : Symbol(SyntaxError, Decl(1.0lib-noErrors.ts, 904, 1), Decl(1.0lib-noErrors.ts, 908, 11)) ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>SyntaxError : Symbol(SyntaxError, Decl(1.0lib-noErrors.ts, 901, 1), Decl(1.0lib-noErrors.ts, 905, 11)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) } declare var SyntaxError: { ->SyntaxError : Symbol(SyntaxError, Decl(1.0lib-noErrors.ts, 904, 1), Decl(1.0lib-noErrors.ts, 908, 11)) +>SyntaxError : Symbol(SyntaxError, Decl(1.0lib-noErrors.ts, 901, 1), Decl(1.0lib-noErrors.ts, 905, 11)) new (message?: string): SyntaxError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 909, 9)) ->SyntaxError : Symbol(SyntaxError, Decl(1.0lib-noErrors.ts, 904, 1), Decl(1.0lib-noErrors.ts, 908, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 906, 9)) +>SyntaxError : Symbol(SyntaxError, Decl(1.0lib-noErrors.ts, 901, 1), Decl(1.0lib-noErrors.ts, 905, 11)) (message?: string): SyntaxError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 910, 5)) ->SyntaxError : Symbol(SyntaxError, Decl(1.0lib-noErrors.ts, 904, 1), Decl(1.0lib-noErrors.ts, 908, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 907, 5)) +>SyntaxError : Symbol(SyntaxError, Decl(1.0lib-noErrors.ts, 901, 1), Decl(1.0lib-noErrors.ts, 905, 11)) prototype: SyntaxError; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 910, 36)) ->SyntaxError : Symbol(SyntaxError, Decl(1.0lib-noErrors.ts, 904, 1), Decl(1.0lib-noErrors.ts, 908, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 907, 36)) +>SyntaxError : Symbol(SyntaxError, Decl(1.0lib-noErrors.ts, 901, 1), Decl(1.0lib-noErrors.ts, 905, 11)) } interface TypeError extends Error { ->TypeError : Symbol(TypeError, Decl(1.0lib-noErrors.ts, 912, 1), Decl(1.0lib-noErrors.ts, 916, 11)) ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>TypeError : Symbol(TypeError, Decl(1.0lib-noErrors.ts, 909, 1), Decl(1.0lib-noErrors.ts, 913, 11)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) } declare var TypeError: { ->TypeError : Symbol(TypeError, Decl(1.0lib-noErrors.ts, 912, 1), Decl(1.0lib-noErrors.ts, 916, 11)) +>TypeError : Symbol(TypeError, Decl(1.0lib-noErrors.ts, 909, 1), Decl(1.0lib-noErrors.ts, 913, 11)) new (message?: string): TypeError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 917, 9)) ->TypeError : Symbol(TypeError, Decl(1.0lib-noErrors.ts, 912, 1), Decl(1.0lib-noErrors.ts, 916, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 914, 9)) +>TypeError : Symbol(TypeError, Decl(1.0lib-noErrors.ts, 909, 1), Decl(1.0lib-noErrors.ts, 913, 11)) (message?: string): TypeError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 918, 5)) ->TypeError : Symbol(TypeError, Decl(1.0lib-noErrors.ts, 912, 1), Decl(1.0lib-noErrors.ts, 916, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 915, 5)) +>TypeError : Symbol(TypeError, Decl(1.0lib-noErrors.ts, 909, 1), Decl(1.0lib-noErrors.ts, 913, 11)) prototype: TypeError; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 918, 34)) ->TypeError : Symbol(TypeError, Decl(1.0lib-noErrors.ts, 912, 1), Decl(1.0lib-noErrors.ts, 916, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 915, 34)) +>TypeError : Symbol(TypeError, Decl(1.0lib-noErrors.ts, 909, 1), Decl(1.0lib-noErrors.ts, 913, 11)) } interface URIError extends Error { ->URIError : Symbol(URIError, Decl(1.0lib-noErrors.ts, 920, 1), Decl(1.0lib-noErrors.ts, 924, 11)) ->Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11)) +>URIError : Symbol(URIError, Decl(1.0lib-noErrors.ts, 917, 1), Decl(1.0lib-noErrors.ts, 921, 11)) +>Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) } declare var URIError: { ->URIError : Symbol(URIError, Decl(1.0lib-noErrors.ts, 920, 1), Decl(1.0lib-noErrors.ts, 924, 11)) +>URIError : Symbol(URIError, Decl(1.0lib-noErrors.ts, 917, 1), Decl(1.0lib-noErrors.ts, 921, 11)) new (message?: string): URIError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 925, 9)) ->URIError : Symbol(URIError, Decl(1.0lib-noErrors.ts, 920, 1), Decl(1.0lib-noErrors.ts, 924, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 922, 9)) +>URIError : Symbol(URIError, Decl(1.0lib-noErrors.ts, 917, 1), Decl(1.0lib-noErrors.ts, 921, 11)) (message?: string): URIError; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 926, 5)) ->URIError : Symbol(URIError, Decl(1.0lib-noErrors.ts, 920, 1), Decl(1.0lib-noErrors.ts, 924, 11)) +>message : Symbol(message, Decl(1.0lib-noErrors.ts, 923, 5)) +>URIError : Symbol(URIError, Decl(1.0lib-noErrors.ts, 917, 1), Decl(1.0lib-noErrors.ts, 921, 11)) prototype: URIError; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 926, 33)) ->URIError : Symbol(URIError, Decl(1.0lib-noErrors.ts, 920, 1), Decl(1.0lib-noErrors.ts, 924, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 923, 33)) +>URIError : Symbol(URIError, Decl(1.0lib-noErrors.ts, 917, 1), Decl(1.0lib-noErrors.ts, 921, 11)) } interface JSON { ->JSON : Symbol(JSON, Decl(1.0lib-noErrors.ts, 928, 1), Decl(1.0lib-noErrors.ts, 973, 11)) +>JSON : Symbol(JSON, Decl(1.0lib-noErrors.ts, 925, 1), Decl(1.0lib-noErrors.ts, 970, 11)) /** * Converts a JavaScript Object Notation (JSON) string into an object. @@ -1649,19 +2401,32 @@ interface JSON { * If a member contains nested objects, the nested objects are transformed before the parent object is. */ parse(text: string, reviver?: (key: any, value: any) => any): any; +<<<<<<< ours >parse : Symbol(JSON.parse, Decl(1.0lib-noErrors.ts, 930, 16)) >text : Symbol(text, Decl(1.0lib-noErrors.ts, 937, 10)) >reviver : Symbol(reviver, Decl(1.0lib-noErrors.ts, 937, 23)) >key : Symbol(key, Decl(1.0lib-noErrors.ts, 937, 35)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 937, 44)) +======= +>parse : Symbol(parse, Decl(1.0lib-noErrors.ts, 927, 16)) +>text : Symbol(text, Decl(1.0lib-noErrors.ts, 934, 10)) +>reviver : Symbol(reviver, Decl(1.0lib-noErrors.ts, 934, 23)) +>key : Symbol(key, Decl(1.0lib-noErrors.ts, 934, 35)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 934, 44)) +>>>>>>> theirs /** * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. * @param value A JavaScript value, usually an object or array, to be converted. */ stringify(value: any): string; +<<<<<<< ours >stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 942, 14)) +======= +>stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 939, 14)) +>>>>>>> theirs /** * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. @@ -1669,11 +2434,19 @@ interface JSON { * @param replacer A function that transforms the results. */ stringify(value: any, replacer: (key: string, value: any) => any): string; +<<<<<<< ours >stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 948, 14)) >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 948, 25)) >key : Symbol(key, Decl(1.0lib-noErrors.ts, 948, 37)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 948, 49)) +======= +>stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 945, 14)) +>replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 945, 25)) +>key : Symbol(key, Decl(1.0lib-noErrors.ts, 945, 37)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 945, 49)) +>>>>>>> theirs /** * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. @@ -1681,9 +2454,15 @@ interface JSON { * @param replacer Array that transforms the results. */ stringify(value: any, replacer: any[]): string; +<<<<<<< ours >stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 954, 14)) >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 954, 25)) +======= +>stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 951, 14)) +>replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 951, 25)) +>>>>>>> theirs /** * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. @@ -1692,12 +2471,21 @@ interface JSON { * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read. */ stringify(value: any, replacer: (key: string, value: any) => any, space: any): string; +<<<<<<< ours >stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 961, 14)) >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 961, 25)) >key : Symbol(key, Decl(1.0lib-noErrors.ts, 961, 37)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 961, 49)) >space : Symbol(space, Decl(1.0lib-noErrors.ts, 961, 69)) +======= +>stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 958, 14)) +>replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 958, 25)) +>key : Symbol(key, Decl(1.0lib-noErrors.ts, 958, 37)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 958, 49)) +>space : Symbol(space, Decl(1.0lib-noErrors.ts, 958, 69)) +>>>>>>> theirs /** * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. @@ -1706,17 +2494,24 @@ interface JSON { * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read. */ stringify(value: any, replacer: any[], space: any): string; +<<<<<<< ours >stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 968, 14)) >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 968, 25)) >space : Symbol(space, Decl(1.0lib-noErrors.ts, 968, 42)) +======= +>stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 965, 14)) +>replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 965, 25)) +>space : Symbol(space, Decl(1.0lib-noErrors.ts, 965, 42)) +>>>>>>> theirs } /** * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format. */ declare var JSON: JSON; ->JSON : Symbol(JSON, Decl(1.0lib-noErrors.ts, 928, 1), Decl(1.0lib-noErrors.ts, 973, 11)) ->JSON : Symbol(JSON, Decl(1.0lib-noErrors.ts, 928, 1), Decl(1.0lib-noErrors.ts, 973, 11)) +>JSON : Symbol(JSON, Decl(1.0lib-noErrors.ts, 925, 1), Decl(1.0lib-noErrors.ts, 970, 11)) +>JSON : Symbol(JSON, Decl(1.0lib-noErrors.ts, 925, 1), Decl(1.0lib-noErrors.ts, 970, 11)) ///////////////////////////// @@ -1724,77 +2519,126 @@ declare var JSON: JSON; ///////////////////////////// interface Array { ->Array : Symbol(Array, Decl(1.0lib-noErrors.ts, 973, 23), Decl(1.0lib-noErrors.ts, 1133, 11)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +>Array : Symbol(Array, Decl(1.0lib-noErrors.ts, 970, 23), Decl(1.0lib-noErrors.ts, 1130, 11)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) /** * Returns a string representation of an array. */ toString(): string; +<<<<<<< ours >toString : Symbol(Array.toString, Decl(1.0lib-noErrors.ts, 980, 20)) toLocaleString(): string; >toLocaleString : Symbol(Array.toLocaleString, Decl(1.0lib-noErrors.ts, 984, 23)) +======= +>toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 977, 20)) + + toLocaleString(): string; +>toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 981, 23)) +>>>>>>> theirs /** * Combines two or more arrays. * @param items Additional items to add to the end of array1. */ concat(...items: U[]): T[]; +<<<<<<< ours >concat : Symbol(Array.concat, Decl(1.0lib-noErrors.ts, 985, 29), Decl(1.0lib-noErrors.ts, 990, 46)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 990, 11)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 990, 26)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 990, 11)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 982, 29), Decl(1.0lib-noErrors.ts, 987, 46)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 987, 11)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 987, 26)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 987, 11)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Combines two or more arrays. * @param items Additional items to add to the end of array1. */ concat(...items: T[]): T[]; +<<<<<<< ours >concat : Symbol(Array.concat, Decl(1.0lib-noErrors.ts, 985, 29), Decl(1.0lib-noErrors.ts, 990, 46)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 995, 11)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 982, 29), Decl(1.0lib-noErrors.ts, 987, 46)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 992, 11)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Adds all the elements of an array separated by the specified separator string. * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma. */ join(separator?: string): string; +<<<<<<< ours >join : Symbol(Array.join, Decl(1.0lib-noErrors.ts, 995, 31)) >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 1000, 9)) +======= +>join : Symbol(join, Decl(1.0lib-noErrors.ts, 992, 31)) +>separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 997, 9)) +>>>>>>> theirs /** * Removes the last element from an array and returns it. */ pop(): T; +<<<<<<< ours >pop : Symbol(Array.pop, Decl(1.0lib-noErrors.ts, 1000, 37)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>pop : Symbol(pop, Decl(1.0lib-noErrors.ts, 997, 37)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Appends new elements to an array, and returns the new length of the array. * @param items New elements of the Array. */ push(...items: T[]): number; +<<<<<<< ours >push : Symbol(Array.push, Decl(1.0lib-noErrors.ts, 1004, 13)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 1009, 9)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>push : Symbol(push, Decl(1.0lib-noErrors.ts, 1001, 13)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 1006, 9)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Reverses the elements in an Array. */ reverse(): T[]; +<<<<<<< ours >reverse : Symbol(Array.reverse, Decl(1.0lib-noErrors.ts, 1009, 32)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>reverse : Symbol(reverse, Decl(1.0lib-noErrors.ts, 1006, 32)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Removes the first element from an array and returns it. */ shift(): T; +<<<<<<< ours >shift : Symbol(Array.shift, Decl(1.0lib-noErrors.ts, 1013, 19)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>shift : Symbol(shift, Decl(1.0lib-noErrors.ts, 1010, 19)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Returns a section of an array. @@ -1802,16 +2646,24 @@ interface Array { * @param end The end of the specified portion of the array. */ slice(start?: number, end?: number): T[]; +<<<<<<< ours >slice : Symbol(Array.slice, Decl(1.0lib-noErrors.ts, 1017, 15)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 1023, 10)) >end : Symbol(end, Decl(1.0lib-noErrors.ts, 1023, 25)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>slice : Symbol(slice, Decl(1.0lib-noErrors.ts, 1014, 15)) +>start : Symbol(start, Decl(1.0lib-noErrors.ts, 1020, 10)) +>end : Symbol(end, Decl(1.0lib-noErrors.ts, 1020, 25)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Sorts an array. * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order. */ sort(compareFn?: (a: T, b: T) => number): T[]; +<<<<<<< ours >sort : Symbol(Array.sort, Decl(1.0lib-noErrors.ts, 1023, 45)) >compareFn : Symbol(compareFn, Decl(1.0lib-noErrors.ts, 1029, 9)) >a : Symbol(a, Decl(1.0lib-noErrors.ts, 1029, 22)) @@ -1819,15 +2671,30 @@ interface Array { >b : Symbol(b, Decl(1.0lib-noErrors.ts, 1029, 27)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>sort : Symbol(sort, Decl(1.0lib-noErrors.ts, 1020, 45)) +>compareFn : Symbol(compareFn, Decl(1.0lib-noErrors.ts, 1026, 9)) +>a : Symbol(a, Decl(1.0lib-noErrors.ts, 1026, 22)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>b : Symbol(b, Decl(1.0lib-noErrors.ts, 1026, 27)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. * @param start The zero-based location in the array from which to start removing elements. */ splice(start: number): T[]; +<<<<<<< ours >splice : Symbol(Array.splice, Decl(1.0lib-noErrors.ts, 1029, 50), Decl(1.0lib-noErrors.ts, 1035, 31)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 1035, 11)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 1026, 50), Decl(1.0lib-noErrors.ts, 1032, 31)) +>start : Symbol(start, Decl(1.0lib-noErrors.ts, 1032, 11)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. @@ -1836,21 +2703,36 @@ interface Array { * @param items Elements to insert into the array in place of the deleted elements. */ splice(start: number, deleteCount: number, ...items: T[]): T[]; +<<<<<<< ours >splice : Symbol(Array.splice, Decl(1.0lib-noErrors.ts, 1029, 50), Decl(1.0lib-noErrors.ts, 1035, 31)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 1043, 11)) >deleteCount : Symbol(deleteCount, Decl(1.0lib-noErrors.ts, 1043, 25)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 1043, 46)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 1026, 50), Decl(1.0lib-noErrors.ts, 1032, 31)) +>start : Symbol(start, Decl(1.0lib-noErrors.ts, 1040, 11)) +>deleteCount : Symbol(deleteCount, Decl(1.0lib-noErrors.ts, 1040, 25)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 1040, 46)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Inserts new elements at the start of an array. * @param items Elements to insert at the start of the Array. */ unshift(...items: T[]): number; +<<<<<<< ours >unshift : Symbol(Array.unshift, Decl(1.0lib-noErrors.ts, 1043, 67)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 1049, 12)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>unshift : Symbol(unshift, Decl(1.0lib-noErrors.ts, 1040, 67)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 1046, 12)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Returns the index of the first occurrence of a value in an array. @@ -1858,10 +2740,17 @@ interface Array { * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0. */ indexOf(searchElement: T, fromIndex?: number): number; +<<<<<<< ours >indexOf : Symbol(Array.indexOf, Decl(1.0lib-noErrors.ts, 1049, 35)) >searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 1056, 12)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 1056, 29)) +======= +>indexOf : Symbol(indexOf, Decl(1.0lib-noErrors.ts, 1046, 35)) +>searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 1053, 12)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 1053, 29)) +>>>>>>> theirs /** * Returns the index of the last occurrence of a specified value in an array. @@ -1869,10 +2758,17 @@ interface Array { * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array. */ lastIndexOf(searchElement: T, fromIndex?: number): number; +<<<<<<< ours >lastIndexOf : Symbol(Array.lastIndexOf, Decl(1.0lib-noErrors.ts, 1056, 58)) >searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 1063, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 1063, 33)) +======= +>lastIndexOf : Symbol(lastIndexOf, Decl(1.0lib-noErrors.ts, 1053, 58)) +>searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 1060, 16)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 1060, 33)) +>>>>>>> theirs /** * Determines whether all the members of an array satisfy the specified test. @@ -1880,6 +2776,7 @@ interface Array { * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean; +<<<<<<< ours >every : Symbol(Array.every, Decl(1.0lib-noErrors.ts, 1063, 62)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1070, 10)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1070, 23)) @@ -1888,6 +2785,16 @@ interface Array { >array : Symbol(array, Decl(1.0lib-noErrors.ts, 1070, 47)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1070, 71)) +======= +>every : Symbol(every, Decl(1.0lib-noErrors.ts, 1060, 62)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1067, 10)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 1067, 23)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 1067, 32)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 1067, 47)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1067, 71)) +>>>>>>> theirs /** * Determines whether the specified callback function returns true for any element of an array. @@ -1895,6 +2802,7 @@ interface Array { * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean; +<<<<<<< ours >some : Symbol(Array.some, Decl(1.0lib-noErrors.ts, 1070, 96)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1077, 9)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1077, 22)) @@ -1903,6 +2811,16 @@ interface Array { >array : Symbol(array, Decl(1.0lib-noErrors.ts, 1077, 46)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1077, 70)) +======= +>some : Symbol(some, Decl(1.0lib-noErrors.ts, 1067, 96)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1074, 9)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 1074, 22)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 1074, 31)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 1074, 46)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1074, 70)) +>>>>>>> theirs /** * Performs the specified action for each element in an array. @@ -1910,6 +2828,7 @@ interface Array { * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void; +<<<<<<< ours >forEach : Symbol(Array.forEach, Decl(1.0lib-noErrors.ts, 1077, 95)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1084, 12)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1084, 25)) @@ -1918,6 +2837,16 @@ interface Array { >array : Symbol(array, Decl(1.0lib-noErrors.ts, 1084, 49)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1084, 70)) +======= +>forEach : Symbol(forEach, Decl(1.0lib-noErrors.ts, 1074, 95)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1081, 12)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 1081, 25)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 1081, 34)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 1081, 49)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1081, 70)) +>>>>>>> theirs /** * Calls a defined callback function on each element of an array, and returns an array that contains the results. @@ -1925,6 +2854,7 @@ interface Array { * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ map(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[]; +<<<<<<< ours >map : Symbol(Array.map, Decl(1.0lib-noErrors.ts, 1084, 92)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1091, 8)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1091, 11)) @@ -1936,6 +2866,19 @@ interface Array { >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1091, 8)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1091, 66)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1091, 8)) +======= +>map : Symbol(map, Decl(1.0lib-noErrors.ts, 1081, 92)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1088, 8)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1088, 11)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 1088, 24)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 1088, 33)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 1088, 48)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1088, 8)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1088, 66)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1088, 8)) +>>>>>>> theirs /** * Returns the elements of an array that meet the condition specified in a callback function. @@ -1943,6 +2886,7 @@ interface Array { * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ filter(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[]; +<<<<<<< ours >filter : Symbol(Array.filter, Decl(1.0lib-noErrors.ts, 1091, 87)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1098, 11)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1098, 24)) @@ -1952,6 +2896,17 @@ interface Array { >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1098, 72)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>filter : Symbol(filter, Decl(1.0lib-noErrors.ts, 1088, 87)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1095, 11)) +>value : Symbol(value, Decl(1.0lib-noErrors.ts, 1095, 24)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>index : Symbol(index, Decl(1.0lib-noErrors.ts, 1095, 33)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 1095, 48)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1095, 72)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. @@ -1959,6 +2914,7 @@ interface Array { * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. */ reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; +<<<<<<< ours >reduce : Symbol(Array.reduce, Decl(1.0lib-noErrors.ts, 1098, 93), Decl(1.0lib-noErrors.ts, 1105, 120)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1105, 11)) >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1105, 24)) @@ -1972,6 +2928,21 @@ interface Array { >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1105, 98)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>reduce : Symbol(reduce, Decl(1.0lib-noErrors.ts, 1095, 93), Decl(1.0lib-noErrors.ts, 1102, 120)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1102, 11)) +>previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1102, 24)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 1102, 41)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 1102, 58)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 1102, 80)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1102, 98)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. @@ -1979,6 +2950,7 @@ interface Array { * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. */ reduce(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; +<<<<<<< ours >reduce : Symbol(Array.reduce, Decl(1.0lib-noErrors.ts, 1098, 93), Decl(1.0lib-noErrors.ts, 1105, 120)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1111, 11)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1111, 14)) @@ -1993,6 +2965,22 @@ interface Array { >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1111, 101)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1111, 11)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1111, 11)) +======= +>reduce : Symbol(reduce, Decl(1.0lib-noErrors.ts, 1095, 93), Decl(1.0lib-noErrors.ts, 1102, 120)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1108, 11)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1108, 14)) +>previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1108, 27)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1108, 11)) +>currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 1108, 44)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 1108, 61)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 1108, 83)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1108, 11)) +>initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1108, 101)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1108, 11)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1108, 11)) +>>>>>>> theirs /** * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. @@ -2000,6 +2988,7 @@ interface Array { * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. */ reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; +<<<<<<< ours >reduceRight : Symbol(Array.reduceRight, Decl(1.0lib-noErrors.ts, 1111, 122), Decl(1.0lib-noErrors.ts, 1118, 125)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1118, 16)) >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1118, 29)) @@ -2013,6 +3002,21 @@ interface Array { >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1118, 103)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +======= +>reduceRight : Symbol(reduceRight, Decl(1.0lib-noErrors.ts, 1108, 122), Decl(1.0lib-noErrors.ts, 1115, 125)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1115, 16)) +>previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1115, 29)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 1115, 46)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 1115, 63)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 1115, 85)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1115, 103)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>>>>>>> theirs /** * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. @@ -2020,6 +3024,7 @@ interface Array { * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. */ reduceRight(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; +<<<<<<< ours >reduceRight : Symbol(Array.reduceRight, Decl(1.0lib-noErrors.ts, 1111, 122), Decl(1.0lib-noErrors.ts, 1118, 125)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1124, 16)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1124, 19)) @@ -2034,53 +3039,73 @@ interface Array { >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1124, 106)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1124, 16)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1124, 16)) +======= +>reduceRight : Symbol(reduceRight, Decl(1.0lib-noErrors.ts, 1108, 122), Decl(1.0lib-noErrors.ts, 1115, 125)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1121, 16)) +>callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1121, 19)) +>previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1121, 32)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1121, 16)) +>currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 1121, 49)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 1121, 66)) +>array : Symbol(array, Decl(1.0lib-noErrors.ts, 1121, 88)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1121, 16)) +>initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1121, 106)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1121, 16)) +>U : Symbol(U, Decl(1.0lib-noErrors.ts, 1121, 16)) +>>>>>>> theirs /** * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array. */ length: number; +<<<<<<< ours >length : Symbol(Array.length, Decl(1.0lib-noErrors.ts, 1124, 127)) +======= +>length : Symbol(length, Decl(1.0lib-noErrors.ts, 1121, 127)) +>>>>>>> theirs [n: number]: T; ->n : Symbol(n, Decl(1.0lib-noErrors.ts, 1131, 5)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) +>n : Symbol(n, Decl(1.0lib-noErrors.ts, 1128, 5)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) } declare var Array: { ->Array : Symbol(Array, Decl(1.0lib-noErrors.ts, 973, 23), Decl(1.0lib-noErrors.ts, 1133, 11)) +>Array : Symbol(Array, Decl(1.0lib-noErrors.ts, 970, 23), Decl(1.0lib-noErrors.ts, 1130, 11)) new (arrayLength?: number): any[]; ->arrayLength : Symbol(arrayLength, Decl(1.0lib-noErrors.ts, 1134, 9)) +>arrayLength : Symbol(arrayLength, Decl(1.0lib-noErrors.ts, 1131, 9)) new (arrayLength: number): T[]; ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 1135, 9)) ->arrayLength : Symbol(arrayLength, Decl(1.0lib-noErrors.ts, 1135, 12)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 1135, 9)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 1132, 9)) +>arrayLength : Symbol(arrayLength, Decl(1.0lib-noErrors.ts, 1132, 12)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 1132, 9)) new (...items: T[]): T[]; ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 1136, 9)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 1136, 12)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 1136, 9)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 1136, 9)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 1133, 9)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 1133, 12)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 1133, 9)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 1133, 9)) (arrayLength?: number): any[]; ->arrayLength : Symbol(arrayLength, Decl(1.0lib-noErrors.ts, 1137, 5)) +>arrayLength : Symbol(arrayLength, Decl(1.0lib-noErrors.ts, 1134, 5)) (arrayLength: number): T[]; ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 1138, 5)) ->arrayLength : Symbol(arrayLength, Decl(1.0lib-noErrors.ts, 1138, 8)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 1138, 5)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 1135, 5)) +>arrayLength : Symbol(arrayLength, Decl(1.0lib-noErrors.ts, 1135, 8)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 1135, 5)) (...items: T[]): T[]; ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 1139, 5)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 1139, 8)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 1139, 5)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 1139, 5)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 1136, 5)) +>items : Symbol(items, Decl(1.0lib-noErrors.ts, 1136, 8)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 1136, 5)) +>T : Symbol(T, Decl(1.0lib-noErrors.ts, 1136, 5)) isArray(arg: any): boolean; ->isArray : Symbol(isArray, Decl(1.0lib-noErrors.ts, 1139, 28)) ->arg : Symbol(arg, Decl(1.0lib-noErrors.ts, 1140, 12)) +>isArray : Symbol(isArray, Decl(1.0lib-noErrors.ts, 1136, 28)) +>arg : Symbol(arg, Decl(1.0lib-noErrors.ts, 1137, 12)) prototype: Array; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 1140, 31)) ->Array : Symbol(Array, Decl(1.0lib-noErrors.ts, 973, 23), Decl(1.0lib-noErrors.ts, 1133, 11)) +>prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 1137, 31)) +>Array : Symbol(Array, Decl(1.0lib-noErrors.ts, 970, 23), Decl(1.0lib-noErrors.ts, 1130, 11)) } diff --git a/tests/baselines/reference/1.0lib-noErrors.types b/tests/baselines/reference/1.0lib-noErrors.types index 96e5acc704946..12f5ac963dfbe 100644 --- a/tests/baselines/reference/1.0lib-noErrors.types +++ b/tests/baselines/reference/1.0lib-noErrors.types @@ -20,12 +20,6 @@ and limitations under the License. /// ECMAScript APIs ///////////////////////////// -declare var NaN: number; ->NaN : number - -declare var Infinity: number; ->Infinity : number - /** * Evaluates JavaScript code and executes it. * @param x A String value that contains valid JavaScript code. diff --git a/tests/baselines/reference/InfinityLiteralTypes.js b/tests/baselines/reference/InfinityLiteralTypes.js new file mode 100644 index 0000000000000..79d8f42e7c3bf --- /dev/null +++ b/tests/baselines/reference/InfinityLiteralTypes.js @@ -0,0 +1,65 @@ +//// [InfinityLiteralTypes.ts] +interface PositiveInfinityMember { + member: Infinity +} + +interface NegativeInfinityMember { + member: -Infinity +} + +function invertInfinity(x: -Infinity): Infinity; +function invertInfinity(x: Infinity): -Infinity; +function invertInfinity(x: number): number { + return -x; +} + +let a: PositiveInfinityMember; +let b: NegativeInfinityMember; + +a = {member: Infinity}; +b = {member: -Infinity} + +let c: -Infinity = invertInfinity(a.member); +let d: Infinity = invertInfinity(b.member); + +let x = c + d; +declare function stillNumber(x: number): boolean; +stillNumber(c); +stillNumber(d); + +/*declare function isInfinity(x: number): x is (Infinity | -Infinity) { + return x !== x; +} + +let y: number; +if (isInfinity(y)) { + let a: (Infinity | -Infinity) = y; +} +else { + let b: number = y; +}*/ + +//// [InfinityLiteralTypes.js] +function invertInfinity(x) { + return -x; +} +var a; +var b; +a = { member: Infinity }; +b = { member: -Infinity }; +var c = invertInfinity(a.member); +var d = invertInfinity(b.member); +var x = c + d; +stillNumber(c); +stillNumber(d); +/*declare function isInfinity(x: number): x is (Infinity | -Infinity) { + return x !== x; +} + +let y: number; +if (isInfinity(y)) { + let a: (Infinity | -Infinity) = y; +} +else { + let b: number = y; +}*/ diff --git a/tests/baselines/reference/InfinityLiteralTypes.symbols b/tests/baselines/reference/InfinityLiteralTypes.symbols new file mode 100644 index 0000000000000..61df0162112c8 --- /dev/null +++ b/tests/baselines/reference/InfinityLiteralTypes.symbols @@ -0,0 +1,95 @@ +=== tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts === +interface PositiveInfinityMember { +>PositiveInfinityMember : Symbol(PositiveInfinityMember, Decl(InfinityLiteralTypes.ts, 0, 0)) + + member: Infinity +>member : Symbol(member, Decl(InfinityLiteralTypes.ts, 0, 34)) +>Infinity : Symbol(Infinity) +} + +interface NegativeInfinityMember { +>NegativeInfinityMember : Symbol(NegativeInfinityMember, Decl(InfinityLiteralTypes.ts, 2, 1)) + + member: -Infinity +>member : Symbol(member, Decl(InfinityLiteralTypes.ts, 4, 34)) +} + +function invertInfinity(x: -Infinity): Infinity; +>invertInfinity : Symbol(invertInfinity, Decl(InfinityLiteralTypes.ts, 6, 1), Decl(InfinityLiteralTypes.ts, 8, 48), Decl(InfinityLiteralTypes.ts, 9, 48)) +>x : Symbol(x, Decl(InfinityLiteralTypes.ts, 8, 24)) +>Infinity : Symbol(Infinity) + +function invertInfinity(x: Infinity): -Infinity; +>invertInfinity : Symbol(invertInfinity, Decl(InfinityLiteralTypes.ts, 6, 1), Decl(InfinityLiteralTypes.ts, 8, 48), Decl(InfinityLiteralTypes.ts, 9, 48)) +>x : Symbol(x, Decl(InfinityLiteralTypes.ts, 9, 24)) +>Infinity : Symbol(Infinity) + +function invertInfinity(x: number): number { +>invertInfinity : Symbol(invertInfinity, Decl(InfinityLiteralTypes.ts, 6, 1), Decl(InfinityLiteralTypes.ts, 8, 48), Decl(InfinityLiteralTypes.ts, 9, 48)) +>x : Symbol(x, Decl(InfinityLiteralTypes.ts, 10, 24)) + + return -x; +>x : Symbol(x, Decl(InfinityLiteralTypes.ts, 10, 24)) +} + +let a: PositiveInfinityMember; +>a : Symbol(a, Decl(InfinityLiteralTypes.ts, 14, 3)) +>PositiveInfinityMember : Symbol(PositiveInfinityMember, Decl(InfinityLiteralTypes.ts, 0, 0)) + +let b: NegativeInfinityMember; +>b : Symbol(b, Decl(InfinityLiteralTypes.ts, 15, 3)) +>NegativeInfinityMember : Symbol(NegativeInfinityMember, Decl(InfinityLiteralTypes.ts, 2, 1)) + +a = {member: Infinity}; +>a : Symbol(a, Decl(InfinityLiteralTypes.ts, 14, 3)) +>member : Symbol(member, Decl(InfinityLiteralTypes.ts, 17, 5)) +>Infinity : Symbol(Infinity) + +b = {member: -Infinity} +>b : Symbol(b, Decl(InfinityLiteralTypes.ts, 15, 3)) +>member : Symbol(member, Decl(InfinityLiteralTypes.ts, 18, 5)) +>Infinity : Symbol(Infinity) + +let c: -Infinity = invertInfinity(a.member); +>c : Symbol(c, Decl(InfinityLiteralTypes.ts, 20, 3)) +>invertInfinity : Symbol(invertInfinity, Decl(InfinityLiteralTypes.ts, 6, 1), Decl(InfinityLiteralTypes.ts, 8, 48), Decl(InfinityLiteralTypes.ts, 9, 48)) +>a.member : Symbol(PositiveInfinityMember.member, Decl(InfinityLiteralTypes.ts, 0, 34)) +>a : Symbol(a, Decl(InfinityLiteralTypes.ts, 14, 3)) +>member : Symbol(PositiveInfinityMember.member, Decl(InfinityLiteralTypes.ts, 0, 34)) + +let d: Infinity = invertInfinity(b.member); +>d : Symbol(d, Decl(InfinityLiteralTypes.ts, 21, 3)) +>Infinity : Symbol(Infinity) +>invertInfinity : Symbol(invertInfinity, Decl(InfinityLiteralTypes.ts, 6, 1), Decl(InfinityLiteralTypes.ts, 8, 48), Decl(InfinityLiteralTypes.ts, 9, 48)) +>b.member : Symbol(NegativeInfinityMember.member, Decl(InfinityLiteralTypes.ts, 4, 34)) +>b : Symbol(b, Decl(InfinityLiteralTypes.ts, 15, 3)) +>member : Symbol(NegativeInfinityMember.member, Decl(InfinityLiteralTypes.ts, 4, 34)) + +let x = c + d; +>x : Symbol(x, Decl(InfinityLiteralTypes.ts, 23, 3)) +>c : Symbol(c, Decl(InfinityLiteralTypes.ts, 20, 3)) +>d : Symbol(d, Decl(InfinityLiteralTypes.ts, 21, 3)) + +declare function stillNumber(x: number): boolean; +>stillNumber : Symbol(stillNumber, Decl(InfinityLiteralTypes.ts, 23, 14)) +>x : Symbol(x, Decl(InfinityLiteralTypes.ts, 24, 29)) + +stillNumber(c); +>stillNumber : Symbol(stillNumber, Decl(InfinityLiteralTypes.ts, 23, 14)) +>c : Symbol(c, Decl(InfinityLiteralTypes.ts, 20, 3)) + +stillNumber(d); +>stillNumber : Symbol(stillNumber, Decl(InfinityLiteralTypes.ts, 23, 14)) +>d : Symbol(d, Decl(InfinityLiteralTypes.ts, 21, 3)) + +/*declare function isInfinity(x: number): x is (Infinity | -Infinity) { + return x !== x; +} + +let y: number; +if (isInfinity(y)) { + let a: (Infinity | -Infinity) = y; +} +else { + let b: number = y; +}*/ diff --git a/tests/baselines/reference/InfinityLiteralTypes.types b/tests/baselines/reference/InfinityLiteralTypes.types new file mode 100644 index 0000000000000..43c60da9de61f --- /dev/null +++ b/tests/baselines/reference/InfinityLiteralTypes.types @@ -0,0 +1,106 @@ +=== tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts === +interface PositiveInfinityMember { +>PositiveInfinityMember : PositiveInfinityMember + + member: Infinity +>member : Infinity +>Infinity : Infinity +} + +interface NegativeInfinityMember { +>NegativeInfinityMember : NegativeInfinityMember + + member: -Infinity +>member : -Infinity +} + +function invertInfinity(x: -Infinity): Infinity; +>invertInfinity : { (x: -Infinity): Infinity; (x: Infinity): -Infinity; } +>x : -Infinity +>Infinity : Infinity + +function invertInfinity(x: Infinity): -Infinity; +>invertInfinity : { (x: -Infinity): Infinity; (x: Infinity): -Infinity; } +>x : Infinity +>Infinity : Infinity + +function invertInfinity(x: number): number { +>invertInfinity : { (x: -Infinity): Infinity; (x: Infinity): -Infinity; } +>x : number + + return -x; +>-x : number +>x : number +} + +let a: PositiveInfinityMember; +>a : PositiveInfinityMember +>PositiveInfinityMember : PositiveInfinityMember + +let b: NegativeInfinityMember; +>b : NegativeInfinityMember +>NegativeInfinityMember : NegativeInfinityMember + +a = {member: Infinity}; +>a = {member: Infinity} : { member: Infinity; } +>a : PositiveInfinityMember +>{member: Infinity} : { member: Infinity; } +>member : Infinity +>Infinity : Infinity + +b = {member: -Infinity} +>b = {member: -Infinity} : { member: -Infinity; } +>b : NegativeInfinityMember +>{member: -Infinity} : { member: -Infinity; } +>member : -Infinity +>-Infinity : -Infinity +>Infinity : Infinity + +let c: -Infinity = invertInfinity(a.member); +>c : -Infinity +>invertInfinity(a.member) : -Infinity +>invertInfinity : { (x: -Infinity): Infinity; (x: Infinity): -Infinity; } +>a.member : Infinity +>a : PositiveInfinityMember +>member : Infinity + +let d: Infinity = invertInfinity(b.member); +>d : Infinity +>Infinity : Infinity +>invertInfinity(b.member) : Infinity +>invertInfinity : { (x: -Infinity): Infinity; (x: Infinity): -Infinity; } +>b.member : -Infinity +>b : NegativeInfinityMember +>member : -Infinity + +let x = c + d; +>x : NaN +>c + d : NaN +>c : -Infinity +>d : Infinity + +declare function stillNumber(x: number): boolean; +>stillNumber : (x: number) => boolean +>x : number + +stillNumber(c); +>stillNumber(c) : boolean +>stillNumber : (x: number) => boolean +>c : -Infinity + +stillNumber(d); +>stillNumber(d) : boolean +>stillNumber : (x: number) => boolean +>d : Infinity + +/*declare function isInfinity(x: number): x is (Infinity | -Infinity) { + return x !== x; +} + +let y: number; +if (isInfinity(y)) { + let a: (Infinity | -Infinity) = y; +} +else { + let b: number = y; +}*/ diff --git a/tests/baselines/reference/NaNLiteralTypes.js b/tests/baselines/reference/NaNLiteralTypes.js new file mode 100644 index 0000000000000..715a8bf81be8c --- /dev/null +++ b/tests/baselines/reference/NaNLiteralTypes.js @@ -0,0 +1,40 @@ +//// [NaNLiteralTypes.ts] +interface NaNMember { + member: NaN +} + +let x: NaNMember; +x = {member: NaN} + +declare function stillNumber(x: number): boolean; +stillNumber(x.member); + +/*function isNaN(x: number): x is NaN { + return x !== x; +} + +let y: number; +if (isNaN(y)) { + let a: NaN = y; +} +else { + let b: number = y; +} +*/ + +//// [NaNLiteralTypes.js] +var x; +x = { member: NaN }; +stillNumber(x.member); +/*function isNaN(x: number): x is NaN { + return x !== x; +} + +let y: number; +if (isNaN(y)) { + let a: NaN = y; +} +else { + let b: number = y; +} +*/ diff --git a/tests/baselines/reference/NaNLiteralTypes.symbols b/tests/baselines/reference/NaNLiteralTypes.symbols new file mode 100644 index 0000000000000..21b250baa3fa1 --- /dev/null +++ b/tests/baselines/reference/NaNLiteralTypes.symbols @@ -0,0 +1,40 @@ +=== tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts === +interface NaNMember { +>NaNMember : Symbol(NaNMember, Decl(NaNLiteralTypes.ts, 0, 0)) + + member: NaN +>member : Symbol(member, Decl(NaNLiteralTypes.ts, 0, 21)) +>NaN : Symbol(NaN) +} + +let x: NaNMember; +>x : Symbol(x, Decl(NaNLiteralTypes.ts, 4, 3)) +>NaNMember : Symbol(NaNMember, Decl(NaNLiteralTypes.ts, 0, 0)) + +x = {member: NaN} +>x : Symbol(x, Decl(NaNLiteralTypes.ts, 4, 3)) +>member : Symbol(member, Decl(NaNLiteralTypes.ts, 5, 5)) +>NaN : Symbol(NaN) + +declare function stillNumber(x: number): boolean; +>stillNumber : Symbol(stillNumber, Decl(NaNLiteralTypes.ts, 5, 17)) +>x : Symbol(x, Decl(NaNLiteralTypes.ts, 7, 29)) + +stillNumber(x.member); +>stillNumber : Symbol(stillNumber, Decl(NaNLiteralTypes.ts, 5, 17)) +>x.member : Symbol(NaNMember.member, Decl(NaNLiteralTypes.ts, 0, 21)) +>x : Symbol(x, Decl(NaNLiteralTypes.ts, 4, 3)) +>member : Symbol(NaNMember.member, Decl(NaNLiteralTypes.ts, 0, 21)) + +/*function isNaN(x: number): x is NaN { + return x !== x; +} + +let y: number; +if (isNaN(y)) { + let a: NaN = y; +} +else { + let b: number = y; +} +*/ diff --git a/tests/baselines/reference/NaNLiteralTypes.types b/tests/baselines/reference/NaNLiteralTypes.types new file mode 100644 index 0000000000000..1a6d999464adf --- /dev/null +++ b/tests/baselines/reference/NaNLiteralTypes.types @@ -0,0 +1,43 @@ +=== tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts === +interface NaNMember { +>NaNMember : NaNMember + + member: NaN +>member : NaN +>NaN : NaN +} + +let x: NaNMember; +>x : NaNMember +>NaNMember : NaNMember + +x = {member: NaN} +>x = {member: NaN} : { member: NaN; } +>x : NaNMember +>{member: NaN} : { member: NaN; } +>member : NaN +>NaN : NaN + +declare function stillNumber(x: number): boolean; +>stillNumber : (x: number) => boolean +>x : number + +stillNumber(x.member); +>stillNumber(x.member) : boolean +>stillNumber : (x: number) => boolean +>x.member : NaN +>x : NaNMember +>member : NaN + +/*function isNaN(x: number): x is NaN { + return x !== x; +} + +let y: number; +if (isNaN(y)) { + let a: NaN = y; +} +else { + let b: number = y; +} +*/ diff --git a/tests/baselines/reference/moduleScoping.symbols b/tests/baselines/reference/moduleScoping.symbols index 7a63e8a60fcab..b4e6d24d11805 100644 --- a/tests/baselines/reference/moduleScoping.symbols +++ b/tests/baselines/reference/moduleScoping.symbols @@ -38,7 +38,7 @@ var v4 = {a: true, b: NaN}; // Should shadow global v2 in this module >v4 : Symbol(v4, Decl(file4.ts, 4, 3)) >a : Symbol(a, Decl(file4.ts, 4, 10)) >b : Symbol(b, Decl(file4.ts, 4, 18)) ->NaN : Symbol(NaN, Decl(lib.d.ts, --, --)) +>NaN : Symbol(NaN) === tests/cases/conformance/externalModules/file5.ts === var x = v2; // Should be global v2 of type number again diff --git a/tests/baselines/reference/moduleScoping.types b/tests/baselines/reference/moduleScoping.types index b2ee83dc69bbf..d3de02370ea32 100644 --- a/tests/baselines/reference/moduleScoping.types +++ b/tests/baselines/reference/moduleScoping.types @@ -44,12 +44,12 @@ var t3 = file3.v3; >v3 : boolean var v4 = {a: true, b: NaN}; // Should shadow global v2 in this module ->v4 : { a: boolean; b: number; } ->{a: true, b: NaN} : { a: boolean; b: number; } +>v4 : { a: boolean; b: NaN; } +>{a: true, b: NaN} : { a: boolean; b: NaN; } >a : boolean >true : boolean ->b : number ->NaN : number +>b : NaN +>NaN : NaN === tests/cases/conformance/externalModules/file5.ts === var x = v2; // Should be global v2 of type number again diff --git a/tests/baselines/reference/negativeNumericLiteralTypes.errors.txt b/tests/baselines/reference/negativeNumericLiteralTypes.errors.txt new file mode 100644 index 0000000000000..9407d495098ad --- /dev/null +++ b/tests/baselines/reference/negativeNumericLiteralTypes.errors.txt @@ -0,0 +1,214 @@ +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(51,1): error TS2322: Type 'NumericMember' is not assignable to type 'NegativeNumericMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(53,1): error TS2322: Type 'NegativeNumericMember' is not assignable to type 'NumericMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(55,1): error TS2322: Type 'HexMember' is not assignable to type 'NegativeHexMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(57,1): error TS2322: Type 'NegativeHexMember' is not assignable to type 'HexMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(59,1): error TS2322: Type 'OctalMember' is not assignable to type 'NegativeOctalMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(61,1): error TS2322: Type 'NegativeOctalMember' is not assignable to type 'OctalMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(63,1): error TS2322: Type '{ member: 42; }' is not assignable to type 'NegativeNumericMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(65,1): error TS2322: Type '{ member: 42; }' is not assignable to type 'NegativeHexMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(67,1): error TS2322: Type '{ member: 42; }' is not assignable to type 'NegativeOctalMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(69,1): error TS2322: Type '{ member: 42; }' is not assignable to type 'NumericMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(71,1): error TS2322: Type '{ member: 42; }' is not assignable to type 'HexMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(73,1): error TS2322: Type '{ member: 42; }' is not assignable to type 'OctalMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(75,1): error TS2322: Type '{ member: -42; }' is not assignable to type 'NegativeNumericMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(77,1): error TS2322: Type '{ member: -42; }' is not assignable to type 'NegativeHexMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(79,1): error TS2322: Type '{ member: -42; }' is not assignable to type 'NegativeOctalMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(81,1): error TS2322: Type '{ member: -42; }' is not assignable to type 'NumericMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(83,1): error TS2322: Type '{ member: -42; }' is not assignable to type 'HexMember'. + Types of property 'member' are incompatible. +tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts(85,1): error TS2322: Type '{ member: -42; }' is not assignable to type 'OctalMember'. + Types of property 'member' are incompatible. + + +==== tests/cases/conformance/types/primitives/numericLiteral/negativeNumericLiteralTypes.ts (18 errors) ==== + interface NumericMember { + member: 255; + } + + interface HexMember { + member: 0xFF; + } + + interface OctalMember { + member: 0o377; + } + + interface NumberMember { + member: number; + } + + var a: NumericMember; + var b: HexMember; + var c: OctalMember; + var d: NumberMember; + + a = b = c = {member: 2.55e2}; + + d = a; + d = b; + d = c; + + interface NegativeNumericMember { + member: -255; + } + + interface NegativeHexMember { + member: -0xFF; + } + + interface NegativeOctalMember { + member: -0o377; + } + + var na: NegativeNumericMember; + var nb: NegativeHexMember; + var nc: NegativeOctalMember; + + na = nb = nc = {member: -2.55e2}; + + d = na; + d = nb; + d = nc; + + // All asignments should fail after this point + na = a; + ~~ +!!! error TS2322: Type 'NumericMember' is not assignable to type 'NegativeNumericMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + a = na; + ~ +!!! error TS2322: Type 'NegativeNumericMember' is not assignable to type 'NumericMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + nb = b; + ~~ +!!! error TS2322: Type 'HexMember' is not assignable to type 'NegativeHexMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + b = nb; + ~ +!!! error TS2322: Type 'NegativeHexMember' is not assignable to type 'HexMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + nc = c; + ~~ +!!! error TS2322: Type 'OctalMember' is not assignable to type 'NegativeOctalMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + c = nc; + ~ +!!! error TS2322: Type 'NegativeOctalMember' is not assignable to type 'OctalMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + na = {member: 42}; + ~~ +!!! error TS2322: Type '{ member: 42; }' is not assignable to type 'NegativeNumericMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + nb = {member: 42}; + ~~ +!!! error TS2322: Type '{ member: 42; }' is not assignable to type 'NegativeHexMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + nc = {member: 42}; + ~~ +!!! error TS2322: Type '{ member: 42; }' is not assignable to type 'NegativeOctalMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + a = {member: 42}; + ~ +!!! error TS2322: Type '{ member: 42; }' is not assignable to type 'NumericMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + b = {member: 42}; + ~ +!!! error TS2322: Type '{ member: 42; }' is not assignable to type 'HexMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + c = {member: 42}; + ~ +!!! error TS2322: Type '{ member: 42; }' is not assignable to type 'OctalMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + na = {member: -42}; + ~~ +!!! error TS2322: Type '{ member: -42; }' is not assignable to type 'NegativeNumericMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + nb = {member: -42}; + ~~ +!!! error TS2322: Type '{ member: -42; }' is not assignable to type 'NegativeHexMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + nc = {member: -42}; + ~~ +!!! error TS2322: Type '{ member: -42; }' is not assignable to type 'NegativeOctalMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + a = {member: -42}; + ~ +!!! error TS2322: Type '{ member: -42; }' is not assignable to type 'NumericMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + b = {member: -42}; + ~ +!!! error TS2322: Type '{ member: -42; }' is not assignable to type 'HexMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + c = {member: -42}; + ~ +!!! error TS2322: Type '{ member: -42; }' is not assignable to type 'OctalMember'. +!!! error TS2322: Types of property 'member' are incompatible. + + const zero: 0 = 0; + const one: 1 = 1; + let two: 2 = 2; + const three: 3 = 3; + const four: 4 = 4; + const ten: 10 = 10; + const twenty: 20 = 20; + two = one * one; + two = one ** zero; + two = one / one; + two = one % twenty; + two = one + zero; + two = one - zero; + two = one & one; + two = one ^ zero; + two = one | one; + two = (((two ** two) - four) + (ten * two)) % three / two; + + + /*type True = 1; + type False = 0; + + function isTrue(x: True | False): x is True { + return !!x; + } + + let x: True | False; + + if (isTrue(x)) { + let y: False = x; + } + else { + let z: True = x; + } + */ \ No newline at end of file diff --git a/tests/baselines/reference/negativeNumericLiteralTypes.js b/tests/baselines/reference/negativeNumericLiteralTypes.js new file mode 100644 index 0000000000000..86cba44021b47 --- /dev/null +++ b/tests/baselines/reference/negativeNumericLiteralTypes.js @@ -0,0 +1,191 @@ +//// [negativeNumericLiteralTypes.ts] +interface NumericMember { + member: 255; +} + +interface HexMember { + member: 0xFF; +} + +interface OctalMember { + member: 0o377; +} + +interface NumberMember { + member: number; +} + +var a: NumericMember; +var b: HexMember; +var c: OctalMember; +var d: NumberMember; + +a = b = c = {member: 2.55e2}; + +d = a; +d = b; +d = c; + +interface NegativeNumericMember { + member: -255; +} + +interface NegativeHexMember { + member: -0xFF; +} + +interface NegativeOctalMember { + member: -0o377; +} + +var na: NegativeNumericMember; +var nb: NegativeHexMember; +var nc: NegativeOctalMember; + +na = nb = nc = {member: -2.55e2}; + +d = na; +d = nb; +d = nc; + +// All asignments should fail after this point +na = a; + +a = na; + +nb = b; + +b = nb; + +nc = c; + +c = nc; + +na = {member: 42}; + +nb = {member: 42}; + +nc = {member: 42}; + +a = {member: 42}; + +b = {member: 42}; + +c = {member: 42}; + +na = {member: -42}; + +nb = {member: -42}; + +nc = {member: -42}; + +a = {member: -42}; + +b = {member: -42}; + +c = {member: -42}; + +const zero: 0 = 0; +const one: 1 = 1; +let two: 2 = 2; +const three: 3 = 3; +const four: 4 = 4; +const ten: 10 = 10; +const twenty: 20 = 20; +two = one * one; +two = one ** zero; +two = one / one; +two = one % twenty; +two = one + zero; +two = one - zero; +two = one & one; +two = one ^ zero; +two = one | one; +two = (((two ** two) - four) + (ten * two)) % three / two; + + +/*type True = 1; +type False = 0; + +function isTrue(x: True | False): x is True { + return !!x; +} + +let x: True | False; + +if (isTrue(x)) { + let y: False = x; +} +else { + let z: True = x; +} +*/ + +//// [negativeNumericLiteralTypes.js] +var a; +var b; +var c; +var d; +a = b = c = { member: 2.55e2 }; +d = a; +d = b; +d = c; +var na; +var nb; +var nc; +na = nb = nc = { member: -2.55e2 }; +d = na; +d = nb; +d = nc; +// All asignments should fail after this point +na = a; +a = na; +nb = b; +b = nb; +nc = c; +c = nc; +na = { member: 42 }; +nb = { member: 42 }; +nc = { member: 42 }; +a = { member: 42 }; +b = { member: 42 }; +c = { member: 42 }; +na = { member: -42 }; +nb = { member: -42 }; +nc = { member: -42 }; +a = { member: -42 }; +b = { member: -42 }; +c = { member: -42 }; +var zero = 0; +var one = 1; +var two = 2; +var three = 3; +var four = 4; +var ten = 10; +var twenty = 20; +two = one * one; +two = Math.pow(one, zero); +two = one / one; +two = one % twenty; +two = one + zero; +two = one - zero; +two = one & one; +two = one ^ zero; +two = one | one; +two = (((Math.pow(two, two)) - four) + (ten * two)) % three / two; +/*type True = 1; +type False = 0; + +function isTrue(x: True | False): x is True { + return !!x; +} + +let x: True | False; + +if (isTrue(x)) { + let y: False = x; +} +else { + let z: True = x; +} +*/ diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols index 96b3840856062..a4abfcfc12a12 100644 --- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols +++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols @@ -74,7 +74,7 @@ var m: MyMap = { "1": 1, "2": 2, "Okay that's enough for today.": NaN ->NaN : Symbol(NaN, Decl(lib.d.ts, --, --)) +>NaN : Symbol(NaN) }; diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types index d82b37e0f9e5b..f8e6e61605a81 100644 --- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types +++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types @@ -87,7 +87,7 @@ interface MyMap { var m: MyMap = { >m : MyMap >MyMap : MyMap ->{ "0": 0, "1": 1, "2": 2, "Okay that's enough for today.": NaN} : { "0": number; "1": number; "2": number; "Okay that's enough for today.": number; } +>{ "0": 0, "1": 1, "2": 2, "Okay that's enough for today.": NaN} : { "0": number; "1": number; "2": number; "Okay that's enough for today.": NaN; } "0": 0, >0 : number @@ -99,7 +99,7 @@ var m: MyMap = { >2 : number "Okay that's enough for today.": NaN ->NaN : number +>NaN : NaN }; diff --git a/tests/baselines/reference/numericLiteralTypes.js b/tests/baselines/reference/numericLiteralTypes.js new file mode 100644 index 0000000000000..50bcbf99ddd3e --- /dev/null +++ b/tests/baselines/reference/numericLiteralTypes.js @@ -0,0 +1,134 @@ +//// [numericLiteralTypes.ts] +interface NumericMember { + member: 255; +} + +interface HexMember { + member: 0xFF; +} + +interface OctalMember { + member: 0o377; +} + +interface NumberMember { + member: number; +} + +var a: NumericMember; +var b: HexMember; +var c: OctalMember; +var d: NumberMember; + +a = b = c = {member: 2.55e2}; + +d = a; +d = b; +d = c; + +interface NegativeNumericMember { + member: -255; +} + +interface NegativeHexMember { + member: -0xFF; +} + +interface NegativeOctalMember { + member: -0o377; +} + +var na: NegativeNumericMember; +var nb: NegativeHexMember; +var nc: NegativeOctalMember; + +na = nb = nc = {member: -2.55e2}; + +d = na; +d = nb; +d = nc; + +const zero: 0 = 0; +let one: 1 = 1; +const two: 2 = 2; +const three: 3 = 3; +const four: 4 = 4; +const ten: 10 = 10; +const twenty: 20 = 20; +one = one * one; +one = one ** zero; +one = one / one; +one = one % twenty; +one = one + zero; +one = one - zero; +one = one & one; +one = one ^ zero; +one = one | one; +one = (((two ** two) - four) + (ten * two)) % three / two; + +/*type True = 1; +type False = 0; + +function isTrue(x: True | False): x is True { + return !!x; +} + +let x: True | False; + +if (isTrue(x)) { + let y: True = x; +} +else { + let z: False = x; +} +*/ + +//// [numericLiteralTypes.js] +var a; +var b; +var c; +var d; +a = b = c = { member: 2.55e2 }; +d = a; +d = b; +d = c; +var na; +var nb; +var nc; +na = nb = nc = { member: -2.55e2 }; +d = na; +d = nb; +d = nc; +var zero = 0; +var one = 1; +var two = 2; +var three = 3; +var four = 4; +var ten = 10; +var twenty = 20; +one = one * one; +one = Math.pow(one, zero); +one = one / one; +one = one % twenty; +one = one + zero; +one = one - zero; +one = one & one; +one = one ^ zero; +one = one | one; +one = (((Math.pow(two, two)) - four) + (ten * two)) % three / two; +/*type True = 1; +type False = 0; + +function isTrue(x: True | False): x is True { + return !!x; +} + +let x: True | False; + +if (isTrue(x)) { + let y: True = x; +} +else { + let z: False = x; +} +*/ diff --git a/tests/baselines/reference/numericLiteralTypes.symbols b/tests/baselines/reference/numericLiteralTypes.symbols new file mode 100644 index 0000000000000..41d5ea22ace0d --- /dev/null +++ b/tests/baselines/reference/numericLiteralTypes.symbols @@ -0,0 +1,206 @@ +=== tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts === +interface NumericMember { +>NumericMember : Symbol(NumericMember, Decl(numericLiteralTypes.ts, 0, 0)) + + member: 255; +>member : Symbol(member, Decl(numericLiteralTypes.ts, 0, 25)) +} + +interface HexMember { +>HexMember : Symbol(HexMember, Decl(numericLiteralTypes.ts, 2, 1)) + + member: 0xFF; +>member : Symbol(member, Decl(numericLiteralTypes.ts, 4, 21)) +} + +interface OctalMember { +>OctalMember : Symbol(OctalMember, Decl(numericLiteralTypes.ts, 6, 1)) + + member: 0o377; +>member : Symbol(member, Decl(numericLiteralTypes.ts, 8, 23)) +} + +interface NumberMember { +>NumberMember : Symbol(NumberMember, Decl(numericLiteralTypes.ts, 10, 1)) + + member: number; +>member : Symbol(member, Decl(numericLiteralTypes.ts, 12, 24)) +} + +var a: NumericMember; +>a : Symbol(a, Decl(numericLiteralTypes.ts, 16, 3)) +>NumericMember : Symbol(NumericMember, Decl(numericLiteralTypes.ts, 0, 0)) + +var b: HexMember; +>b : Symbol(b, Decl(numericLiteralTypes.ts, 17, 3)) +>HexMember : Symbol(HexMember, Decl(numericLiteralTypes.ts, 2, 1)) + +var c: OctalMember; +>c : Symbol(c, Decl(numericLiteralTypes.ts, 18, 3)) +>OctalMember : Symbol(OctalMember, Decl(numericLiteralTypes.ts, 6, 1)) + +var d: NumberMember; +>d : Symbol(d, Decl(numericLiteralTypes.ts, 19, 3)) +>NumberMember : Symbol(NumberMember, Decl(numericLiteralTypes.ts, 10, 1)) + +a = b = c = {member: 2.55e2}; +>a : Symbol(a, Decl(numericLiteralTypes.ts, 16, 3)) +>b : Symbol(b, Decl(numericLiteralTypes.ts, 17, 3)) +>c : Symbol(c, Decl(numericLiteralTypes.ts, 18, 3)) +>member : Symbol(member, Decl(numericLiteralTypes.ts, 21, 13)) + +d = a; +>d : Symbol(d, Decl(numericLiteralTypes.ts, 19, 3)) +>a : Symbol(a, Decl(numericLiteralTypes.ts, 16, 3)) + +d = b; +>d : Symbol(d, Decl(numericLiteralTypes.ts, 19, 3)) +>b : Symbol(b, Decl(numericLiteralTypes.ts, 17, 3)) + +d = c; +>d : Symbol(d, Decl(numericLiteralTypes.ts, 19, 3)) +>c : Symbol(c, Decl(numericLiteralTypes.ts, 18, 3)) + +interface NegativeNumericMember { +>NegativeNumericMember : Symbol(NegativeNumericMember, Decl(numericLiteralTypes.ts, 25, 6)) + + member: -255; +>member : Symbol(member, Decl(numericLiteralTypes.ts, 27, 33)) +} + +interface NegativeHexMember { +>NegativeHexMember : Symbol(NegativeHexMember, Decl(numericLiteralTypes.ts, 29, 1)) + + member: -0xFF; +>member : Symbol(member, Decl(numericLiteralTypes.ts, 31, 29)) +} + +interface NegativeOctalMember { +>NegativeOctalMember : Symbol(NegativeOctalMember, Decl(numericLiteralTypes.ts, 33, 1)) + + member: -0o377; +>member : Symbol(member, Decl(numericLiteralTypes.ts, 35, 31)) +} + +var na: NegativeNumericMember; +>na : Symbol(na, Decl(numericLiteralTypes.ts, 39, 3)) +>NegativeNumericMember : Symbol(NegativeNumericMember, Decl(numericLiteralTypes.ts, 25, 6)) + +var nb: NegativeHexMember; +>nb : Symbol(nb, Decl(numericLiteralTypes.ts, 40, 3)) +>NegativeHexMember : Symbol(NegativeHexMember, Decl(numericLiteralTypes.ts, 29, 1)) + +var nc: NegativeOctalMember; +>nc : Symbol(nc, Decl(numericLiteralTypes.ts, 41, 3)) +>NegativeOctalMember : Symbol(NegativeOctalMember, Decl(numericLiteralTypes.ts, 33, 1)) + +na = nb = nc = {member: -2.55e2}; +>na : Symbol(na, Decl(numericLiteralTypes.ts, 39, 3)) +>nb : Symbol(nb, Decl(numericLiteralTypes.ts, 40, 3)) +>nc : Symbol(nc, Decl(numericLiteralTypes.ts, 41, 3)) +>member : Symbol(member, Decl(numericLiteralTypes.ts, 43, 16)) + +d = na; +>d : Symbol(d, Decl(numericLiteralTypes.ts, 19, 3)) +>na : Symbol(na, Decl(numericLiteralTypes.ts, 39, 3)) + +d = nb; +>d : Symbol(d, Decl(numericLiteralTypes.ts, 19, 3)) +>nb : Symbol(nb, Decl(numericLiteralTypes.ts, 40, 3)) + +d = nc; +>d : Symbol(d, Decl(numericLiteralTypes.ts, 19, 3)) +>nc : Symbol(nc, Decl(numericLiteralTypes.ts, 41, 3)) + +const zero: 0 = 0; +>zero : Symbol(zero, Decl(numericLiteralTypes.ts, 49, 5)) + +let one: 1 = 1; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) + +const two: 2 = 2; +>two : Symbol(two, Decl(numericLiteralTypes.ts, 51, 5)) + +const three: 3 = 3; +>three : Symbol(three, Decl(numericLiteralTypes.ts, 52, 5)) + +const four: 4 = 4; +>four : Symbol(four, Decl(numericLiteralTypes.ts, 53, 5)) + +const ten: 10 = 10; +>ten : Symbol(ten, Decl(numericLiteralTypes.ts, 54, 5)) + +const twenty: 20 = 20; +>twenty : Symbol(twenty, Decl(numericLiteralTypes.ts, 55, 5)) + +one = one * one; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) + +one = one ** zero; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>zero : Symbol(zero, Decl(numericLiteralTypes.ts, 49, 5)) + +one = one / one; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) + +one = one % twenty; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>twenty : Symbol(twenty, Decl(numericLiteralTypes.ts, 55, 5)) + +one = one + zero; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>zero : Symbol(zero, Decl(numericLiteralTypes.ts, 49, 5)) + +one = one - zero; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>zero : Symbol(zero, Decl(numericLiteralTypes.ts, 49, 5)) + +one = one & one; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) + +one = one ^ zero; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>zero : Symbol(zero, Decl(numericLiteralTypes.ts, 49, 5)) + +one = one | one; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) + +one = (((two ** two) - four) + (ten * two)) % three / two; +>one : Symbol(one, Decl(numericLiteralTypes.ts, 50, 3)) +>two : Symbol(two, Decl(numericLiteralTypes.ts, 51, 5)) +>two : Symbol(two, Decl(numericLiteralTypes.ts, 51, 5)) +>four : Symbol(four, Decl(numericLiteralTypes.ts, 53, 5)) +>ten : Symbol(ten, Decl(numericLiteralTypes.ts, 54, 5)) +>two : Symbol(two, Decl(numericLiteralTypes.ts, 51, 5)) +>three : Symbol(three, Decl(numericLiteralTypes.ts, 52, 5)) +>two : Symbol(two, Decl(numericLiteralTypes.ts, 51, 5)) + +/*type True = 1; +type False = 0; + +function isTrue(x: True | False): x is True { + return !!x; +} + +let x: True | False; + +if (isTrue(x)) { + let y: True = x; +} +else { + let z: False = x; +} +*/ diff --git a/tests/baselines/reference/numericLiteralTypes.types b/tests/baselines/reference/numericLiteralTypes.types new file mode 100644 index 0000000000000..77cc9810aec8a --- /dev/null +++ b/tests/baselines/reference/numericLiteralTypes.types @@ -0,0 +1,259 @@ +=== tests/cases/conformance/types/primitives/numericLiteral/numericLiteralTypes.ts === +interface NumericMember { +>NumericMember : NumericMember + + member: 255; +>member : 255 +} + +interface HexMember { +>HexMember : HexMember + + member: 0xFF; +>member : 0xFF +} + +interface OctalMember { +>OctalMember : OctalMember + + member: 0o377; +>member : 0o377 +} + +interface NumberMember { +>NumberMember : NumberMember + + member: number; +>member : number +} + +var a: NumericMember; +>a : NumericMember +>NumericMember : NumericMember + +var b: HexMember; +>b : HexMember +>HexMember : HexMember + +var c: OctalMember; +>c : OctalMember +>OctalMember : OctalMember + +var d: NumberMember; +>d : NumberMember +>NumberMember : NumberMember + +a = b = c = {member: 2.55e2}; +>a = b = c = {member: 2.55e2} : { member: 255; } +>a : NumericMember +>b = c = {member: 2.55e2} : { member: 255; } +>b : HexMember +>c = {member: 2.55e2} : { member: 255; } +>c : OctalMember +>{member: 2.55e2} : { member: 255; } +>member : 255 +>2.55e2 : 255 + +d = a; +>d = a : NumericMember +>d : NumberMember +>a : NumericMember + +d = b; +>d = b : HexMember +>d : NumberMember +>b : HexMember + +d = c; +>d = c : OctalMember +>d : NumberMember +>c : OctalMember + +interface NegativeNumericMember { +>NegativeNumericMember : NegativeNumericMember + + member: -255; +>member : -255 +} + +interface NegativeHexMember { +>NegativeHexMember : NegativeHexMember + + member: -0xFF; +>member : -0xFF +} + +interface NegativeOctalMember { +>NegativeOctalMember : NegativeOctalMember + + member: -0o377; +>member : -0o377 +} + +var na: NegativeNumericMember; +>na : NegativeNumericMember +>NegativeNumericMember : NegativeNumericMember + +var nb: NegativeHexMember; +>nb : NegativeHexMember +>NegativeHexMember : NegativeHexMember + +var nc: NegativeOctalMember; +>nc : NegativeOctalMember +>NegativeOctalMember : NegativeOctalMember + +na = nb = nc = {member: -2.55e2}; +>na = nb = nc = {member: -2.55e2} : { member: -255; } +>na : NegativeNumericMember +>nb = nc = {member: -2.55e2} : { member: -255; } +>nb : NegativeHexMember +>nc = {member: -2.55e2} : { member: -255; } +>nc : NegativeOctalMember +>{member: -2.55e2} : { member: -255; } +>member : -255 +>-2.55e2 : -255 +>2.55e2 : 255 + +d = na; +>d = na : NegativeNumericMember +>d : NumberMember +>na : NegativeNumericMember + +d = nb; +>d = nb : NegativeHexMember +>d : NumberMember +>nb : NegativeHexMember + +d = nc; +>d = nc : NegativeOctalMember +>d : NumberMember +>nc : NegativeOctalMember + +const zero: 0 = 0; +>zero : 0 +>0 : 0 + +let one: 1 = 1; +>one : 1 +>1 : 1 + +const two: 2 = 2; +>two : 2 +>2 : 2 + +const three: 3 = 3; +>three : 3 +>3 : 3 + +const four: 4 = 4; +>four : 4 +>4 : 4 + +const ten: 10 = 10; +>ten : 10 +>10 : 10 + +const twenty: 20 = 20; +>twenty : 20 +>20 : 20 + +one = one * one; +>one = one * one : 1 +>one : 1 +>one * one : 1 +>one : 1 +>one : 1 + +one = one ** zero; +>one = one ** zero : 1 +>one : 1 +>one ** zero : 1 +>one : 1 +>zero : 0 + +one = one / one; +>one = one / one : 1 +>one : 1 +>one / one : 1 +>one : 1 +>one : 1 + +one = one % twenty; +>one = one % twenty : 1 +>one : 1 +>one % twenty : 1 +>one : 1 +>twenty : 20 + +one = one + zero; +>one = one + zero : 1 +>one : 1 +>one + zero : 1 +>one : 1 +>zero : 0 + +one = one - zero; +>one = one - zero : 1 +>one : 1 +>one - zero : 1 +>one : 1 +>zero : 0 + +one = one & one; +>one = one & one : 1 +>one : 1 +>one & one : 1 +>one : 1 +>one : 1 + +one = one ^ zero; +>one = one ^ zero : 1 +>one : 1 +>one ^ zero : 1 +>one : 1 +>zero : 0 + +one = one | one; +>one = one | one : 1 +>one : 1 +>one | one : 1 +>one : 1 +>one : 1 + +one = (((two ** two) - four) + (ten * two)) % three / two; +>one = (((two ** two) - four) + (ten * two)) % three / two : 1 +>one : 1 +>(((two ** two) - four) + (ten * two)) % three / two : 1 +>(((two ** two) - four) + (ten * two)) % three : 2 +>(((two ** two) - four) + (ten * two)) : 20 +>((two ** two) - four) + (ten * two) : 20 +>((two ** two) - four) : 0 +>(two ** two) - four : 0 +>(two ** two) : 4 +>two ** two : 4 +>two : 2 +>two : 2 +>four : 4 +>(ten * two) : 20 +>ten * two : 20 +>ten : 10 +>two : 2 +>three : 3 +>two : 2 + +/*type True = 1; +type False = 0; + +function isTrue(x: True | False): x is True { + return !!x; +} + +let x: True | False; + +if (isTrue(x)) { + let y: True = x; +} +else { + let z: False = x; +} +*/ diff --git a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.symbols b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.symbols index 22af33732cf47..a37a82584e857 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.symbols +++ b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.symbols @@ -1,5 +1,5 @@ === tests/cases/conformance/es6/templates/templateStringWithEmbeddedUnaryPlus.ts === var x = `abc${ +Infinity }def`; >x : Symbol(x, Decl(templateStringWithEmbeddedUnaryPlus.ts, 0, 3)) ->Infinity : Symbol(Infinity, Decl(lib.d.ts, --, --)) +>Infinity : Symbol(Infinity) diff --git a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.types b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.types index 9c6c4bc921367..01e2a8bb420ee 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.types +++ b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.types @@ -2,6 +2,6 @@ var x = `abc${ +Infinity }def`; >x : string >`abc${ +Infinity }def` : string ->+Infinity : number ->Infinity : number +>+Infinity : Infinity +>Infinity : Infinity diff --git a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols index df10fbfca6de9..00ac33becb437 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols +++ b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols @@ -1,5 +1,9 @@ === tests/cases/conformance/es6/templates/templateStringWithEmbeddedUnaryPlusES6.ts === var x = `abc${ +Infinity }def`; >x : Symbol(x, Decl(templateStringWithEmbeddedUnaryPlusES6.ts, 0, 3)) +<<<<<<< ours >Infinity : Symbol(Infinity, Decl(lib.es5.d.ts, --, --)) +======= +>Infinity : Symbol(Infinity) +>>>>>>> theirs diff --git a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.types b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.types index 4a957f636e6de..219958fc24dba 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.types +++ b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.types @@ -2,6 +2,6 @@ var x = `abc${ +Infinity }def`; >x : string >`abc${ +Infinity }def` : string ->+Infinity : number ->Infinity : number +>+Infinity : Infinity +>Infinity : Infinity diff --git a/tests/baselines/reference/underscoreTest1.symbols b/tests/baselines/reference/underscoreTest1.symbols index 3506f23510eca..2cbc4e3436939 100644 --- a/tests/baselines/reference/underscoreTest1.symbols +++ b/tests/baselines/reference/underscoreTest1.symbols @@ -771,7 +771,7 @@ _.isFinite(-Infinity); >_.isFinite : Symbol(Underscore.Static.isFinite, Decl(underscoreTest1_underscore.ts, 609, 39)) >_ : Symbol(_, Decl(underscoreTest1_underscore.ts, 645, 11)) >isFinite : Symbol(Underscore.Static.isFinite, Decl(underscoreTest1_underscore.ts, 609, 39)) ->Infinity : Symbol(Infinity, Decl(lib.d.ts, --, --)) +>Infinity : Symbol(Infinity) _.isBoolean(null); >_.isBoolean : Symbol(Underscore.Static.isBoolean, Decl(underscoreTest1_underscore.ts, 610, 39)) @@ -793,7 +793,7 @@ _.isNaN(NaN); >_.isNaN : Symbol(Underscore.Static.isNaN, Decl(underscoreTest1_underscore.ts, 613, 39)) >_ : Symbol(_, Decl(underscoreTest1_underscore.ts, 645, 11)) >isNaN : Symbol(Underscore.Static.isNaN, Decl(underscoreTest1_underscore.ts, 613, 39)) ->NaN : Symbol(NaN, Decl(lib.d.ts, --, --)) +>NaN : Symbol(NaN) isNaN(undefined); >isNaN : Symbol(isNaN, Decl(lib.d.ts, --, --)) diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types index 37f3bdb12ab13..e77bcaea50302 100644 --- a/tests/baselines/reference/underscoreTest1.types +++ b/tests/baselines/reference/underscoreTest1.types @@ -1426,8 +1426,8 @@ _.isFinite(-Infinity); >_.isFinite : (object: any) => boolean >_ : Underscore.Static >isFinite : (object: any) => boolean ->-Infinity : number ->Infinity : number +>-Infinity : -Infinity +>Infinity : Infinity _.isBoolean(null); >_.isBoolean(null) : boolean @@ -1456,7 +1456,7 @@ _.isNaN(NaN); >_.isNaN : (object: any) => boolean >_ : Underscore.Static >isNaN : (object: any) => boolean ->NaN : number +>NaN : NaN isNaN(undefined); >isNaN(undefined) : boolean diff --git a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt index 9dd9a8d41a1bf..9bdc5f2d354fc 100644 --- a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt +++ b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt @@ -1,4 +1,4 @@ -lib.d.ts(28,18): error TS2300: Duplicate identifier 'eval'. +lib.d.ts(25,18): error TS2300: Duplicate identifier 'eval'. tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS1100: Invalid use of 'eval' in strict mode. tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Duplicate identifier 'eval'. From 7562a9d05c170d46538d23aa40abff112e505e30 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 14 Mar 2016 14:27:03 -0400 Subject: [PATCH 10/13] Revert NaN and Infinity to number types when not used in type positions --- src/compiler/checker.ts | 4 +- .../reference/InfinityLiteralTypes.js | 15 ++++++- .../reference/InfinityLiteralTypes.symbols | 21 +++++++++- .../reference/InfinityLiteralTypes.types | 39 +++++++++++++++---- tests/baselines/reference/NaNLiteralTypes.js | 9 ++++- .../reference/NaNLiteralTypes.symbols | 15 +++++-- .../baselines/reference/NaNLiteralTypes.types | 18 +++++++-- tests/baselines/reference/moduleScoping.types | 8 ++-- .../noImplicitAnyIndexingSuppressed.types | 4 +- ...ousTypeNotReferencingTypeParameter.symbols | 2 +- .../templateStringWithEmbeddedUnaryPlus.types | 4 +- ...mplateStringWithEmbeddedUnaryPlusES6.types | 4 +- .../baselines/reference/underscoreTest1.types | 6 +-- .../numericLiteral/InfinityLiteralTypes.ts | 10 ++++- .../numericLiteral/NaNLiteralTypes.ts | 6 ++- 15 files changed, 128 insertions(+), 37 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 0b4ec5f138736..7efe28849f15e 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -17424,9 +17424,9 @@ namespace ts { addToSymbolTable(globals, builtinGlobals, Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0); getSymbolLinks(undefinedSymbol).type = undefinedType; - getSymbolLinks(NaNSymbol).type = NaNLiteralType; + getSymbolLinks(NaNSymbol).type = numberType; getSymbolLinks(NaNSymbol).declaredType = NaNLiteralType; - getSymbolLinks(InfinitySymbol).type = InfinityLiteralType; + getSymbolLinks(InfinitySymbol).type = numberType; getSymbolLinks(InfinitySymbol).declaredType = InfinityLiteralType; getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments"); getSymbolLinks(unknownSymbol).type = unknownType; diff --git a/tests/baselines/reference/InfinityLiteralTypes.js b/tests/baselines/reference/InfinityLiteralTypes.js index 79d8f42e7c3bf..0c23c7d9d1e04 100644 --- a/tests/baselines/reference/InfinityLiteralTypes.js +++ b/tests/baselines/reference/InfinityLiteralTypes.js @@ -16,8 +16,8 @@ function invertInfinity(x: number): number { let a: PositiveInfinityMember; let b: NegativeInfinityMember; -a = {member: Infinity}; -b = {member: -Infinity} +a = {member: Infinity as Infinity}; +b = {member: -(Infinity)} let c: -Infinity = invertInfinity(a.member); let d: Infinity = invertInfinity(b.member); @@ -27,6 +27,12 @@ declare function stillNumber(x: number): boolean; stillNumber(c); stillNumber(d); +//Check that Infinity's declaration is still of type "number", while being "Infinity" when used as a type, so its usage is opt-in +let y = Infinity; +y = 42; +let z = -Infinity; +z = 42; + /*declare function isInfinity(x: number): x is (Infinity | -Infinity) { return x !== x; } @@ -52,6 +58,11 @@ var d = invertInfinity(b.member); var x = c + d; stillNumber(c); stillNumber(d); +//Check that Infinity's declaration is still of type "number", while being "Infinity" when used as a type, so its usage is opt-in +var y = Infinity; +y = 42; +var z = -Infinity; +z = 42; /*declare function isInfinity(x: number): x is (Infinity | -Infinity) { return x !== x; } diff --git a/tests/baselines/reference/InfinityLiteralTypes.symbols b/tests/baselines/reference/InfinityLiteralTypes.symbols index 61df0162112c8..bdc07ae2d2209 100644 --- a/tests/baselines/reference/InfinityLiteralTypes.symbols +++ b/tests/baselines/reference/InfinityLiteralTypes.symbols @@ -40,15 +40,17 @@ let b: NegativeInfinityMember; >b : Symbol(b, Decl(InfinityLiteralTypes.ts, 15, 3)) >NegativeInfinityMember : Symbol(NegativeInfinityMember, Decl(InfinityLiteralTypes.ts, 2, 1)) -a = {member: Infinity}; +a = {member: Infinity as Infinity}; >a : Symbol(a, Decl(InfinityLiteralTypes.ts, 14, 3)) >member : Symbol(member, Decl(InfinityLiteralTypes.ts, 17, 5)) >Infinity : Symbol(Infinity) +>Infinity : Symbol(Infinity) -b = {member: -Infinity} +b = {member: -(Infinity)} >b : Symbol(b, Decl(InfinityLiteralTypes.ts, 15, 3)) >member : Symbol(member, Decl(InfinityLiteralTypes.ts, 18, 5)) >Infinity : Symbol(Infinity) +>Infinity : Symbol(Infinity) let c: -Infinity = invertInfinity(a.member); >c : Symbol(c, Decl(InfinityLiteralTypes.ts, 20, 3)) @@ -82,6 +84,21 @@ stillNumber(d); >stillNumber : Symbol(stillNumber, Decl(InfinityLiteralTypes.ts, 23, 14)) >d : Symbol(d, Decl(InfinityLiteralTypes.ts, 21, 3)) +//Check that Infinity's declaration is still of type "number", while being "Infinity" when used as a type, so its usage is opt-in +let y = Infinity; +>y : Symbol(y, Decl(InfinityLiteralTypes.ts, 29, 3)) +>Infinity : Symbol(Infinity) + +y = 42; +>y : Symbol(y, Decl(InfinityLiteralTypes.ts, 29, 3)) + +let z = -Infinity; +>z : Symbol(z, Decl(InfinityLiteralTypes.ts, 31, 3)) +>Infinity : Symbol(Infinity) + +z = 42; +>z : Symbol(z, Decl(InfinityLiteralTypes.ts, 31, 3)) + /*declare function isInfinity(x: number): x is (Infinity | -Infinity) { return x !== x; } diff --git a/tests/baselines/reference/InfinityLiteralTypes.types b/tests/baselines/reference/InfinityLiteralTypes.types index 43c60da9de61f..c347768a21beb 100644 --- a/tests/baselines/reference/InfinityLiteralTypes.types +++ b/tests/baselines/reference/InfinityLiteralTypes.types @@ -41,20 +41,25 @@ let b: NegativeInfinityMember; >b : NegativeInfinityMember >NegativeInfinityMember : NegativeInfinityMember -a = {member: Infinity}; ->a = {member: Infinity} : { member: Infinity; } +a = {member: Infinity as Infinity}; +>a = {member: Infinity as Infinity} : { member: Infinity; } >a : PositiveInfinityMember ->{member: Infinity} : { member: Infinity; } +>{member: Infinity as Infinity} : { member: Infinity; } >member : Infinity +>Infinity as Infinity : Infinity +>Infinity : number >Infinity : Infinity -b = {member: -Infinity} ->b = {member: -Infinity} : { member: -Infinity; } +b = {member: -(Infinity)} +>b = {member: -(Infinity)} : { member: -Infinity; } >b : NegativeInfinityMember ->{member: -Infinity} : { member: -Infinity; } +>{member: -(Infinity)} : { member: -Infinity; } >member : -Infinity ->-Infinity : -Infinity +>-(Infinity) : -Infinity +>(Infinity) : Infinity +>Infinity : Infinity >Infinity : Infinity +>Infinity : number let c: -Infinity = invertInfinity(a.member); >c : -Infinity @@ -93,6 +98,26 @@ stillNumber(d); >stillNumber : (x: number) => boolean >d : Infinity +//Check that Infinity's declaration is still of type "number", while being "Infinity" when used as a type, so its usage is opt-in +let y = Infinity; +>y : number +>Infinity : number + +y = 42; +>y = 42 : number +>y : number +>42 : number + +let z = -Infinity; +>z : number +>-Infinity : number +>Infinity : number + +z = 42; +>z = 42 : number +>z : number +>42 : number + /*declare function isInfinity(x: number): x is (Infinity | -Infinity) { return x !== x; } diff --git a/tests/baselines/reference/NaNLiteralTypes.js b/tests/baselines/reference/NaNLiteralTypes.js index 715a8bf81be8c..c442f50960037 100644 --- a/tests/baselines/reference/NaNLiteralTypes.js +++ b/tests/baselines/reference/NaNLiteralTypes.js @@ -4,11 +4,15 @@ interface NaNMember { } let x: NaNMember; -x = {member: NaN} +x = {member: NaN as NaN} declare function stillNumber(x: number): boolean; stillNumber(x.member); +//Check that NaN's declaration is still of type "number", while being "NaN" when used as a type, so its usage is opt-in +let y = NaN; +y = 42; + /*function isNaN(x: number): x is NaN { return x !== x; } @@ -26,6 +30,9 @@ else { var x; x = { member: NaN }; stillNumber(x.member); +//Check that NaN's declaration is still of type "number", while being "NaN" when used as a type, so its usage is opt-in +var y = NaN; +y = 42; /*function isNaN(x: number): x is NaN { return x !== x; } diff --git a/tests/baselines/reference/NaNLiteralTypes.symbols b/tests/baselines/reference/NaNLiteralTypes.symbols index 21b250baa3fa1..3393633502dd0 100644 --- a/tests/baselines/reference/NaNLiteralTypes.symbols +++ b/tests/baselines/reference/NaNLiteralTypes.symbols @@ -11,21 +11,30 @@ let x: NaNMember; >x : Symbol(x, Decl(NaNLiteralTypes.ts, 4, 3)) >NaNMember : Symbol(NaNMember, Decl(NaNLiteralTypes.ts, 0, 0)) -x = {member: NaN} +x = {member: NaN as NaN} >x : Symbol(x, Decl(NaNLiteralTypes.ts, 4, 3)) >member : Symbol(member, Decl(NaNLiteralTypes.ts, 5, 5)) >NaN : Symbol(NaN) +>NaN : Symbol(NaN) declare function stillNumber(x: number): boolean; ->stillNumber : Symbol(stillNumber, Decl(NaNLiteralTypes.ts, 5, 17)) +>stillNumber : Symbol(stillNumber, Decl(NaNLiteralTypes.ts, 5, 24)) >x : Symbol(x, Decl(NaNLiteralTypes.ts, 7, 29)) stillNumber(x.member); ->stillNumber : Symbol(stillNumber, Decl(NaNLiteralTypes.ts, 5, 17)) +>stillNumber : Symbol(stillNumber, Decl(NaNLiteralTypes.ts, 5, 24)) >x.member : Symbol(NaNMember.member, Decl(NaNLiteralTypes.ts, 0, 21)) >x : Symbol(x, Decl(NaNLiteralTypes.ts, 4, 3)) >member : Symbol(NaNMember.member, Decl(NaNLiteralTypes.ts, 0, 21)) +//Check that NaN's declaration is still of type "number", while being "NaN" when used as a type, so its usage is opt-in +let y = NaN; +>y : Symbol(y, Decl(NaNLiteralTypes.ts, 11, 3)) +>NaN : Symbol(NaN) + +y = 42; +>y : Symbol(y, Decl(NaNLiteralTypes.ts, 11, 3)) + /*function isNaN(x: number): x is NaN { return x !== x; } diff --git a/tests/baselines/reference/NaNLiteralTypes.types b/tests/baselines/reference/NaNLiteralTypes.types index 1a6d999464adf..08cb183c09993 100644 --- a/tests/baselines/reference/NaNLiteralTypes.types +++ b/tests/baselines/reference/NaNLiteralTypes.types @@ -11,11 +11,13 @@ let x: NaNMember; >x : NaNMember >NaNMember : NaNMember -x = {member: NaN} ->x = {member: NaN} : { member: NaN; } +x = {member: NaN as NaN} +>x = {member: NaN as NaN} : { member: NaN; } >x : NaNMember ->{member: NaN} : { member: NaN; } +>{member: NaN as NaN} : { member: NaN; } >member : NaN +>NaN as NaN : NaN +>NaN : number >NaN : NaN declare function stillNumber(x: number): boolean; @@ -29,6 +31,16 @@ stillNumber(x.member); >x : NaNMember >member : NaN +//Check that NaN's declaration is still of type "number", while being "NaN" when used as a type, so its usage is opt-in +let y = NaN; +>y : number +>NaN : number + +y = 42; +>y = 42 : number +>y : number +>42 : number + /*function isNaN(x: number): x is NaN { return x !== x; } diff --git a/tests/baselines/reference/moduleScoping.types b/tests/baselines/reference/moduleScoping.types index d3de02370ea32..b2ee83dc69bbf 100644 --- a/tests/baselines/reference/moduleScoping.types +++ b/tests/baselines/reference/moduleScoping.types @@ -44,12 +44,12 @@ var t3 = file3.v3; >v3 : boolean var v4 = {a: true, b: NaN}; // Should shadow global v2 in this module ->v4 : { a: boolean; b: NaN; } ->{a: true, b: NaN} : { a: boolean; b: NaN; } +>v4 : { a: boolean; b: number; } +>{a: true, b: NaN} : { a: boolean; b: number; } >a : boolean >true : boolean ->b : NaN ->NaN : NaN +>b : number +>NaN : number === tests/cases/conformance/externalModules/file5.ts === var x = v2; // Should be global v2 of type number again diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types index f8e6e61605a81..d82b37e0f9e5b 100644 --- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types +++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types @@ -87,7 +87,7 @@ interface MyMap { var m: MyMap = { >m : MyMap >MyMap : MyMap ->{ "0": 0, "1": 1, "2": 2, "Okay that's enough for today.": NaN} : { "0": number; "1": number; "2": number; "Okay that's enough for today.": NaN; } +>{ "0": 0, "1": 1, "2": 2, "Okay that's enough for today.": NaN} : { "0": number; "1": number; "2": number; "Okay that's enough for today.": number; } "0": 0, >0 : number @@ -99,7 +99,7 @@ var m: MyMap = { >2 : number "Okay that's enough for today.": NaN ->NaN : NaN +>NaN : number }; diff --git a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.symbols b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.symbols index a6aa91e3a563e..34de4a58840ef 100644 --- a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.symbols +++ b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.symbols @@ -592,7 +592,7 @@ class ListWrapper { var maxValue = -Infinity; >maxValue : Symbol(maxValue, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 120, 7)) ->Infinity : Symbol(Infinity, Decl(lib.d.ts, --, --)) +>Infinity : Symbol(Infinity) for (var index = 0; index < list.length; index++) { >index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 121, 12)) diff --git a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.types b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.types index 01e2a8bb420ee..9c6c4bc921367 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.types +++ b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlus.types @@ -2,6 +2,6 @@ var x = `abc${ +Infinity }def`; >x : string >`abc${ +Infinity }def` : string ->+Infinity : Infinity ->Infinity : Infinity +>+Infinity : number +>Infinity : number diff --git a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.types b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.types index 219958fc24dba..4a957f636e6de 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.types +++ b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.types @@ -2,6 +2,6 @@ var x = `abc${ +Infinity }def`; >x : string >`abc${ +Infinity }def` : string ->+Infinity : Infinity ->Infinity : Infinity +>+Infinity : number +>Infinity : number diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types index e77bcaea50302..37f3bdb12ab13 100644 --- a/tests/baselines/reference/underscoreTest1.types +++ b/tests/baselines/reference/underscoreTest1.types @@ -1426,8 +1426,8 @@ _.isFinite(-Infinity); >_.isFinite : (object: any) => boolean >_ : Underscore.Static >isFinite : (object: any) => boolean ->-Infinity : -Infinity ->Infinity : Infinity +>-Infinity : number +>Infinity : number _.isBoolean(null); >_.isBoolean(null) : boolean @@ -1456,7 +1456,7 @@ _.isNaN(NaN); >_.isNaN : (object: any) => boolean >_ : Underscore.Static >isNaN : (object: any) => boolean ->NaN : NaN +>NaN : number isNaN(undefined); >isNaN(undefined) : boolean diff --git a/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts index 6fe5f1cf30ab3..66918c8e52faf 100644 --- a/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts +++ b/tests/cases/conformance/types/primitives/numericLiteral/InfinityLiteralTypes.ts @@ -15,8 +15,8 @@ function invertInfinity(x: number): number { let a: PositiveInfinityMember; let b: NegativeInfinityMember; -a = {member: Infinity}; -b = {member: -Infinity} +a = {member: Infinity as Infinity}; +b = {member: -(Infinity)} let c: -Infinity = invertInfinity(a.member); let d: Infinity = invertInfinity(b.member); @@ -26,6 +26,12 @@ declare function stillNumber(x: number): boolean; stillNumber(c); stillNumber(d); +//Check that Infinity's declaration is still of type "number", while being "Infinity" when used as a type, so its usage is opt-in +let y = Infinity; +y = 42; +let z = -Infinity; +z = 42; + /*declare function isInfinity(x: number): x is (Infinity | -Infinity) { return x !== x; } diff --git a/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts b/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts index b28a9463abdd6..cff37d55cf461 100644 --- a/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts +++ b/tests/cases/conformance/types/primitives/numericLiteral/NaNLiteralTypes.ts @@ -3,11 +3,15 @@ interface NaNMember { } let x: NaNMember; -x = {member: NaN} +x = {member: NaN as NaN} declare function stillNumber(x: number): boolean; stillNumber(x.member); +//Check that NaN's declaration is still of type "number", while being "NaN" when used as a type, so its usage is opt-in +let y = NaN; +y = 42; + /*function isNaN(x: number): x is NaN { return x !== x; } From e346855fd6f74d98b1ca41f657fa5a85cedb6e36 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 14 Mar 2016 14:41:15 -0400 Subject: [PATCH 11/13] fix lint --- src/compiler/checker.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7efe28849f15e..b6c2971cbd3d9 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5142,7 +5142,7 @@ namespace ts { function getTypeFromTypeUnaryPrefixNode(node: TypeUnaryPrefix): NumericLiteralType { const type = getTypeFromNumericLiteralTypeNode(node.operand) as NumericLiteralType; if (node.operator === SyntaxKind.MinusToken) { - const text = "-"+type.text; + const text = "-" + type.text; if (hasProperty(numericLiteralTypes, text)) { return numericLiteralTypes[text]; } @@ -5150,7 +5150,7 @@ namespace ts { const newType = numericLiteralTypes[text] = createType(TypeFlags.NumericLiteral) as NumericLiteralType; newType.number = -type.number; newType.text = text; - + return newType; } return type; @@ -5887,7 +5887,7 @@ namespace ts { if (isNumericLiteralType(target)) return isNumericLiteralEquivalentTo(source as NumericLiteralType, target as NumericLiteralType); if (target === numberType) return Ternary.True; if (target.flags & TypeFlags.Enum) { - //TODO: If enum numeric value = numeric literal value, then true, else false + // TODO (weswig): If enum numeric value = numeric literal value, then true, else false } } if (relation === assignableRelation || relation === comparableRelation) { @@ -8771,7 +8771,7 @@ namespace ts { function contextualTypeIsStringLiteralType(type: Type): boolean { return !!(type.flags & TypeFlags.Union ? forEach((type).types, isStringLiteralType) : isStringLiteralType(type)); } - + function contextualTypeIsNumericLiteralType(type: Type): boolean { return !!(type.flags & TypeFlags.Union ? forEach((type).types, isNumericLiteralType) : isNumericLiteralType(type)); } From 659d2e069342bba69909e41cd2648274ee27ef45 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 14 Mar 2016 16:41:04 -0400 Subject: [PATCH 12/13] rework how number types are made to fix node 0.10 octal literals --- src/compiler/checker.ts | 39 ++++++++++++++++++++------------------- src/compiler/parser.ts | 7 ++++--- src/compiler/types.ts | 1 + 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b6c2971cbd3d9..4d1f276a7a01f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -193,8 +193,8 @@ namespace ts { const intersectionTypes: Map = {}; const stringLiteralTypes: Map = {}; const numericLiteralTypes: Map = {}; - const NaNLiteralType = getNumericLiteralTypeForText(NaN.toString()); - const InfinityLiteralType = getNumericLiteralTypeForText(Infinity.toString()); + const NaNLiteralType = getNumericLiteralTypeForNumber(NaN); + const InfinityLiteralType = getNumericLiteralTypeForNumber(Infinity); const resolutionTargets: TypeSystemEntity[] = []; const resolutionResults: boolean[] = []; @@ -5110,9 +5110,10 @@ namespace ts { function getNumericLiteralTypeForText(text: string): NumericLiteralType { // Use +(string) rather than Number(string) to be consistient with what we use in the parser const num = +(text); - if (typeof num !== "number") { - return NaNLiteralType; - } + return getNumericLiteralTypeForNumber(num, text); + } + + function getNumericLiteralTypeForNumber(num: number, text: string = num.toString()): NumericLiteralType { if (hasProperty(numericLiteralTypes, text)) { return numericLiteralTypes[text]; } @@ -5134,7 +5135,7 @@ namespace ts { function getTypeFromNumericLiteralTypeNode(node: NumericLiteralTypeNode): Type { const links = getNodeLinks(node); if (!links.resolvedType) { - links.resolvedType = getNumericLiteralTypeForText(node.text); + links.resolvedType = getNumericLiteralTypeForNumber(node.number, node.text); } return links.resolvedType; } @@ -11877,13 +11878,13 @@ namespace ts { if (operandType.flags & TypeFlags.NumericLiteral) { const litType = operandType as NumericLiteralType; const newNumber = -litType.number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } case SyntaxKind.TildeToken: if (operandType.flags & TypeFlags.NumericLiteral) { const litType = operandType as NumericLiteralType; const newNumber = ~litType.number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } if (maybeTypeOfKind(operandType, TypeFlags.ESSymbol)) { error(node.operand, Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, tokenToString(node.operator)); @@ -11895,14 +11896,14 @@ namespace ts { if (operandType.flags & TypeFlags.NumericLiteral) { const litType = operandType as NumericLiteralType; const newNumber = litType.number + 1; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } // Intentional fallthrough case SyntaxKind.MinusMinusToken: if (operandType.flags & TypeFlags.NumericLiteral) { const litType = operandType as NumericLiteralType; const newNumber = litType.number - 1; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } const ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type); @@ -12161,49 +12162,49 @@ namespace ts { case SyntaxKind.AsteriskEqualsToken: if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { const newNumber = (leftType as NumericLiteralType).number * (rightType as NumericLiteralType).number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } case SyntaxKind.AsteriskAsteriskToken: case SyntaxKind.AsteriskAsteriskEqualsToken: if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { const newNumber = (leftType as NumericLiteralType).number ** (rightType as NumericLiteralType).number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } case SyntaxKind.SlashToken: case SyntaxKind.SlashEqualsToken: if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { const newNumber = (leftType as NumericLiteralType).number / (rightType as NumericLiteralType).number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } case SyntaxKind.PercentToken: case SyntaxKind.PercentEqualsToken: if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { const newNumber = (leftType as NumericLiteralType).number % (rightType as NumericLiteralType).number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } case SyntaxKind.MinusToken: case SyntaxKind.MinusEqualsToken: if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { const newNumber = (leftType as NumericLiteralType).number - (rightType as NumericLiteralType).number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } case SyntaxKind.BarToken: case SyntaxKind.BarEqualsToken: if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { const newNumber = (leftType as NumericLiteralType).number | (rightType as NumericLiteralType).number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } case SyntaxKind.CaretToken: case SyntaxKind.CaretEqualsToken: if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { const newNumber = (leftType as NumericLiteralType).number ^ (rightType as NumericLiteralType).number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } case SyntaxKind.AmpersandToken: case SyntaxKind.AmpersandEqualsToken: if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { const newNumber = (leftType as NumericLiteralType).number & (rightType as NumericLiteralType).number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } case SyntaxKind.LessThanLessThanToken: case SyntaxKind.LessThanLessThanEqualsToken: @@ -12246,7 +12247,7 @@ namespace ts { if (leftType.flags & rightType.flags & TypeFlags.NumericLiteral) { // TODO (weswig): add case for when 1 side is a string literal type and the other is a numeric literal, then cast as appropriate const newNumber = (leftType as NumericLiteralType).number + (rightType as NumericLiteralType).number; - return getNumericLiteralTypeForText(newNumber.toString()); + return getNumericLiteralTypeForNumber(newNumber); } // TypeScript 1.0 spec (April 2014): 4.19.2 // The binary + operator requires both operands to be of the Number primitive type or an enum type, diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 8b4b70c251c51..06e26cd996b6c 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1907,9 +1907,10 @@ namespace ts { function parseNumericLiteralTypeNode(): NumericLiteralTypeNode { const node = createNode(SyntaxKind.NumericLiteralType) as NumericLiteralTypeNode; - // Get token text rather than value, this way number formatting is preserved - const text = scanner.getTokenText(); - node.text = text; + // Get token text for node text rather than value, this way number formatting is preserved + node.text = scanner.getTokenText(); + // But store the number on the node because we need it for comparisons later + node.number = +(scanner.getTokenValue()); return finishLiteralLikeNode(node); } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index f70e67ce46c8b..7461641c6dde4 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -787,6 +787,7 @@ namespace ts { // @kind(SyntaxKind.NumericLiteralTypeNode) export interface NumericLiteralTypeNode extends LiteralLikeNode, TypeNode { _numericLiteralTypeBrand: any; + number: number; // The value of the number } // @kind(SyntaxKind.StringLiteral) From fcb4f9b6ee881bf371dd8548d2b702969d327418 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 26 Apr 2016 02:40:47 -0400 Subject: [PATCH 13/13] Fix symbol baselines post-rebase --- .../reference/1.0lib-noErrors.symbols | 1407 +++-------------- .../reference/InfinityLiteralTypes.symbols | 4 +- .../reference/NaNLiteralTypes.symbols | 2 +- .../reference/numericLiteralTypes.symbols | 14 +- ...lateStringWithEmbeddedUnaryPlusES6.symbols | 4 - 5 files changed, 198 insertions(+), 1233 deletions(-) diff --git a/tests/baselines/reference/1.0lib-noErrors.symbols b/tests/baselines/reference/1.0lib-noErrors.symbols index 37ae16a8628a1..54930585407ce 100644 --- a/tests/baselines/reference/1.0lib-noErrors.symbols +++ b/tests/baselines/reference/1.0lib-noErrors.symbols @@ -100,43 +100,23 @@ interface PropertyDescriptor { >PropertyDescriptor : Symbol(PropertyDescriptor, Decl(1.0lib-noErrors.ts, 76, 66)) configurable?: boolean; -<<<<<<< ours ->configurable : Symbol(PropertyDescriptor.configurable, Decl(1.0lib-noErrors.ts, 81, 30)) +>configurable : Symbol(PropertyDescriptor.configurable, Decl(1.0lib-noErrors.ts, 78, 30)) enumerable?: boolean; ->enumerable : Symbol(PropertyDescriptor.enumerable, Decl(1.0lib-noErrors.ts, 82, 27)) +>enumerable : Symbol(PropertyDescriptor.enumerable, Decl(1.0lib-noErrors.ts, 79, 27)) value?: any; ->value : Symbol(PropertyDescriptor.value, Decl(1.0lib-noErrors.ts, 83, 25)) +>value : Symbol(PropertyDescriptor.value, Decl(1.0lib-noErrors.ts, 80, 25)) writable?: boolean; ->writable : Symbol(PropertyDescriptor.writable, Decl(1.0lib-noErrors.ts, 84, 16)) +>writable : Symbol(PropertyDescriptor.writable, Decl(1.0lib-noErrors.ts, 81, 16)) get?(): any; ->get : Symbol(PropertyDescriptor.get, Decl(1.0lib-noErrors.ts, 85, 23)) +>get : Symbol(PropertyDescriptor.get, Decl(1.0lib-noErrors.ts, 82, 23)) set?(v: any): void; ->set : Symbol(PropertyDescriptor.set, Decl(1.0lib-noErrors.ts, 86, 16)) ->v : Symbol(v, Decl(1.0lib-noErrors.ts, 87, 9)) -======= ->configurable : Symbol(configurable, Decl(1.0lib-noErrors.ts, 78, 30)) - - enumerable?: boolean; ->enumerable : Symbol(enumerable, Decl(1.0lib-noErrors.ts, 79, 27)) - - value?: any; ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 80, 25)) - - writable?: boolean; ->writable : Symbol(writable, Decl(1.0lib-noErrors.ts, 81, 16)) - - get?(): any; ->get : Symbol(get, Decl(1.0lib-noErrors.ts, 82, 23)) - - set?(v: any): void; ->set : Symbol(set, Decl(1.0lib-noErrors.ts, 83, 16)) +>set : Symbol(PropertyDescriptor.set, Decl(1.0lib-noErrors.ts, 83, 16)) >v : Symbol(v, Decl(1.0lib-noErrors.ts, 84, 9)) ->>>>>>> theirs } interface PropertyDescriptorMap { @@ -152,80 +132,46 @@ interface Object { /** The initial value of Object.prototype.constructor is the standard built-in Object constructor. */ constructor: Function; -<<<<<<< ours ->constructor : Symbol(Object.constructor, Decl(1.0lib-noErrors.ts, 94, 18)) ->Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) - - /** Returns a string representation of an object. */ - toString(): string; ->toString : Symbol(Object.toString, Decl(1.0lib-noErrors.ts, 96, 26)) - - /** Returns a date converted to a string using the current locale. */ - toLocaleString(): string; ->toLocaleString : Symbol(Object.toLocaleString, Decl(1.0lib-noErrors.ts, 99, 23)) - - /** Returns the primitive value of the specified object. */ - valueOf(): Object; ->valueOf : Symbol(Object.valueOf, Decl(1.0lib-noErrors.ts, 102, 29)) ->Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 92, 1), Decl(1.0lib-noErrors.ts, 129, 11)) -======= ->constructor : Symbol(constructor, Decl(1.0lib-noErrors.ts, 91, 18)) +>constructor : Symbol(Object.constructor, Decl(1.0lib-noErrors.ts, 91, 18)) >Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) /** Returns a string representation of an object. */ toString(): string; ->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 93, 26)) +>toString : Symbol(Object.toString, Decl(1.0lib-noErrors.ts, 93, 26)) /** Returns a date converted to a string using the current locale. */ toLocaleString(): string; ->toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 96, 23)) +>toLocaleString : Symbol(Object.toLocaleString, Decl(1.0lib-noErrors.ts, 96, 23)) /** Returns the primitive value of the specified object. */ valueOf(): Object; ->valueOf : Symbol(valueOf, Decl(1.0lib-noErrors.ts, 99, 29)) +>valueOf : Symbol(Object.valueOf, Decl(1.0lib-noErrors.ts, 99, 29)) >Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 89, 1), Decl(1.0lib-noErrors.ts, 126, 11)) ->>>>>>> theirs /** * Determines whether an object has a property with the specified name. * @param v A property name. */ hasOwnProperty(v: string): boolean; -<<<<<<< ours ->hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(1.0lib-noErrors.ts, 105, 22)) ->v : Symbol(v, Decl(1.0lib-noErrors.ts, 111, 19)) -======= ->hasOwnProperty : Symbol(hasOwnProperty, Decl(1.0lib-noErrors.ts, 102, 22)) +>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(1.0lib-noErrors.ts, 102, 22)) >v : Symbol(v, Decl(1.0lib-noErrors.ts, 108, 19)) ->>>>>>> theirs /** * Determines whether an object exists in another object's prototype chain. * @param v Another object whose prototype chain is to be checked. */ isPrototypeOf(v: Object): boolean; -<<<<<<< ours ->isPrototypeOf : Symbol(Object.isPrototypeOf, Decl(1.0lib-noErrors.ts, 111, 39)) ->v : Symbol(v, Decl(1.0lib-noErrors.ts, 117, 18)) ->Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 92, 1), Decl(1.0lib-noErrors.ts, 129, 11)) -======= ->isPrototypeOf : Symbol(isPrototypeOf, Decl(1.0lib-noErrors.ts, 108, 39)) +>isPrototypeOf : Symbol(Object.isPrototypeOf, Decl(1.0lib-noErrors.ts, 108, 39)) >v : Symbol(v, Decl(1.0lib-noErrors.ts, 114, 18)) >Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 89, 1), Decl(1.0lib-noErrors.ts, 126, 11)) ->>>>>>> theirs /** * Determines whether a specified property is enumerable. * @param v A property name. */ propertyIsEnumerable(v: string): boolean; -<<<<<<< ours ->propertyIsEnumerable : Symbol(Object.propertyIsEnumerable, Decl(1.0lib-noErrors.ts, 117, 38)) ->v : Symbol(v, Decl(1.0lib-noErrors.ts, 123, 25)) -======= ->propertyIsEnumerable : Symbol(propertyIsEnumerable, Decl(1.0lib-noErrors.ts, 114, 38)) +>propertyIsEnumerable : Symbol(Object.propertyIsEnumerable, Decl(1.0lib-noErrors.ts, 114, 38)) >v : Symbol(v, Decl(1.0lib-noErrors.ts, 120, 25)) ->>>>>>> theirs } /** @@ -380,15 +326,9 @@ interface Function { * @param argArray A set of arguments to be passed to the function. */ apply(thisArg: any, argArray?: any): any; -<<<<<<< ours ->apply : Symbol(Function.apply, Decl(1.0lib-noErrors.ts, 226, 20)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 232, 10)) ->argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 232, 23)) -======= ->apply : Symbol(apply, Decl(1.0lib-noErrors.ts, 223, 20)) +>apply : Symbol(Function.apply, Decl(1.0lib-noErrors.ts, 223, 20)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 229, 10)) >argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 229, 23)) ->>>>>>> theirs /** * Calls a method of an object, substituting another object for the current object. @@ -396,15 +336,9 @@ interface Function { * @param argArray A list of arguments to be passed to the method. */ call(thisArg: any, ...argArray: any[]): any; -<<<<<<< ours ->call : Symbol(Function.call, Decl(1.0lib-noErrors.ts, 232, 45)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 239, 9)) ->argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 239, 22)) -======= ->call : Symbol(call, Decl(1.0lib-noErrors.ts, 229, 45)) +>call : Symbol(Function.call, Decl(1.0lib-noErrors.ts, 229, 45)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 236, 9)) >argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 236, 22)) ->>>>>>> theirs /** * For a given function, creates a bound function that has the same body as the original function. @@ -413,43 +347,23 @@ interface Function { * @param argArray A list of arguments to be passed to the new function. */ bind(thisArg: any, ...argArray: any[]): any; -<<<<<<< ours ->bind : Symbol(Function.bind, Decl(1.0lib-noErrors.ts, 239, 48)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 247, 9)) ->argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 247, 22)) - - prototype: any; ->prototype : Symbol(Function.prototype, Decl(1.0lib-noErrors.ts, 247, 48)) - - length: number; ->length : Symbol(Function.length, Decl(1.0lib-noErrors.ts, 249, 19)) - - // Non-standard extensions - arguments: any; ->arguments : Symbol(Function.arguments, Decl(1.0lib-noErrors.ts, 250, 19)) - - caller: Function; ->caller : Symbol(Function.caller, Decl(1.0lib-noErrors.ts, 253, 19)) ->Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) -======= ->bind : Symbol(bind, Decl(1.0lib-noErrors.ts, 236, 48)) +>bind : Symbol(Function.bind, Decl(1.0lib-noErrors.ts, 236, 48)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 244, 9)) >argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 244, 22)) prototype: any; ->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 244, 48)) +>prototype : Symbol(Function.prototype, Decl(1.0lib-noErrors.ts, 244, 48)) length: number; ->length : Symbol(length, Decl(1.0lib-noErrors.ts, 246, 19)) +>length : Symbol(Function.length, Decl(1.0lib-noErrors.ts, 246, 19)) // Non-standard extensions arguments: any; ->arguments : Symbol(arguments, Decl(1.0lib-noErrors.ts, 247, 19)) +>arguments : Symbol(Function.arguments, Decl(1.0lib-noErrors.ts, 247, 19)) caller: Function; ->caller : Symbol(caller, Decl(1.0lib-noErrors.ts, 250, 19)) +>caller : Symbol(Function.caller, Decl(1.0lib-noErrors.ts, 250, 19)) >Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) ->>>>>>> theirs } declare var Function: { @@ -479,19 +393,11 @@ interface IArguments { >index : Symbol(index, Decl(1.0lib-noErrors.ts, 265, 5)) length: number; -<<<<<<< ours ->length : Symbol(IArguments.length, Decl(1.0lib-noErrors.ts, 268, 25)) +>length : Symbol(IArguments.length, Decl(1.0lib-noErrors.ts, 265, 25)) callee: Function; ->callee : Symbol(IArguments.callee, Decl(1.0lib-noErrors.ts, 269, 19)) ->Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11)) -======= ->length : Symbol(length, Decl(1.0lib-noErrors.ts, 265, 25)) - - callee: Function; ->callee : Symbol(callee, Decl(1.0lib-noErrors.ts, 266, 19)) +>callee : Symbol(IArguments.callee, Decl(1.0lib-noErrors.ts, 266, 19)) >Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 218, 1), Decl(1.0lib-noErrors.ts, 254, 11)) ->>>>>>> theirs } interface String { @@ -499,50 +405,31 @@ interface String { /** Returns a string representation of a string. */ toString(): string; -<<<<<<< ours ->toString : Symbol(String.toString, Decl(1.0lib-noErrors.ts, 273, 18)) -======= ->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 270, 18)) ->>>>>>> theirs +>toString : Symbol(String.toString, Decl(1.0lib-noErrors.ts, 270, 18)) /** * Returns the character at the specified index. * @param pos The zero-based index of the desired character. */ charAt(pos: number): string; -<<<<<<< ours ->charAt : Symbol(String.charAt, Decl(1.0lib-noErrors.ts, 275, 23)) ->pos : Symbol(pos, Decl(1.0lib-noErrors.ts, 281, 11)) -======= ->charAt : Symbol(charAt, Decl(1.0lib-noErrors.ts, 272, 23)) +>charAt : Symbol(String.charAt, Decl(1.0lib-noErrors.ts, 272, 23)) >pos : Symbol(pos, Decl(1.0lib-noErrors.ts, 278, 11)) ->>>>>>> theirs /** * Returns the Unicode value of the character at the specified location. * @param index The zero-based index of the desired character. If there is no character at the specified index, NaN is returned. */ charCodeAt(index: number): number; -<<<<<<< ours ->charCodeAt : Symbol(String.charCodeAt, Decl(1.0lib-noErrors.ts, 281, 32)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 287, 15)) -======= ->charCodeAt : Symbol(charCodeAt, Decl(1.0lib-noErrors.ts, 278, 32)) +>charCodeAt : Symbol(String.charCodeAt, Decl(1.0lib-noErrors.ts, 278, 32)) >index : Symbol(index, Decl(1.0lib-noErrors.ts, 284, 15)) ->>>>>>> theirs /** * Returns a string that contains the concatenation of two or more strings. * @param strings The strings to append to the end of the string. */ concat(...strings: string[]): string; -<<<<<<< ours ->concat : Symbol(String.concat, Decl(1.0lib-noErrors.ts, 287, 38)) ->strings : Symbol(strings, Decl(1.0lib-noErrors.ts, 293, 11)) -======= ->concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 284, 38)) +>concat : Symbol(String.concat, Decl(1.0lib-noErrors.ts, 284, 38)) >strings : Symbol(strings, Decl(1.0lib-noErrors.ts, 290, 11)) ->>>>>>> theirs /** * Returns the position of the first occurrence of a substring. @@ -550,15 +437,9 @@ interface String { * @param position The index at which to begin searching the String object. If omitted, search starts at the beginning of the string. */ indexOf(searchString: string, position?: number): number; -<<<<<<< ours ->indexOf : Symbol(String.indexOf, Decl(1.0lib-noErrors.ts, 293, 41)) ->searchString : Symbol(searchString, Decl(1.0lib-noErrors.ts, 300, 12)) ->position : Symbol(position, Decl(1.0lib-noErrors.ts, 300, 33)) -======= ->indexOf : Symbol(indexOf, Decl(1.0lib-noErrors.ts, 290, 41)) +>indexOf : Symbol(String.indexOf, Decl(1.0lib-noErrors.ts, 290, 41)) >searchString : Symbol(searchString, Decl(1.0lib-noErrors.ts, 297, 12)) >position : Symbol(position, Decl(1.0lib-noErrors.ts, 297, 33)) ->>>>>>> theirs /** * Returns the last occurrence of a substring in the string. @@ -566,56 +447,34 @@ interface String { * @param position The index at which to begin searching. If omitted, the search begins at the end of the string. */ lastIndexOf(searchString: string, position?: number): number; -<<<<<<< ours ->lastIndexOf : Symbol(String.lastIndexOf, Decl(1.0lib-noErrors.ts, 300, 61)) ->searchString : Symbol(searchString, Decl(1.0lib-noErrors.ts, 307, 16)) ->position : Symbol(position, Decl(1.0lib-noErrors.ts, 307, 37)) -======= ->lastIndexOf : Symbol(lastIndexOf, Decl(1.0lib-noErrors.ts, 297, 61)) +>lastIndexOf : Symbol(String.lastIndexOf, Decl(1.0lib-noErrors.ts, 297, 61)) >searchString : Symbol(searchString, Decl(1.0lib-noErrors.ts, 304, 16)) >position : Symbol(position, Decl(1.0lib-noErrors.ts, 304, 37)) ->>>>>>> theirs /** * Determines whether two strings are equivalent in the current locale. * @param that String to compare to target string */ localeCompare(that: string): number; -<<<<<<< ours ->localeCompare : Symbol(String.localeCompare, Decl(1.0lib-noErrors.ts, 307, 65)) ->that : Symbol(that, Decl(1.0lib-noErrors.ts, 313, 18)) -======= ->localeCompare : Symbol(localeCompare, Decl(1.0lib-noErrors.ts, 304, 65)) +>localeCompare : Symbol(String.localeCompare, Decl(1.0lib-noErrors.ts, 304, 65)) >that : Symbol(that, Decl(1.0lib-noErrors.ts, 310, 18)) ->>>>>>> theirs /** * Matches a string with a regular expression, and returns an array containing the results of that search. * @param regexp A variable name or string literal containing the regular expression pattern and flags. */ match(regexp: string): string[]; -<<<<<<< ours ->match : Symbol(String.match, Decl(1.0lib-noErrors.ts, 313, 40), Decl(1.0lib-noErrors.ts, 319, 36)) ->regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 319, 10)) -======= ->match : Symbol(match, Decl(1.0lib-noErrors.ts, 310, 40), Decl(1.0lib-noErrors.ts, 316, 36)) +>match : Symbol(String.match, Decl(1.0lib-noErrors.ts, 310, 40), Decl(1.0lib-noErrors.ts, 316, 36)) >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 316, 10)) ->>>>>>> theirs /** * Matches a string with a regular expression, and returns an array containing the results of that search. * @param regexp A regular expression object that contains the regular expression pattern and applicable flags. */ match(regexp: RegExp): string[]; -<<<<<<< ours ->match : Symbol(String.match, Decl(1.0lib-noErrors.ts, 313, 40), Decl(1.0lib-noErrors.ts, 319, 36)) ->regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 325, 10)) ->RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) -======= ->match : Symbol(match, Decl(1.0lib-noErrors.ts, 310, 40), Decl(1.0lib-noErrors.ts, 316, 36)) +>match : Symbol(String.match, Decl(1.0lib-noErrors.ts, 310, 40), Decl(1.0lib-noErrors.ts, 316, 36)) >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 322, 10)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) ->>>>>>> theirs /** * Replaces text in a string, using a regular expression or search string. @@ -623,15 +482,9 @@ interface String { * @param replaceValue A String object or string literal containing the text to replace for every successful match of rgExp in stringObj. */ replace(searchValue: string, replaceValue: string): string; -<<<<<<< ours ->replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63)) ->searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 332, 12)) ->replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 332, 32)) -======= ->replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) +>replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 329, 12)) >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 329, 32)) ->>>>>>> theirs /** * Replaces text in a string, using a regular expression or search string. @@ -639,19 +492,11 @@ interface String { * @param replaceValue A function that returns the replacement text. */ replace(searchValue: string, replaceValue: (substring: string, ...args: any[]) => string): string; -<<<<<<< ours ->replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63)) ->searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 339, 12)) ->replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 339, 32)) ->substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 339, 48)) ->args : Symbol(args, Decl(1.0lib-noErrors.ts, 339, 66)) -======= ->replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) +>replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 336, 12)) >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 336, 32)) >substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 336, 48)) >args : Symbol(args, Decl(1.0lib-noErrors.ts, 336, 66)) ->>>>>>> theirs /** * Replaces text in a string, using a regular expression or search string. @@ -659,17 +504,10 @@ interface String { * @param replaceValue A String object or string literal containing the text to replace for every successful match of rgExp in stringObj. */ replace(searchValue: RegExp, replaceValue: string): string; -<<<<<<< ours ->replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63)) ->searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 346, 12)) ->RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) ->replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 346, 32)) -======= ->replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) +>replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 343, 12)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 343, 32)) ->>>>>>> theirs /** * Replaces text in a string, using a regular expression or search string. @@ -677,49 +515,29 @@ interface String { * @param replaceValue A function that returns the replacement text. */ replace(searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string; -<<<<<<< ours ->replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63)) ->searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 353, 12)) ->RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) ->replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 353, 32)) ->substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 353, 48)) ->args : Symbol(args, Decl(1.0lib-noErrors.ts, 353, 66)) -======= ->replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) +>replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 322, 36), Decl(1.0lib-noErrors.ts, 329, 63), Decl(1.0lib-noErrors.ts, 336, 102), Decl(1.0lib-noErrors.ts, 343, 63)) >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 350, 12)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 350, 32)) >substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 350, 48)) >args : Symbol(args, Decl(1.0lib-noErrors.ts, 350, 66)) ->>>>>>> theirs /** * Finds the first substring match in a regular expression search. * @param regexp The regular expression pattern and applicable flags. */ search(regexp: string): number; -<<<<<<< ours ->search : Symbol(String.search, Decl(1.0lib-noErrors.ts, 353, 102), Decl(1.0lib-noErrors.ts, 359, 35)) ->regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 359, 11)) -======= ->search : Symbol(search, Decl(1.0lib-noErrors.ts, 350, 102), Decl(1.0lib-noErrors.ts, 356, 35)) +>search : Symbol(String.search, Decl(1.0lib-noErrors.ts, 350, 102), Decl(1.0lib-noErrors.ts, 356, 35)) >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 356, 11)) ->>>>>>> theirs /** * Finds the first substring match in a regular expression search. * @param regexp The regular expression pattern and applicable flags. */ search(regexp: RegExp): number; -<<<<<<< ours ->search : Symbol(String.search, Decl(1.0lib-noErrors.ts, 353, 102), Decl(1.0lib-noErrors.ts, 359, 35)) ->regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 365, 11)) ->RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) -======= ->search : Symbol(search, Decl(1.0lib-noErrors.ts, 350, 102), Decl(1.0lib-noErrors.ts, 356, 35)) +>search : Symbol(String.search, Decl(1.0lib-noErrors.ts, 350, 102), Decl(1.0lib-noErrors.ts, 356, 35)) >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 362, 11)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) ->>>>>>> theirs /** * Returns a section of a string. @@ -728,15 +546,9 @@ interface String { * If this value is not specified, the substring continues to the end of stringObj. */ slice(start?: number, end?: number): string; -<<<<<<< ours ->slice : Symbol(String.slice, Decl(1.0lib-noErrors.ts, 365, 35)) ->start : Symbol(start, Decl(1.0lib-noErrors.ts, 373, 10)) ->end : Symbol(end, Decl(1.0lib-noErrors.ts, 373, 25)) -======= ->slice : Symbol(slice, Decl(1.0lib-noErrors.ts, 362, 35)) +>slice : Symbol(String.slice, Decl(1.0lib-noErrors.ts, 362, 35)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 370, 10)) >end : Symbol(end, Decl(1.0lib-noErrors.ts, 370, 25)) ->>>>>>> theirs /** * Split a string into substrings using the specified separator and return them as an array. @@ -744,15 +556,9 @@ interface String { * @param limit A value used to limit the number of elements returned in the array. */ split(separator: string, limit?: number): string[]; -<<<<<<< ours ->split : Symbol(String.split, Decl(1.0lib-noErrors.ts, 373, 48), Decl(1.0lib-noErrors.ts, 380, 55)) ->separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 380, 10)) ->limit : Symbol(limit, Decl(1.0lib-noErrors.ts, 380, 28)) -======= ->split : Symbol(split, Decl(1.0lib-noErrors.ts, 370, 48), Decl(1.0lib-noErrors.ts, 377, 55)) +>split : Symbol(String.split, Decl(1.0lib-noErrors.ts, 370, 48), Decl(1.0lib-noErrors.ts, 377, 55)) >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 377, 10)) >limit : Symbol(limit, Decl(1.0lib-noErrors.ts, 377, 28)) ->>>>>>> theirs /** * Split a string into substrings using the specified separator and return them as an array. @@ -760,17 +566,10 @@ interface String { * @param limit A value used to limit the number of elements returned in the array. */ split(separator: RegExp, limit?: number): string[]; -<<<<<<< ours ->split : Symbol(String.split, Decl(1.0lib-noErrors.ts, 373, 48), Decl(1.0lib-noErrors.ts, 380, 55)) ->separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 387, 10)) ->RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) ->limit : Symbol(limit, Decl(1.0lib-noErrors.ts, 387, 28)) -======= ->split : Symbol(split, Decl(1.0lib-noErrors.ts, 370, 48), Decl(1.0lib-noErrors.ts, 377, 55)) +>split : Symbol(String.split, Decl(1.0lib-noErrors.ts, 370, 48), Decl(1.0lib-noErrors.ts, 377, 55)) >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 384, 10)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) >limit : Symbol(limit, Decl(1.0lib-noErrors.ts, 384, 28)) ->>>>>>> theirs /** * Returns the substring at the specified location within a String object. @@ -779,63 +578,33 @@ interface String { * If end is omitted, the characters from start through the end of the original string are returned. */ substring(start: number, end?: number): string; -<<<<<<< ours ->substring : Symbol(String.substring, Decl(1.0lib-noErrors.ts, 387, 55)) ->start : Symbol(start, Decl(1.0lib-noErrors.ts, 395, 14)) ->end : Symbol(end, Decl(1.0lib-noErrors.ts, 395, 28)) - - /** Converts all the alphabetic characters in a string to lowercase. */ - toLowerCase(): string; ->toLowerCase : Symbol(String.toLowerCase, Decl(1.0lib-noErrors.ts, 395, 51)) - - /** Converts all alphabetic characters to lowercase, taking into account the host environment's current locale. */ - toLocaleLowerCase(): string; ->toLocaleLowerCase : Symbol(String.toLocaleLowerCase, Decl(1.0lib-noErrors.ts, 398, 26)) - - /** Converts all the alphabetic characters in a string to uppercase. */ - toUpperCase(): string; ->toUpperCase : Symbol(String.toUpperCase, Decl(1.0lib-noErrors.ts, 401, 32)) - - /** Returns a string where all alphabetic characters have been converted to uppercase, taking into account the host environment's current locale. */ - toLocaleUpperCase(): string; ->toLocaleUpperCase : Symbol(String.toLocaleUpperCase, Decl(1.0lib-noErrors.ts, 404, 26)) - - /** Removes the leading and trailing white space and line terminator characters from a string. */ - trim(): string; ->trim : Symbol(String.trim, Decl(1.0lib-noErrors.ts, 407, 32)) - - /** Returns the length of a String object. */ - length: number; ->length : Symbol(String.length, Decl(1.0lib-noErrors.ts, 410, 19)) -======= ->substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 384, 55)) +>substring : Symbol(String.substring, Decl(1.0lib-noErrors.ts, 384, 55)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 392, 14)) >end : Symbol(end, Decl(1.0lib-noErrors.ts, 392, 28)) /** Converts all the alphabetic characters in a string to lowercase. */ toLowerCase(): string; ->toLowerCase : Symbol(toLowerCase, Decl(1.0lib-noErrors.ts, 392, 51)) +>toLowerCase : Symbol(String.toLowerCase, Decl(1.0lib-noErrors.ts, 392, 51)) /** Converts all alphabetic characters to lowercase, taking into account the host environment's current locale. */ toLocaleLowerCase(): string; ->toLocaleLowerCase : Symbol(toLocaleLowerCase, Decl(1.0lib-noErrors.ts, 395, 26)) +>toLocaleLowerCase : Symbol(String.toLocaleLowerCase, Decl(1.0lib-noErrors.ts, 395, 26)) /** Converts all the alphabetic characters in a string to uppercase. */ toUpperCase(): string; ->toUpperCase : Symbol(toUpperCase, Decl(1.0lib-noErrors.ts, 398, 32)) +>toUpperCase : Symbol(String.toUpperCase, Decl(1.0lib-noErrors.ts, 398, 32)) /** Returns a string where all alphabetic characters have been converted to uppercase, taking into account the host environment's current locale. */ toLocaleUpperCase(): string; ->toLocaleUpperCase : Symbol(toLocaleUpperCase, Decl(1.0lib-noErrors.ts, 401, 26)) +>toLocaleUpperCase : Symbol(String.toLocaleUpperCase, Decl(1.0lib-noErrors.ts, 401, 26)) /** Removes the leading and trailing white space and line terminator characters from a string. */ trim(): string; ->trim : Symbol(trim, Decl(1.0lib-noErrors.ts, 404, 32)) +>trim : Symbol(String.trim, Decl(1.0lib-noErrors.ts, 404, 32)) /** Returns the length of a String object. */ length: number; ->length : Symbol(length, Decl(1.0lib-noErrors.ts, 407, 19)) ->>>>>>> theirs +>length : Symbol(String.length, Decl(1.0lib-noErrors.ts, 407, 19)) // IE extensions /** @@ -844,15 +613,9 @@ interface String { * @param length The number of characters to include in the returned substring. */ substr(from: number, length?: number): string; -<<<<<<< ours ->substr : Symbol(String.substr, Decl(1.0lib-noErrors.ts, 413, 19)) ->from : Symbol(from, Decl(1.0lib-noErrors.ts, 421, 11)) ->length : Symbol(length, Decl(1.0lib-noErrors.ts, 421, 24)) -======= ->substr : Symbol(substr, Decl(1.0lib-noErrors.ts, 410, 19)) +>substr : Symbol(String.substr, Decl(1.0lib-noErrors.ts, 410, 19)) >from : Symbol(from, Decl(1.0lib-noErrors.ts, 418, 11)) >length : Symbol(length, Decl(1.0lib-noErrors.ts, 418, 24)) ->>>>>>> theirs [index: number]: string; >index : Symbol(index, Decl(1.0lib-noErrors.ts, 420, 5)) @@ -906,52 +669,32 @@ interface Number { * @param radix Specifies a radix for converting numeric values to strings. This value is only used for numbers. */ toString(radix?: number): string; -<<<<<<< ours ->toString : Symbol(Number.toString, Decl(1.0lib-noErrors.ts, 444, 18)) ->radix : Symbol(radix, Decl(1.0lib-noErrors.ts, 449, 13)) -======= ->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 441, 18)) +>toString : Symbol(Number.toString, Decl(1.0lib-noErrors.ts, 441, 18)) >radix : Symbol(radix, Decl(1.0lib-noErrors.ts, 446, 13)) ->>>>>>> theirs /** * Returns a string representing a number in fixed-point notation. * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive. */ toFixed(fractionDigits?: number): string; -<<<<<<< ours ->toFixed : Symbol(Number.toFixed, Decl(1.0lib-noErrors.ts, 449, 37)) ->fractionDigits : Symbol(fractionDigits, Decl(1.0lib-noErrors.ts, 455, 12)) -======= ->toFixed : Symbol(toFixed, Decl(1.0lib-noErrors.ts, 446, 37)) +>toFixed : Symbol(Number.toFixed, Decl(1.0lib-noErrors.ts, 446, 37)) >fractionDigits : Symbol(fractionDigits, Decl(1.0lib-noErrors.ts, 452, 12)) ->>>>>>> theirs /** * Returns a string containing a number represented in exponential notation. * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive. */ toExponential(fractionDigits?: number): string; -<<<<<<< ours ->toExponential : Symbol(Number.toExponential, Decl(1.0lib-noErrors.ts, 455, 45)) ->fractionDigits : Symbol(fractionDigits, Decl(1.0lib-noErrors.ts, 461, 18)) -======= ->toExponential : Symbol(toExponential, Decl(1.0lib-noErrors.ts, 452, 45)) +>toExponential : Symbol(Number.toExponential, Decl(1.0lib-noErrors.ts, 452, 45)) >fractionDigits : Symbol(fractionDigits, Decl(1.0lib-noErrors.ts, 458, 18)) ->>>>>>> theirs /** * Returns a string containing a number represented either in exponential or fixed-point notation with a specified number of digits. * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive. */ toPrecision(precision?: number): string; -<<<<<<< ours ->toPrecision : Symbol(Number.toPrecision, Decl(1.0lib-noErrors.ts, 461, 51)) ->precision : Symbol(precision, Decl(1.0lib-noErrors.ts, 467, 16)) -======= ->toPrecision : Symbol(toPrecision, Decl(1.0lib-noErrors.ts, 458, 51)) +>toPrecision : Symbol(Number.toPrecision, Decl(1.0lib-noErrors.ts, 458, 51)) >precision : Symbol(precision, Decl(1.0lib-noErrors.ts, 464, 16)) ->>>>>>> theirs } /** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */ @@ -1004,67 +747,35 @@ interface Math { /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */ E: number; -<<<<<<< ours ->E : Symbol(Math.E, Decl(1.0lib-noErrors.ts, 501, 16)) +>E : Symbol(Math.E, Decl(1.0lib-noErrors.ts, 498, 16)) /** The natural logarithm of 10. */ LN10: number; ->LN10 : Symbol(Math.LN10, Decl(1.0lib-noErrors.ts, 503, 14)) +>LN10 : Symbol(Math.LN10, Decl(1.0lib-noErrors.ts, 500, 14)) /** The natural logarithm of 2. */ LN2: number; ->LN2 : Symbol(Math.LN2, Decl(1.0lib-noErrors.ts, 505, 17)) +>LN2 : Symbol(Math.LN2, Decl(1.0lib-noErrors.ts, 502, 17)) /** The base-2 logarithm of e. */ LOG2E: number; ->LOG2E : Symbol(Math.LOG2E, Decl(1.0lib-noErrors.ts, 507, 16)) +>LOG2E : Symbol(Math.LOG2E, Decl(1.0lib-noErrors.ts, 504, 16)) /** The base-10 logarithm of e. */ LOG10E: number; ->LOG10E : Symbol(Math.LOG10E, Decl(1.0lib-noErrors.ts, 509, 18)) +>LOG10E : Symbol(Math.LOG10E, Decl(1.0lib-noErrors.ts, 506, 18)) /** Pi. This is the ratio of the circumference of a circle to its diameter. */ PI: number; ->PI : Symbol(Math.PI, Decl(1.0lib-noErrors.ts, 511, 19)) +>PI : Symbol(Math.PI, Decl(1.0lib-noErrors.ts, 508, 19)) /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */ SQRT1_2: number; ->SQRT1_2 : Symbol(Math.SQRT1_2, Decl(1.0lib-noErrors.ts, 513, 15)) +>SQRT1_2 : Symbol(Math.SQRT1_2, Decl(1.0lib-noErrors.ts, 510, 15)) /** The square root of 2. */ SQRT2: number; ->SQRT2 : Symbol(Math.SQRT2, Decl(1.0lib-noErrors.ts, 515, 20)) -======= ->E : Symbol(E, Decl(1.0lib-noErrors.ts, 498, 16)) - - /** The natural logarithm of 10. */ - LN10: number; ->LN10 : Symbol(LN10, Decl(1.0lib-noErrors.ts, 500, 14)) - - /** The natural logarithm of 2. */ - LN2: number; ->LN2 : Symbol(LN2, Decl(1.0lib-noErrors.ts, 502, 17)) - - /** The base-2 logarithm of e. */ - LOG2E: number; ->LOG2E : Symbol(LOG2E, Decl(1.0lib-noErrors.ts, 504, 16)) - - /** The base-10 logarithm of e. */ - LOG10E: number; ->LOG10E : Symbol(LOG10E, Decl(1.0lib-noErrors.ts, 506, 18)) - - /** Pi. This is the ratio of the circumference of a circle to its diameter. */ - PI: number; ->PI : Symbol(PI, Decl(1.0lib-noErrors.ts, 508, 19)) - - /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */ - SQRT1_2: number; ->SQRT1_2 : Symbol(SQRT1_2, Decl(1.0lib-noErrors.ts, 510, 15)) - - /** The square root of 2. */ - SQRT2: number; ->SQRT2 : Symbol(SQRT2, Decl(1.0lib-noErrors.ts, 512, 20)) ->>>>>>> theirs +>SQRT2 : Symbol(Math.SQRT2, Decl(1.0lib-noErrors.ts, 512, 20)) /** * Returns the absolute value of a number (the value without regard to whether it is positive or negative). @@ -1072,52 +783,32 @@ interface Math { * @param x A numeric expression for which the absolute value is needed. */ abs(x: number): number; -<<<<<<< ours ->abs : Symbol(Math.abs, Decl(1.0lib-noErrors.ts, 517, 18)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 523, 8)) -======= ->abs : Symbol(abs, Decl(1.0lib-noErrors.ts, 514, 18)) +>abs : Symbol(Math.abs, Decl(1.0lib-noErrors.ts, 514, 18)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 520, 8)) ->>>>>>> theirs /** * Returns the arc cosine (or inverse cosine) of a number. * @param x A numeric expression. */ acos(x: number): number; -<<<<<<< ours ->acos : Symbol(Math.acos, Decl(1.0lib-noErrors.ts, 523, 27)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 528, 9)) -======= ->acos : Symbol(acos, Decl(1.0lib-noErrors.ts, 520, 27)) +>acos : Symbol(Math.acos, Decl(1.0lib-noErrors.ts, 520, 27)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 525, 9)) ->>>>>>> theirs /** * Returns the arcsine of a number. * @param x A numeric expression. */ asin(x: number): number; -<<<<<<< ours ->asin : Symbol(Math.asin, Decl(1.0lib-noErrors.ts, 528, 28)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 533, 9)) -======= ->asin : Symbol(asin, Decl(1.0lib-noErrors.ts, 525, 28)) +>asin : Symbol(Math.asin, Decl(1.0lib-noErrors.ts, 525, 28)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 530, 9)) ->>>>>>> theirs /** * Returns the arctangent of a number. * @param x A numeric expression for which the arctangent is needed. */ atan(x: number): number; -<<<<<<< ours ->atan : Symbol(Math.atan, Decl(1.0lib-noErrors.ts, 533, 28)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 538, 9)) -======= ->atan : Symbol(atan, Decl(1.0lib-noErrors.ts, 530, 28)) +>atan : Symbol(Math.atan, Decl(1.0lib-noErrors.ts, 530, 28)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 535, 9)) ->>>>>>> theirs /** * Returns the angle (in radians) from the X axis to a point (y,x). @@ -1125,106 +816,65 @@ interface Math { * @param x A numeric expression representing the cartesian x-coordinate. */ atan2(y: number, x: number): number; -<<<<<<< ours ->atan2 : Symbol(Math.atan2, Decl(1.0lib-noErrors.ts, 538, 28)) ->y : Symbol(y, Decl(1.0lib-noErrors.ts, 544, 10)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 544, 20)) -======= ->atan2 : Symbol(atan2, Decl(1.0lib-noErrors.ts, 535, 28)) +>atan2 : Symbol(Math.atan2, Decl(1.0lib-noErrors.ts, 535, 28)) >y : Symbol(y, Decl(1.0lib-noErrors.ts, 541, 10)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 541, 20)) ->>>>>>> theirs /** * Returns the smallest number greater than or equal to its numeric argument. * @param x A numeric expression. */ ceil(x: number): number; -<<<<<<< ours ->ceil : Symbol(Math.ceil, Decl(1.0lib-noErrors.ts, 544, 40)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 549, 9)) -======= ->ceil : Symbol(ceil, Decl(1.0lib-noErrors.ts, 541, 40)) +>ceil : Symbol(Math.ceil, Decl(1.0lib-noErrors.ts, 541, 40)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 546, 9)) ->>>>>>> theirs /** * Returns the cosine of a number. * @param x A numeric expression that contains an angle measured in radians. */ cos(x: number): number; -<<<<<<< ours ->cos : Symbol(Math.cos, Decl(1.0lib-noErrors.ts, 549, 28)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 554, 8)) -======= ->cos : Symbol(cos, Decl(1.0lib-noErrors.ts, 546, 28)) +>cos : Symbol(Math.cos, Decl(1.0lib-noErrors.ts, 546, 28)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 551, 8)) ->>>>>>> theirs /** * Returns e (the base of natural logarithms) raised to a power. * @param x A numeric expression representing the power of e. */ exp(x: number): number; -<<<<<<< ours ->exp : Symbol(Math.exp, Decl(1.0lib-noErrors.ts, 554, 27)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 559, 8)) -======= ->exp : Symbol(exp, Decl(1.0lib-noErrors.ts, 551, 27)) +>exp : Symbol(Math.exp, Decl(1.0lib-noErrors.ts, 551, 27)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 556, 8)) ->>>>>>> theirs /** * Returns the greatest number less than or equal to its numeric argument. * @param x A numeric expression. */ floor(x: number): number; -<<<<<<< ours ->floor : Symbol(Math.floor, Decl(1.0lib-noErrors.ts, 559, 27)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 564, 10)) -======= ->floor : Symbol(floor, Decl(1.0lib-noErrors.ts, 556, 27)) +>floor : Symbol(Math.floor, Decl(1.0lib-noErrors.ts, 556, 27)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 561, 10)) ->>>>>>> theirs /** * Returns the natural logarithm (base e) of a number. * @param x A numeric expression. */ log(x: number): number; -<<<<<<< ours ->log : Symbol(Math.log, Decl(1.0lib-noErrors.ts, 564, 29)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 569, 8)) -======= ->log : Symbol(log, Decl(1.0lib-noErrors.ts, 561, 29)) +>log : Symbol(Math.log, Decl(1.0lib-noErrors.ts, 561, 29)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 566, 8)) ->>>>>>> theirs /** * Returns the larger of a set of supplied numeric expressions. * @param values Numeric expressions to be evaluated. */ max(...values: number[]): number; -<<<<<<< ours ->max : Symbol(Math.max, Decl(1.0lib-noErrors.ts, 569, 27)) ->values : Symbol(values, Decl(1.0lib-noErrors.ts, 574, 8)) -======= ->max : Symbol(max, Decl(1.0lib-noErrors.ts, 566, 27)) +>max : Symbol(Math.max, Decl(1.0lib-noErrors.ts, 566, 27)) >values : Symbol(values, Decl(1.0lib-noErrors.ts, 571, 8)) ->>>>>>> theirs /** * Returns the smaller of a set of supplied numeric expressions. * @param values Numeric expressions to be evaluated. */ min(...values: number[]): number; -<<<<<<< ours ->min : Symbol(Math.min, Decl(1.0lib-noErrors.ts, 574, 37)) ->values : Symbol(values, Decl(1.0lib-noErrors.ts, 579, 8)) -======= ->min : Symbol(min, Decl(1.0lib-noErrors.ts, 571, 37)) +>min : Symbol(Math.min, Decl(1.0lib-noErrors.ts, 571, 37)) >values : Symbol(values, Decl(1.0lib-noErrors.ts, 576, 8)) ->>>>>>> theirs /** * Returns the value of a base expression taken to a specified power. @@ -1232,75 +882,45 @@ interface Math { * @param y The exponent value of the expression. */ pow(x: number, y: number): number; -<<<<<<< ours ->pow : Symbol(Math.pow, Decl(1.0lib-noErrors.ts, 579, 37)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 585, 8)) ->y : Symbol(y, Decl(1.0lib-noErrors.ts, 585, 18)) - - /** Returns a pseudorandom number between 0 and 1. */ - random(): number; ->random : Symbol(Math.random, Decl(1.0lib-noErrors.ts, 585, 38)) -======= ->pow : Symbol(pow, Decl(1.0lib-noErrors.ts, 576, 37)) +>pow : Symbol(Math.pow, Decl(1.0lib-noErrors.ts, 576, 37)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 582, 8)) >y : Symbol(y, Decl(1.0lib-noErrors.ts, 582, 18)) /** Returns a pseudorandom number between 0 and 1. */ random(): number; ->random : Symbol(random, Decl(1.0lib-noErrors.ts, 582, 38)) ->>>>>>> theirs +>random : Symbol(Math.random, Decl(1.0lib-noErrors.ts, 582, 38)) /** * Returns a supplied numeric expression rounded to the nearest number. * @param x The value to be rounded to the nearest number. */ round(x: number): number; -<<<<<<< ours ->round : Symbol(Math.round, Decl(1.0lib-noErrors.ts, 587, 21)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 592, 10)) -======= ->round : Symbol(round, Decl(1.0lib-noErrors.ts, 584, 21)) +>round : Symbol(Math.round, Decl(1.0lib-noErrors.ts, 584, 21)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 589, 10)) ->>>>>>> theirs /** * Returns the sine of a number. * @param x A numeric expression that contains an angle measured in radians. */ sin(x: number): number; -<<<<<<< ours ->sin : Symbol(Math.sin, Decl(1.0lib-noErrors.ts, 592, 29)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 597, 8)) -======= ->sin : Symbol(sin, Decl(1.0lib-noErrors.ts, 589, 29)) +>sin : Symbol(Math.sin, Decl(1.0lib-noErrors.ts, 589, 29)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 594, 8)) ->>>>>>> theirs /** * Returns the square root of a number. * @param x A numeric expression. */ sqrt(x: number): number; -<<<<<<< ours ->sqrt : Symbol(Math.sqrt, Decl(1.0lib-noErrors.ts, 597, 27)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 602, 9)) -======= ->sqrt : Symbol(sqrt, Decl(1.0lib-noErrors.ts, 594, 27)) +>sqrt : Symbol(Math.sqrt, Decl(1.0lib-noErrors.ts, 594, 27)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 599, 9)) ->>>>>>> theirs /** * Returns the tangent of a number. * @param x A numeric expression that contains an angle measured in radians. */ tan(x: number): number; -<<<<<<< ours ->tan : Symbol(Math.tan, Decl(1.0lib-noErrors.ts, 602, 28)) ->x : Symbol(x, Decl(1.0lib-noErrors.ts, 607, 8)) -======= ->tan : Symbol(tan, Decl(1.0lib-noErrors.ts, 599, 28)) +>tan : Symbol(Math.tan, Decl(1.0lib-noErrors.ts, 599, 28)) >x : Symbol(x, Decl(1.0lib-noErrors.ts, 604, 8)) ->>>>>>> theirs } /** An intrinsic object that provides basic mathematics functionality and constants. */ declare var Math: Math; @@ -1313,242 +933,127 @@ interface Date { /** Returns a string representation of a date. The format of the string depends on the locale. */ toString(): string; -<<<<<<< ours ->toString : Symbol(Date.toString, Decl(1.0lib-noErrors.ts, 613, 16)) - - /** Returns a date as a string value. */ - toDateString(): string; ->toDateString : Symbol(Date.toDateString, Decl(1.0lib-noErrors.ts, 615, 23)) - - /** Returns a time as a string value. */ - toTimeString(): string; ->toTimeString : Symbol(Date.toTimeString, Decl(1.0lib-noErrors.ts, 617, 27)) - - /** Returns a value as a string value appropriate to the host environment's current locale. */ - toLocaleString(): string; ->toLocaleString : Symbol(Date.toLocaleString, Decl(1.0lib-noErrors.ts, 619, 27)) - - /** Returns a date as a string value appropriate to the host environment's current locale. */ - toLocaleDateString(): string; ->toLocaleDateString : Symbol(Date.toLocaleDateString, Decl(1.0lib-noErrors.ts, 621, 29)) - - /** Returns a time as a string value appropriate to the host environment's current locale. */ - toLocaleTimeString(): string; ->toLocaleTimeString : Symbol(Date.toLocaleTimeString, Decl(1.0lib-noErrors.ts, 623, 33)) - - /** Returns the stored time value in milliseconds since midnight, January 1, 1970 UTC. */ - valueOf(): number; ->valueOf : Symbol(Date.valueOf, Decl(1.0lib-noErrors.ts, 625, 33)) - - /** Gets the time value in milliseconds. */ - getTime(): number; ->getTime : Symbol(Date.getTime, Decl(1.0lib-noErrors.ts, 627, 22)) - - /** Gets the year, using local time. */ - getFullYear(): number; ->getFullYear : Symbol(Date.getFullYear, Decl(1.0lib-noErrors.ts, 629, 22)) - - /** Gets the year using Universal Coordinated Time (UTC). */ - getUTCFullYear(): number; ->getUTCFullYear : Symbol(Date.getUTCFullYear, Decl(1.0lib-noErrors.ts, 631, 26)) - - /** Gets the month, using local time. */ - getMonth(): number; ->getMonth : Symbol(Date.getMonth, Decl(1.0lib-noErrors.ts, 633, 29)) - - /** Gets the month of a Date object using Universal Coordinated Time (UTC). */ - getUTCMonth(): number; ->getUTCMonth : Symbol(Date.getUTCMonth, Decl(1.0lib-noErrors.ts, 635, 23)) - - /** Gets the day-of-the-month, using local time. */ - getDate(): number; ->getDate : Symbol(Date.getDate, Decl(1.0lib-noErrors.ts, 637, 26)) - - /** Gets the day-of-the-month, using Universal Coordinated Time (UTC). */ - getUTCDate(): number; ->getUTCDate : Symbol(Date.getUTCDate, Decl(1.0lib-noErrors.ts, 639, 22)) - - /** Gets the day of the week, using local time. */ - getDay(): number; ->getDay : Symbol(Date.getDay, Decl(1.0lib-noErrors.ts, 641, 25)) - - /** Gets the day of the week using Universal Coordinated Time (UTC). */ - getUTCDay(): number; ->getUTCDay : Symbol(Date.getUTCDay, Decl(1.0lib-noErrors.ts, 643, 21)) - - /** Gets the hours in a date, using local time. */ - getHours(): number; ->getHours : Symbol(Date.getHours, Decl(1.0lib-noErrors.ts, 645, 24)) - - /** Gets the hours value in a Date object using Universal Coordinated Time (UTC). */ - getUTCHours(): number; ->getUTCHours : Symbol(Date.getUTCHours, Decl(1.0lib-noErrors.ts, 647, 23)) - - /** Gets the minutes of a Date object, using local time. */ - getMinutes(): number; ->getMinutes : Symbol(Date.getMinutes, Decl(1.0lib-noErrors.ts, 649, 26)) - - /** Gets the minutes of a Date object using Universal Coordinated Time (UTC). */ - getUTCMinutes(): number; ->getUTCMinutes : Symbol(Date.getUTCMinutes, Decl(1.0lib-noErrors.ts, 651, 25)) - - /** Gets the seconds of a Date object, using local time. */ - getSeconds(): number; ->getSeconds : Symbol(Date.getSeconds, Decl(1.0lib-noErrors.ts, 653, 28)) - - /** Gets the seconds of a Date object using Universal Coordinated Time (UTC). */ - getUTCSeconds(): number; ->getUTCSeconds : Symbol(Date.getUTCSeconds, Decl(1.0lib-noErrors.ts, 655, 25)) - - /** Gets the milliseconds of a Date, using local time. */ - getMilliseconds(): number; ->getMilliseconds : Symbol(Date.getMilliseconds, Decl(1.0lib-noErrors.ts, 657, 28)) - - /** Gets the milliseconds of a Date object using Universal Coordinated Time (UTC). */ - getUTCMilliseconds(): number; ->getUTCMilliseconds : Symbol(Date.getUTCMilliseconds, Decl(1.0lib-noErrors.ts, 659, 30)) - - /** Gets the difference in minutes between the time on the local computer and Universal Coordinated Time (UTC). */ - getTimezoneOffset(): number; ->getTimezoneOffset : Symbol(Date.getTimezoneOffset, Decl(1.0lib-noErrors.ts, 661, 33)) -======= ->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 610, 16)) +>toString : Symbol(Date.toString, Decl(1.0lib-noErrors.ts, 610, 16)) /** Returns a date as a string value. */ toDateString(): string; ->toDateString : Symbol(toDateString, Decl(1.0lib-noErrors.ts, 612, 23)) +>toDateString : Symbol(Date.toDateString, Decl(1.0lib-noErrors.ts, 612, 23)) /** Returns a time as a string value. */ toTimeString(): string; ->toTimeString : Symbol(toTimeString, Decl(1.0lib-noErrors.ts, 614, 27)) +>toTimeString : Symbol(Date.toTimeString, Decl(1.0lib-noErrors.ts, 614, 27)) /** Returns a value as a string value appropriate to the host environment's current locale. */ toLocaleString(): string; ->toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 616, 27)) +>toLocaleString : Symbol(Date.toLocaleString, Decl(1.0lib-noErrors.ts, 616, 27)) /** Returns a date as a string value appropriate to the host environment's current locale. */ toLocaleDateString(): string; ->toLocaleDateString : Symbol(toLocaleDateString, Decl(1.0lib-noErrors.ts, 618, 29)) +>toLocaleDateString : Symbol(Date.toLocaleDateString, Decl(1.0lib-noErrors.ts, 618, 29)) /** Returns a time as a string value appropriate to the host environment's current locale. */ toLocaleTimeString(): string; ->toLocaleTimeString : Symbol(toLocaleTimeString, Decl(1.0lib-noErrors.ts, 620, 33)) +>toLocaleTimeString : Symbol(Date.toLocaleTimeString, Decl(1.0lib-noErrors.ts, 620, 33)) /** Returns the stored time value in milliseconds since midnight, January 1, 1970 UTC. */ valueOf(): number; ->valueOf : Symbol(valueOf, Decl(1.0lib-noErrors.ts, 622, 33)) +>valueOf : Symbol(Date.valueOf, Decl(1.0lib-noErrors.ts, 622, 33)) /** Gets the time value in milliseconds. */ getTime(): number; ->getTime : Symbol(getTime, Decl(1.0lib-noErrors.ts, 624, 22)) +>getTime : Symbol(Date.getTime, Decl(1.0lib-noErrors.ts, 624, 22)) /** Gets the year, using local time. */ getFullYear(): number; ->getFullYear : Symbol(getFullYear, Decl(1.0lib-noErrors.ts, 626, 22)) +>getFullYear : Symbol(Date.getFullYear, Decl(1.0lib-noErrors.ts, 626, 22)) /** Gets the year using Universal Coordinated Time (UTC). */ getUTCFullYear(): number; ->getUTCFullYear : Symbol(getUTCFullYear, Decl(1.0lib-noErrors.ts, 628, 26)) +>getUTCFullYear : Symbol(Date.getUTCFullYear, Decl(1.0lib-noErrors.ts, 628, 26)) /** Gets the month, using local time. */ getMonth(): number; ->getMonth : Symbol(getMonth, Decl(1.0lib-noErrors.ts, 630, 29)) +>getMonth : Symbol(Date.getMonth, Decl(1.0lib-noErrors.ts, 630, 29)) /** Gets the month of a Date object using Universal Coordinated Time (UTC). */ getUTCMonth(): number; ->getUTCMonth : Symbol(getUTCMonth, Decl(1.0lib-noErrors.ts, 632, 23)) +>getUTCMonth : Symbol(Date.getUTCMonth, Decl(1.0lib-noErrors.ts, 632, 23)) /** Gets the day-of-the-month, using local time. */ getDate(): number; ->getDate : Symbol(getDate, Decl(1.0lib-noErrors.ts, 634, 26)) +>getDate : Symbol(Date.getDate, Decl(1.0lib-noErrors.ts, 634, 26)) /** Gets the day-of-the-month, using Universal Coordinated Time (UTC). */ getUTCDate(): number; ->getUTCDate : Symbol(getUTCDate, Decl(1.0lib-noErrors.ts, 636, 22)) +>getUTCDate : Symbol(Date.getUTCDate, Decl(1.0lib-noErrors.ts, 636, 22)) /** Gets the day of the week, using local time. */ getDay(): number; ->getDay : Symbol(getDay, Decl(1.0lib-noErrors.ts, 638, 25)) +>getDay : Symbol(Date.getDay, Decl(1.0lib-noErrors.ts, 638, 25)) /** Gets the day of the week using Universal Coordinated Time (UTC). */ getUTCDay(): number; ->getUTCDay : Symbol(getUTCDay, Decl(1.0lib-noErrors.ts, 640, 21)) +>getUTCDay : Symbol(Date.getUTCDay, Decl(1.0lib-noErrors.ts, 640, 21)) /** Gets the hours in a date, using local time. */ getHours(): number; ->getHours : Symbol(getHours, Decl(1.0lib-noErrors.ts, 642, 24)) +>getHours : Symbol(Date.getHours, Decl(1.0lib-noErrors.ts, 642, 24)) /** Gets the hours value in a Date object using Universal Coordinated Time (UTC). */ getUTCHours(): number; ->getUTCHours : Symbol(getUTCHours, Decl(1.0lib-noErrors.ts, 644, 23)) +>getUTCHours : Symbol(Date.getUTCHours, Decl(1.0lib-noErrors.ts, 644, 23)) /** Gets the minutes of a Date object, using local time. */ getMinutes(): number; ->getMinutes : Symbol(getMinutes, Decl(1.0lib-noErrors.ts, 646, 26)) +>getMinutes : Symbol(Date.getMinutes, Decl(1.0lib-noErrors.ts, 646, 26)) /** Gets the minutes of a Date object using Universal Coordinated Time (UTC). */ getUTCMinutes(): number; ->getUTCMinutes : Symbol(getUTCMinutes, Decl(1.0lib-noErrors.ts, 648, 25)) +>getUTCMinutes : Symbol(Date.getUTCMinutes, Decl(1.0lib-noErrors.ts, 648, 25)) /** Gets the seconds of a Date object, using local time. */ getSeconds(): number; ->getSeconds : Symbol(getSeconds, Decl(1.0lib-noErrors.ts, 650, 28)) +>getSeconds : Symbol(Date.getSeconds, Decl(1.0lib-noErrors.ts, 650, 28)) /** Gets the seconds of a Date object using Universal Coordinated Time (UTC). */ getUTCSeconds(): number; ->getUTCSeconds : Symbol(getUTCSeconds, Decl(1.0lib-noErrors.ts, 652, 25)) +>getUTCSeconds : Symbol(Date.getUTCSeconds, Decl(1.0lib-noErrors.ts, 652, 25)) /** Gets the milliseconds of a Date, using local time. */ getMilliseconds(): number; ->getMilliseconds : Symbol(getMilliseconds, Decl(1.0lib-noErrors.ts, 654, 28)) +>getMilliseconds : Symbol(Date.getMilliseconds, Decl(1.0lib-noErrors.ts, 654, 28)) /** Gets the milliseconds of a Date object using Universal Coordinated Time (UTC). */ getUTCMilliseconds(): number; ->getUTCMilliseconds : Symbol(getUTCMilliseconds, Decl(1.0lib-noErrors.ts, 656, 30)) +>getUTCMilliseconds : Symbol(Date.getUTCMilliseconds, Decl(1.0lib-noErrors.ts, 656, 30)) /** Gets the difference in minutes between the time on the local computer and Universal Coordinated Time (UTC). */ getTimezoneOffset(): number; ->getTimezoneOffset : Symbol(getTimezoneOffset, Decl(1.0lib-noErrors.ts, 658, 33)) ->>>>>>> theirs +>getTimezoneOffset : Symbol(Date.getTimezoneOffset, Decl(1.0lib-noErrors.ts, 658, 33)) /** * Sets the date and time value in the Date object. * @param time A numeric value representing the number of elapsed milliseconds since midnight, January 1, 1970 GMT. */ setTime(time: number): number; -<<<<<<< ours ->setTime : Symbol(Date.setTime, Decl(1.0lib-noErrors.ts, 663, 32)) ->time : Symbol(time, Decl(1.0lib-noErrors.ts, 668, 12)) -======= ->setTime : Symbol(setTime, Decl(1.0lib-noErrors.ts, 660, 32)) +>setTime : Symbol(Date.setTime, Decl(1.0lib-noErrors.ts, 660, 32)) >time : Symbol(time, Decl(1.0lib-noErrors.ts, 665, 12)) ->>>>>>> theirs /** * Sets the milliseconds value in the Date object using local time. * @param ms A numeric value equal to the millisecond value. */ setMilliseconds(ms: number): number; -<<<<<<< ours ->setMilliseconds : Symbol(Date.setMilliseconds, Decl(1.0lib-noErrors.ts, 668, 34)) ->ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 673, 20)) -======= ->setMilliseconds : Symbol(setMilliseconds, Decl(1.0lib-noErrors.ts, 665, 34)) +>setMilliseconds : Symbol(Date.setMilliseconds, Decl(1.0lib-noErrors.ts, 665, 34)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 670, 20)) ->>>>>>> theirs /** * Sets the milliseconds value in the Date object using Universal Coordinated Time (UTC). * @param ms A numeric value equal to the millisecond value. */ setUTCMilliseconds(ms: number): number; -<<<<<<< ours ->setUTCMilliseconds : Symbol(Date.setUTCMilliseconds, Decl(1.0lib-noErrors.ts, 673, 40)) ->ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 678, 23)) -======= ->setUTCMilliseconds : Symbol(setUTCMilliseconds, Decl(1.0lib-noErrors.ts, 670, 40)) +>setUTCMilliseconds : Symbol(Date.setUTCMilliseconds, Decl(1.0lib-noErrors.ts, 670, 40)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 675, 23)) ->>>>>>> theirs /** * Sets the seconds value in the Date object using local time. @@ -1556,15 +1061,9 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setSeconds(sec: number, ms?: number): number; -<<<<<<< ours ->setSeconds : Symbol(Date.setSeconds, Decl(1.0lib-noErrors.ts, 678, 43)) ->sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 685, 15)) ->ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 685, 27)) -======= ->setSeconds : Symbol(setSeconds, Decl(1.0lib-noErrors.ts, 675, 43)) +>setSeconds : Symbol(Date.setSeconds, Decl(1.0lib-noErrors.ts, 675, 43)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 682, 15)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 682, 27)) ->>>>>>> theirs /** * Sets the seconds value in the Date object using Universal Coordinated Time (UTC). @@ -1572,15 +1071,9 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setUTCSeconds(sec: number, ms?: number): number; -<<<<<<< ours ->setUTCSeconds : Symbol(Date.setUTCSeconds, Decl(1.0lib-noErrors.ts, 685, 49)) ->sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 691, 18)) ->ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 691, 30)) -======= ->setUTCSeconds : Symbol(setUTCSeconds, Decl(1.0lib-noErrors.ts, 682, 49)) +>setUTCSeconds : Symbol(Date.setUTCSeconds, Decl(1.0lib-noErrors.ts, 682, 49)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 688, 18)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 688, 30)) ->>>>>>> theirs /** * Sets the minutes value in the Date object using local time. @@ -1589,17 +1082,10 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setMinutes(min: number, sec?: number, ms?: number): number; -<<<<<<< ours ->setMinutes : Symbol(Date.setMinutes, Decl(1.0lib-noErrors.ts, 691, 52)) ->min : Symbol(min, Decl(1.0lib-noErrors.ts, 698, 15)) ->sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 698, 27)) ->ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 698, 41)) -======= ->setMinutes : Symbol(setMinutes, Decl(1.0lib-noErrors.ts, 688, 52)) +>setMinutes : Symbol(Date.setMinutes, Decl(1.0lib-noErrors.ts, 688, 52)) >min : Symbol(min, Decl(1.0lib-noErrors.ts, 695, 15)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 695, 27)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 695, 41)) ->>>>>>> theirs /** * Sets the minutes value in the Date object using Universal Coordinated Time (UTC). @@ -1608,17 +1094,10 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setUTCMinutes(min: number, sec?: number, ms?: number): number; -<<<<<<< ours ->setUTCMinutes : Symbol(Date.setUTCMinutes, Decl(1.0lib-noErrors.ts, 698, 63)) ->min : Symbol(min, Decl(1.0lib-noErrors.ts, 705, 18)) ->sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 705, 30)) ->ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 705, 44)) -======= ->setUTCMinutes : Symbol(setUTCMinutes, Decl(1.0lib-noErrors.ts, 695, 63)) +>setUTCMinutes : Symbol(Date.setUTCMinutes, Decl(1.0lib-noErrors.ts, 695, 63)) >min : Symbol(min, Decl(1.0lib-noErrors.ts, 702, 18)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 702, 30)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 702, 44)) ->>>>>>> theirs /** * Sets the hour value in the Date object using local time. @@ -1628,19 +1107,11 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setHours(hours: number, min?: number, sec?: number, ms?: number): number; -<<<<<<< ours ->setHours : Symbol(Date.setHours, Decl(1.0lib-noErrors.ts, 705, 66)) ->hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 713, 13)) ->min : Symbol(min, Decl(1.0lib-noErrors.ts, 713, 27)) ->sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 713, 41)) ->ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 713, 55)) -======= ->setHours : Symbol(setHours, Decl(1.0lib-noErrors.ts, 702, 66)) +>setHours : Symbol(Date.setHours, Decl(1.0lib-noErrors.ts, 702, 66)) >hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 710, 13)) >min : Symbol(min, Decl(1.0lib-noErrors.ts, 710, 27)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 710, 41)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 710, 55)) ->>>>>>> theirs /** * Sets the hours value in the Date object using Universal Coordinated Time (UTC). @@ -1650,45 +1121,27 @@ interface Date { * @param ms A numeric value equal to the milliseconds value. */ setUTCHours(hours: number, min?: number, sec?: number, ms?: number): number; -<<<<<<< ours ->setUTCHours : Symbol(Date.setUTCHours, Decl(1.0lib-noErrors.ts, 713, 77)) ->hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 721, 16)) ->min : Symbol(min, Decl(1.0lib-noErrors.ts, 721, 30)) ->sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 721, 44)) ->ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 721, 58)) -======= ->setUTCHours : Symbol(setUTCHours, Decl(1.0lib-noErrors.ts, 710, 77)) +>setUTCHours : Symbol(Date.setUTCHours, Decl(1.0lib-noErrors.ts, 710, 77)) >hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 718, 16)) >min : Symbol(min, Decl(1.0lib-noErrors.ts, 718, 30)) >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 718, 44)) >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 718, 58)) ->>>>>>> theirs /** * Sets the numeric day-of-the-month value of the Date object using local time. * @param date A numeric value equal to the day of the month. */ setDate(date: number): number; -<<<<<<< ours ->setDate : Symbol(Date.setDate, Decl(1.0lib-noErrors.ts, 721, 80)) ->date : Symbol(date, Decl(1.0lib-noErrors.ts, 726, 12)) -======= ->setDate : Symbol(setDate, Decl(1.0lib-noErrors.ts, 718, 80)) +>setDate : Symbol(Date.setDate, Decl(1.0lib-noErrors.ts, 718, 80)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 723, 12)) ->>>>>>> theirs /** * Sets the numeric day of the month in the Date object using Universal Coordinated Time (UTC). * @param date A numeric value equal to the day of the month. */ setUTCDate(date: number): number; -<<<<<<< ours ->setUTCDate : Symbol(Date.setUTCDate, Decl(1.0lib-noErrors.ts, 726, 34)) ->date : Symbol(date, Decl(1.0lib-noErrors.ts, 731, 15)) -======= ->setUTCDate : Symbol(setUTCDate, Decl(1.0lib-noErrors.ts, 723, 34)) +>setUTCDate : Symbol(Date.setUTCDate, Decl(1.0lib-noErrors.ts, 723, 34)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 728, 15)) ->>>>>>> theirs /** * Sets the month value in the Date object using local time. @@ -1696,15 +1149,9 @@ interface Date { * @param date A numeric value representing the day of the month. If this value is not supplied, the value from a call to the getDate method is used. */ setMonth(month: number, date?: number): number; -<<<<<<< ours ->setMonth : Symbol(Date.setMonth, Decl(1.0lib-noErrors.ts, 731, 37)) ->month : Symbol(month, Decl(1.0lib-noErrors.ts, 737, 13)) ->date : Symbol(date, Decl(1.0lib-noErrors.ts, 737, 27)) -======= ->setMonth : Symbol(setMonth, Decl(1.0lib-noErrors.ts, 728, 37)) +>setMonth : Symbol(Date.setMonth, Decl(1.0lib-noErrors.ts, 728, 37)) >month : Symbol(month, Decl(1.0lib-noErrors.ts, 734, 13)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 734, 27)) ->>>>>>> theirs /** * Sets the month value in the Date object using Universal Coordinated Time (UTC). @@ -1712,15 +1159,9 @@ interface Date { * @param date A numeric value representing the day of the month. If it is not supplied, the value from a call to the getUTCDate method is used. */ setUTCMonth(month: number, date?: number): number; -<<<<<<< ours ->setUTCMonth : Symbol(Date.setUTCMonth, Decl(1.0lib-noErrors.ts, 737, 51)) ->month : Symbol(month, Decl(1.0lib-noErrors.ts, 743, 16)) ->date : Symbol(date, Decl(1.0lib-noErrors.ts, 743, 30)) -======= ->setUTCMonth : Symbol(setUTCMonth, Decl(1.0lib-noErrors.ts, 734, 51)) +>setUTCMonth : Symbol(Date.setUTCMonth, Decl(1.0lib-noErrors.ts, 734, 51)) >month : Symbol(month, Decl(1.0lib-noErrors.ts, 740, 16)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 740, 30)) ->>>>>>> theirs /** * Sets the year of the Date object using local time. @@ -1729,17 +1170,10 @@ interface Date { * @param date A numeric value equal for the day of the month. */ setFullYear(year: number, month?: number, date?: number): number; -<<<<<<< ours ->setFullYear : Symbol(Date.setFullYear, Decl(1.0lib-noErrors.ts, 743, 54)) ->year : Symbol(year, Decl(1.0lib-noErrors.ts, 750, 16)) ->month : Symbol(month, Decl(1.0lib-noErrors.ts, 750, 29)) ->date : Symbol(date, Decl(1.0lib-noErrors.ts, 750, 45)) -======= ->setFullYear : Symbol(setFullYear, Decl(1.0lib-noErrors.ts, 740, 54)) +>setFullYear : Symbol(Date.setFullYear, Decl(1.0lib-noErrors.ts, 740, 54)) >year : Symbol(year, Decl(1.0lib-noErrors.ts, 747, 16)) >month : Symbol(month, Decl(1.0lib-noErrors.ts, 747, 29)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 747, 45)) ->>>>>>> theirs /** * Sets the year value in the Date object using Universal Coordinated Time (UTC). @@ -1748,43 +1182,23 @@ interface Date { * @param date A numeric value equal to the day of the month. */ setUTCFullYear(year: number, month?: number, date?: number): number; -<<<<<<< ours ->setUTCFullYear : Symbol(Date.setUTCFullYear, Decl(1.0lib-noErrors.ts, 750, 69)) ->year : Symbol(year, Decl(1.0lib-noErrors.ts, 757, 19)) ->month : Symbol(month, Decl(1.0lib-noErrors.ts, 757, 32)) ->date : Symbol(date, Decl(1.0lib-noErrors.ts, 757, 48)) - - /** Returns a date converted to a string using Universal Coordinated Time (UTC). */ - toUTCString(): string; ->toUTCString : Symbol(Date.toUTCString, Decl(1.0lib-noErrors.ts, 757, 72)) - - /** Returns a date as a string value in ISO format. */ - toISOString(): string; ->toISOString : Symbol(Date.toISOString, Decl(1.0lib-noErrors.ts, 759, 26)) - - /** Used by the JSON.stringify method to enable the transformation of an object's data for JavaScript Object Notation (JSON) serialization. */ - toJSON(key?: any): string; ->toJSON : Symbol(Date.toJSON, Decl(1.0lib-noErrors.ts, 761, 26)) ->key : Symbol(key, Decl(1.0lib-noErrors.ts, 763, 11)) -======= ->setUTCFullYear : Symbol(setUTCFullYear, Decl(1.0lib-noErrors.ts, 747, 69)) +>setUTCFullYear : Symbol(Date.setUTCFullYear, Decl(1.0lib-noErrors.ts, 747, 69)) >year : Symbol(year, Decl(1.0lib-noErrors.ts, 754, 19)) >month : Symbol(month, Decl(1.0lib-noErrors.ts, 754, 32)) >date : Symbol(date, Decl(1.0lib-noErrors.ts, 754, 48)) /** Returns a date converted to a string using Universal Coordinated Time (UTC). */ toUTCString(): string; ->toUTCString : Symbol(toUTCString, Decl(1.0lib-noErrors.ts, 754, 72)) +>toUTCString : Symbol(Date.toUTCString, Decl(1.0lib-noErrors.ts, 754, 72)) /** Returns a date as a string value in ISO format. */ toISOString(): string; ->toISOString : Symbol(toISOString, Decl(1.0lib-noErrors.ts, 756, 26)) +>toISOString : Symbol(Date.toISOString, Decl(1.0lib-noErrors.ts, 756, 26)) /** Used by the JSON.stringify method to enable the transformation of an object's data for JavaScript Object Notation (JSON) serialization. */ toJSON(key?: any): string; ->toJSON : Symbol(toJSON, Decl(1.0lib-noErrors.ts, 758, 26)) +>toJSON : Symbol(Date.toJSON, Decl(1.0lib-noErrors.ts, 758, 26)) >key : Symbol(key, Decl(1.0lib-noErrors.ts, 760, 11)) ->>>>>>> theirs } declare var Date: { @@ -1855,207 +1269,78 @@ interface RegExpExecArray { >index : Symbol(index, Decl(1.0lib-noErrors.ts, 790, 5)) length: number; -<<<<<<< ours ->length : Symbol(RegExpExecArray.length, Decl(1.0lib-noErrors.ts, 793, 28)) +>length : Symbol(RegExpExecArray.length, Decl(1.0lib-noErrors.ts, 790, 28)) index: number; ->index : Symbol(RegExpExecArray.index, Decl(1.0lib-noErrors.ts, 794, 19)) +>index : Symbol(RegExpExecArray.index, Decl(1.0lib-noErrors.ts, 791, 19)) input: string; ->input : Symbol(RegExpExecArray.input, Decl(1.0lib-noErrors.ts, 796, 18)) +>input : Symbol(RegExpExecArray.input, Decl(1.0lib-noErrors.ts, 793, 18)) toString(): string; ->toString : Symbol(RegExpExecArray.toString, Decl(1.0lib-noErrors.ts, 797, 18)) +>toString : Symbol(RegExpExecArray.toString, Decl(1.0lib-noErrors.ts, 794, 18)) toLocaleString(): string; ->toLocaleString : Symbol(RegExpExecArray.toLocaleString, Decl(1.0lib-noErrors.ts, 799, 23)) +>toLocaleString : Symbol(RegExpExecArray.toLocaleString, Decl(1.0lib-noErrors.ts, 796, 23)) concat(...items: string[][]): string[]; ->concat : Symbol(RegExpExecArray.concat, Decl(1.0lib-noErrors.ts, 800, 29)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 801, 11)) - - join(separator?: string): string; ->join : Symbol(RegExpExecArray.join, Decl(1.0lib-noErrors.ts, 801, 43)) ->separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 802, 9)) - - pop(): string; ->pop : Symbol(RegExpExecArray.pop, Decl(1.0lib-noErrors.ts, 802, 37)) - - push(...items: string[]): number; ->push : Symbol(RegExpExecArray.push, Decl(1.0lib-noErrors.ts, 803, 18)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 804, 9)) - - reverse(): string[]; ->reverse : Symbol(RegExpExecArray.reverse, Decl(1.0lib-noErrors.ts, 804, 37)) - - shift(): string; ->shift : Symbol(RegExpExecArray.shift, Decl(1.0lib-noErrors.ts, 805, 24)) - - slice(start?: number, end?: number): string[]; ->slice : Symbol(RegExpExecArray.slice, Decl(1.0lib-noErrors.ts, 806, 20)) ->start : Symbol(start, Decl(1.0lib-noErrors.ts, 807, 10)) ->end : Symbol(end, Decl(1.0lib-noErrors.ts, 807, 25)) - - sort(compareFn?: (a: string, b: string) => number): string[]; ->sort : Symbol(RegExpExecArray.sort, Decl(1.0lib-noErrors.ts, 807, 50)) ->compareFn : Symbol(compareFn, Decl(1.0lib-noErrors.ts, 808, 9)) ->a : Symbol(a, Decl(1.0lib-noErrors.ts, 808, 22)) ->b : Symbol(b, Decl(1.0lib-noErrors.ts, 808, 32)) - - splice(start: number): string[]; ->splice : Symbol(RegExpExecArray.splice, Decl(1.0lib-noErrors.ts, 808, 65), Decl(1.0lib-noErrors.ts, 809, 36)) ->start : Symbol(start, Decl(1.0lib-noErrors.ts, 809, 11)) - - splice(start: number, deleteCount: number, ...items: string[]): string[]; ->splice : Symbol(RegExpExecArray.splice, Decl(1.0lib-noErrors.ts, 808, 65), Decl(1.0lib-noErrors.ts, 809, 36)) ->start : Symbol(start, Decl(1.0lib-noErrors.ts, 810, 11)) ->deleteCount : Symbol(deleteCount, Decl(1.0lib-noErrors.ts, 810, 25)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 810, 46)) - - unshift(...items: string[]): number; ->unshift : Symbol(RegExpExecArray.unshift, Decl(1.0lib-noErrors.ts, 810, 77)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 811, 12)) - - indexOf(searchElement: string, fromIndex?: number): number; ->indexOf : Symbol(RegExpExecArray.indexOf, Decl(1.0lib-noErrors.ts, 811, 40)) ->searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 813, 12)) ->fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 813, 34)) - - lastIndexOf(searchElement: string, fromIndex?: number): number; ->lastIndexOf : Symbol(RegExpExecArray.lastIndexOf, Decl(1.0lib-noErrors.ts, 813, 63)) ->searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 814, 16)) ->fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 814, 38)) - - every(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): boolean; ->every : Symbol(RegExpExecArray.every, Decl(1.0lib-noErrors.ts, 814, 67)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 815, 10)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 815, 23)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 815, 37)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 815, 52)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 815, 81)) - - some(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): boolean; ->some : Symbol(RegExpExecArray.some, Decl(1.0lib-noErrors.ts, 815, 106)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 816, 9)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 816, 22)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 816, 36)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 816, 51)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 816, 80)) - - forEach(callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any): void; ->forEach : Symbol(RegExpExecArray.forEach, Decl(1.0lib-noErrors.ts, 816, 105)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 817, 12)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 817, 25)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 817, 39)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 817, 54)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 817, 80)) - - map(callbackfn: (value: string, index: number, array: string[]) => any, thisArg?: any): any[]; ->map : Symbol(RegExpExecArray.map, Decl(1.0lib-noErrors.ts, 817, 102)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 818, 8)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 818, 21)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 818, 35)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 818, 50)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 818, 75)) - - filter(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): string[]; ->filter : Symbol(RegExpExecArray.filter, Decl(1.0lib-noErrors.ts, 818, 98)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 819, 11)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 819, 24)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 819, 38)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 819, 53)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 819, 82)) - - reduce(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: string[]) => any, initialValue?: any): any; ->reduce : Symbol(RegExpExecArray.reduce, Decl(1.0lib-noErrors.ts, 819, 108)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 820, 11)) ->previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 820, 24)) ->currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 820, 43)) ->currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 820, 62)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 820, 84)) ->initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 820, 109)) - - reduceRight(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: string[]) => any, initialValue?: any): any; ->reduceRight : Symbol(RegExpExecArray.reduceRight, Decl(1.0lib-noErrors.ts, 820, 135)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 821, 16)) ->previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 821, 29)) ->currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 821, 48)) ->currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 821, 67)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 821, 89)) ->initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 821, 114)) -======= ->length : Symbol(length, Decl(1.0lib-noErrors.ts, 790, 28)) - - index: number; ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 791, 19)) - - input: string; ->input : Symbol(input, Decl(1.0lib-noErrors.ts, 793, 18)) - - toString(): string; ->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 794, 18)) - - toLocaleString(): string; ->toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 796, 23)) - - concat(...items: string[][]): string[]; ->concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 797, 29)) +>concat : Symbol(RegExpExecArray.concat, Decl(1.0lib-noErrors.ts, 797, 29)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 798, 11)) join(separator?: string): string; ->join : Symbol(join, Decl(1.0lib-noErrors.ts, 798, 43)) +>join : Symbol(RegExpExecArray.join, Decl(1.0lib-noErrors.ts, 798, 43)) >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 799, 9)) pop(): string; ->pop : Symbol(pop, Decl(1.0lib-noErrors.ts, 799, 37)) +>pop : Symbol(RegExpExecArray.pop, Decl(1.0lib-noErrors.ts, 799, 37)) push(...items: string[]): number; ->push : Symbol(push, Decl(1.0lib-noErrors.ts, 800, 18)) +>push : Symbol(RegExpExecArray.push, Decl(1.0lib-noErrors.ts, 800, 18)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 801, 9)) reverse(): string[]; ->reverse : Symbol(reverse, Decl(1.0lib-noErrors.ts, 801, 37)) +>reverse : Symbol(RegExpExecArray.reverse, Decl(1.0lib-noErrors.ts, 801, 37)) shift(): string; ->shift : Symbol(shift, Decl(1.0lib-noErrors.ts, 802, 24)) +>shift : Symbol(RegExpExecArray.shift, Decl(1.0lib-noErrors.ts, 802, 24)) slice(start?: number, end?: number): string[]; ->slice : Symbol(slice, Decl(1.0lib-noErrors.ts, 803, 20)) +>slice : Symbol(RegExpExecArray.slice, Decl(1.0lib-noErrors.ts, 803, 20)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 804, 10)) >end : Symbol(end, Decl(1.0lib-noErrors.ts, 804, 25)) sort(compareFn?: (a: string, b: string) => number): string[]; ->sort : Symbol(sort, Decl(1.0lib-noErrors.ts, 804, 50)) +>sort : Symbol(RegExpExecArray.sort, Decl(1.0lib-noErrors.ts, 804, 50)) >compareFn : Symbol(compareFn, Decl(1.0lib-noErrors.ts, 805, 9)) >a : Symbol(a, Decl(1.0lib-noErrors.ts, 805, 22)) >b : Symbol(b, Decl(1.0lib-noErrors.ts, 805, 32)) splice(start: number): string[]; ->splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 805, 65), Decl(1.0lib-noErrors.ts, 806, 36)) +>splice : Symbol(RegExpExecArray.splice, Decl(1.0lib-noErrors.ts, 805, 65), Decl(1.0lib-noErrors.ts, 806, 36)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 806, 11)) splice(start: number, deleteCount: number, ...items: string[]): string[]; ->splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 805, 65), Decl(1.0lib-noErrors.ts, 806, 36)) +>splice : Symbol(RegExpExecArray.splice, Decl(1.0lib-noErrors.ts, 805, 65), Decl(1.0lib-noErrors.ts, 806, 36)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 807, 11)) >deleteCount : Symbol(deleteCount, Decl(1.0lib-noErrors.ts, 807, 25)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 807, 46)) unshift(...items: string[]): number; ->unshift : Symbol(unshift, Decl(1.0lib-noErrors.ts, 807, 77)) +>unshift : Symbol(RegExpExecArray.unshift, Decl(1.0lib-noErrors.ts, 807, 77)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 808, 12)) indexOf(searchElement: string, fromIndex?: number): number; ->indexOf : Symbol(indexOf, Decl(1.0lib-noErrors.ts, 808, 40)) +>indexOf : Symbol(RegExpExecArray.indexOf, Decl(1.0lib-noErrors.ts, 808, 40)) >searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 810, 12)) >fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 810, 34)) lastIndexOf(searchElement: string, fromIndex?: number): number; ->lastIndexOf : Symbol(lastIndexOf, Decl(1.0lib-noErrors.ts, 810, 63)) +>lastIndexOf : Symbol(RegExpExecArray.lastIndexOf, Decl(1.0lib-noErrors.ts, 810, 63)) >searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 811, 16)) >fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 811, 38)) every(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): boolean; ->every : Symbol(every, Decl(1.0lib-noErrors.ts, 811, 67)) +>every : Symbol(RegExpExecArray.every, Decl(1.0lib-noErrors.ts, 811, 67)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 812, 10)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 812, 23)) >index : Symbol(index, Decl(1.0lib-noErrors.ts, 812, 37)) @@ -2063,7 +1348,7 @@ interface RegExpExecArray { >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 812, 81)) some(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): boolean; ->some : Symbol(some, Decl(1.0lib-noErrors.ts, 812, 106)) +>some : Symbol(RegExpExecArray.some, Decl(1.0lib-noErrors.ts, 812, 106)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 813, 9)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 813, 22)) >index : Symbol(index, Decl(1.0lib-noErrors.ts, 813, 36)) @@ -2071,7 +1356,7 @@ interface RegExpExecArray { >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 813, 80)) forEach(callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any): void; ->forEach : Symbol(forEach, Decl(1.0lib-noErrors.ts, 813, 105)) +>forEach : Symbol(RegExpExecArray.forEach, Decl(1.0lib-noErrors.ts, 813, 105)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 814, 12)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 814, 25)) >index : Symbol(index, Decl(1.0lib-noErrors.ts, 814, 39)) @@ -2079,7 +1364,7 @@ interface RegExpExecArray { >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 814, 80)) map(callbackfn: (value: string, index: number, array: string[]) => any, thisArg?: any): any[]; ->map : Symbol(map, Decl(1.0lib-noErrors.ts, 814, 102)) +>map : Symbol(RegExpExecArray.map, Decl(1.0lib-noErrors.ts, 814, 102)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 815, 8)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 815, 21)) >index : Symbol(index, Decl(1.0lib-noErrors.ts, 815, 35)) @@ -2087,7 +1372,7 @@ interface RegExpExecArray { >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 815, 75)) filter(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): string[]; ->filter : Symbol(filter, Decl(1.0lib-noErrors.ts, 815, 98)) +>filter : Symbol(RegExpExecArray.filter, Decl(1.0lib-noErrors.ts, 815, 98)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 816, 11)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 816, 24)) >index : Symbol(index, Decl(1.0lib-noErrors.ts, 816, 38)) @@ -2095,7 +1380,7 @@ interface RegExpExecArray { >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 816, 82)) reduce(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: string[]) => any, initialValue?: any): any; ->reduce : Symbol(reduce, Decl(1.0lib-noErrors.ts, 816, 108)) +>reduce : Symbol(RegExpExecArray.reduce, Decl(1.0lib-noErrors.ts, 816, 108)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 817, 11)) >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 817, 24)) >currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 817, 43)) @@ -2104,14 +1389,13 @@ interface RegExpExecArray { >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 817, 109)) reduceRight(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: string[]) => any, initialValue?: any): any; ->reduceRight : Symbol(reduceRight, Decl(1.0lib-noErrors.ts, 817, 135)) +>reduceRight : Symbol(RegExpExecArray.reduceRight, Decl(1.0lib-noErrors.ts, 817, 135)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 818, 16)) >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 818, 29)) >currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 818, 48)) >currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 818, 67)) >array : Symbol(array, Decl(1.0lib-noErrors.ts, 818, 89)) >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 818, 114)) ->>>>>>> theirs } @@ -2123,76 +1407,41 @@ interface RegExp { * @param string The String object or string literal on which to perform the search. */ exec(string: string): RegExpExecArray; -<<<<<<< ours ->exec : Symbol(RegExp.exec, Decl(1.0lib-noErrors.ts, 825, 18)) ->string : Symbol(string, Decl(1.0lib-noErrors.ts, 830, 9)) ->RegExpExecArray : Symbol(RegExpExecArray, Decl(1.0lib-noErrors.ts, 790, 1)) -======= ->exec : Symbol(exec, Decl(1.0lib-noErrors.ts, 822, 18)) +>exec : Symbol(RegExp.exec, Decl(1.0lib-noErrors.ts, 822, 18)) >string : Symbol(string, Decl(1.0lib-noErrors.ts, 827, 9)) >RegExpExecArray : Symbol(RegExpExecArray, Decl(1.0lib-noErrors.ts, 787, 1)) ->>>>>>> theirs /** * Returns a Boolean value that indicates whether or not a pattern exists in a searched string. * @param string String on which to perform the search. */ test(string: string): boolean; -<<<<<<< ours ->test : Symbol(RegExp.test, Decl(1.0lib-noErrors.ts, 830, 42)) ->string : Symbol(string, Decl(1.0lib-noErrors.ts, 836, 9)) - - /** Returns a copy of the text of the regular expression pattern. Read-only. The rgExp argument is a Regular expression object. It can be a variable name or a literal. */ - source: string; ->source : Symbol(RegExp.source, Decl(1.0lib-noErrors.ts, 836, 34)) - - /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */ - global: boolean; ->global : Symbol(RegExp.global, Decl(1.0lib-noErrors.ts, 839, 19)) - - /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */ - ignoreCase: boolean; ->ignoreCase : Symbol(RegExp.ignoreCase, Decl(1.0lib-noErrors.ts, 842, 20)) - - /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */ - multiline: boolean; ->multiline : Symbol(RegExp.multiline, Decl(1.0lib-noErrors.ts, 845, 24)) - - lastIndex: number; ->lastIndex : Symbol(RegExp.lastIndex, Decl(1.0lib-noErrors.ts, 848, 23)) - - // Non-standard extensions - compile(): RegExp; ->compile : Symbol(RegExp.compile, Decl(1.0lib-noErrors.ts, 850, 22)) ->RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11)) -======= ->test : Symbol(test, Decl(1.0lib-noErrors.ts, 827, 42)) +>test : Symbol(RegExp.test, Decl(1.0lib-noErrors.ts, 827, 42)) >string : Symbol(string, Decl(1.0lib-noErrors.ts, 833, 9)) /** Returns a copy of the text of the regular expression pattern. Read-only. The rgExp argument is a Regular expression object. It can be a variable name or a literal. */ source: string; ->source : Symbol(source, Decl(1.0lib-noErrors.ts, 833, 34)) +>source : Symbol(RegExp.source, Decl(1.0lib-noErrors.ts, 833, 34)) /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */ global: boolean; ->global : Symbol(global, Decl(1.0lib-noErrors.ts, 836, 19)) +>global : Symbol(RegExp.global, Decl(1.0lib-noErrors.ts, 836, 19)) /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */ ignoreCase: boolean; ->ignoreCase : Symbol(ignoreCase, Decl(1.0lib-noErrors.ts, 839, 20)) +>ignoreCase : Symbol(RegExp.ignoreCase, Decl(1.0lib-noErrors.ts, 839, 20)) /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */ multiline: boolean; ->multiline : Symbol(multiline, Decl(1.0lib-noErrors.ts, 842, 24)) +>multiline : Symbol(RegExp.multiline, Decl(1.0lib-noErrors.ts, 842, 24)) lastIndex: number; ->lastIndex : Symbol(lastIndex, Decl(1.0lib-noErrors.ts, 845, 23)) +>lastIndex : Symbol(RegExp.lastIndex, Decl(1.0lib-noErrors.ts, 845, 23)) // Non-standard extensions compile(): RegExp; ->compile : Symbol(compile, Decl(1.0lib-noErrors.ts, 847, 22)) +>compile : Symbol(RegExp.compile, Decl(1.0lib-noErrors.ts, 847, 22)) >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) ->>>>>>> theirs } declare var RegExp: { >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 819, 1), Decl(1.0lib-noErrors.ts, 852, 11)) @@ -2243,17 +1492,10 @@ interface Error { >Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) name: string; -<<<<<<< ours ->name : Symbol(Error.name, Decl(1.0lib-noErrors.ts, 872, 17)) - - message: string; ->message : Symbol(Error.message, Decl(1.0lib-noErrors.ts, 873, 17)) -======= ->name : Symbol(name, Decl(1.0lib-noErrors.ts, 869, 17)) +>name : Symbol(Error.name, Decl(1.0lib-noErrors.ts, 869, 17)) message: string; ->message : Symbol(message, Decl(1.0lib-noErrors.ts, 870, 17)) ->>>>>>> theirs +>message : Symbol(Error.message, Decl(1.0lib-noErrors.ts, 870, 17)) } declare var Error: { >Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 867, 1), Decl(1.0lib-noErrors.ts, 873, 11)) @@ -2401,32 +1643,19 @@ interface JSON { * If a member contains nested objects, the nested objects are transformed before the parent object is. */ parse(text: string, reviver?: (key: any, value: any) => any): any; -<<<<<<< ours ->parse : Symbol(JSON.parse, Decl(1.0lib-noErrors.ts, 930, 16)) ->text : Symbol(text, Decl(1.0lib-noErrors.ts, 937, 10)) ->reviver : Symbol(reviver, Decl(1.0lib-noErrors.ts, 937, 23)) ->key : Symbol(key, Decl(1.0lib-noErrors.ts, 937, 35)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 937, 44)) -======= ->parse : Symbol(parse, Decl(1.0lib-noErrors.ts, 927, 16)) +>parse : Symbol(JSON.parse, Decl(1.0lib-noErrors.ts, 927, 16)) >text : Symbol(text, Decl(1.0lib-noErrors.ts, 934, 10)) >reviver : Symbol(reviver, Decl(1.0lib-noErrors.ts, 934, 23)) >key : Symbol(key, Decl(1.0lib-noErrors.ts, 934, 35)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 934, 44)) ->>>>>>> theirs /** * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. * @param value A JavaScript value, usually an object or array, to be converted. */ stringify(value: any): string; -<<<<<<< ours ->stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 942, 14)) -======= ->stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) +>stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 939, 14)) ->>>>>>> theirs /** * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. @@ -2434,19 +1663,11 @@ interface JSON { * @param replacer A function that transforms the results. */ stringify(value: any, replacer: (key: string, value: any) => any): string; -<<<<<<< ours ->stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 948, 14)) ->replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 948, 25)) ->key : Symbol(key, Decl(1.0lib-noErrors.ts, 948, 37)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 948, 49)) -======= ->stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) +>stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 945, 14)) >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 945, 25)) >key : Symbol(key, Decl(1.0lib-noErrors.ts, 945, 37)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 945, 49)) ->>>>>>> theirs /** * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. @@ -2454,15 +1675,9 @@ interface JSON { * @param replacer Array that transforms the results. */ stringify(value: any, replacer: any[]): string; -<<<<<<< ours ->stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 954, 14)) ->replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 954, 25)) -======= ->stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) +>stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 951, 14)) >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 951, 25)) ->>>>>>> theirs /** * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. @@ -2471,21 +1686,12 @@ interface JSON { * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read. */ stringify(value: any, replacer: (key: string, value: any) => any, space: any): string; -<<<<<<< ours ->stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 961, 14)) ->replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 961, 25)) ->key : Symbol(key, Decl(1.0lib-noErrors.ts, 961, 37)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 961, 49)) ->space : Symbol(space, Decl(1.0lib-noErrors.ts, 961, 69)) -======= ->stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) +>stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 958, 14)) >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 958, 25)) >key : Symbol(key, Decl(1.0lib-noErrors.ts, 958, 37)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 958, 49)) >space : Symbol(space, Decl(1.0lib-noErrors.ts, 958, 69)) ->>>>>>> theirs /** * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. @@ -2494,17 +1700,10 @@ interface JSON { * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read. */ stringify(value: any, replacer: any[], space: any): string; -<<<<<<< ours ->stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 968, 14)) ->replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 968, 25)) ->space : Symbol(space, Decl(1.0lib-noErrors.ts, 968, 42)) -======= ->stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) +>stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 934, 70), Decl(1.0lib-noErrors.ts, 939, 34), Decl(1.0lib-noErrors.ts, 945, 78), Decl(1.0lib-noErrors.ts, 951, 51), Decl(1.0lib-noErrors.ts, 958, 90)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 965, 14)) >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 965, 25)) >space : Symbol(space, Decl(1.0lib-noErrors.ts, 965, 42)) ->>>>>>> theirs } /** * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format. @@ -2526,119 +1725,70 @@ interface Array { * Returns a string representation of an array. */ toString(): string; -<<<<<<< ours ->toString : Symbol(Array.toString, Decl(1.0lib-noErrors.ts, 980, 20)) - - toLocaleString(): string; ->toLocaleString : Symbol(Array.toLocaleString, Decl(1.0lib-noErrors.ts, 984, 23)) -======= ->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 977, 20)) +>toString : Symbol(Array.toString, Decl(1.0lib-noErrors.ts, 977, 20)) toLocaleString(): string; ->toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 981, 23)) ->>>>>>> theirs +>toLocaleString : Symbol(Array.toLocaleString, Decl(1.0lib-noErrors.ts, 981, 23)) /** * Combines two or more arrays. * @param items Additional items to add to the end of array1. */ concat(...items: U[]): T[]; -<<<<<<< ours ->concat : Symbol(Array.concat, Decl(1.0lib-noErrors.ts, 985, 29), Decl(1.0lib-noErrors.ts, 990, 46)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 990, 11)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 990, 26)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 990, 11)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 982, 29), Decl(1.0lib-noErrors.ts, 987, 46)) +>concat : Symbol(Array.concat, Decl(1.0lib-noErrors.ts, 982, 29), Decl(1.0lib-noErrors.ts, 987, 46)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 987, 11)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 987, 26)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 987, 11)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Combines two or more arrays. * @param items Additional items to add to the end of array1. */ concat(...items: T[]): T[]; -<<<<<<< ours ->concat : Symbol(Array.concat, Decl(1.0lib-noErrors.ts, 985, 29), Decl(1.0lib-noErrors.ts, 990, 46)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 995, 11)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 982, 29), Decl(1.0lib-noErrors.ts, 987, 46)) +>concat : Symbol(Array.concat, Decl(1.0lib-noErrors.ts, 982, 29), Decl(1.0lib-noErrors.ts, 987, 46)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 992, 11)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Adds all the elements of an array separated by the specified separator string. * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma. */ join(separator?: string): string; -<<<<<<< ours ->join : Symbol(Array.join, Decl(1.0lib-noErrors.ts, 995, 31)) ->separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 1000, 9)) -======= ->join : Symbol(join, Decl(1.0lib-noErrors.ts, 992, 31)) +>join : Symbol(Array.join, Decl(1.0lib-noErrors.ts, 992, 31)) >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 997, 9)) ->>>>>>> theirs /** * Removes the last element from an array and returns it. */ pop(): T; -<<<<<<< ours ->pop : Symbol(Array.pop, Decl(1.0lib-noErrors.ts, 1000, 37)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->pop : Symbol(pop, Decl(1.0lib-noErrors.ts, 997, 37)) +>pop : Symbol(Array.pop, Decl(1.0lib-noErrors.ts, 997, 37)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Appends new elements to an array, and returns the new length of the array. * @param items New elements of the Array. */ push(...items: T[]): number; -<<<<<<< ours ->push : Symbol(Array.push, Decl(1.0lib-noErrors.ts, 1004, 13)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 1009, 9)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->push : Symbol(push, Decl(1.0lib-noErrors.ts, 1001, 13)) +>push : Symbol(Array.push, Decl(1.0lib-noErrors.ts, 1001, 13)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 1006, 9)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Reverses the elements in an Array. */ reverse(): T[]; -<<<<<<< ours ->reverse : Symbol(Array.reverse, Decl(1.0lib-noErrors.ts, 1009, 32)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->reverse : Symbol(reverse, Decl(1.0lib-noErrors.ts, 1006, 32)) +>reverse : Symbol(Array.reverse, Decl(1.0lib-noErrors.ts, 1006, 32)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Removes the first element from an array and returns it. */ shift(): T; -<<<<<<< ours ->shift : Symbol(Array.shift, Decl(1.0lib-noErrors.ts, 1013, 19)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->shift : Symbol(shift, Decl(1.0lib-noErrors.ts, 1010, 19)) +>shift : Symbol(Array.shift, Decl(1.0lib-noErrors.ts, 1010, 19)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Returns a section of an array. @@ -2646,55 +1796,32 @@ interface Array { * @param end The end of the specified portion of the array. */ slice(start?: number, end?: number): T[]; -<<<<<<< ours ->slice : Symbol(Array.slice, Decl(1.0lib-noErrors.ts, 1017, 15)) ->start : Symbol(start, Decl(1.0lib-noErrors.ts, 1023, 10)) ->end : Symbol(end, Decl(1.0lib-noErrors.ts, 1023, 25)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->slice : Symbol(slice, Decl(1.0lib-noErrors.ts, 1014, 15)) +>slice : Symbol(Array.slice, Decl(1.0lib-noErrors.ts, 1014, 15)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 1020, 10)) >end : Symbol(end, Decl(1.0lib-noErrors.ts, 1020, 25)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Sorts an array. * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order. */ sort(compareFn?: (a: T, b: T) => number): T[]; -<<<<<<< ours ->sort : Symbol(Array.sort, Decl(1.0lib-noErrors.ts, 1023, 45)) ->compareFn : Symbol(compareFn, Decl(1.0lib-noErrors.ts, 1029, 9)) ->a : Symbol(a, Decl(1.0lib-noErrors.ts, 1029, 22)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->b : Symbol(b, Decl(1.0lib-noErrors.ts, 1029, 27)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->sort : Symbol(sort, Decl(1.0lib-noErrors.ts, 1020, 45)) +>sort : Symbol(Array.sort, Decl(1.0lib-noErrors.ts, 1020, 45)) >compareFn : Symbol(compareFn, Decl(1.0lib-noErrors.ts, 1026, 9)) >a : Symbol(a, Decl(1.0lib-noErrors.ts, 1026, 22)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >b : Symbol(b, Decl(1.0lib-noErrors.ts, 1026, 27)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. * @param start The zero-based location in the array from which to start removing elements. */ splice(start: number): T[]; -<<<<<<< ours ->splice : Symbol(Array.splice, Decl(1.0lib-noErrors.ts, 1029, 50), Decl(1.0lib-noErrors.ts, 1035, 31)) ->start : Symbol(start, Decl(1.0lib-noErrors.ts, 1035, 11)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 1026, 50), Decl(1.0lib-noErrors.ts, 1032, 31)) +>splice : Symbol(Array.splice, Decl(1.0lib-noErrors.ts, 1026, 50), Decl(1.0lib-noErrors.ts, 1032, 31)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 1032, 11)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. @@ -2703,36 +1830,21 @@ interface Array { * @param items Elements to insert into the array in place of the deleted elements. */ splice(start: number, deleteCount: number, ...items: T[]): T[]; -<<<<<<< ours ->splice : Symbol(Array.splice, Decl(1.0lib-noErrors.ts, 1029, 50), Decl(1.0lib-noErrors.ts, 1035, 31)) ->start : Symbol(start, Decl(1.0lib-noErrors.ts, 1043, 11)) ->deleteCount : Symbol(deleteCount, Decl(1.0lib-noErrors.ts, 1043, 25)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 1043, 46)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 1026, 50), Decl(1.0lib-noErrors.ts, 1032, 31)) +>splice : Symbol(Array.splice, Decl(1.0lib-noErrors.ts, 1026, 50), Decl(1.0lib-noErrors.ts, 1032, 31)) >start : Symbol(start, Decl(1.0lib-noErrors.ts, 1040, 11)) >deleteCount : Symbol(deleteCount, Decl(1.0lib-noErrors.ts, 1040, 25)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 1040, 46)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Inserts new elements at the start of an array. * @param items Elements to insert at the start of the Array. */ unshift(...items: T[]): number; -<<<<<<< ours ->unshift : Symbol(Array.unshift, Decl(1.0lib-noErrors.ts, 1043, 67)) ->items : Symbol(items, Decl(1.0lib-noErrors.ts, 1049, 12)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->unshift : Symbol(unshift, Decl(1.0lib-noErrors.ts, 1040, 67)) +>unshift : Symbol(Array.unshift, Decl(1.0lib-noErrors.ts, 1040, 67)) >items : Symbol(items, Decl(1.0lib-noErrors.ts, 1046, 12)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Returns the index of the first occurrence of a value in an array. @@ -2740,17 +1852,10 @@ interface Array { * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0. */ indexOf(searchElement: T, fromIndex?: number): number; -<<<<<<< ours ->indexOf : Symbol(Array.indexOf, Decl(1.0lib-noErrors.ts, 1049, 35)) ->searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 1056, 12)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 1056, 29)) -======= ->indexOf : Symbol(indexOf, Decl(1.0lib-noErrors.ts, 1046, 35)) +>indexOf : Symbol(Array.indexOf, Decl(1.0lib-noErrors.ts, 1046, 35)) >searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 1053, 12)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 1053, 29)) ->>>>>>> theirs /** * Returns the index of the last occurrence of a specified value in an array. @@ -2758,17 +1863,10 @@ interface Array { * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array. */ lastIndexOf(searchElement: T, fromIndex?: number): number; -<<<<<<< ours ->lastIndexOf : Symbol(Array.lastIndexOf, Decl(1.0lib-noErrors.ts, 1056, 58)) ->searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 1063, 16)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 1063, 33)) -======= ->lastIndexOf : Symbol(lastIndexOf, Decl(1.0lib-noErrors.ts, 1053, 58)) +>lastIndexOf : Symbol(Array.lastIndexOf, Decl(1.0lib-noErrors.ts, 1053, 58)) >searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 1060, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 1060, 33)) ->>>>>>> theirs /** * Determines whether all the members of an array satisfy the specified test. @@ -2776,17 +1874,7 @@ interface Array { * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean; -<<<<<<< ours ->every : Symbol(Array.every, Decl(1.0lib-noErrors.ts, 1063, 62)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1070, 10)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 1070, 23)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 1070, 32)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 1070, 47)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1070, 71)) -======= ->every : Symbol(every, Decl(1.0lib-noErrors.ts, 1060, 62)) +>every : Symbol(Array.every, Decl(1.0lib-noErrors.ts, 1060, 62)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1067, 10)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1067, 23)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) @@ -2794,7 +1882,6 @@ interface Array { >array : Symbol(array, Decl(1.0lib-noErrors.ts, 1067, 47)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1067, 71)) ->>>>>>> theirs /** * Determines whether the specified callback function returns true for any element of an array. @@ -2802,17 +1889,7 @@ interface Array { * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean; -<<<<<<< ours ->some : Symbol(Array.some, Decl(1.0lib-noErrors.ts, 1070, 96)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1077, 9)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 1077, 22)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 1077, 31)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 1077, 46)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1077, 70)) -======= ->some : Symbol(some, Decl(1.0lib-noErrors.ts, 1067, 96)) +>some : Symbol(Array.some, Decl(1.0lib-noErrors.ts, 1067, 96)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1074, 9)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1074, 22)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) @@ -2820,7 +1897,6 @@ interface Array { >array : Symbol(array, Decl(1.0lib-noErrors.ts, 1074, 46)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1074, 70)) ->>>>>>> theirs /** * Performs the specified action for each element in an array. @@ -2828,17 +1904,7 @@ interface Array { * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void; -<<<<<<< ours ->forEach : Symbol(Array.forEach, Decl(1.0lib-noErrors.ts, 1077, 95)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1084, 12)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 1084, 25)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 1084, 34)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 1084, 49)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1084, 70)) -======= ->forEach : Symbol(forEach, Decl(1.0lib-noErrors.ts, 1074, 95)) +>forEach : Symbol(Array.forEach, Decl(1.0lib-noErrors.ts, 1074, 95)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1081, 12)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1081, 25)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) @@ -2846,7 +1912,6 @@ interface Array { >array : Symbol(array, Decl(1.0lib-noErrors.ts, 1081, 49)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1081, 70)) ->>>>>>> theirs /** * Calls a defined callback function on each element of an array, and returns an array that contains the results. @@ -2854,20 +1919,7 @@ interface Array { * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ map(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[]; -<<<<<<< ours ->map : Symbol(Array.map, Decl(1.0lib-noErrors.ts, 1084, 92)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1091, 8)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1091, 11)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 1091, 24)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 1091, 33)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 1091, 48)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1091, 8)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1091, 66)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1091, 8)) -======= ->map : Symbol(map, Decl(1.0lib-noErrors.ts, 1081, 92)) +>map : Symbol(Array.map, Decl(1.0lib-noErrors.ts, 1081, 92)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1088, 8)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1088, 11)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1088, 24)) @@ -2878,7 +1930,6 @@ interface Array { >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1088, 8)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1088, 66)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1088, 8)) ->>>>>>> theirs /** * Returns the elements of an array that meet the condition specified in a callback function. @@ -2886,18 +1937,7 @@ interface Array { * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ filter(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[]; -<<<<<<< ours ->filter : Symbol(Array.filter, Decl(1.0lib-noErrors.ts, 1091, 87)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1098, 11)) ->value : Symbol(value, Decl(1.0lib-noErrors.ts, 1098, 24)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->index : Symbol(index, Decl(1.0lib-noErrors.ts, 1098, 33)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 1098, 48)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1098, 72)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->filter : Symbol(filter, Decl(1.0lib-noErrors.ts, 1088, 87)) +>filter : Symbol(Array.filter, Decl(1.0lib-noErrors.ts, 1088, 87)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1095, 11)) >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1095, 24)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) @@ -2906,7 +1946,6 @@ interface Array { >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 1095, 72)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. @@ -2914,22 +1953,7 @@ interface Array { * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. */ reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; -<<<<<<< ours ->reduce : Symbol(Array.reduce, Decl(1.0lib-noErrors.ts, 1098, 93), Decl(1.0lib-noErrors.ts, 1105, 120)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1105, 11)) ->previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1105, 24)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 1105, 41)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 1105, 58)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 1105, 80)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1105, 98)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->reduce : Symbol(reduce, Decl(1.0lib-noErrors.ts, 1095, 93), Decl(1.0lib-noErrors.ts, 1102, 120)) +>reduce : Symbol(Array.reduce, Decl(1.0lib-noErrors.ts, 1095, 93), Decl(1.0lib-noErrors.ts, 1102, 120)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1102, 11)) >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1102, 24)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) @@ -2942,7 +1966,6 @@ interface Array { >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1102, 98)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. @@ -2950,23 +1973,7 @@ interface Array { * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. */ reduce(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; -<<<<<<< ours ->reduce : Symbol(Array.reduce, Decl(1.0lib-noErrors.ts, 1098, 93), Decl(1.0lib-noErrors.ts, 1105, 120)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1111, 11)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1111, 14)) ->previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1111, 27)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1111, 11)) ->currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 1111, 44)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 1111, 61)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 1111, 83)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1111, 11)) ->initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1111, 101)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1111, 11)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1111, 11)) -======= ->reduce : Symbol(reduce, Decl(1.0lib-noErrors.ts, 1095, 93), Decl(1.0lib-noErrors.ts, 1102, 120)) +>reduce : Symbol(Array.reduce, Decl(1.0lib-noErrors.ts, 1095, 93), Decl(1.0lib-noErrors.ts, 1102, 120)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1108, 11)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1108, 14)) >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1108, 27)) @@ -2980,7 +1987,6 @@ interface Array { >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1108, 101)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1108, 11)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1108, 11)) ->>>>>>> theirs /** * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. @@ -2988,22 +1994,7 @@ interface Array { * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. */ reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; -<<<<<<< ours ->reduceRight : Symbol(Array.reduceRight, Decl(1.0lib-noErrors.ts, 1111, 122), Decl(1.0lib-noErrors.ts, 1118, 125)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1118, 16)) ->previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1118, 29)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 1118, 46)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 1118, 63)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 1118, 85)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1118, 103)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) -======= ->reduceRight : Symbol(reduceRight, Decl(1.0lib-noErrors.ts, 1108, 122), Decl(1.0lib-noErrors.ts, 1115, 125)) +>reduceRight : Symbol(Array.reduceRight, Decl(1.0lib-noErrors.ts, 1108, 122), Decl(1.0lib-noErrors.ts, 1115, 125)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1115, 16)) >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1115, 29)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) @@ -3016,7 +2007,6 @@ interface Array { >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1115, 103)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) >T : Symbol(T, Decl(1.0lib-noErrors.ts, 977, 16)) ->>>>>>> theirs /** * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. @@ -3024,23 +2014,7 @@ interface Array { * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. */ reduceRight(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; -<<<<<<< ours ->reduceRight : Symbol(Array.reduceRight, Decl(1.0lib-noErrors.ts, 1111, 122), Decl(1.0lib-noErrors.ts, 1118, 125)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1124, 16)) ->callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1124, 19)) ->previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1124, 32)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1124, 16)) ->currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 1124, 49)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->currentIndex : Symbol(currentIndex, Decl(1.0lib-noErrors.ts, 1124, 66)) ->array : Symbol(array, Decl(1.0lib-noErrors.ts, 1124, 88)) ->T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1124, 16)) ->initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1124, 106)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1124, 16)) ->U : Symbol(U, Decl(1.0lib-noErrors.ts, 1124, 16)) -======= ->reduceRight : Symbol(reduceRight, Decl(1.0lib-noErrors.ts, 1108, 122), Decl(1.0lib-noErrors.ts, 1115, 125)) +>reduceRight : Symbol(Array.reduceRight, Decl(1.0lib-noErrors.ts, 1108, 122), Decl(1.0lib-noErrors.ts, 1115, 125)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1121, 16)) >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1121, 19)) >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1121, 32)) @@ -3054,17 +2028,12 @@ interface Array { >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 1121, 106)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1121, 16)) >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1121, 16)) ->>>>>>> theirs /** * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array. */ length: number; -<<<<<<< ours ->length : Symbol(Array.length, Decl(1.0lib-noErrors.ts, 1124, 127)) -======= ->length : Symbol(length, Decl(1.0lib-noErrors.ts, 1121, 127)) ->>>>>>> theirs +>length : Symbol(Array.length, Decl(1.0lib-noErrors.ts, 1121, 127)) [n: number]: T; >n : Symbol(n, Decl(1.0lib-noErrors.ts, 1128, 5)) diff --git a/tests/baselines/reference/InfinityLiteralTypes.symbols b/tests/baselines/reference/InfinityLiteralTypes.symbols index bdc07ae2d2209..7b6fe1046adc6 100644 --- a/tests/baselines/reference/InfinityLiteralTypes.symbols +++ b/tests/baselines/reference/InfinityLiteralTypes.symbols @@ -3,7 +3,7 @@ interface PositiveInfinityMember { >PositiveInfinityMember : Symbol(PositiveInfinityMember, Decl(InfinityLiteralTypes.ts, 0, 0)) member: Infinity ->member : Symbol(member, Decl(InfinityLiteralTypes.ts, 0, 34)) +>member : Symbol(PositiveInfinityMember.member, Decl(InfinityLiteralTypes.ts, 0, 34)) >Infinity : Symbol(Infinity) } @@ -11,7 +11,7 @@ interface NegativeInfinityMember { >NegativeInfinityMember : Symbol(NegativeInfinityMember, Decl(InfinityLiteralTypes.ts, 2, 1)) member: -Infinity ->member : Symbol(member, Decl(InfinityLiteralTypes.ts, 4, 34)) +>member : Symbol(NegativeInfinityMember.member, Decl(InfinityLiteralTypes.ts, 4, 34)) } function invertInfinity(x: -Infinity): Infinity; diff --git a/tests/baselines/reference/NaNLiteralTypes.symbols b/tests/baselines/reference/NaNLiteralTypes.symbols index 3393633502dd0..8edda477410b2 100644 --- a/tests/baselines/reference/NaNLiteralTypes.symbols +++ b/tests/baselines/reference/NaNLiteralTypes.symbols @@ -3,7 +3,7 @@ interface NaNMember { >NaNMember : Symbol(NaNMember, Decl(NaNLiteralTypes.ts, 0, 0)) member: NaN ->member : Symbol(member, Decl(NaNLiteralTypes.ts, 0, 21)) +>member : Symbol(NaNMember.member, Decl(NaNLiteralTypes.ts, 0, 21)) >NaN : Symbol(NaN) } diff --git a/tests/baselines/reference/numericLiteralTypes.symbols b/tests/baselines/reference/numericLiteralTypes.symbols index 41d5ea22ace0d..6a762a3d0aa11 100644 --- a/tests/baselines/reference/numericLiteralTypes.symbols +++ b/tests/baselines/reference/numericLiteralTypes.symbols @@ -3,28 +3,28 @@ interface NumericMember { >NumericMember : Symbol(NumericMember, Decl(numericLiteralTypes.ts, 0, 0)) member: 255; ->member : Symbol(member, Decl(numericLiteralTypes.ts, 0, 25)) +>member : Symbol(NumericMember.member, Decl(numericLiteralTypes.ts, 0, 25)) } interface HexMember { >HexMember : Symbol(HexMember, Decl(numericLiteralTypes.ts, 2, 1)) member: 0xFF; ->member : Symbol(member, Decl(numericLiteralTypes.ts, 4, 21)) +>member : Symbol(HexMember.member, Decl(numericLiteralTypes.ts, 4, 21)) } interface OctalMember { >OctalMember : Symbol(OctalMember, Decl(numericLiteralTypes.ts, 6, 1)) member: 0o377; ->member : Symbol(member, Decl(numericLiteralTypes.ts, 8, 23)) +>member : Symbol(OctalMember.member, Decl(numericLiteralTypes.ts, 8, 23)) } interface NumberMember { >NumberMember : Symbol(NumberMember, Decl(numericLiteralTypes.ts, 10, 1)) member: number; ->member : Symbol(member, Decl(numericLiteralTypes.ts, 12, 24)) +>member : Symbol(NumberMember.member, Decl(numericLiteralTypes.ts, 12, 24)) } var a: NumericMember; @@ -65,21 +65,21 @@ interface NegativeNumericMember { >NegativeNumericMember : Symbol(NegativeNumericMember, Decl(numericLiteralTypes.ts, 25, 6)) member: -255; ->member : Symbol(member, Decl(numericLiteralTypes.ts, 27, 33)) +>member : Symbol(NegativeNumericMember.member, Decl(numericLiteralTypes.ts, 27, 33)) } interface NegativeHexMember { >NegativeHexMember : Symbol(NegativeHexMember, Decl(numericLiteralTypes.ts, 29, 1)) member: -0xFF; ->member : Symbol(member, Decl(numericLiteralTypes.ts, 31, 29)) +>member : Symbol(NegativeHexMember.member, Decl(numericLiteralTypes.ts, 31, 29)) } interface NegativeOctalMember { >NegativeOctalMember : Symbol(NegativeOctalMember, Decl(numericLiteralTypes.ts, 33, 1)) member: -0o377; ->member : Symbol(member, Decl(numericLiteralTypes.ts, 35, 31)) +>member : Symbol(NegativeOctalMember.member, Decl(numericLiteralTypes.ts, 35, 31)) } var na: NegativeNumericMember; diff --git a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols index 00ac33becb437..12ba1e5fcbc13 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols +++ b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols @@ -1,9 +1,5 @@ === tests/cases/conformance/es6/templates/templateStringWithEmbeddedUnaryPlusES6.ts === var x = `abc${ +Infinity }def`; >x : Symbol(x, Decl(templateStringWithEmbeddedUnaryPlusES6.ts, 0, 3)) -<<<<<<< ours ->Infinity : Symbol(Infinity, Decl(lib.es5.d.ts, --, --)) -======= >Infinity : Symbol(Infinity) ->>>>>>> theirs