From 13a3f1aa6e48e7f7db4fae7a9e6042afc9619774 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 6 Feb 2019 11:50:41 +0200 Subject: [PATCH 1/2] - re-added --keep-going make switch in Travis configuration Builds no longer stop on the first error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 375d779bb..acba0ae31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -133,7 +133,7 @@ script: -DPK3_QUIET_ZIPDIR=YES \ .. - if [[ $TRAVIS_OS_NAME == 'windows' ]]; then cmake --build . -- -m; fi - - if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- -j2; fi + - if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- -j2 -k; fi notifications: email: false From 78c0b7f2300c6b8c859e39cbc04c1b7718a9524e Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 6 Feb 2019 12:09:14 +0200 Subject: [PATCH 2/2] - changed type of Nop expression to void Control flow statements with constant condition no longer cause misleading fatal errors in ZScript https://forum.zdoom.org/viewtopic.php?t=63566 --- src/scripting/backend/codegen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripting/backend/codegen.h b/src/scripting/backend/codegen.h index 39de03f93..aa05c7d06 100644 --- a/src/scripting/backend/codegen.h +++ b/src/scripting/backend/codegen.h @@ -2106,7 +2106,7 @@ public: : FxExpression(EFX_Nop, p) { isresolved = true; - ValueType = TypeError; + ValueType = TypeVoid; } ExpEmit Emit(VMFunctionBuilder *build) {