sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix to european number handling

Browse source
This commit is contained in:
John Wiegley 2004-07-18 04:24:49 -04:00 • committed by johnw
parent a8c4ecbc8e
commit fde56d0f12
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -2,11 +2,11 @@ CODE = amount.cc ledger.cc parse.cc reports.cc
OBJS = $(patsubst %.cc,%.o,$(CODE)) OBJS = $(patsubst %.cc,%.o,$(CODE))
#CXX = cc #CXX = cc
CXX = g++ CXX = g++
CFLAGS = -Wall -ansi -pedantic CFLAGS = #-Wall -ansi -pedantic
#DFLAGS = -O3 -fomit-frame-pointer DFLAGS = -O3 -fomit-frame-pointer
DFLAGS = -g -DDEBUG=1 #DFLAGS = -g -DDEBUG=1
INCS = -I/sw/include -I/usr/include/gcc/darwin/3.3/c++ -I/usr/include/gcc/darwin/3.3/c++/ppc-darwin INCS = -I/usr/local/include
LIBS = -L/sw/lib -lgmpxx -lgmp -lpcre LIBS = -L/usr/local/lib -lgmpxx -lgmp -lpcre
ifdef GNUCASH ifdef GNUCASH
CODE := $(CODE) gnucash.cc CODE := $(CODE) gnucash.cc

16
amount.cc
View file

@ -532,14 +532,6 @@ static commodity * parse_amount(mpz_t out, const char * num,
result = pcre_copy_substring(num, ovector, matched, base + 3, buf, 255); result = pcre_copy_substring(num, ovector, matched, base + 3, buf, 255);
assert(result >= 0); assert(result >= 0);
// Determine the precision used
if (char * p = std::strchr(buf, '.'))
precision = std::strlen(++p);
else if (char * p = std::strchr(buf, '/'))
precision = std::strlen(++p) - 1;
else
precision = 0;
// Where "thousands" markers used? Is it a european number? // Where "thousands" markers used? Is it a european number?
if (char * p = std::strrchr(buf, ',')) { if (char * p = std::strrchr(buf, ',')) {
if (std::strchr(p, '.')) if (std::strchr(p, '.'))
@ -548,6 +540,14 @@ static commodity * parse_amount(mpz_t out, const char * num,
european = true; european = true;
} }
// Determine the precision used
if (char * p = std::strchr(buf, european ? ',' : '.'))
precision = std::strlen(++p);
else if (char * p = std::strchr(buf, '/'))
precision = std::strlen(++p) - 1;
else
precision = 0;
// Parse the actual quantity // Parse the actual quantity
std::string value_str = buf; std::string value_str = buf;