@@ -12,21 +12,22 @@
  * under the License.
  */
 
+#include <assert.h>
 #include <fstream>
 #include <iostream>
+#include <set>
+#include <sstream>
 #include "InputTree.h"
 #include "headFinder.h"
 #include "utils.h"
-#include <assert.h>
-#include <set>
 #include "Term.h"
 
 
 int              InputTree::pageWidth = 75; //used for prettyPrinting
 ECString         InputTree::tempword[MAXSENTLEN];
 int              InputTree::tempwordnum = 0;
 
-// reset internal state after reporting an error
+// reset internal state before reporting an error
 #define TREEREADINGERROR(message) \
     { InputTree::init(); error(__FILE__, __LINE__, message); }
 
@@ -93,8 +94,7 @@ readParse(istream& is)
   if(!is) return;
   if(temp != "(")
     {
-      cerr << "Saw " << temp << endl;
-      TREEREADINGERROR("Should have seen an open paren here.");
+      TREEREADINGERROR("Saw '" + temp + "' instead of open paren here.");
     }
   /* get annotated symbols like NP-OBJ.  term_ = NP ntInfo_ = OBJ */
   temp = readNext(is);
@@ -110,8 +110,7 @@ readParse(istream& is)
   if(temp == ")") return;
   if(temp != "(")
     {
-      cerr << "Saw " << temp << endl;
-      TREEREADINGERROR("Should have seen second open paren here.");
+      TREEREADINGERROR("Saw '" + temp + "' instead of second open paren here.");
     }
 
   for (;;)
@@ -125,8 +124,9 @@ readParse(istream& is)
       if (temp==")") break;
       if (temp!="(")
 	{
-	  cerr << *this << endl;
-      TREEREADINGERROR("Should have open or closed paren here.");
+      stringstream message("Saw '");
+      message << *this << "' instead of open or closed paren here.";
+      TREEREADINGERROR(message.str());
 	}
     }
 }
@@ -176,8 +176,7 @@ newParse(istream& is, int& strt, InputTree* par)
       const Term* ctrm = Term::get(trm);
       if(!ctrm)
 	{
-	  cerr << "No such term " << trm << endl;
-	  assert(ctrm);
+      TREEREADINGERROR("No such term: " + trm);
 	}
       if(wrd!="" && !(ctrm->terminal_p()))
 	{
 
@@ -52,6 +52,13 @@ error(const char *s)
   ERROR( s ); 
 }
 
