mathlib-commitlog Mailing List for JMathLib - Octave, Matlab clone in java (Page 17)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 509
          http://mathlib.svn.sourceforge.net/mathlib/?rev=509&view=rev
Author:   st_mueller
Date:     2008-11-30 16:24:14 +0000 (Sun, 30 Nov 2008)

Log Message:
-----------


Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/core/interpreter/Parser.java

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Parser.java
===================================================================

--- JMathLib/trunk/src/jmathlib/core/interpreter/Parser.java	2008-11-30 16:21:29 UTC (rev 508)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Parser.java	2008-11-30 16:24:14 UTC (rev 509)
@@ -334,9 +334,8 @@
                 (pToken     instanceof PowerOperatorToken)                )
                 Errors.throwParserException("multiple operators ^");
 
-            
+            ErrorLogger.debugLine("PARSER  op+op: "+nextToken);
             ErrorLogger.debugLine("PARSER  op+op: "+pToken);
-            ErrorLogger.debugLine("PARSER  op+op: "+nextToken);
             
         	if(nextToken instanceof AssignmentOperatorToken)
             {
@@ -353,6 +352,15 @@
                 ErrorLogger.debugLine("Parser: dot-operator");
                 retToken  = parseDotOperator(operandStack, deliTyp);
             }
+            else if((nextToken instanceof AddSubOperatorToken) &&
+                    (pToken instanceof AssignmentOperatorToken))
+            {
+                // += or -=
+                ErrorLogger.debugLine("Parser: += or -=");
+                nextToken = getNextToken(deliTyp);
+                retToken = parseAssignmentOperator(nextToken, operandStack);
+                
+            }
             else if(    (nextToken instanceof AddSubOperatorToken)
                      || (nextToken instanceof MulDivOperatorToken)
                      || (nextToken instanceof PowerOperatorToken)
@@ -591,7 +599,7 @@
     /* @return expression of assignment (e.g. a=3)                                     */
     private OperandToken parseAssignmentOperator(Token currentToken, Stack operandStack)
     {
-        // operator    (this should be a "=")
+        // operator    (this should be a "=" or ("+" for +=) or ("-" for -=))
         OperatorToken operator = (OperatorToken)currentToken; 
         
         //parse right parameter                    
@@ -601,7 +609,19 @@
         OperandToken leftSide = (OperandToken)operandStack.pop(); 
 
         /* create new expression */
-        Expression tree = new Expression(operator, leftSide, rightSide);
+        Expression tree = null;
+        if (currentToken instanceof AssignmentOperatorToken)
+        {
+            // e.g. a=8
+            tree = new Expression(operator, leftSide, rightSide);
+        }
+        else if (currentToken instanceof AddSubOperatorToken)
+        {
+            // e.g. a+=8
+            tree = new Expression(operator, rightSide, new DoubleNumberToken(1.0));
+            tree = new Expression(new AssignmentOperatorToken(), leftSide, tree);
+    // ???????
+        }
 
         return tree;
     } // end parseAssignmentOperator
@@ -1445,14 +1465,15 @@
         boolean numberIndicatorB = false;         //
         boolean singleIndicatorB = false;         //
         boolean imagIndicatorB   = false;         //
-
+        System.out.println("*+*");
         // remove spaces between "[" and first element (e.g. [  2,3] -> [2,3]
         while (isExpectedDelimiter(peekNextToken(MATRIX), ' '))
         		getNextToken();
-        
+        System.out.println("*++*");
         // parse code of matrices (e.g. [1,2,3;4,5,6] or [1 sin(2) 3; 4 5+1 a]
         while(!endMatrix) 
         {
+            System.out.println("**");
             // get next parameter (whitespaces are treated as delimiter, too)
             OperandToken nextParameter = parseArithExpression(MATRIX);    
 


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




2006	Jan	Feb	Mar	Apr	May	Jun (2)	Jul (4)	Aug (150)	Sep	Oct	Nov	Dec (2)
2007	Jan (233)	Feb (86)	Mar (32)	Apr (26)	May (73)	Jun (45)	Jul (23)	Aug (23)	Sep (5)	Oct (80)	Nov (11)	Dec (11)
2008	Jan	Feb	Mar (13)	Apr (3)	May (7)	Jun (30)	Jul (12)	Aug (12)	Sep	Oct	Nov (78)	Dec (78)
2009	Jan (214)	Feb (79)	Mar (20)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

mathlib-commitlog Mailing List for JMathLib - Octave, Matlab clone in java (Page 17)

mathlib-commitlog — log of all commits to CVS