From 63abbe2597b03303b7edc3bb33c48f4e73787383 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Fri, 8 Aug 2014 13:39:00 +0200
Subject: [PATCH] Prepend 'var ' for root symbols

---
 tasks/generate-externs.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/tasks/generate-externs.js b/tasks/generate-externs.js
index b2ebdd9f34..0fbd7bb050 100644
--- a/tasks/generate-externs.js
+++ b/tasks/generate-externs.js
@@ -48,17 +48,23 @@ function generateExterns(typedefs, symbols, externs) {
       var partialNamespace = namespace.join('.');
       if (!(partialNamespace in namespaces ||
           partialNamespace in constructors)) {
-        namespaces[partialNamespace] = true;
         lines.push('/**');
         lines.push(' * @type {Object}');
         lines.push(' */');
-        lines.push(
-            (namespace.length == 1 ? 'var ' : '') + partialNamespace + ';');
+        lines.push(nameToJS(partialNamespace) + ';');
         lines.push('\n');
       }
     });
   }
 
+  function nameToJS(name) {
+    if (name.indexOf('.') == -1) {
+      namespaces[name] = true;
+      name = 'var ' + name;
+    }
+    return name;
+  }
+
   function processSymbol(symbol) {
     addNamespaces(symbol.name.split('#')[0]);
 
@@ -71,7 +77,7 @@ function generateExterns(typedefs, symbols, externs) {
         lines.push('/**');
         lines.push(' * @constructor');
         lines.push(' */');
-        lines.push(constructor + ' = function() {};');
+        lines.push(nameToJS(constructor) + ' = function() {};');
         lines.push('\n');
       }
     }
@@ -103,23 +109,24 @@ function generateExterns(typedefs, symbols, externs) {
     }
     lines.push(' */');
     if (symbol.kind == 'function' || symbol.kind == 'class') {
-      lines.push(name + ' = function(' + args.join(', ') + ') {};');
+      lines.push(nameToJS(name) + ' = function(' + args.join(', ') + ') {};');
     } else {
-      lines.push(name + ';');
+      lines.push(nameToJS(name) + ';');
     }
     lines.push('\n');
   }
 
+  externs.forEach(processSymbol);
+
   typedefs.forEach(function(typedef) {
     addNamespaces(typedef.name);
     lines.push('/**');
     lines.push(' * @typedef {' + typedef.types.join('|') + '}');
     lines.push(' */');
-    lines.push(typedef.name + ';');
+    lines.push(nameToJS(typedef.name) + ';');
     lines.push('\n');
   });
 
-  externs.forEach(processSymbol);
   symbols.forEach(processSymbol);
   
   return lines.join('\n');