From 36cc705fa2c926dd86b946bfd22f347eb7723133 Mon Sep 17 00:00:00 2001
From: Yui T <yuisu@microsoft.com>
Date: Tue, 18 Nov 2014 11:54:50 -0800
Subject: [PATCH] Refactoring parser/scanner using short-hand

---
 src/compiler/parser.ts  | 29 ++++++++++++++---------------
 src/compiler/scanner.ts | 14 +++++++-------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 924f6e83930..f59ecb8a6e3 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -774,13 +774,12 @@ module ts {
                 if (matchResult) {
                     var start = commentRange.pos;
                     var end = commentRange.end;
-                    var fileRef = {
-                        pos: start,
-                        end: end,
-                        filename: matchResult[3]
-                    };
                     return {
-                        fileReference: fileRef,
+                        fileReference: {
+                            pos: start,
+                            end: end,
+                            filename: matchResult[3]
+                        },
                         isNoDefaultLib: false
                     };
                 }
@@ -944,11 +943,11 @@ module ts {
             }
 
             return {
-                addLabel: addLabel,
-                pushCurrentLabelSet: pushCurrentLabelSet,
-                pushFunctionBoundary: pushFunctionBoundary,
-                pop: pop,
-                nodeIsNestedInLabel: nodeIsNestedInLabel,
+                addLabel,
+                pushCurrentLabelSet,
+                pushFunctionBoundary,
+                pop,
+                nodeIsNestedInLabel,
             };
         })();
 
@@ -1674,8 +1673,8 @@ module ts {
             }
 
             return {
-                typeParameters: typeParameters,
-                parameters: parameters,
+                typeParameters,
+                parameters,
                 type: type
             };
         }
@@ -4276,8 +4275,8 @@ module ts {
             }
             commentRanges = undefined;
             return {
-                referencedFiles: referencedFiles,
-                amdDependencies: amdDependencies
+                referencedFiles,
+                amdDependencies
             };
         }
 
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 0647d61f24d..e08f481ba9c 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -1167,13 +1167,13 @@ module ts {
             hasPrecedingLineBreak: () => precedingLineBreak,
             isIdentifier: () => token === SyntaxKind.Identifier || token > SyntaxKind.LastReservedWord,
             isReservedWord: () => token >= SyntaxKind.FirstReservedWord && token <= SyntaxKind.LastReservedWord,
-            reScanGreaterToken: reScanGreaterToken,
-            reScanSlashToken: reScanSlashToken,
-            reScanTemplateToken: reScanTemplateToken,
-            scan: scan,
-            setText: setText,
-            setTextPos: setTextPos,
-            tryScan: tryScan,
+            reScanGreaterToken,
+            reScanSlashToken,
+            reScanTemplateToken,
+            scan,
+            setText,
+            setTextPos,
+            tryScan,
         };
     }
 }