Fix bug 42097

mozilla · Jun 14, 2000 · 5335cff · 5335cff
1 parent 767d67a
commit 5335cff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/org/mozilla/javascript/NodeTransformer.java b/org/mozilla/javascript/NodeTransformer.java
@@ -508,7 +508,9 @@ protected void addVariables(Node tree, VariableTable vars) {
         Node node;
         while ((node = iterator.nextNode()) != null) {
             int nodeType = node.getType();
-            if (inFunction && nodeType == TokenStream.FUNCTION) {
+            if (inFunction && nodeType == TokenStream.FUNCTION &&
+                node != tree) 
+            {
                 // In a function with both "var x" and "function x",
                 // disregard the var statement, independent of order.
                 String name = node.getString();

diff --git a/src/org/mozilla/javascript/NodeTransformer.java b/src/org/mozilla/javascript/NodeTransformer.java
@@ -508,7 +508,9 @@ protected void addVariables(Node tree, VariableTable vars) {
         Node node;
         while ((node = iterator.nextNode()) != null) {
             int nodeType = node.getType();
-            if (inFunction && nodeType == TokenStream.FUNCTION) {
+            if (inFunction && nodeType == TokenStream.FUNCTION &&
+                node != tree) 
+            {
                 // In a function with both "var x" and "function x",
                 // disregard the var statement, independent of order.
                 String name = node.getString();