2003/11/03 06:36:13

darcs-hash:20040130074056-2ba56-0af2158b66f682edca67be7638f3e9ffcd723ea2.gz

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index a81f150..3234c01 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -351,7 +351,6 @@ public class Template {
             this.xwt = xwt;
             this.myStatic = myStatic;
         }
-        public boolean isTransparent() { return true; }
         public Object get(Object key) {
             if (super.has(key)) return super.get(key);
             if (key.equals("xwt")) return xwt;

diff --git a/src/org/xwt/js/JS.java b/src/org/xwt/js/JS.java
index ba83b01..635d4e5 100644 (file)
--- a/src/org/xwt/js/JS.java
+++ b/src/org/xwt/js/JS.java
@@ -144,7 +144,6 @@ public abstract class JS {
     public static class Scope extends ScopeImpl { 
         public Scope(Scope parentScope) { this(parentScope, false); }
         public Scope(Scope parentScope, boolean sealed) { super(parentScope, sealed); }
-        public boolean isTransparent() { return super.isTransparent(); }   //< transparent scopes are not returned by THIS
         public boolean has(Object key) { return super.has(key); }
         public Object get(Object key) { return super._get(key); }
         public Object put(Object key, Object val) { super._put(key, val); return null; }

diff --git a/src/org/xwt/js/Lexer.java b/src/org/xwt/js/Lexer.java
index 81066bb..1e2494e 100644 (file)
--- a/src/org/xwt/js/Lexer.java
+++ b/src/org/xwt/js/Lexer.java
@@ -108,7 +108,6 @@ class Lexer implements Tokens {
                 case 'n': return s.equals("null") ? NULL : -1;
                 case 't': c=s.charAt(3);
                     if (c=='e') { if (s.charAt(2)=='u' && s.charAt(1)=='r') return TRUE; }
-                    else if (c=='s') { if (s.charAt(2)=='i' && s.charAt(1)=='h') return THIS; }
                     return -1;
                 case 'w': if (s.equals("with")) return RESERVED; else return -1;
                 case 'v': if (s.equals("void")) return RESERVED; else return -1;

diff --git a/src/org/xwt/js/Parser.java b/src/org/xwt/js/Parser.java
index 6ce0760..5e37596 100644 (file)
--- a/src/org/xwt/js/Parser.java
+++ b/src/org/xwt/js/Parser.java
@@ -157,7 +157,6 @@ class Parser extends Lexer implements ByteCodes {
         // all of these simply push values onto the stack
         case NUMBER: b.add(parserLine, LITERAL, number); break;
         case STRING: b.add(parserLine, LITERAL, string); break;
-        case THIS: b.add(parserLine, TOPSCOPE, null); break;
         case NULL: b.add(parserLine, LITERAL, null); break;
         case TRUE: case FALSE: b.add(parserLine, LITERAL, new Boolean(tok == TRUE)); break;