diff options
| -rw-r--r-- | src/analyzer.js | 9 | ||||
| -rw-r--r-- | tests/bullet/readme.txt | 3 | ||||
| -rw-r--r-- | tests/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h | 3 | ||||
| -rw-r--r-- | tests/runner.py | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/src/analyzer.js b/src/analyzer.js index 06fff03c..1b438db4 100644 --- a/src/analyzer.js +++ b/src/analyzer.js @@ -834,7 +834,7 @@ function analyzer(data) { return ret; } - if (mustReturn) return makeLoop(); + if (canReturn) return makeLoop(); // === handle multiple branches from the entry with a 'multiple' === // @@ -886,12 +886,7 @@ function analyzer(data) { if (handlingNow.length == 0) { // Spaghetti - cannot even find a single label to do before the rest. What a mess. - // But if there is looping, perhaps we can use that to simplify matters? - if (canReturn) { - return makeLoop(); - } else { - throw "Spaghetti encountered in relooping."; - } + throw "Spaghetti encountered in relooping."; } // This is a 'multiple' diff --git a/tests/bullet/readme.txt b/tests/bullet/readme.txt index b524e36f..8caa777b 100644 --- a/tests/bullet/readme.txt +++ b/tests/bullet/readme.txt @@ -2,3 +2,6 @@ The files in this directory are the Bullet Physics library, version 2.78. See README and LICENSE files for details. +Changes to the source appear in the following files: (search for XXX Emscripten) + - btManifoldResult.h + diff --git a/tests/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h b/tests/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h index 18199b49..78537195 100644 --- a/tests/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h +++ b/tests/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h @@ -28,7 +28,8 @@ class btManifoldPoint; typedef bool (*ContactAddedCallback)(btManifoldPoint& cp, const btCollisionObject* colObj0,int partId0,int index0,const btCollisionObject* colObj1,int partId1,int index1); extern ContactAddedCallback gContactAddedCallback; -//#define DEBUG_PART_INDEX 1 +// XXX Emscripten: Uncomment the next line, to prevent SAFE_HEAP warnings +#define DEBUG_PART_INDEX 1 ///btManifoldResult is a helper class to manage contact results. diff --git a/tests/runner.py b/tests/runner.py index 6b76a9e2..cf347f0c 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -2388,7 +2388,7 @@ else: assert(os.path.exists(CLOSURE_COMPILER)) - COMPILER = LLVM_GCC + COMPILER = CLANG JS_ENGINE = SPIDERMONKEY_ENGINE #JS_ENGINE = V8_ENGINE @@ -2406,7 +2406,7 @@ else: USE_CLOSURE_COMPILER = 1 - TEST_REPS = 3 + TEST_REPS = 10 TOTAL_TESTS = 4 tests_done = 0 |