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

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

Revision: 777
          http://mathlib.svn.sourceforge.net/mathlib/?rev=777&view=rev
Author:   st_mueller
Date:     2009-01-25 21:01:47 +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/AssignmentOperatorToken.java
    JMathLib/trunk/src/jmathlib/core/tokens/numbertokens/DoubleNumberToken.java

Modified: JMathLib/trunk/src/jmathlib/core/tokens/AssignmentOperatorToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/AssignmentOperatorToken.java	2009-01-25 21:01:09 UTC (rev 776)
+++ JMathLib/trunk/src/jmathlib/core/tokens/AssignmentOperatorToken.java	2009-01-25 21:01:47 UTC (rev 777)
@@ -99,7 +99,7 @@
                 // clone limits functions/values to preserve for future evalutation
                 ops[0] = left.getData();
 				ops[1] = right;
-                ops[2] = ((OperandToken)limits[0].clone());
+                ops[2] = (OperandToken)limits[0].clone();
                 ops[2] = ops[2].evaluate(null, globals);
                 
 				if (limitsLength==2)
@@ -128,7 +128,7 @@
             {
                 ErrorLogger.debugLine("AssignmentOperatorToken: displayResult");
                 if ((right!=null))
-                    globals.getInterpreter().displayText(left.getName() +" = "+ right.toString());
+                    globals.getInterpreter().displayText(left.getName() +" = "+ right.toString(globals));
                 else
                     globals.getInterpreter().displayText(left.getName() +" = []");
             }

Modified: JMathLib/trunk/src/jmathlib/core/tokens/numbertokens/DoubleNumberToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/numbertokens/DoubleNumberToken.java	2009-01-25 21:01:09 UTC (rev 776)
+++ JMathLib/trunk/src/jmathlib/core/tokens/numbertokens/DoubleNumberToken.java	2009-01-25 21:01:47 UTC (rev 777)
@@ -682,7 +682,7 @@
         else if (Double.isNaN(re))    
             result.append("NaN");
         else
-            //result.append(globals.getNumberFormat().format(re));
+            //result.append(getNumberFormat().format(re));
             result.append(numFormat.format(re));
 //stefan
         


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