/** 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!");
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; }