Merge branch 'master' into v2.1

2018-01-29 13:19:30 +01:00
parent 74c544d68c d4ee803427
commit 0bf46e1edf
10 changed files with 39 additions and 7 deletions
--- a/src/lj_parse.c
+++ b/src/lj_parse.c
@@ -2667,7 +2667,8 @@ static int parse_stmt(LexState *ls)
      lj_lex_next(ls);
      parse_goto(ls);
      break;
-    }  /* else: fallthrough */
+    }
+    /* fallthrough */
  default:
    parse_call_assign(ls);
    break;