gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5974 from ltegman/fix/loop-protect-default-case

Browse Source 
Fix loop protect thinking default cases are loop labels
This commit is contained in:
Rex Schrader
2016-01-08 11:56:35 -08:00
parent 0612b92eaa 5d6808e7af
commit b28c7089a2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulpfile.js
View File

@ -521,7 +521,7 @@ gulp.task('reload', function() {
gulp.task('watch', watchDependents, function() { gulp.task('watch', watchDependents, function() {
gulp.watch(paths.lessFiles, ['less']); gulp.watch(paths.lessFiles, ['less']);
gulp.watch(paths.js, ['js']); gulp.watch(paths.js.concat(paths.vendorChallenges), ['js']);
gulp.watch(paths.challenges, ['test-challenges', 'reload']); gulp.watch(paths.challenges, ['test-challenges', 'reload']);
gulp.watch(paths.js, ['js', 'dependents']); gulp.watch(paths.js, ['js', 'dependents']);
gulp.watch( gulp.watch(

4
public/js/lib/loop-protect/loop-protect.js
View File

@ -18,7 +18,7 @@ if (typeof DEBUG === 'undefined') { DEBUG = true; }
// the standard loops - note that recursive is not supported // the standard loops - note that recursive is not supported
var re = /\b(for|while|do)\b/g; var re = /\b(for|while|do)\b/g;
var reSingle = /\b(for|while|do)\b/; var reSingle = /\b(for|while|do)\b/;
var labelRe = /\b([a-z_]{1}\w+:)/i; var labelRe = /\b(?!default:)([a-z_]{1}\w+:)/i;
var comments = /(?:\/\*(?:[\s\S]*?)\*\/)|(?:([\s;])+\/\/(?:.*)$)/gm; var comments = /(?:\/\*(?:[\s\S]*?)\*\/)|(?:([\s;])+\/\/(?:.*)$)/gm;
var loopTimeout = 1000; var loopTimeout = 1000;
@ -136,7 +136,7 @@ if (typeof DEBUG === 'undefined') { DEBUG = true; }
// so that we insert in to the correct location (instead of possibly // so that we insert in to the correct location (instead of possibly
// outside the logic // outside the logic
return line.slice(0, matchPosition) + ';' + method + '({ line: ' + lineNum + ', reset: true }); ' + line.slice(matchPosition); return line.slice(0, matchPosition) + ';' + method + '({ line: ' + lineNum + ', reset: true }); ' + line.slice(matchPosition);
}; }
if (!offset) { if (!offset) {
offset = 0; offset = 0;