merge apis for (optional) simpler vineflower decompilation

Author: tran4o

src/main/java/oscript/data/BasicScope.java

@@ -288,7 +288,7 @@ protected Value get()
   public Value createMember( int id, int attr )
   {
     int idx = smit.create(id);
-    members.ensureCapacity(idx);
+    members.ensureCapacity(idx); 
     Reference ref = members.referenceAt(idx);
     ref.reset(attr);
     return ref;

src/main/java/oscript/data/OArray.java

@@ -31,8 +31,7 @@
  * @author Rob Clark ([email protected])
  */
 public class OArray 
-  extends OObject
-  implements java.io.Externalizable, MemberTable
+  extends Value implements MemberTable,java.io.Externalizable
 {
 
 	/*=======================================================================*/
@@ -1019,27 +1018,31 @@ public MemberTable safeCopy()
     // no-op... OArray is always safe
     return this;
   }
-  
+
+  @Override
   public void push1( Value val )
   {
     int idx = length();
     ensureCapacity(idx);
     referenceAt(idx).reset(val);
   }
 
+  @Override
   public void push2( Value val1, Value val2 )
   {
     push1(val1);
     push1(val2);
   }
 
+  @Override
   public void push3( Value val1, Value val2, Value val3 )
   {
     push1(val1);
     push1(val2);
     push1(val3);
   }
 
+  @Override
   public void push4( Value val1, Value val2, Value val3, Value val4 )
   {
     push1(val1);

src/main/java/oscript/data/Value.java

@@ -34,9 +34,7 @@
  * 
  * @author Rob Clark ([email protected])
  */
-public abstract class Value
-  implements java.io.Serializable
-{
+public abstract class Value implements MemberTable {
   /**
    * Various and asundry special values.  UNDEFINED is different from
    * NULL in that it is used for un-initialized variables or array
@@ -772,11 +770,17 @@ public void opAssign( Value val )
    * @throws PackagedScriptObjectException
    * @see Function
    */
-  public Value callAsFunction( StackFrame sf, MemberTable args )
-    throws PackagedScriptObjectException
+  public Value callAsFunction( StackFrame sf, MemberTable args ) throws PackagedScriptObjectException
   {
 	  return OscriptHost.me.callValueAsFunction(this,sf,args);
   }
+  
+  public Value callAsConstructor( StackFrame sf, MemberTable args )
+    throws PackagedScriptObjectException
+  {
+    throw PackagedScriptObjectException.makeExceptionWrapper( new OUnsupportedOperationException("can't call as constructor") );
+  }
+
   public final Value callAsFunction( Value oneArg) {
 	  Value[] t = new Value[1];
 	  t[0]=oneArg;
@@ -788,12 +792,6 @@ public final Value callAsFunction( Value[] args )
   {
     return callAsFunction( StackFrame.currentStackFrame(), new OArray(args) );
   }
-  /** @deprecated */
-  public final Value callAsFunction( StackFrame sf, Value[] args )
-  {
-    throw new ProgrammingErrorException("shouldn't get here!!");
-  }
-  
   /*=======================================================================*/
   /**
    * Call this object as a constructor.
@@ -804,22 +802,11 @@ public final Value callAsFunction( StackFrame sf, Value[] args )
    * @throws PackagedScriptObjectException
    * @see Function
    */
-  public Value callAsConstructor( StackFrame sf, MemberTable args )
-    throws PackagedScriptObjectException
-  {
-    throw PackagedScriptObjectException.makeExceptionWrapper( new OUnsupportedOperationException("can't call as constructor") );
-  }
   public final Value callAsConstructor( Value[] args )
     throws PackagedScriptObjectException
   {
     return callAsConstructor( StackFrame.currentStackFrame(), new OArray(args) );
   }
-  /** @deprecated */
-  public final Value callAsConstructor( StackFrame sf, Value[] args )
-  {
-    throw new ProgrammingErrorException("shouldn't get here!!");
-  }
- 
   /*=======================================================================*/
   /**
    * Call this object as a parent class constructor.
@@ -1079,21 +1066,64 @@ public boolean castToBooleanSoft() throws PackagedScriptObjectException
   {
 	  return !(this.bopEquals(Value.NULL).castToBoolean()); 
   }
-  
-}
 
+  //--------------------------------------------
+  @Override
+  public void push1( Value val )
+  {
+	    throw noSuchMember("push1");
+  }
+  
+  @Override
+  public void push2( Value val1, Value val2 )
+  {
+	    throw noSuchMember("push2");
+  }
+  
+  @Override
+  public void push3( Value val1, Value val2, Value val3 )
+  {
+	    throw noSuchMember("push3");
+  }
+  
+  @Override
+  public void push4( Value val1, Value val2, Value val3, Value val4 )
+  {
+	    throw noSuchMember("push4");
+  }
+  
+  @Override
+  public void reset()
+  {
+	    throw noSuchMember("reset");
+  }
+  @Override
+  public void free()
+  {
+	    throw noSuchMember("free");
+  }
+  @Override
+  public MemberTable safeCopy()
+  {
+	    throw noSuchMember("safeCopy");
+  }
+  @Override
+  public void ensureCapacity(int sz)
+  {
+	    throw noSuchMember("ensureCapacity");
+  }
+  
+  @Override
+  public void reinit(int sz)
+  {
+	    throw noSuchMember("reinit");
+  }
+  
+  @Override
+  public Reference referenceAt(final int idx)
+  {
+	    throw noSuchMember("referenceAt");
+  }
 
-/*
- *   Local Variables:
- *   tab-width: 2
- *   indent-tabs-mode: nil
- *   mode: java
- *   c-indentation-style: java
- *   c-basic-offset: 2
- *   eval: (c-set-offset 'substatement-open '0)
- *   eval: (c-set-offset 'case-label '+)
- *   eval: (c-set-offset 'inclass '+)
- *   eval: (c-set-offset 'inline-open '0)
- *   End:
- */
+}
 

src/main/java/oscript/util/MemberTable.java

@@ -15,128 +15,23 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-
 package oscript.util;
 
-import oscript.data.*;
+import oscript.data.Reference;
+import oscript.data.Value;
 
-
-/**
- * A member table is a special array, with some special methods that don't
- * need to exist for regular script arrays:
- * <ul>
- *   <li> direct access to the Reference
- *   <li> pushN() methods
- * </ul>
- * Since the member table is used by scope and to pass args to a function/
- * constructor, performance is critical, which is the reason for some of these
- * methods.
- * 
- * @author Rob Clark ([email protected])
- * @version 1
- */
-public interface MemberTable
+public interface MemberTable 
 {
-  /**
-   * Return the reference at the specified index.  This does not necessarily 
-   * grow the array, so the user should be sure to use 
-   * {@link #ensureCapacity(int)} to ensure the array has sufficient capacity 
-   * before dereferencing an index into the table which is not known to exist.
-   * 
-   * @param idx   an index into the member-table
-   * @return a reference
-   */
-  public Reference referenceAt( int idx );
-  
-  /**
-   * Ensure that the member-table has sufficient capacity to accomodate the
-   * index <code>sz</code>.  Grow the array, if necessary.
-   * 
-   * @param sz   the requested table size
-   */
-  public void ensureCapacity( int sz );
-  
-  /**
-   * Indication to the member-table that a "safe" copy is required.  This
-   * means that the table may need to outlive the stack-frame that it was
-   * (possibly) allocated from.  What it means to convert this table into
-   * a "safe" copy depends on the implementation of the table.  A safe
-   * copy is still valid after {@link #free()} is called.
-   * @return a safe copy of this table
-   */
-  public MemberTable safeCopy();
-  
-  /**
-   * Push a single parameter into the table.
-   * @param val   the value to push
-   */
-  public void push1( Value val );
-  
-  /**
-   * Push two values into the table.
-   * 
-   * @param val1  the value to push
-   * @param val2  the value to push
-   */
-  public void push2( Value val1, Value val2 );
-  
-  /**
-   * Push three values into the table.
-   * 
-   * @param val1  the value to push
-   * @param val2  the value to push
-   * @param val3  the value to push
-   */
-  public void push3( Value val1, Value val2, Value val3 );
-  
-  /**
-   * Push four values into the table.
-   * 
-   * @param val1  the value to push
-   * @param val2  the value to push
-   * @param val3  the value to push
-   * @param val4  the value to push
-   */
-  public void push4( Value val1, Value val2, Value val3, Value val4 );
-  
-  /**
-   * An indication from the creator of the member-table that, while the table
-   * itself is still required, the references referred to by the table are
-   * no longer required and can be freed.
-   */
-  public void reset();
-  
-  /**
-   * Indication from creator of member-table that resources allocated from
-   * the stack are no longer needed and should be released.  (If the member
-   * table is needed after this point, a safe copy should have already been
-   * obtained by calling {@link #safeCopy()}.)
-   */
-  public void free();
-  
-  /**
-   * Get the current size of the member-table.  The maximum index which
-   * can be referenced via {@link #referenceAt(int)} is <code>length()-1</code>
-   * 
-   * @return the current size
-   */
-  public int length();
+	public void reset();
+	public void free();
+	public void reinit(int len);
+	public Reference referenceAt(final int idx);
+	public int length();
+	public MemberTable safeCopy();
+	public void push1(Value val);
+	public void push2(Value val1, Value val2);
+	public void push3(Value val1, Value val2, Value val3);
+	public void push4(Value val1, Value val2, Value val3, Value val4);
+	public void ensureCapacity(int nsz);
 }
 
-
-
-/*
- *   Local Variables:
- *   tab-width: 2
- *   indent-tabs-mode: nil
- *   mode: java
- *   c-indentation-style: java
- *   c-basic-offset: 2
- *   eval: (c-set-offset 'substatement-open '0)
- *   eval: (c-set-offset 'case-label '+)
- *   eval: (c-set-offset 'inclass '+)
- *   eval: (c-set-offset 'inline-open '0)
- *   End:
- */
-