[Mathlib-commitlog] SF.net SVN: mathlib:[719] JMathLib/trunk/src/jmathlib/toolbox/general

[<st_...@us...>]

Revision: 719
          http://mathlib.svn.sourceforge.net/mathlib/?rev=719&view=rev
Author:   st_mueller
Date:     2009-01-23 12:39:30 +0000 (Fri, 23 Jan 2009)

Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/toolbox/general/who.java
    JMathLib/trunk/src/jmathlib/toolbox/general/whos.java

Modified: JMathLib/trunk/src/jmathlib/toolbox/general/who.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/general/who.java	2009-01-23 12:28:36 UTC (rev 718)
+++ JMathLib/trunk/src/jmathlib/toolbox/general/who.java	2009-01-23 12:39:30 UTC (rev 719)
@@ -9,7 +9,7 @@
 /**An external function for getting the stored variables*/
 public class who extends ExternalFunction
 {
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		//if (operands != null)
@@ -17,14 +17,14 @@
 
 		Variable var;
 
-		getInterpreter().displayText("\nYour variables are:\n");
+		globals.getInterpreter().displayText("\nYour variables are:\n");
 
-		Iterator iter = getLocalVariables().getIterator();
+		Iterator iter = globals.getLocalVariables().getIterator();
 		while(iter.hasNext())
 		{
 		    Map.Entry next = ((Map.Entry)iter.next());
 		    var = ((Variable)next.getValue());
-		    getInterpreter().displayText(var.getName());
+		    globals.getInterpreter().displayText(var.getName());
 		}
 
 		return null;		

Modified: JMathLib/trunk/src/jmathlib/toolbox/general/whos.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/general/whos.java	2009-01-23 12:28:36 UTC (rev 718)
+++ JMathLib/trunk/src/jmathlib/toolbox/general/whos.java	2009-01-23 12:39:30 UTC (rev 719)
@@ -8,14 +8,14 @@
 /**An external function for getting the stored variables*/
 public class whos extends ExternalFunction
 {
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
         
-        Iterator iter = getLocalVariables().getIterator();
+        Iterator iter = globals.getLocalVariables().getIterator();
 
         // display header information
-        getInterpreter().displayText("\nYour variables are:\n");
-        getInterpreter().displayText("\nName: \t size: \t type \n");
+        globals.getInterpreter().displayText("\nYour variables are:\n");
+        globals.getInterpreter().displayText("\nName: \t size: \t type \n");
 
         // check if global context is requested
         if (getNArgIn(operands) == 1)
@@ -24,7 +24,7 @@
             {
                 String data = ((CharToken)operands[0]).getValue();
                 if (data.equals("global"))
-                    iter = getGlobalVariables().getIterator();
+                    iter = globals.getGlobalVariables().getIterator();
             }
         }
 
@@ -42,7 +42,7 @@
             
             // if variable is global get data from global context
             if (global)
-                op = (OperandToken)getGlobalVariables().getVariable(name).getData();
+                op = (OperandToken)globals.getGlobalVariables().getVariable(name).getData();
             
             // check which type of variable
             if (op instanceof DataToken)
@@ -59,7 +59,7 @@
             if (global)
                    line += "(global)";
             
-		    getInterpreter().displayText(line);
+            globals.getInterpreter().displayText(line);
 		}
 
 		return null;		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.