From 0efbf156721aa4e8c8c77a55b603d13f2b15f62e Mon Sep 17 00:00:00 2001 From: Igor Oleinikov Date: Fri, 25 Oct 2013 19:21:41 +0400 Subject: [PATCH] Fixed formatting --- ix.js/ix.d.ts | 2 - ix.js/l2o.d.ts | 414 ++++++++++++++++++++++++------------------------- 2 files changed, 207 insertions(+), 209 deletions(-) diff --git a/ix.js/ix.d.ts b/ix.js/ix.d.ts index 9ea0ae0c9..2a598dde7 100644 --- a/ix.js/ix.d.ts +++ b/ix.js/ix.d.ts @@ -74,8 +74,6 @@ declare module Ix { onErrorResumeNext(second: Enumerable): Enumerable; retry(retryCount?: number): Enumerable; - - } export interface EnumerableStatic { diff --git a/ix.js/l2o.d.ts b/ix.js/l2o.d.ts index 035d59234..5a74c6259 100644 --- a/ix.js/l2o.d.ts +++ b/ix.js/l2o.d.ts @@ -8,263 +8,263 @@ declare module Ix { } export interface Enumerator extends Disposable { - moveNext(): boolean; - getCurrent(): T; - } + moveNext(): boolean; + getCurrent(): T; + } - export interface EnumeratorStatic { - new(moveNext: () => boolean, getCurrent: () => T, dispose: () => void): Enumerator; - create(moveNext: () => boolean, getCurrent: () => T, dispose?: () => void): Enumerator; - } + export interface EnumeratorStatic { + new (moveNext: () => boolean, getCurrent: () => T, dispose: () => void): Enumerator; + create(moveNext: () => boolean, getCurrent: () => T, dispose?: () => void): Enumerator; + } - var Enumerator: EnumerableStatic; + var Enumerator: EnumerableStatic; - export interface EnumerableFunc { - (item: T, index: number, self: Enumerable): TResult; - } - export interface EnumerablePredicate extends EnumerableFunc { } - export interface Predicate { - (item: T): boolean; - } - export interface EqualityComparer { - (item1: T1, item2: T2): boolean; - } + export interface EnumerableFunc { + (item: T, index: number, self: Enumerable): TResult; + } + export interface EnumerablePredicate extends EnumerableFunc { } + export interface Predicate { + (item: T): boolean; + } + export interface EqualityComparer { + (item1: T1, item2: T2): boolean; + } - export interface Enumerable { - // base functions - getEnumerator(): Enumerator; + export interface Enumerable { + // base functions + getEnumerator(): Enumerator; - // "extension" functions + // "extension" functions - aggregate(seed: TAccumulate, func: (accumulate: TAccumulate, current: T, index: number, self: Enumerable) => TAccumulate, resultSelector: (accumulate: TAccumulate) => TResult): TResult; - aggregate(seed: TAccumulate, func: (accumulate: TAccumulate, current: T, index: number, self: Enumerable) => TAccumulate): TAccumulate; - aggregate(func: (accumulate: T, current: T, index: number, self: Enumerable) => T): T; + aggregate(seed: TAccumulate, func: (accumulate: TAccumulate, current: T, index: number, self: Enumerable) => TAccumulate, resultSelector: (accumulate: TAccumulate) => TResult): TResult; + aggregate(seed: TAccumulate, func: (accumulate: TAccumulate, current: T, index: number, self: Enumerable) => TAccumulate): TAccumulate; + aggregate(func: (accumulate: T, current: T, index: number, self: Enumerable) => T): T; - reduce(func: (accumulate: T, current: T, index: number, self: Enumerable) => T): T; - reduce(func: (accumulate: TAccumulate, current: T, index: number, self: Enumerable) => TAccumulate, seed: TAccumulate): TAccumulate; + reduce(func: (accumulate: T, current: T, index: number, self: Enumerable) => T): T; + reduce(func: (accumulate: TAccumulate, current: T, index: number, self: Enumerable) => TAccumulate, seed: TAccumulate): TAccumulate; - all(predicate: EnumerablePredicate, thisArg?: any): boolean; - every(predicate: EnumerablePredicate, thisArg?: any): boolean; // alias + all(predicate: EnumerablePredicate, thisArg?: any): boolean; + every(predicate: EnumerablePredicate, thisArg?: any): boolean; // alias - any(predicate?: EnumerablePredicate, thisArg?: any): boolean; - some(predicate?: EnumerablePredicate, thisArg?: any): boolean; // alias + any(predicate?: EnumerablePredicate, thisArg?: any): boolean; + some(predicate?: EnumerablePredicate, thisArg?: any): boolean; // alias - average(selector?: EnumerableFunc): number; - max(selector?: EnumerableFunc): number; - min(selector?: EnumerableFunc): number; - sum(selector?: EnumerableFunc): number; + average(selector?: EnumerableFunc): number; + max(selector?: EnumerableFunc): number; + min(selector?: EnumerableFunc): number; + sum(selector?: EnumerableFunc): number; - concat(...sources: Enumerable[]): Enumerable; + concat(...sources: Enumerable[]): Enumerable; - contains(value: TValue, comparer: EqualityComparer): boolean; - contains(value: any): boolean; + contains(value: TValue, comparer: EqualityComparer): boolean; + contains(value: any): boolean; - count(predicate?: EnumerablePredicate, thisArg?: any): number; + count(predicate?: EnumerablePredicate, thisArg?: any): number; - defaultIfEmpty(defaultValue: T): Enumerable; + defaultIfEmpty(defaultValue: T): Enumerable; - distinct(comparer?: EqualityComparer): Enumerable; + distinct(comparer?: EqualityComparer): Enumerable; - elementAt(index: number): T; - elementAtOrDefault(index: number): T; + elementAt(index: number): T; + elementAtOrDefault(index: number): T; - except(second: Enumerable, comparer?: EqualityComparer): Enumerable; + except(second: Enumerable, comparer?: EqualityComparer): Enumerable; - first(predicate?: Predicate): T; - firstOrDefault(predicate?: Predicate): T; - last(predicate?: Predicate): T; - lastOrDefault(predicate?: Predicate): T; - single(predicate?: Predicate): T; - singleOrDefault(predicate?: Predicate): T; + first(predicate?: Predicate): T; + firstOrDefault(predicate?: Predicate): T; + last(predicate?: Predicate): T; + lastOrDefault(predicate?: Predicate): T; + single(predicate?: Predicate): T; + singleOrDefault(predicate?: Predicate): T; - forEach(action: EnumerableFunc, thisArg?: any): void; + forEach(action: EnumerableFunc, thisArg?: any): void; - groupBy( - keySelector: (item: T) => TKey, - elementSelector: (item: T) => TElement, - resultSelector: (key: TKey, values: Enumerable) => TResult, - comparer?: EqualityComparer): Enumerable; - groupBy( - keySelector: (item: T) => TKey, - elementSelector: (item: T) => TElement): Grouping; - // spec 3.5.2, waiting for restriction on generative recursion removal + groupBy( + keySelector: (item: T) => TKey, + elementSelector: (item: T) => TElement, + resultSelector: (key: TKey, values: Enumerable) => TResult, + comparer?: EqualityComparer): Enumerable; + groupBy( + keySelector: (item: T) => TKey, + elementSelector: (item: T) => TElement): Grouping; + // spec 3.5.2, waiting for restriction on generative recursion removal /*groupBy( - keySelector: (item: T) => TKey): Grouping;*/ - groupBy( - keySelector: (item: T) => TKey): Grouping; + keySelector: (item: T) => TKey): Grouping;*/ + groupBy( + keySelector: (item: T) => TKey): Grouping; - // if need to set comparer without resultSelector - groupBy( - keySelector: (item: T) => TKey, - elementSelector: (item: T) => TElement, - _: boolean, - comparer: EqualityComparer): Grouping; - // if need to set resultSelector without elementSelector - groupBy( - keySelector: (item: T) => TKey, - _: boolean, - resultSelector: (key: TKey, values: Enumerable) => TResult, - comparer?: EqualityComparer): Enumerable; - // if need to set comparer without elementSelector and resultSelector - // spec 3.5.2, waiting for restriction on generative recursion removal + // if need to set comparer without resultSelector + groupBy( + keySelector: (item: T) => TKey, + elementSelector: (item: T) => TElement, + _: boolean, + comparer: EqualityComparer): Grouping; + // if need to set resultSelector without elementSelector + groupBy( + keySelector: (item: T) => TKey, + _: boolean, + resultSelector: (key: TKey, values: Enumerable) => TResult, + comparer?: EqualityComparer): Enumerable; + // if need to set comparer without elementSelector and resultSelector + // spec 3.5.2, waiting for restriction on generative recursion removal /*groupBy( - keySelector: (item: T) => TKey, - _: boolean, - __: boolean, - comparer: EqualityComparer): Grouping;*/ - groupBy( - keySelector: (item: T) => TKey, - _: boolean, - __: boolean, - comparer: EqualityComparer): Grouping; + keySelector: (item: T) => TKey, + _: boolean, + __: boolean, + comparer: EqualityComparer): Grouping;*/ + groupBy( + keySelector: (item: T) => TKey, + _: boolean, + __: boolean, + comparer: EqualityComparer): Grouping; - groupJoin( - inner: Enumerable, - outerKeySelector: (item: T) => TOuterKey, - innerKeySelector: (item: TInner) => TInnerKey, - resultSelector: (outer: T, innerSequence: Enumerable) => TResult, - comparer: EqualityComparer): Enumerable; - groupJoin( - inner: Enumerable, - outerKeySelector: (item: T) => TKey, - innerKeySelector: (item: TInner) => TKey, - resultSelector: (outer: T, innerSequence: Enumerable) => TResult): Enumerable; + groupJoin( + inner: Enumerable, + outerKeySelector: (item: T) => TOuterKey, + innerKeySelector: (item: TInner) => TInnerKey, + resultSelector: (outer: T, innerSequence: Enumerable) => TResult, + comparer: EqualityComparer): Enumerable; + groupJoin( + inner: Enumerable, + outerKeySelector: (item: T) => TKey, + innerKeySelector: (item: TInner) => TKey, + resultSelector: (outer: T, innerSequence: Enumerable) => TResult): Enumerable; - join( - inner: Enumerable, - outerKeySelector: (item: T) => TOuterKey, - innerKeySelector: (item: TInner) => TInnerKey, - resultSelector: (outer: T, inner: TInner) => TResult, - comparer: EqualityComparer): Enumerable; - join( - inner: Enumerable, - outerKeySelector: (item: T) => TKey, - innerKeySelector: (item: TInner) => TKey, - resultSelector: (outer: T, inner: TInner) => TResult): Enumerable; + join( + inner: Enumerable, + outerKeySelector: (item: T) => TOuterKey, + innerKeySelector: (item: TInner) => TInnerKey, + resultSelector: (outer: T, inner: TInner) => TResult, + comparer: EqualityComparer): Enumerable; + join( + inner: Enumerable, + outerKeySelector: (item: T) => TKey, + innerKeySelector: (item: TInner) => TKey, + resultSelector: (outer: T, inner: TInner) => TResult): Enumerable; - intersect(second: Enumerable, comparer: EqualityComparer): Enumerable; - intersect(second: Enumerable): Enumerable; - union(second: Enumerable, comparer?: EqualityComparer): Enumerable; + intersect(second: Enumerable, comparer: EqualityComparer): Enumerable; + intersect(second: Enumerable): Enumerable; + union(second: Enumerable, comparer?: EqualityComparer): Enumerable; - orderBy(keySelector: (item: T) => TKey, comparer?: EqualityComparer): OrderedEnumerable; - orderByDescending(keySelector: (item: T) => TKey, comparer?: EqualityComparer): OrderedEnumerable; + orderBy(keySelector: (item: T) => TKey, comparer?: EqualityComparer): OrderedEnumerable; + orderByDescending(keySelector: (item: T) => TKey, comparer?: EqualityComparer): OrderedEnumerable; - reverse(): Enumerable; + reverse(): Enumerable; - select(selector: EnumerableFunc, thisArg?: any): Enumerable; - map(selector: EnumerableFunc, thisArg?: any): Enumerable; + select(selector: EnumerableFunc, thisArg?: any): Enumerable; + map(selector: EnumerableFunc, thisArg?: any): Enumerable; - selectMany(collectionSelector: (item: T, index: number) => Enumerable, - resultSelector: (outer: T, inner: TCollection) => TResult): Enumerable; - selectMany(collectionSelector: (item: T, index: number) => Enumerable): Enumerable; + selectMany(collectionSelector: (item: T, index: number) => Enumerable, + resultSelector: (outer: T, inner: TCollection) => TResult): Enumerable; + selectMany(collectionSelector: (item: T, index: number) => Enumerable): Enumerable; - sequenceEqual(second: Enumerable, comparer: EqualityComparer): boolean; - sequenceEqual(second: Enumerable): boolean; + sequenceEqual(second: Enumerable, comparer: EqualityComparer): boolean; + sequenceEqual(second: Enumerable): boolean; - skip(count: number): Enumerable; - skipWhile(selector: EnumerablePredicate, thisArg?: any): Enumerable; - take(count: number): Enumerable; - takeWhile(selector: EnumerablePredicate, thisArg?: any): Enumerable; + skip(count: number): Enumerable; + skipWhile(selector: EnumerablePredicate, thisArg?: any): Enumerable; + take(count: number): Enumerable; + takeWhile(selector: EnumerablePredicate, thisArg?: any): Enumerable; - toArray(): T[]; + toArray(): T[]; - toDictionary( - keySelector: (item: T) => TKey, - elementSelector: (item: T) => TValue, - comparer?: EqualityComparer): Dictionary; - // spec 3.5.2, waiting for restriction on generative recursion removal + toDictionary( + keySelector: (item: T) => TKey, + elementSelector: (item: T) => TValue, + comparer?: EqualityComparer): Dictionary; + // spec 3.5.2, waiting for restriction on generative recursion removal /*toDictionary( - keySelector: (item: T) => TKey): Dictionary;*/ - toDictionary( - keySelector: (item: T) => TKey): Dictionary; - // if need to set comparer without elementSelector - // spec 3.5.2, waiting for restriction on generative recursion removal + keySelector: (item: T) => TKey): Dictionary;*/ + toDictionary( + keySelector: (item: T) => TKey): Dictionary; + // if need to set comparer without elementSelector + // spec 3.5.2, waiting for restriction on generative recursion removal /*toDictionary( - keySelector: (item: T) => TKey, - _: boolean, - comparer: EqualityComparer): Dictionary;*/ - toDictionary( - keySelector: (item: T) => TKey, - _: boolean, - comparer: EqualityComparer): Dictionary; + keySelector: (item: T) => TKey, + _: boolean, + comparer: EqualityComparer): Dictionary;*/ + toDictionary( + keySelector: (item: T) => TKey, + _: boolean, + comparer: EqualityComparer): Dictionary; - toLookup( - keySelector: (item: T) => TKey, - elementSelector: (item: T) => TValue, - comparer?: EqualityComparer): Lookup; - // spec 3.5.2, waiting for restriction on generative recursion removal + toLookup( + keySelector: (item: T) => TKey, + elementSelector: (item: T) => TValue, + comparer?: EqualityComparer): Lookup; + // spec 3.5.2, waiting for restriction on generative recursion removal /*toLookup( - keySelector: (item: T) => TKey): Lookup;*/ - toLookup( - keySelector: (item: T) => TKey): Lookup; - // if need to set comparer without elementSelector - // spec 3.5.2, waiting for restriction on generative recursion removal + keySelector: (item: T) => TKey): Lookup;*/ + toLookup( + keySelector: (item: T) => TKey): Lookup; + // if need to set comparer without elementSelector + // spec 3.5.2, waiting for restriction on generative recursion removal /*toLookup( - keySelector: (item: T) => TKey, - _: boolean, - comparer: EqualityComparer): Lookup;*/ - toLookup( - keySelector: (item: T) => TKey, - _: boolean, - comparer: EqualityComparer): Lookup; + keySelector: (item: T) => TKey, + _: boolean, + comparer: EqualityComparer): Lookup;*/ + toLookup( + keySelector: (item: T) => TKey, + _: boolean, + comparer: EqualityComparer): Lookup; - where(selector: EnumerablePredicate, thisArg?: any): Enumerable; - filter(selector: EnumerablePredicate, thisArg?: any): Enumerable; + where(selector: EnumerablePredicate, thisArg?: any): Enumerable; + filter(selector: EnumerablePredicate, thisArg?: any): Enumerable; - zip(right: Enumerable, selector: (left: T, right: TRight) => TResult): Enumerable; - } + zip(right: Enumerable, selector: (left: T, right: TRight) => TResult): Enumerable; + } - export interface Grouping extends Enumerable { - key: TKey; - } + export interface Grouping extends Enumerable { + key: TKey; + } - export interface OrderedEnumerable extends Enumerable { - thenBy(keySelector: (item: T) => TKey, comparer?: EqualityComparer): OrderedEnumerable; - thenByDescending(keySelector: (item: T) => TKey, comparer?: EqualityComparer): OrderedEnumerable; - } + export interface OrderedEnumerable extends Enumerable { + thenBy(keySelector: (item: T) => TKey, comparer?: EqualityComparer): OrderedEnumerable; + thenByDescending(keySelector: (item: T) => TKey, comparer?: EqualityComparer): OrderedEnumerable; + } - class Dictionary { - constructor(capacity, comparer?: EqualityComparer); + class Dictionary { + constructor(capacity, comparer?: EqualityComparer); - toEnumerable(): Enumerable>; + toEnumerable(): Enumerable>; - add(key: TKey, value: TValue): void; - remove(key: TKey): boolean; - clear(): void; - length(): number; - tryGetValue(key: TKey): TValue; - get(key: TKey): TValue; - set(key: TKey, value: TValue): void; - getValues(): TValue[]; - has(key: TKey): boolean; - } + add(key: TKey, value: TValue): void; + remove(key: TKey): boolean; + clear(): void; + length(): number; + tryGetValue(key: TKey): TValue; + get(key: TKey): TValue; + set(key: TKey, value: TValue): void; + getValues(): TValue[]; + has(key: TKey): boolean; + } - export interface KeyValuePair { - key: TKey; - value: TValue; - } + export interface KeyValuePair { + key: TKey; + value: TValue; + } - export interface Lookup { - toEnumerable(): Enumerable>; - has(key: TKey): boolean; - length(): number; - get(key: TKey): Enumerable; - } + export interface Lookup { + toEnumerable(): Enumerable>; + has(key: TKey): boolean; + length(): number; + get(key: TKey): Enumerable; + } - export interface EnumerableStatic { - new (getEnumerator: () => Enumerator): Enumerable; - create(getEnumerator: () => Enumerator): Enumerable; + export interface EnumerableStatic { + new (getEnumerator: () => Enumerator): Enumerable; + create(getEnumerator: () => Enumerator): Enumerable; - concat(...sources: Enumerable[]): Enumerable; - empty(): Enumerable; - fromArray(array: T[]): Enumerable; - returnValue(value: T): Enumerable; - range(start: number, count: number): Enumerable; - repeat(value: T, repeatCount?: number): Enumerable; + concat(...sources: Enumerable[]): Enumerable; + empty(): Enumerable; + fromArray(array: T[]): Enumerable; + returnValue(value: T): Enumerable; + range(start: number, count: number): Enumerable; + repeat(value: T, repeatCount?: number): Enumerable; - sequenceEqual(first: Enumerable, second: Enumerable, comparer: EqualityComparer): boolean; - sequenceEqual(first: Enumerable, second: Enumerable): boolean; - } + sequenceEqual(first: Enumerable, second: Enumerable, comparer: EqualityComparer): boolean; + sequenceEqual(first: Enumerable, second: Enumerable): boolean; + } - var Enumerable: EnumerableStatic; + var Enumerable: EnumerableStatic; } \ No newline at end of file