From db128252b0b59ca0fe0ef8fa437a64e35439f077 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 19 Apr 2015 16:57:44 -0700
Subject: [PATCH] Simplify code in the binder.

---
 src/compiler/binder.ts | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 381e2750fd5..56022bc61d4 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -347,21 +347,15 @@ module ts {
         }
 
         function declareClassMember(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags) {
-            if (node.flags & NodeFlags.Static) {
-                return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-            }
-            else {
-                return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-            }
+            return node.flags & NodeFlags.Static
+                ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
+                : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
         }
 
         function declareSourceFileMember(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags) {
-            if (isExternalModule(file)) {
-                return declareModuleMember(node, symbolFlags, symbolExcludes);
-            }
-            else {
-                return declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
-            }
+            return isExternalModule(file)
+                ? declareModuleMember(node, symbolFlags, symbolExcludes)
+                : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
 
         function isAmbientContext(node: Node): boolean {
@@ -616,12 +610,9 @@ module ts {
         }
 
         function bindImportClause(node: ImportClause) {
-            if (node.name) {
-                return declareSymbolAndAddToSymbolTable(node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
-            }
-            else {
-                return SymbolFlags.None;
-            }
+            return node.name
+                ? declareSymbolAndAddToSymbolTable(node, SymbolFlags.Alias, SymbolFlags.AliasExcludes)
+                : SymbolFlags.None;
         }
 
         function bindEnumDeclaration(node: EnumDeclaration) {
@@ -664,12 +655,9 @@ module ts {
         }
 
         function bindPropertyOrMethodOrAccessor(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags): SymbolFlags {
-            if (hasDynamicName(node)) {
-                return bindAnonymousDeclaration(node, symbolFlags, "__computed");
-            }
-            else {
-                return declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
-            }
+            return hasDynamicName(node)
+                ? bindAnonymousDeclaration(node, symbolFlags, "__computed")
+                : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
         }
     }
 }