From 47f708e9d75f65e097c5968653139859047ec5a0 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:41:51 +0000 Subject: [PATCH] 2003/11/18 10:47:27 darcs-hash:20040130074151-2ba56-fa6c0c1f9e85fe5e1cc19b4025c4d01a123b0f88.gz --- src/org/xwt/js/Parser.java | 102 +++++++++++++++++++++--------------------- src/org/xwt/js/Trap.java | 60 +++++++++++++++++++++++++ src/org/xwt/plat/Darwin.java | 10 ++--- src/org/xwt/plat/OpenGL.java | 8 ++-- src/org/xwt/plat/X11.java | 4 +- 5 files changed, 123 insertions(+), 61 deletions(-) create mode 100644 src/org/xwt/js/Trap.java diff --git a/src/org/xwt/js/Parser.java b/src/org/xwt/js/Parser.java index 4b288a8..3f61832 100644 --- a/src/org/xwt/js/Parser.java +++ b/src/org/xwt/js/Parser.java @@ -4,8 +4,6 @@ package org.xwt.js; import org.xwt.util.*; import java.io.*; -// FEATURE intern Integers/Numbers - /** * Parses a stream of lexed tokens into a tree of JSFunction's. * @@ -75,7 +73,7 @@ class Parser extends Lexer implements ByteCodes { /** for debugging */ public static void main(String[] s) throws Exception { - JSFunction block = new JSFunction("stdin", 0, new InputStreamReader(System.in), null); + JSFunction block = JSFunction.fromReader("stdin", 0, new InputStreamReader(System.in)); if (block == null) return; System.out.println(block); } @@ -160,16 +158,16 @@ class Parser extends Lexer implements ByteCodes { case NUMBER: b.add(parserLine, LITERAL, number); break; case STRING: b.add(parserLine, LITERAL, string); break; case NULL: b.add(parserLine, LITERAL, null); break; - case TRUE: case FALSE: b.add(parserLine, LITERAL, new Boolean(tok == TRUE)); break; + case TRUE: case FALSE: b.add(parserLine, LITERAL, JS.B(tok == TRUE)); break; case LB: { - b.add(parserLine, ARRAY, new Integer(0)); // push an array onto the stack + b.add(parserLine, ARRAY, JS.ZERO); // push an array onto the stack int size0 = b.size; int i = 0; if (peekToken() != RB) while(true) { // iterate over the initialization values int size = b.size; - b.add(parserLine, LITERAL, new Integer(i++)); // push the index in the array to place it into + b.add(parserLine, LITERAL, JS.N(i++)); // push the index in the array to place it into if (peekToken() == COMMA || peekToken() == RB) b.add(parserLine, LITERAL, null); // for stuff like [1,,2,] else @@ -179,13 +177,13 @@ class Parser extends Lexer implements ByteCodes { if (peekToken() == RB) break; consume(COMMA); } - b.set(size0 - 1, new Integer(i)); // back at the ARRAY instruction, write the size of the array + b.set(size0 - 1, JS.N(i)); // back at the ARRAY instruction, write the size of the array consume(RB); break; } case SUB: { // negative literal (like "3 * -1") consume(NUMBER); - b.add(parserLine, LITERAL, new Double(number.doubleValue() * -1)); + b.add(parserLine, LITERAL, JS.N(number.doubleValue() * -1)); break; } case LP: { // grouping (not calling) @@ -203,8 +201,8 @@ class Parser extends Lexer implements ByteCodes { else throw pe("prefixed increment/decrement can only be performed on a valid assignment target"); b.add(parserLine, GET_PRESERVE, Boolean.TRUE); - b.add(parserLine, LITERAL, new Integer(1)); - b.add(parserLine, tok == INC ? ADD : SUB, new Integer(2)); + b.add(parserLine, LITERAL, JS.N(1)); + b.add(parserLine, tok == INC ? ADD : SUB, JS.N(2)); b.add(parserLine, PUT, null); b.add(parserLine, SWAP, null); b.add(parserLine, POP, null); @@ -243,7 +241,7 @@ class Parser extends Lexer implements ByteCodes { case FUNCTION: { consume(LP); int numArgs = 0; - JSFunction b2 = new JSFunction(sourceName, parserLine, null, null); + JSFunction b2 = new JSFunction(sourceName, parserLine, null); b.add(parserLine, NEWFUNCTION, b2); // function prelude; arguments array is already on the stack @@ -260,7 +258,7 @@ class Parser extends Lexer implements ByteCodes { String varName = string; b2.add(parserLine, DUP); // dup the args array - b2.add(parserLine, GET, new Integer(numArgs - 1)); // retrieve it from the arguments array + b2.add(parserLine, GET, JS.N(numArgs - 1)); // retrieve it from the arguments array b2.add(parserLine, TOPSCOPE); b2.add(parserLine, SWAP); b2.add(parserLine, DECLARE, varName); // declare the name @@ -324,21 +322,21 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, tok); } // tok-1 is always s/^ASSIGN_// (0 is BITOR, 1 is ASSIGN_BITOR, etc) - b.add(parserLine, tok - 1, tok-1==ADD ? new Integer(2) : null); + b.add(parserLine, tok - 1, tok-1==ADD ? JS.N(2) : null); b.add(parserLine, PUT); b.add(parserLine, SWAP); b.add(parserLine, POP); - if (tok == ASSIGN_ADD || tok == ASSIGN_SUB) b.set(size, tok, new Integer(b.size - size)); + if (tok == ASSIGN_ADD || tok == ASSIGN_SUB) b.set(size, tok, JS.N(b.size - size)); break; } case INC: case DEC: { // postfix b.add(parserLine, GET_PRESERVE, Boolean.TRUE); - b.add(parserLine, LITERAL, new Integer(1)); - b.add(parserLine, tok == INC ? ADD : SUB, new Integer(2)); + b.add(parserLine, LITERAL, JS.N(1)); + b.add(parserLine, tok == INC ? ADD : SUB, JS.N(2)); b.add(parserLine, PUT, null); b.add(parserLine, SWAP, null); b.add(parserLine, POP, null); - b.add(parserLine, LITERAL, new Integer(1)); + b.add(parserLine, LITERAL, JS.N(1)); b.add(parserLine, tok == INC ? SUB : ADD, null); // undo what we just did, since this is postfix break; } @@ -350,9 +348,13 @@ class Parser extends Lexer implements ByteCodes { break; } case LP: { + + // Method calls are implemented by doing a GET_PRESERVE + // first. If the object supports method calls, it will + // return JS.METHOD int n = parseArgs(b, 2); b.add(parserLine, GET_PRESERVE); - b.add(parserLine, CALLMETHOD, new Integer(n)); + b.add(parserLine, CALLMETHOD, JS.N(n)); break; } default: { @@ -395,7 +397,7 @@ class Parser extends Lexer implements ByteCodes { switch (tok) { case LP: { // invocation (not grouping) int n = parseArgs(b, 1); - b.add(parserLine, CALL, new Integer(n)); + b.add(parserLine, CALL, JS.N(n)); break; } case BITOR: case BITXOR: case BITAND: case SHEQ: case SHNE: case LSH: @@ -414,17 +416,17 @@ class Parser extends Lexer implements ByteCodes { nextTok = getToken(); } while(nextTok == tok); pushBackToken(); - b.add(parserLine, tok, new Integer(count)); + b.add(parserLine, tok, JS.N(count)); break; } case OR: case AND: { - b.add(parserLine, tok == AND ? b.JF : b.JT, new Integer(0)); // test to see if we can short-circuit + b.add(parserLine, tok == AND ? b.JF : b.JT, JS.ZERO); // test to see if we can short-circuit int size = b.size; startExpr(b, precedence[tok]); // otherwise check the second value - b.add(parserLine, JMP, new Integer(2)); // leave the second value on the stack and jump to the end + b.add(parserLine, JMP, JS.N(2)); // leave the second value on the stack and jump to the end b.add(parserLine, LITERAL, tok == AND ? - new Boolean(false) : new Boolean(true)); // target of the short-circuit jump is here - b.set(size - 1, new Integer(b.size - size)); // write the target of the short-circuit jump + JS.B(false) : JS.B(true)); // target of the short-circuit jump is here + b.set(size - 1, JS.N(b.size - size)); // write the target of the short-circuit jump break; } case DOT: { @@ -445,15 +447,15 @@ class Parser extends Lexer implements ByteCodes { break; } case HOOK: { - b.add(parserLine, JF, new Integer(0)); // jump to the if-false expression + b.add(parserLine, JF, JS.ZERO); // jump to the if-false expression int size = b.size; startExpr(b, minPrecedence); // write the if-true expression - b.add(parserLine, JMP, new Integer(0)); // if true, jump *over* the if-false expression - b.set(size - 1, new Integer(b.size - size + 1)); // now we know where the target of the jump is + b.add(parserLine, JMP, JS.ZERO); // if true, jump *over* the if-false expression + b.set(size - 1, JS.N(b.size - size + 1)); // now we know where the target of the jump is consume(COLON); size = b.size; startExpr(b, minPrecedence); // write the if-false expression - b.set(size - 1, new Integer(b.size - size + 1)); // this is the end; jump to here + b.set(size - 1, JS.N(b.size - size + 1)); // this is the end; jump to here break; } case COMMA: { @@ -479,7 +481,7 @@ class Parser extends Lexer implements ByteCodes { i++; if (peekToken() != COMMA) { startExpr(b, NO_COMMA); - b.add(parserLine, SWAP, new Integer(pushdown)); + b.add(parserLine, SWAP, JS.N(pushdown)); if (peekToken() == RP) break; } consume(COMMA); @@ -556,18 +558,18 @@ class Parser extends Lexer implements ByteCodes { startExpr(b, -1); consume(RP); - b.add(parserLine, JF, new Integer(0)); // if false, jump to the else-block + b.add(parserLine, JF, JS.ZERO); // if false, jump to the else-block int size = b.size; parseStatement(b, null); if (peekToken() == ELSE) { consume(ELSE); - b.add(parserLine, JMP, new Integer(0)); // if we took the true-block, jump over the else-block - b.set(size - 1, new Integer(b.size - size + 1)); + b.add(parserLine, JMP, JS.ZERO); // if we took the true-block, jump over the else-block + b.set(size - 1, JS.N(b.size - size + 1)); size = b.size; parseStatement(b, null); } - b.set(size - 1, new Integer(b.size - size + 1)); // regardless of which branch we took, b[size] needs to point here + b.set(size - 1, JS.N(b.size - size + 1)); // regardless of which branch we took, b[size] needs to point here break; } case WHILE: { @@ -577,12 +579,12 @@ class Parser extends Lexer implements ByteCodes { int size = b.size; b.add(parserLine, POP); // discard the first-iteration indicator startExpr(b, -1); - b.add(parserLine, JT, new Integer(2)); // if the while() clause is true, jump over the BREAK + b.add(parserLine, JT, JS.N(2)); // if the while() clause is true, jump over the BREAK b.add(parserLine, BREAK); consume(RP); parseStatement(b, null); b.add(parserLine, CONTINUE); // if we fall out of the end, definately continue - b.set(size - 1, new Integer(b.size - size + 1)); // end of the loop + b.set(size - 1, JS.N(b.size - size + 1)); // end of the loop break; } case SWITCH: { @@ -600,10 +602,10 @@ class Parser extends Lexer implements ByteCodes { startExpr(b, -1); consume(COLON); b.add(parserLine, EQ); // check if we should do this case-block - b.add(parserLine, JF, new Integer(0)); // if not, jump to the next one + b.add(parserLine, JF, JS.ZERO); // if not, jump to the next one int size = b.size; while(peekToken() != CASE && peekToken() != DEFAULT && peekToken() != RC) parseStatement(b, null); - b.set(size - 1, new Integer(1 + b.size - size)); + b.set(size - 1, JS.N(1 + b.size - size)); } else if (peekToken() == DEFAULT) { consume(DEFAULT); consume(COLON); @@ -615,7 +617,7 @@ class Parser extends Lexer implements ByteCodes { } else { throw pe("expected CASE, DEFAULT, or RC; got " + codeToString[peekToken()]); } - b.set(size0 - 1, new Integer(b.size - size0 + 1)); // end of the loop + b.set(size0 - 1, JS.N(b.size - size0 + 1)); // end of the loop break; } @@ -627,12 +629,12 @@ class Parser extends Lexer implements ByteCodes { consume(WHILE); consume(LP); startExpr(b, -1); - b.add(parserLine, JT, new Integer(2)); // check the while() clause; jump over the BREAK if true + b.add(parserLine, JT, JS.N(2)); // check the while() clause; jump over the BREAK if true b.add(parserLine, BREAK); b.add(parserLine, CONTINUE); consume(RP); consume(SEMI); - b.set(size - 1, new Integer(b.size - size + 1)); // end of the loop; write this location to the LOOP instruction + b.set(size - 1, JS.N(b.size - size + 1)); // end of the loop; write this location to the LOOP instruction break; } @@ -673,7 +675,7 @@ class Parser extends Lexer implements ByteCodes { } // jump here if no exception was thrown - b.set(successJMPInsn, new Integer(b.size - successJMPInsn)); + b.set(successJMPInsn, JS.N(b.size - successJMPInsn)); int finallyJMPDistance = -1; if (peekToken() == FINALLY) { @@ -716,12 +718,12 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, GET); consume(RP); - b.add(parserLine, LITERAL, new Integer(1)); // decrement the length + b.add(parserLine, LITERAL, JS.N(1)); // decrement the length b.add(parserLine, SUB); b.add(parserLine, DUP); - b.add(parserLine, LITERAL, new Integer(0)); // see if we've exhausted all the elements + b.add(parserLine, LITERAL, JS.ZERO); // see if we've exhausted all the elements b.add(parserLine, LT); - b.add(parserLine, JF, new Integer(2)); + b.add(parserLine, JF, JS.N(2)); b.add(parserLine, BREAK); // if we have, then BREAK b.add(parserLine, GET_PRESERVE); // get the key out of the keys array b.add(parserLine, LITERAL, varName); @@ -729,7 +731,7 @@ class Parser extends Lexer implements ByteCodes { parseStatement(b, null); // do some stuff b.add(parserLine, CONTINUE); // continue if we fall out the bottom - b.set(size - 1, new Integer(b.size - size + 1)); // BREAK to here + b.set(size - 1, JS.N(b.size - size + 1)); // BREAK to here b.add(parserLine, OLDSCOPE); // restore the scope } else { @@ -738,7 +740,7 @@ class Parser extends Lexer implements ByteCodes { parseStatement(b, null); // initializer JSFunction e2 = // we need to put the incrementor before the test - new JSFunction(sourceName, parserLine, null, null); // so we save the test here + new JSFunction(sourceName, parserLine, null); // so we save the test here if (peekToken() != SEMI) startExpr(e2, -1); else @@ -748,21 +750,21 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, LOOP); int size2 = b.size; - b.add(parserLine, JT, new Integer(0)); // if we're on the first iteration, jump over the incrementor + b.add(parserLine, JT, JS.ZERO); // if we're on the first iteration, jump over the incrementor int size = b.size; if (peekToken() != RP) { // do the increment thing startExpr(b, -1); b.add(parserLine, POP); } - b.set(size - 1, new Integer(b.size - size + 1)); + b.set(size - 1, JS.N(b.size - size + 1)); consume(RP); b.paste(e2); // ok, *now* test if we're done yet - b.add(parserLine, JT, new Integer(2)); // break out if we don't meet the test + b.add(parserLine, JT, JS.N(2)); // break out if we don't meet the test b.add(parserLine, BREAK); parseStatement(b, null); b.add(parserLine, CONTINUE); // if we fall out the bottom, CONTINUE - b.set(size2 - 1, new Integer(b.size - size2 + 1)); // end of the loop + b.set(size2 - 1, JS.N(b.size - size2 + 1)); // end of the loop b.add(parserLine, OLDSCOPE); // get our scope back } diff --git a/src/org/xwt/js/Trap.java b/src/org/xwt/js/Trap.java new file mode 100644 index 0000000..2986079 --- /dev/null +++ b/src/org/xwt/js/Trap.java @@ -0,0 +1,60 @@ +// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL] +package org.xwt.js; + +import java.util.*; +import org.xwt.util.*; +import java.io.*; + +/** + * This class encapsulates a single trap placed on a given node. The + * traps for a given property name on a given box are maintained as a + * linked list stack, with the most recently placed trap at the head + * of the list. + */ +class Trap { + + JS trapee = null; ///< the box on which this trap was placed + Object name = null; ///< the property that the trap was placed on + + JSFunction f = null; ///< the function for this trap + Trap next = null; ///< the next trap down the trap stack + + Trap(JS b, String n, JSFunction f, Trap nx) { trapee = b; name = n; this.f = f; this.next = nx; } + + private static final JSFunction putInvoker = new JSFunction("putInvoker", 0, null); + private static final JSFunction getInvoker = new JSFunction("getInvoker", 0, null); + static { + putInvoker.add(-1, ByteCodes.PUT, null); + getInvoker.add(-1, ByteCodes.GET, null); + } + + void invoke(Object key, Object value) { + Interpreter i = new Interpreter(putInvoker, false, null); + i.stack.push(this); + i.stack.push(key); + i.stack.push(value); + i.resume(); + } + + Object invoke(Object key) { + Interpreter i = new Interpreter(getInvoker, false, null); + i.stack.push(this); + i.stack.push(key); + i.resume(); + return i.stack.pop(); + } + + // FIXME: review; is necessary? + static class TrapScope extends JSScope { + Trap t; + Object val = null; + boolean cascadeHappened = false; + public TrapScope(JSScope parent, Trap t, Object val) { super(parent); this.t = t; this.val = val; } + public Object get(Object key) { + if (key.equals("trapee")) return t.trapee; + if (key.equals("trapname")) return t.name; + return super.get(key); + } + } +} + diff --git a/src/org/xwt/plat/Darwin.java b/src/org/xwt/plat/Darwin.java index 907b937..07c2fe5 100644 --- a/src/org/xwt/plat/Darwin.java +++ b/src/org/xwt/plat/Darwin.java @@ -98,20 +98,20 @@ public class Darwin extends POSIX { private final class CarbonOpenGL extends OpenGL { public RawData rawPixelFormat; - public RawData rawSharedJSContext; + public RawData rawSharedInterpreter; public int maxAglSurfaceTexSize; public int maxSurfaceWidth; public int maxSurfaceHeight; private native boolean initPixelFormat(); - private native void initSharedJSContext(); + private native void initSharedInterpreter(); public CarbonOpenGL() throws NotSupportedException { if(!jaguar) throw new NotSupportedException("OpenGL requires Mac OS X 10.2 or greater"); if(!initPixelFormat()) throw new NotSupportedException("Couldn't get an acceptable pixel format"); - initSharedJSContext(); + initSharedInterpreter(); } public void init() throws NotSupportedException { @@ -123,7 +123,7 @@ public class Darwin extends POSIX { } maxSurfaceWidth = maxSurfaceHeight = maxAglSurfaceTexSize; } - protected native void activateSharedJSContext(); + protected native void activateSharedInterpreter(); } static abstract class CarbonSurface extends Surface.DoubleBufferedSurface { @@ -216,7 +216,7 @@ public class Darwin extends POSIX { CarbonMessage.add(new CarbonMessage() { public void perform() { GLCarbonPixelBuffer.this.natInit(); sem.release(); } }); sem.block(); } - public native void activateJSContext(); + public native void activateInterpreter(); protected void finalize() { CarbonMessage.add(new CarbonMessage() { public void perform() { natCleanup(rawWindowRef,rawCTX); } }); gl.deleteTexture(textureName); diff --git a/src/org/xwt/plat/OpenGL.java b/src/org/xwt/plat/OpenGL.java index 20fbacb..16f8d75 100644 --- a/src/org/xwt/plat/OpenGL.java +++ b/src/org/xwt/plat/OpenGL.java @@ -28,7 +28,7 @@ abstract class OpenGL { } } - // This MUST be called after OpenGL is instansiated (and activateSharedJSContext is functioning) + // This MUST be called after OpenGL is instansiated (and activateSharedInterpreter is functioning) public void init() throws NotSupportedException { natInit(); glVersion = parseVersion(version); @@ -46,7 +46,7 @@ abstract class OpenGL { Log.log(this,"Max rectangular texture size: " + maxRectTexSize); } - protected abstract void activateSharedJSContext(); + protected abstract void activateSharedInterpreter(); public static class NotSupportedException extends Exception { public NotSupportedException(String s) { super(s); } @@ -66,7 +66,7 @@ abstract class OpenGL { } // This should activate the drawing context and prepare the double buffer for drawing - protected abstract void activateJSContext(); + protected abstract void activateInterpreter(); protected static native void drawableInit(int w, int h); @@ -88,7 +88,7 @@ abstract class OpenGL { } private void drawPicture_(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int color) { - activateJSContext(); + activateInterpreter(); setColor(color); GLPicture p = (GLPicture) source; p.draw(dx,dy,cx1,cy1,cx2,cy2); diff --git a/src/org/xwt/plat/X11.java b/src/org/xwt/plat/X11.java index 094e14f..afaf975 100644 --- a/src/org/xwt/plat/X11.java +++ b/src/org/xwt/plat/X11.java @@ -155,8 +155,8 @@ public class X11 extends POSIX { RawData fake_ximage = null; // a 'fake' XImage corresponding to the shared pixmap; gives us the address and depth parameters RawData shm_segment = null; // XShmSegmentInfo - RawData gc; // Graphics JSContext on pm (never changes, so it's fast) - RawData clipped_gc; // Graphics JSContext on pm, use this one if you need a clip/stipple + RawData gc; // Graphics Interpreter on pm (never changes, so it's fast) + RawData clipped_gc; // Graphics Interpreter on pm, use this one if you need a clip/stipple /** PixelBuffer mode */ public X11PixelBuffer(int w, int h) { this(w, h, true); } -- 1.7.10.4