X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fjs%2FScopeImpl.java;h=a01b3bb22e52e247fc4b0bd63bfd398946aa2ae9;hb=5e8485ac88b45693b5cdb8e70f346b92732eb91f;hp=52a74f560ff175f6d794537624a18b9bb976d903;hpb=5a767a58377c540730f5be44621596406d36a0d1;p=org.ibex.core.git

diff --git a/src/org/xwt/js/ScopeImpl.java b/src/org/xwt/js/ScopeImpl.java
index 52a74f5..a01b3bb 100644
--- a/src/org/xwt/js/ScopeImpl.java
+++ b/src/org/xwt/js/ScopeImpl.java
@@ -8,7 +8,7 @@ import java.util.*;
 /** Implementation of a JavaScript Scope */
 class ScopeImpl extends JS.Obj { 
     private JS.Scope parentScope;
-    private static Object NULL_PLACEHOLDER = new Object();
+    private static final Object NULL_PLACEHOLDER = new Object();
     public ScopeImpl(JS.Scope parentScope, boolean sealed) {
         super(sealed);
         if (parentScope == this) throw new Error("can't make a scope its own parent!");
@@ -18,17 +18,17 @@ class ScopeImpl extends JS.Obj {
     public boolean has(Object key) { return super.get(key) != null; }
     // we use _get instead of get solely to work around a GCJ bug
     public Object _get(Object key) {
-        if (!has(key)) return parentScope == null ? null : parentScope.get(key);
-        Object ret = super.get(key); return ret == NULL_PLACEHOLDER ? null : ret;
+        Object o = super.get(key);
+        if (o != null) return o == NULL_PLACEHOLDER ? null : o;
+        else return parentScope == null ? null : parentScope.get(key);
     }
     // we use _put instead of put solely to work around a GCJ bug
     public void _put(Object key, Object val) {
-        if (!has(key) && parentScope != null) parentScope.put(key, val);
+        if (parentScope != null && !has(key)) parentScope.put(key, val);
         else super.put(key, val == null ? NULL_PLACEHOLDER : val);
     }
     public boolean isTransparent() { return false; }
-    public void declare(String s) {
-        if (isTransparent()) parentScope.declare(s);
-        else super.put(s, NULL_PLACEHOLDER);
-    }
-} 
+    public void declare(String s) { super.put(s, NULL_PLACEHOLDER); }
+    public Scope getParentScope() { return parentScope; }
+}
+