changeset
Disable the locale when parsing LDraw code or atof's behavior becomes locale-dependant. Who the hell thought that was a great idea?
Wed, 20 Mar 2013 03:28:49 +0200
- author
- Santeri Piippo <crimsondusk64@gmail.com>
- date
- Wed, 20 Mar 2013 03:28:49 +0200
- changeset 45
- 19d99d62d88e
- parent 44
- 4c2fdadb9262
- child 46
- 69962c85f717
Disable the locale when parsing LDraw code or atof's behavior becomes locale-dependant. Who the hell thought that was a great idea?
| file.cpp | file | annotate | diff | comparison | revisions |
--- a/file.cpp Wed Mar 20 03:25:49 2013 +0200 +++ b/file.cpp Wed Mar 20 03:28:49 2013 +0200 @@ -202,9 +202,6 @@ return true; } -// ============================================================================= -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -// ============================================================================= #define CHECK_TOKEN_COUNT(N) \ if (tokens.size() != N) \ return new LDGibberish (zLine, "Bad amount of tokens"); @@ -215,7 +212,15 @@ return new LDGibberish (zLine, str::mkfmt ("Token #%u was `%s`, expected a number", \ (i + 1), tokens[i].chars())); +// ============================================================================= +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +// ============================================================================= LDObject* parseLine (str zLine) { + // Disable the locale while parsing the line or atof's behavior changes + // between locales (i.e. fails to read decimals properly). That is + // quite undesired... + setlocale (LC_NUMERIC, "C"); + str zNoWhitespace = zLine; stripWhitespace (zNoWhitespace); if (!~zNoWhitespace) { @@ -352,6 +357,8 @@ default: // Strange line we couldn't parse return new LDGibberish (zLine, "Unknown line code number"); } + + setlocale (LC_NUMERIC, ""); } // =============================================================================
