formatting changes

darcs-hash:20050116012937-5007d-a538b036669085e7bd7ab9d77f892aa9e1ecb174.gz

diff --git a/src/org/ibex/js/JS.java b/src/org/ibex/js/JS.java
index 782b445..e2fc5c8 100644 (file)
--- a/src/org/ibex/js/JS.java
+++ b/src/org/ibex/js/JS.java
@@ -79,22 +79,17 @@ public interface JS extends Pausable {
             throw new JSExn("method not found: " + JSU.str(method) + " class="+this.getClass().getName());
         }
         public String[] getFormalArgs() { return emptystr; }
             throw new JSExn("method not found: " + JSU.str(method) + " class="+this.getClass().getName());
         }
         public String[] getFormalArgs() { return emptystr; }

+        public String coerceToString() throws JSExn { throw new JSExn("cannot coerce a "+getClass().getName()+" to a string"); }

 
         public JS putAndTriggerTraps(JS key, JS val) throws JSExn { throw new JSExn(
             "'" + key + "' is trap read only on class ["+ getClass().getName() +"]"); }
         public JS getAndTriggerTraps(JS key) throws JSExn { return null; } // FIXME throw errors?
         public JS justTriggerTraps(JS key, JS value) throws JSExn { return null; }
 
         public JS putAndTriggerTraps(JS key, JS val) throws JSExn { throw new JSExn(
             "'" + key + "' is trap read only on class ["+ getClass().getName() +"]"); }
         public JS getAndTriggerTraps(JS key) throws JSExn { return null; } // FIXME throw errors?
         public JS justTriggerTraps(JS key, JS value) throws JSExn { return null; }

-

         public void addTrap(JS key, JS function) throws JSExn {
             Log.warn(this, "'" + JSU.str(key) + "' is not trappable on class ["+ getClass().getName() +"]"); }
         public void delTrap(JS key, JS function) throws JSExn {
             Log.warn(this, "'" + JSU.str(key) + "' trap is read only on class ["+ getClass().getName() +"]"); }
         public void addTrap(JS key, JS function) throws JSExn {
             Log.warn(this, "'" + JSU.str(key) + "' is not trappable on class ["+ getClass().getName() +"]"); }
         public void delTrap(JS key, JS function) throws JSExn {
             Log.warn(this, "'" + JSU.str(key) + "' trap is read only on class ["+ getClass().getName() +"]"); }

-        public Trap getTrap(JS key) throws JSExn {
-            //Log.warn(this, "'" + JSU.str(key) + "' is not trappable on class ["+ getClass().getName() +"]");
-            return null;
-        }
-        public String coerceToString() throws JSExn {
-            throw new JSExn("cannot coerce a " + getClass().getName() + " to a string"); }
+        public Trap getTrap(JS key) throws JSExn { return null; }

     }
 
     public interface Cloneable {}
     }
 
     public interface Cloneable {}

@@ -128,11 +123,10 @@ public interface JS extends Pausable {
         public Obj() { super(3, 4, 0.75F); }
 
         public JS unclone() { return this; }
         public Obj() { super(3, 4, 0.75F); }
 
         public JS unclone() { return this; }

+        public String[] getFormalArgs() { return emptystr; }

 
         public JS call(JS method, JS[] args) throws JSExn {
 
         public JS call(JS method, JS[] args) throws JSExn {

-            if (method==null) throw new JSExn("cannot call a " + getClass().getName());
-            throw new JSExn("method not found: " + JSU.str(method)); }
-        public String[] getFormalArgs() { return emptystr; }
+            throw new JSExn(method==null ? "cannot call a " + getClass().getName() : "method not found: " + JSU.str(method)); }

 
         public Enumeration keys() throws JSExn {
             final Object[] keys = super.dumpkeys();
 
         public Enumeration keys() throws JSExn {
             final Object[] keys = super.dumpkeys();

@@ -166,8 +160,8 @@ public interface JS extends Pausable {
         }
 
         public void addTrap(JS key, JS f) throws JSExn {
         }
 
         public void addTrap(JS key, JS f) throws JSExn {

-            if (f.getFormalArgs() == null || f.getFormalArgs().length > 1) throw new JSExn(
-                "traps must take either one argument (write) or no arguments (read)");
+            if (f.getFormalArgs() == null || f.getFormalArgs().length > 1)
+                throw new JSExn("traps must take either one argument (write) or no arguments (read)");

             for (Trap t = (Trap)super.get(key, 1); t != null; t = t.next())
                 if (t.function().equals(f)) return;
             super.put(key, new TrapHolder(this, key, f, (Trap)super.get(key, 1)), 1);
             for (Trap t = (Trap)super.get(key, 1); t != null; t = t.next())
                 if (t.function().equals(f)) return;
             super.put(key, new TrapHolder(this, key, f, (Trap)super.get(key, 1)), 1);

@@ -183,8 +177,7 @@ public interface JS extends Pausable {
 
         public Trap getTrap(JS key) throws JSExn { return (Trap)super.get(key, 1); }
 
 
         public Trap getTrap(JS key) throws JSExn { return (Trap)super.get(key, 1); }
 

-        public String coerceToString() throws JSExn {
-            throw new JSExn("cannot coerce a " + getClass().getName() + " to a string"); }
+        public String coerceToString() throws JSExn { throw new JSExn("cannot coerce a "+getClass().getName()+" to a string"); }

 
         private static final class Placeholder implements Serializable {}
 
 
         private static final class Placeholder implements Serializable {}