Author: amol
Date: Thu Aug 24 09:42:52 2006
New Revision: 434426

URL: http://svn.apache.org/viewvc?rev=434426&view=rev
Log:
1. when formula parse fails, reported error now includes the "pointer"
2. added the case of interpreting a missing argument as MissingArgPtg

Modified:
    jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java

Modified: 
jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java
URL: 
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java?rev=434426&r1=434425&r2=434426&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java 
(original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java Thu 
Aug 24 09:42:52 2006
@@ -110,7 +110,7 @@
     private void Abort(String s) {
         Error(s);
         //System.exit(1);  //throw exception??
-        throw new RuntimeException("Cannot Parse, sorry : "+s + " [Formula 
String was: '"+formulaString+"']");
+        throw new RuntimeException("Cannot Parse, sorry : " + s + " @ " + 
pointer + " [Formula String was: '" + formulaString + "']");
     }
     
     
@@ -493,6 +493,8 @@
             Ident();
         } else if(look == '"') {
            StringLiteral();
+        } else if (look == ')' || look == ',') {
+               tokens.add(new MissingArgPtg());
         } else {
              
             String number = GetNum();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
Mailing List:    http://jakarta.apache.org/site/mail2.html#poi
The Apache Jakarta POI Project: http://jakarta.apache.org/poi/

Reply via email to