[Mathlib-commitlog] SF.net SVN: mathlib:[769] JMathLib/trunk/src/jmathlib/core/tokens/ DotOperatorToken.java

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

Revision: 769
          http://mathlib.svn.sourceforge.net/mathlib/?rev=769&view=rev
Author:   st_mueller
Date:     2009-01-25 07:56:19 +0000 (Sun, 25 Jan 2009)

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

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/core/tokens/DotOperatorToken.java

Modified: JMathLib/trunk/src/jmathlib/core/tokens/DotOperatorToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/DotOperatorToken.java	2009-01-25 07:55:54 UTC (rev 768)
+++ JMathLib/trunk/src/jmathlib/core/tokens/DotOperatorToken.java	2009-01-25 07:56:19 UTC (rev 769)
@@ -12,7 +12,7 @@
     }
 
     /**evaluates the operator*/
-    public OperandToken evaluate(Token[] operands)
+    public OperandToken evaluate(Token[] operands, GlobalValues globals)
     {
     	ErrorLogger.debugLine("DotOperatorToken: evaluate");
         
@@ -20,7 +20,7 @@
         Token left  = operands[0];
         Token right = operands[1];
         
-		left = left.evaluate(null);
+		left = left.evaluate(null, globals);
         
         // not needed. is done by variable token
         // check if left is a variable (e.g. a.abc, where "a" is a structure)
@@ -50,12 +50,12 @@
 	        try
 	   	 	{
 	    	    //check if a function with this name exists
-	    	    if (getFunctionManager().findFunctionByName(name) != null)
+	    	    if (globals.getFunctionManager().findFunctionByName(name) != null)
 				{
 	                ErrorLogger.debugLine("parser value.function");
 		        	FunctionToken func = new FunctionToken(name, (OperandToken)left);
 	     
-	    	        return func.evaluate(null);
+	    	        return func.evaluate(null, globals);
 				}
 	        }
 	    	catch(Exception e){}


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