Make lexical function decls only kick in at top level

Issue #714

Author: marijnh

src/statement.js

@@ -498,7 +498,7 @@ pp.parseFunction = function(node, isStatement, allowExpressionBody, isAsync) {
   if (isStatement) {
     node.id = isStatement === "nullableID" && this.type !== tt.name ? null : this.parseIdent()
     if (node.id) {
-      this.checkLVal(node.id, this.inModule ? "let" : "var")
+      this.checkLVal(node.id, this.inModule && !this.inFunction ? "let" : "var")
     }
   }
 

test/tests-harmony.js

@@ -16239,3 +16239,5 @@ test('for ([...foo, bar].baz in qux);', {
 }, {ecmaVersion: 6})
 
 testFail("var f;\nfunction f() {}", "Identifier 'f' has already been declared (2:9)", {ecmaVersion: 6, sourceType: "module"});
+
+test("function f() { var x; function x() {} }", {}, {ecmaVersion: 6, sourceType: "module"})