chore: remove int in favor for number

Closes angular#3511

Author: mhevery

modules/angular2/globals.d.ts

@@ -4,7 +4,6 @@
 
 /// <reference path="typings/zone/zone.d.ts"/>
 declare var assert: any;
-declare type int = number;
 
 interface List<T> extends Array<T> {}
 

modules/angular2/src/change_detection/codegen_name_util.ts

@@ -83,13 +83,13 @@ export class CodegenNameUtil {
     return this._addFieldPrefix(_FIRST_PROTO_IN_CURRENT_BINDING);
   }
 
-  getLocalName(idx: int): string { return `l_${this._sanitizedNames[idx]}`; }
+  getLocalName(idx: number): string { return `l_${this._sanitizedNames[idx]}`; }
 
-  getEventLocalName(eb: EventBinding, idx: int): string {
+  getEventLocalName(eb: EventBinding, idx: number): string {
     return `l_${MapWrapper.get(this._sanitizedEventNames, eb)[idx]}`;
   }
 
-  getChangeName(idx: int): string { return `c_${this._sanitizedNames[idx]}`; }
+  getChangeName(idx: number): string { return `c_${this._sanitizedNames[idx]}`; }
 
   /**
    * Generate a statement initializing local variables used when detecting changes.
@@ -133,9 +133,9 @@ export class CodegenNameUtil {
 
   getPreventDefaultAccesor(): string { return "preventDefault"; }
 
-  getFieldCount(): int { return this._sanitizedNames.length; }
+  getFieldCount(): number { return this._sanitizedNames.length; }
 
-  getFieldName(idx: int): string { return this._addFieldPrefix(this._sanitizedNames[idx]); }
+  getFieldName(idx: number): string { return this._addFieldPrefix(this._sanitizedNames[idx]); }
 
   getAllFieldNames(): List<string> {
     var fieldList = [];
@@ -188,7 +188,7 @@ export class CodegenNameUtil {
         '\n');
   }
 
-  getPipeName(idx: int): string {
+  getPipeName(idx: number): string {
     return this._addFieldPrefix(`${this._sanitizedNames[idx]}_pipe`);
   }
 

modules/angular2/src/change_detection/differs/default_iterable_differ.ts

@@ -26,7 +26,7 @@ export class DefaultIterableDifferFactory implements IterableDifferFactory {
 
 export class DefaultIterableDiffer implements IterableDiffer {
   private _collection = null;
-  private _length: int = null;
+  private _length: number = null;
   // Keeps track of the used records at any point in time (during & across `_check()` calls)
   private _linkedRecords: _DuplicateMap = null;
   // Keeps track of the removed records at any point in time during `_check()` calls.
@@ -43,7 +43,7 @@ export class DefaultIterableDiffer implements IterableDiffer {
 
   get collection() { return this._collection; }
 
-  get length(): int { return this._length; }
+  get length(): number { return this._length; }
 
   forEachItem(fn: Function) {
     var record: CollectionChangeRecord;
@@ -101,7 +101,7 @@ export class DefaultIterableDiffer implements IterableDiffer {
 
     var record: CollectionChangeRecord = this._itHead;
     var mayBeDirty: boolean = false;
-    var index: int;
+    var index: number;
     var item;
 
     if (isArray(collection)) {
@@ -185,7 +185,7 @@ export class DefaultIterableDiffer implements IterableDiffer {
    * - `item` is the current item in the collection
    * - `index` is the position of the item in the collection
    */
-  _mismatch(record: CollectionChangeRecord, item, index: int): CollectionChangeRecord {
+  _mismatch(record: CollectionChangeRecord, item, index: number): CollectionChangeRecord {
     // The previous record after which we will append the current one.
     var previousRecord: CollectionChangeRecord;
 
@@ -241,7 +241,7 @@ export class DefaultIterableDiffer implements IterableDiffer {
    * better way to think of it is as insert of 'b' rather then switch 'a' with 'b' and then add 'a'
    * at the end.
    */
-  _verifyReinsertion(record: CollectionChangeRecord, item, index: int): CollectionChangeRecord {
+  _verifyReinsertion(record: CollectionChangeRecord, item, index: number): CollectionChangeRecord {
     var reinsertRecord: CollectionChangeRecord =
         this._unlinkedRecords === null ? null : this._unlinkedRecords.get(item);
     if (reinsertRecord !== null) {
@@ -284,7 +284,7 @@ export class DefaultIterableDiffer implements IterableDiffer {
   }
 
   _reinsertAfter(record: CollectionChangeRecord, prevRecord: CollectionChangeRecord,
-                 index: int): CollectionChangeRecord {
+                 index: number): CollectionChangeRecord {
     if (this._unlinkedRecords !== null) {
       this._unlinkedRecords.remove(record);
     }
@@ -308,15 +308,15 @@ export class DefaultIterableDiffer implements IterableDiffer {
   }
 
   _moveAfter(record: CollectionChangeRecord, prevRecord: CollectionChangeRecord,
-             index: int): CollectionChangeRecord {
+             index: number): CollectionChangeRecord {
     this._unlink(record);
     this._insertAfter(record, prevRecord, index);
     this._addToMoves(record, index);
     return record;
   }
 
   _addAfter(record: CollectionChangeRecord, prevRecord: CollectionChangeRecord,
-            index: int): CollectionChangeRecord {
+            index: number): CollectionChangeRecord {
     this._insertAfter(record, prevRecord, index);
 
     if (this._additionsTail === null) {
@@ -333,7 +333,7 @@ export class DefaultIterableDiffer implements IterableDiffer {
   }
 
   _insertAfter(record: CollectionChangeRecord, prevRecord: CollectionChangeRecord,
-               index: int): CollectionChangeRecord {
+               index: number): CollectionChangeRecord {
     // todo(vicb)
     // assert(record != prevRecord);
     // assert(record._next === null);
@@ -395,7 +395,7 @@ export class DefaultIterableDiffer implements IterableDiffer {
     return record;
   }
 
-  _addToMoves(record: CollectionChangeRecord, toIndex: int): CollectionChangeRecord {
+  _addToMoves(record: CollectionChangeRecord, toIndex: number): CollectionChangeRecord {
     // todo(vicb)
     // assert(record._nextMoved === null);
 
@@ -473,8 +473,8 @@ export class DefaultIterableDiffer implements IterableDiffer {
 }
 
 export class CollectionChangeRecord {
-  currentIndex: int = null;
-  previousIndex: int = null;
+  currentIndex: number = null;
+  previousIndex: number = null;
 
   _nextPrevious: CollectionChangeRecord = null;
   _prev: CollectionChangeRecord = null;
@@ -524,7 +524,7 @@ class _DuplicateItemRecordList {
 
   // Returns a CollectionChangeRecord having CollectionChangeRecord.item == item and
   // CollectionChangeRecord.currentIndex >= afterIndex
-  get(item: any, afterIndex: int): CollectionChangeRecord {
+  get(item: any, afterIndex: number): CollectionChangeRecord {
     var record: CollectionChangeRecord;
     for (record = this._head; record !== null; record = record._nextDup) {
       if ((afterIndex === null || afterIndex < record.currentIndex) &&
@@ -588,7 +588,7 @@ class _DuplicateMap {
    * Use case: `[a, b, c, a, a]` if we are at index `3` which is the second `a` then asking if we
    * have any more `a`s needs to return the last `a` not the first or second.
    */
-  get(value: any, afterIndex: int = null): CollectionChangeRecord {
+  get(value: any, afterIndex: number = null): CollectionChangeRecord {
     var key = getMapKey(value);
 
     var recordList = this.map.get(key);

modules/angular2/src/change_detection/parser/parser.ts

@@ -122,24 +122,24 @@ export class Parser {
 }
 
 export class _ParseAST {
-  index: int = 0;
+  index: number = 0;
   constructor(public input: string, public location: any, public tokens: List<any>,
               public reflector: Reflector, public parseAction: boolean) {}
 
-  peek(offset: int): Token {
+  peek(offset: number): Token {
     var i = this.index + offset;
     return i < this.tokens.length ? this.tokens[i] : EOF;
   }
 
   get next(): Token { return this.peek(0); }
 
-  get inputIndex(): int {
+  get inputIndex(): number {
     return (this.index < this.tokens.length) ? this.next.index : this.input.length;
   }
 
   advance() { this.index++; }
 
-  optionalCharacter(code: int): boolean {
+  optionalCharacter(code: number): boolean {
     if (this.next.isCharacter(code)) {
       this.advance();
       return true;
@@ -159,7 +159,7 @@ export class _ParseAST {
 
   peekKeywordVar(): boolean { return this.next.isKeywordVar() || this.next.isOperator('#'); }
 
-  expectCharacter(code: int) {
+  expectCharacter(code: number) {
     if (this.optionalCharacter(code)) return;
     this.error(`Missing expected ${StringWrapper.fromCharCode(code)}`);
   }
@@ -453,7 +453,7 @@ export class _ParseAST {
     throw new BaseException("Fell through all cases in parsePrimary");
   }
 
-  parseExpressionList(terminator: int): List<any> {
+  parseExpressionList(terminator: number): List<any> {
     var result = [];
     if (!this.next.isCharacter(terminator)) {
       do {
@@ -606,7 +606,7 @@ export class _ParseAST {
     return bindings;
   }
 
-  error(message: string, index: int = null) {
+  error(message: string, index: number = null) {
     if (isBlank(index)) index = this.index;
 
     var location = (index < this.tokens.length) ? `at column ${this.tokens[index].index + 1} in` :

modules/angular2/src/core/compiler/element_binder.ts

@@ -7,7 +7,7 @@ export class ElementBinder {
   // updated later, so we are able to resolve cycles
   nestedProtoView: viewModule.AppProtoView = null;
 
-  constructor(public index: int, public parent: ElementBinder, public distanceToParent: int,
+  constructor(public index: number, public parent: ElementBinder, public distanceToParent: number,
               public protoElementInjector: eiModule.ProtoElementInjector,
               public componentDirective: DirectiveBinding) {
     if (isBlank(index)) {

modules/angular2/src/core/compiler/element_injector.ts

@@ -378,8 +378,9 @@ export class ProtoElementInjector {
 
 
 
-  constructor(public parent: ProtoElementInjector, public index: int, bwv: BindingWithVisibility[],
-              public distanceToParent: number, public _firstBindingIsComponent: boolean,
+  constructor(public parent: ProtoElementInjector, public index: number,
+              bwv: BindingWithVisibility[], public distanceToParent: number,
+              public _firstBindingIsComponent: boolean,
               public directiveVariableBindings: Map<string, number>) {
     var length = bwv.length;
 

modules/angular2/src/core/compiler/view.ts

@@ -162,9 +162,9 @@ export class AppView implements ChangeDispatcher, RenderEventDispatcher {
    *
    * @param {string} eventName
    * @param {*} eventObj
-   * @param {int} boundElementIndex
+   * @param {number} boundElementIndex
    */
-  triggerEventHandlers(eventName: string, eventObj: Event, boundElementIndex: int): void {
+  triggerEventHandlers(eventName: string, eventObj: Event, boundElementIndex: number): void {
     var locals = new Map();
     locals.set('$event', eventObj);
     this.dispatchEvent(boundElementIndex, eventName, locals);
@@ -328,7 +328,7 @@ export class AppProtoView {
     }
   }
 
-  bindElement(parent: ElementBinder, distanceToParent: int,
+  bindElement(parent: ElementBinder, distanceToParent: number,
               protoElementInjector: ProtoElementInjector,
               componentDirective: DirectiveBinding = null): ElementBinder {
     var elBinder = new ElementBinder(this.elementBinders.length, parent, distanceToParent,

modules/angular2/src/facade/async.ts

@@ -58,11 +58,13 @@ export class PromiseWrapper {
 }
 
 export class TimerWrapper {
-  static setTimeout(fn: Function, millis: int): int { return global.setTimeout(fn, millis); }
-  static clearTimeout(id: int): void { global.clearTimeout(id); }
+  static setTimeout(fn: Function, millis: number): number { return global.setTimeout(fn, millis); }
+  static clearTimeout(id: number): void { global.clearTimeout(id); }
 
-  static setInterval(fn: Function, millis: int): int { return global.setInterval(fn, millis); }
-  static clearInterval(id: int): void { global.clearInterval(id); }
+  static setInterval(fn: Function, millis: number): number {
+    return global.setInterval(fn, millis);
+  }
+  static clearInterval(id: number): void { global.clearInterval(id); }
 }
 
 export class ObservableWrapper {

modules/angular2/src/facade/intl.ts

@@ -51,9 +51,9 @@ export class NumberFormatter {
   static format(number: number, locale: string, style: NumberFormatStyle,
                 {minimumIntegerDigits = 1, minimumFractionDigits = 0, maximumFractionDigits = 3,
                  currency, currencyAsSymbol = false}: {
-                  minimumIntegerDigits?: int,
-                  minimumFractionDigits?: int,
-                  maximumFractionDigits?: int,
+                  minimumIntegerDigits?: number,
+                  minimumFractionDigits?: number,
+                  maximumFractionDigits?: number,
                   currency?: string,
                   currencyAsSymbol?: boolean
                 } = {}): string {
@@ -71,10 +71,10 @@ export class NumberFormatter {
   }
 }
 
-function digitCondition(len: int): string {
+function digitCondition(len: number): string {
   return len == 2 ? '2-digit' : 'numeric';
 }
-function nameCondition(len: int): string {
+function nameCondition(len: number): string {
   return len < 4 ? 'short' : 'long';
 }
 function extractComponents(pattern: string): Intl.DateTimeFormatOptions {

modules/angular2/src/facade/lang.dart

@@ -50,7 +50,7 @@ int serializeEnum(val) {
  * val should be the indexed value of the enum (sa returned from @Link{serializeEnum})
  * values should be a map from indexes to values for the enum that you want to deserialize.
  */
-dynamic deserializeEnum(int val, Map<int, dynamic> values) {
+dynamic deserializeEnum(num val, Map<num, dynamic> values) {
   return values[val];
 }