diff options
| -rwxr-xr-x | acprep | 2 | ||||
| -rw-r--r-- | tests/parser.h | 6 | ||||
| -rw-r--r-- | value.cc | 14 |
3 files changed, 12 insertions, 10 deletions
@@ -17,7 +17,7 @@ else fi autoconf -INCDIRS="-I/sw/include -I/usr/local/include/boost-1_33 -I/usr/include/httpd/xml" +INCDIRS="-I/sw/include -I/sw/include/boost -I/usr/include/httpd/xml" #INCDIRS="$INCDIRS -I/sw/include/libofx" INCDIRS="$INCDIRS -I/usr/include/python2.3" INCDIRS="$INCDIRS -Wno-long-double" diff --git a/tests/parser.h b/tests/parser.h index 439d478f..aa1a3a74 100644 --- a/tests/parser.h +++ b/tests/parser.h @@ -20,25 +20,27 @@ public: TS_ASSERT_EQUALS(0, emptyStream.tellg()); } -#if defined(HAVE_EXPAT) || defined(HAVE_XMLPARSE) void testEmptyFileIsNotXMLFile() { +#if defined(HAVE_EXPAT) || defined(HAVE_XMLPARSE) stringstream emptyStream(stringstream::in); xml_parser_t xmlParser; TS_ASSERT(!xmlParser.test(emptyStream)); TS_ASSERT(emptyStream.good()); TS_ASSERT_EQUALS(0, emptyStream.tellg()); +#endif } void testEmptyFileIsNotGnuCashFile() { +#if defined(HAVE_EXPAT) || defined(HAVE_XMLPARSE) stringstream emptyStream(stringstream::in); gnucash_parser_t gnucashParser; TS_ASSERT(!gnucashParser.test(emptyStream)); TS_ASSERT(emptyStream.good()); TS_ASSERT_EQUALS(0, emptyStream.tellg()); - } #endif + } void testEmptyFileIsNotBinaryFile() { @@ -35,13 +35,13 @@ void value_t::simplify() DEBUG_PRINT("amounts.values.simplify", "Reducing balance pair to balance"); cast(BALANCE); } - + if (type == BALANCE && ((balance_t *) data)->amounts.size() == 1) { DEBUG_PRINT("amounts.values.simplify", "Reducing balance to amount"); cast(AMOUNT); - } - + } + if (type == AMOUNT && ! ((amount_t *) data)->commodity()) { DEBUG_PRINT("amounts.values.simplify", "Reducing amount to integer"); @@ -97,7 +97,7 @@ value_t& value_t::operator+=(const value_t& value) throw new value_error("Cannot add a boolean to a value"); else if (value.type == DATETIME) throw new value_error("Cannot add a date/time to a value"); - + switch (type) { case BOOLEAN: throw new value_error("Cannot add a value to a boolean"); @@ -235,7 +235,7 @@ value_t& value_t::operator-=(const value_t& value) throw new value_error("Cannot subtract a boolean from a value"); else if (value.type == DATETIME && type != DATETIME) throw new value_error("Cannot subtract a date/time from a value"); - + switch (type) { case BOOLEAN: throw new value_error("Cannot subtract a value from a boolean"); @@ -382,7 +382,7 @@ value_t& value_t::operator*=(const value_t& value) throw new value_error("Cannot multiply a boolean by a value"); else if (value.type == DATETIME) throw new value_error("Cannot multiply a date/time by a value"); - + if (value.realzero()) { *this = 0L; return *this; @@ -491,7 +491,7 @@ value_t& value_t::operator/=(const value_t& value) throw new value_error("Cannot divide a boolean by a value"); else if (value.type == DATETIME) throw new value_error("Cannot divide a date/time by a value"); - + switch (type) { case BOOLEAN: throw new value_error("Cannot divide a value by a boolean"); |