bprocessor-commit

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//bscript/src/net/sourceforge/bprocessor/model/evaluator
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3442/src/net/sourceforge/bprocessor/model/evaluator

Modified Files:
	Operation.java Invokable.java Call.java 
Log Message:
more generics

Index: Operation.java
===================================================================
RCS file: /cvsroot/bprocessor//bscript/src/net/sourceforge/bprocessor/model/evaluator/Operation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Operation.java	11 Oct 2006 11:23:26 -0000	1.5
--- Operation.java	14 Apr 2007 15:01:08 -0000	1.6
***************
*** 28,31 ****
     * @return offset
     */
!   public abstract int evaluate(Environment env, Stack stack) throws SemanticError;
  }
--- 28,31 ----
     * @return offset
     */
!   public abstract int evaluate(Environment env, Stack<Object> stack) throws SemanticError;
  }

Index: Invokable.java
===================================================================
RCS file: /cvsroot/bprocessor//bscript/src/net/sourceforge/bprocessor/model/evaluator/Invokable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Invokable.java	11 Oct 2006 11:23:26 -0000	1.3
--- Invokable.java	14 Apr 2007 15:01:08 -0000	1.4
***************
*** 19,22 ****
     * @throws SemanticError 
     */
!   public void evaluate(Environment env, Stack stack) throws SemanticError;
  }
--- 19,22 ----
     * @throws SemanticError 
     */
!   public void evaluate(Environment env, Stack<Object> stack) throws SemanticError;
  }

Index: Call.java
===================================================================
RCS file: /cvsroot/bprocessor//bscript/src/net/sourceforge/bprocessor/model/evaluator/Call.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Call.java	11 Oct 2006 11:23:26 -0000	1.8
--- Call.java	14 Apr 2007 15:01:08 -0000	1.9
***************
*** 35,41 ****
     * @param stack Stack
     */
!   public int evaluate(Environment env, Stack stack) throws SemanticError {
      int length = stack.search(Function.mark) - 1;
!     List arguments = new ArrayList(length);
      for (int i = 0; i < length; i++) {
        arguments.add(null);
--- 35,42 ----
     * @param stack Stack
     */
!   @Override
!   public int evaluate(Environment env, Stack<Object> stack) throws SemanticError {
      int length = stack.search(Function.mark) - 1;
!     List<Object> arguments = new ArrayList<Object>(length);
      for (int i = 0; i < length; i++) {
        arguments.add(null);
***************
*** 49,53 ****
      Invokable invokable = (Invokable) env.lookupGlobal(name);
      if (invokable != null) {
!       HashMap locals = new HashMap();
        if (invokable instanceof Function) {
          Function function = (Function) invokable;
--- 50,54 ----
      Invokable invokable = (Invokable) env.lookupGlobal(name);
      if (invokable != null) {
!       HashMap<String, Object> locals = new HashMap<String, Object>();
        if (invokable instanceof Function) {
          Function function = (Function) invokable;