diff options
| -rw-r--r-- | src/library.js | 2 | ||||
| -rwxr-xr-x | tests/runner.py | 9 | ||||
| -rw-r--r-- | tools/shared.py | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/library.js b/src/library.js index 4096ba75..6385507c 100644 --- a/src/library.js +++ b/src/library.js @@ -2177,7 +2177,7 @@ LibraryManager.library = { // ========================================================================== _isFloat: function(text) { - return !!(/^[+]?[0-9]*\.?[0-9]+([eE][+-]?[0-9]+)?$/.exec(text)); + return !!(/^[+-]?[0-9]*\.?[0-9]+([eE][+-]?[0-9]+)?$/.exec(text)); }, // TODO: Document. diff --git a/tests/runner.py b/tests/runner.py index 4eb085ff..23937974 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -3289,13 +3289,16 @@ at function.:blag printf("%f, %f\n", atof("1.234567"), atof("cheez")); + float a = -1; + sscanf("-3.03", "%f", &a); + printf("%.4f\n", a); + return 0; } ''' - self.do_run(src, 'en-us : 2*en-r : 99*en : 3*1.234567, 0.000000', - output_nicerizer = lambda x: x.replace('\n', '*')) + self.do_run(src, 'en-us : 2\nen-r : 99\nen : 3\n1.234567, 0.000000\n-3.0300') - # Part 2: doubles (issue 148) + # Part 2: doubles if Settings.USE_TYPED_ARRAYS == 2: for ftype in ['float', 'double']: src = r''' diff --git a/tools/shared.py b/tools/shared.py index dc84bce3..a0e86156 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -395,7 +395,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)'''.replace('$EMSCRIPTEN_ROOT', path_ if env is None: env = Building.get_building_env() env['EMMAKEN_JUST_CONFIGURE'] = '1' - if args[0].find('cmake') > -1: + if 'cmake' in argv[0]: args = Building.handle_CMake_toolchain(args) Popen(args, stdout=stdout, stderr=stderr, env=env).communicate()[0] del env['EMMAKEN_JUST_CONFIGURE'] |