new js api

[org.ibex.core.git] / src / org / ibex / js / Trap.java

diff --git a/src/org/ibex/js/Trap.java b/src/org/ibex/js/Trap.java
index e2566c5..248ae6a 100644 (file)
--- a/src/org/ibex/js/Trap.java
+++ b/src/org/ibex/js/Trap.java
@@ -10,12 +10,12 @@ package org.ibex.js;
 class Trap {
 
     JS trapee = null;          ///< the box on which this trap was placed
-    Object name = null;        ///< the property that the trap was placed on
+    JS 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) {
+    Trap(JS b, JS n, JSFunction f, Trap nx) {
         trapee = b; name = n; this.f = f; this.next = nx;
     }
 
@@ -32,7 +32,7 @@ class Trap {
     boolean readTrap() { return f.numFormalArgs == 0; }
     boolean writeTrap() { return f.numFormalArgs != 0; }
     
-    void invoke(Object value) throws JSExn {
+    void invoke(JS value) throws JSExn {
         Interpreter i = new Interpreter(putInvoker, false, null);
         i.stack.push(trapee);
         i.stack.push(name);
@@ -40,7 +40,7 @@ class Trap {
         i.resume();
     }
 
-    Object invoke() throws JSExn {
+    JS invoke() throws JSExn {
         Interpreter i = new Interpreter(getInvoker, false, null);
         i.stack.push(trapee);
         i.stack.push(name);