+void 
+error(const char *filename, int filelinenum, string str) 
+{ 
+  const char* s = str.c_str();
+  error(filename, filelinenum, s); 
+}
+
 ECString
 langAwareToLower(ECString str)
 {
 
@@ -24,8 +24,9 @@
 #define WARN( msg ) if (!Bchart::silent) { warn( __FILE__, __LINE__, msg ); }
 #define ERROR( msg ) error( __FILE__, __LINE__, msg )
 
-void warn( const char *filename, int filelinenum, const char *msg );
-void error( const char *filename, int filelinenum, const char *msg );
+void warn(const char *filename, int filelinenum, const char *msg);
+void error(const char *filename, int filelinenum, const char *msg);
+void error(const char *filename, int filelinenum, string str);
 void error(const char *s); // backwards compatibility
 
 ECString langAwareToLower(ECString str);
 
@@ -14,7 +14,7 @@ def test_tree_errors():
         bllipparser.Tree('(())')
       File "/usr/local/lib/python2.7/dist-packages/bllipparser/RerankingParser.py", line 63, in __init__
         parser.inputTreeFromString(input_tree_or_string)
-    RuntimeError: [first-stage/PARSE/InputTree.C:260]: Saw paren rather than term
+    RuntimeError: [first-stage/PARSE/InputTree.C:259]: Saw paren rather than term
     >>> bllipparser.Tree('(S1 (S (NP (DT This)) (VP (VBZ is) (NP (DT a) (ADJP (RB fairly) (JJ simple)) (NN parse) (NN tree))) (. .)))')
     Tree('(S1 (S (NP (DT This)) (VP (VBZ is) (NP (DT a) (ADJP (RB fairly) (JJ simple)) (NN parse) (NN tree))) (. .)))')
     >>> bllipparser.Tree('(S1 (S (NP (DT This)) (VP (VBZ is) (NP (DT a) (ADJP (RB fairly) (JJ simple)) (NN parse) (NN tree))) (. .)))')
@@ -36,7 +36,7 @@ def test_tree_errors():
         bllipparser.Tree('Does not start with a paren')
       File "/usr/local/lib/python2.7/dist-packages/bllipparser/RerankingParser.py", line 63, in __init__
         parser.inputTreeFromString(input_tree_or_string)
-    RuntimeError: [first-stage/PARSE/InputTree.C:97]: Should have seen an open paren here.
+    RuntimeError: [first-stage/PARSE/InputTree.C:97]: Saw 'Does' instead of open paren here.
     >>> bllipparser.Tree('(S1 eh)')
     Traceback (most recent call last):
       File "/usr/lib/python2.7/doctest.py", line 1315, in __run
@@ -45,7 +45,7 @@ def test_tree_errors():
         bllipparser.Tree('(S1 eh)')
       File "/usr/local/lib/python2.7/dist-packages/bllipparser/RerankingParser.py", line 63, in __init__
         parser.inputTreeFromString(input_tree_or_string)
-    RuntimeError: [first-stage/PARSE/InputTree.C:114]: Should have seen second open paren here.
+    RuntimeError: [first-stage/PARSE/InputTree.C:113]: Saw 'eh' instead of second open paren here.
     >>> bllipparser.Tree('(S1')
     Traceback (most recent call last):
       File "/usr/lib/python2.7/doctest.py", line 1315, in __run
@@ -54,7 +54,7 @@ def test_tree_errors():
         bllipparser.Tree('(S1')
       File "/usr/local/lib/python2.7/dist-packages/bllipparser/RerankingParser.py", line 63, in __init__
         parser.inputTreeFromString(input_tree_or_string)
-    RuntimeError: [first-stage/PARSE/InputTree.C:114]: Should have seen second open paren here.
+    RuntimeError: [first-stage/PARSE/InputTree.C:113]: Saw '' instead of second open paren here.
     >>> bllipparser.Tree('(S1 ((')
     Traceback (most recent call last):
       File "/usr/lib/python2.7/doctest.py", line 1315, in __run
@@ -63,7 +63,7 @@ def test_tree_errors():
         bllipparser.Tree('(S1 ((')
       File "/usr/local/lib/python2.7/dist-packages/bllipparser/RerankingParser.py", line 63, in __init__
         parser.inputTreeFromString(input_tree_or_string)
-    RuntimeError: [first-stage/PARSE/InputTree.C:260]: Saw paren rather than term
+    RuntimeError: [first-stage/PARSE/InputTree.C:259]: Saw paren rather than term
     >>> bllipparser.Tree('(S1 (NP')
     Traceback (most recent call last):
       File "/usr/lib/python2.7/doctest.py", line 1315, in __run
Original file line number	Diff line number	Diff line change
`@@ -12,21 +12,22 @@`
`12`	`12`	`* under the License.`
`13`	`13`	`*/`
`14`	`14`
	`15`	`+#include <assert.h>`
`15`	`16`	`#include <fstream>`
`16`	`17`	`#include <iostream>`
	`18`	`+#include <set>`
	`19`	`+#include <sstream>`
`17`	`20`	`#include "InputTree.h"`
`18`	`21`	`#include "headFinder.h"`
`19`	`22`	`#include "utils.h"`
`20`		`-#include <assert.h>`
`21`		`-#include <set>`
`22`	`23`	`#include "Term.h"`
`23`	`24`
`24`	`25`
`25`	`26`	`int InputTree::pageWidth = 75; //used for prettyPrinting`
`26`	`27`	`ECString InputTree::tempword[MAXSENTLEN];`
`27`	`28`	`int InputTree::tempwordnum = 0;`
`28`	`29`
`29`		`-// reset internal state after reporting an error`
	`30`	`+// reset internal state before reporting an error`
`30`	`31`	`#define TREEREADINGERROR(message) \`
`31`	`32`	`{ InputTree::init(); error(__FILE__, __LINE__, message); }`
`32`	`33`
`@@ -93,8 +94,7 @@ readParse(istream& is)`
`93`	`94`	`if(!is) return;`
`94`	`95`	`if(temp != "(")`
`95`	`96`	`{`
`96`		`- cerr << "Saw " << temp << endl;`
`97`		`- TREEREADINGERROR("Should have seen an open paren here.");`
	`97`	`+ TREEREADINGERROR("Saw '" + temp + "' instead of open paren here.");`
`98`	`98`	`}`
`99`	`99`	`/* get annotated symbols like NP-OBJ. term_ = NP ntInfo_ = OBJ */`
`100`	`100`	`temp = readNext(is);`
`@@ -110,8 +110,7 @@ readParse(istream& is)`
`110`	`110`	`if(temp == ")") return;`
`111`	`111`	`if(temp != "(")`
`112`	`112`	`{`
`113`		`- cerr << "Saw " << temp << endl;`
`114`		`- TREEREADINGERROR("Should have seen second open paren here.");`
	`113`	`+ TREEREADINGERROR("Saw '" + temp + "' instead of second open paren here.");`
`115`	`114`	`}`
`116`	`115`
`117`	`116`	`for (;;)`
`@@ -125,8 +124,9 @@ readParse(istream& is)`
`125`	`124`	`if (temp==")") break;`
`126`	`125`	`if (temp!="(")`
`127`	`126`	`{`
`128`		`- cerr << *this << endl;`
`129`		`- TREEREADINGERROR("Should have open or closed paren here.");`
	`127`	`+ stringstream message("Saw '");`
	`128`	`+ message << *this << "' instead of open or closed paren here.";`
	`129`	`+ TREEREADINGERROR(message.str());`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`}`
`@@ -176,8 +176,7 @@ newParse(istream& is, int& strt, InputTree* par)`
`176`	`176`	`const Term* ctrm = Term::get(trm);`
`177`	`177`	`if(!ctrm)`
`178`	`178`	`{`
`179`		`- cerr << "No such term " << trm << endl;`
`180`		`- assert(ctrm);`
	`179`	`+ TREEREADINGERROR("No such term: " + trm);`
`181`	`180`	`}`
`182`	`181`	`if(wrd!="" && !(ctrm->terminal_p()))`
`183`	`182`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,13 @@ error(const char *s)`
`52`	`52`	`ERROR( s );`
`53`	`53`	`}`
`54`	`54`
	`55`	`+void`
	`56`	`+error(const char *filename, int filelinenum, string str)`
	`57`	`+{`
	`58`	`+ const char* s = str.c_str();`
	`59`	`+ error(filename, filelinenum, s);`
	`60`	`+}`
	`61`	`+`
`55`	`62`	`ECString`
`56`	`63`	`langAwareToLower(ECString str)`
`57`	`64`	`{`