archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix switch fall-through to default (fix #964)

Browse Source
This commit is contained in:
Gordon Williams 2016-11-03 11:11:28 +00:00
parent bf38ab7651
commit 9338bc18ce
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -33,6 +33,7 @@
Fix potential issues with Telnet server and return values from netCreateSocket/netAccept on some platforms (fix #931)
nRF5x: Add Puck.js self-test code, fix issue where analogRead reset pin state
nRF5x: Change central mode API to mirror Web Bluetooth
Fix switch fall-through to default (fix #964)
1v87 : Add support for compiling with float-abi=hard (even if it doesn't give us real-world benefits)
Add shortcut for quick execution of common call types

14
src/jsparse.c
View File

@ -1999,7 +1999,7 @@ NO_INLINE JsVar *jspeStatementSwitch() {
if (!execute) { jsvUnLock(switchOn); jspeBlock(); return 0; }
JSP_MATCH_WITH_CLEANUP_AND_RETURN('{', jsvUnLock(switchOn), 0);
bool hasExecuted = false;
bool executeDefault = true;
if (execute) execInfo.execute=EXEC_NO|EXEC_IN_SWITCH;
while (lex->tk==LEX_R_CASE) {
JSP_MATCH_WITH_CLEANUP_AND_RETURN(LEX_R_CASE, jsvUnLock(switchOn), 0);
@ -2011,7 +2011,7 @@ NO_INLINE JsVar *jspeStatementSwitch() {
bool cond = false;
if (execute)
cond = jsvGetBoolAndUnLock(jsvMathsOpSkipNames(switchOn, test, LEX_TYPEEQUAL));
if (cond) hasExecuted = true;
if (cond) executeDefault = false;
jsvUnLock(test);
if (cond && (execInfo.execute&EXEC_RUN_MASK)==EXEC_NO)
execInfo.execute=EXEC_YES|EXEC_IN_SWITCH;
@ -2021,22 +2021,24 @@ NO_INLINE JsVar *jspeStatementSwitch() {
oldExecute |= EXEC_RETURN;
}
jsvUnLock(switchOn);
if (execute && (execInfo.execute&EXEC_RUN_MASK)==EXEC_BREAK)
if (execute && (execInfo.execute&EXEC_RUN_MASK)==EXEC_BREAK) {
execInfo.execute=EXEC_YES|EXEC_IN_SWITCH;
} else {
executeDefault = true;
}
JSP_RESTORE_EXECUTE();
if (lex->tk==LEX_R_DEFAULT) {
JSP_ASSERT_MATCH(LEX_R_DEFAULT);
JSP_MATCH(':');
JSP_SAVE_EXECUTE();
if (hasExecuted) jspSetNoExecute();
if (!executeDefault) jspSetNoExecute();
else execInfo.execute |= EXEC_IN_SWITCH;
while (!JSP_SHOULDNT_PARSE && lex->tk!=LEX_EOF && lex->tk!='}')
jsvUnLock(jspeBlockOrStatement());
if (execInfo.execute & EXEC_RETURN)
oldExecute |= EXEC_RETURN;
if (execute && !hasExecuted)
execInfo.execute = execInfo.execute & (JsExecFlags)~EXEC_BREAK;
execInfo.execute = execInfo.execute & (JsExecFlags)~EXEC_BREAK;
JSP_RESTORE_EXECUTE();
}
JSP_MATCH('}');

7
tests/test_switch_default.js Normal file
View File

@ -0,0 +1,7 @@
// https://github.com/espruino/Espruino/issues/964
switch (5) {
case 5:
default:
console.log( "I should be called!" );
result = 1;
}