JSHint trivial fixes #81

trentm · Dec 4, 2014 · bd3a086 · bd3a086
1 parent 5c6d5e0
commit bd3a086
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,3 @@
+{
+	"laxbreak":"true"
+}
diff --git a/lib/json.js b/lib/json.js
@@ -45,7 +45,7 @@ var OM_FROM_NAME = {
     'json': OM_JSON,
     'inspect': OM_INSPECT,
     'compact': OM_COMPACT
-}
+};
 
 
 
@@ -82,14 +82,15 @@ if (util.format) {
     var formatRegExp = /%[sdj%]/g;
 
     function format(f) {
+        var i;
         if (typeof (f) !== 'string') {
             var objects = [];
-            for (var i = 0; i < arguments.length; i++) {
+            for (i= 0; i < arguments.length; i++) {
                 objects.push(util.inspect(arguments[i]));
             }
             return objects.join(' ');
         }
-        var i = 1;
+        i = 1;
         var args = arguments;
         var len = args.length;
         var str = String(f).replace(formatRegExp, function (x) {
@@ -116,7 +117,7 @@ if (util.format) {
             }
         }
         return str;
-    };
+    }
 }
 
 /**

diff --git a/test/test.js b/test/test.js
@@ -110,9 +110,9 @@ for (var i = 0; i < names.length; ++i) {
             return function (test) {
                 var numTests = 0;
 
-                var expectedExitCode = null;
+                var p, expectedExitCode = null;
                 try {
-                    var p = path.join(dir, 'expected.exitCode');
+                    p = path.join(dir, 'expected.exitCode');
                     if (fs.statSync(p)) {
                         expectedExitCode = Number(fs.readFileSync(p));
                         numTests += 1;
@@ -121,7 +121,7 @@ for (var i = 0; i < names.length; ++i) {
 
                 var expectedStdout = null;
                 try {
-                    var p = path.join(dir, 'expected.stdout');
+                    p = path.join(dir, 'expected.stdout');
                     if (fs.statSync(p)) {
                         expectedStdout = fs.readFileSync(p, 'utf8');
                         numTests += 1;
@@ -130,7 +130,7 @@ for (var i = 0; i < names.length; ++i) {
 
                 var expectedStderr = null;
                 try {
-                    var p = path.join(dir, 'expected.stderr');
+                    p = path.join(dir, 'expected.stderr');
                     if (fs.statSync(p)) {
                         expectedStderr = fs.readFileSync(p, 'utf8');
                         numTests += 1;
@@ -171,9 +171,9 @@ for (var i = 0; i < names.length; ++i) {
                     }
                     test.done();
                 });
-            }
+            };
         })(dir);
     }
 }
 
-exports['test'] = testCase(data);
+exports.test = testCase(data);
diff --git a/tools/perf.js b/tools/perf.js
@@ -27,7 +27,7 @@ var nodes = [
     //'node11',
     'node10',
     'node8',
-    'node6',
+    'node6'
 ];
 
 var cmds = [
@@ -37,7 +37,7 @@ var cmds = [
     ['>=3', 'echo \'{"foo":"bar"}\' | JSON -e "foo=\'baz\'" foo'],
     ['>=3', 'echo \'{"foo":"bar"}\' | JSON -c "true" foo'],
     ['*', 'echo \'{"foo":"bar"}\' | JSON foo'],
-    ['*', 'echo \'{"foo":"bar"}\' | JSON'],
+    ['*', 'echo \'{"foo":"bar"}\' | JSON']
 ];
 
 async.forEachSeries(cmds, function (cmdInfo, nextCmd) {
@@ -51,7 +51,7 @@ async.forEachSeries(cmds, function (cmdInfo, nextCmd) {
             if (version !== 'dev' && !semver.satisfies(version, cmdVerRange)) {
                 return nextVer();
             }
-
+            
             var json = (version === 'dev'
                 ? path.resolve(TOP, 'lib', 'json.js')
                 : path.resolve(JSONS, version, 'json'));
@@ -69,7 +69,7 @@ async.forEachSeries(cmds, function (cmdInfo, nextCmd) {
                         console.log('error with cmd `%s`: %s', cmd, err);
                         fail = true;
                     }
-                    done()
+                    done();
                 });
             }
             ben.async(runCmd, function (ms) {

diff --git a/tools/update_json_parse.js b/tools/update_json_parse.js
@@ -15,7 +15,7 @@ var execFile = require('child_process').execFile;
 
 var startSep = "// START json_parse\n";
 var endSep = "// END json_parse\n";
-var jsonJs = path.resolve(__dirname, "..", "lib", "json.js")
+var jsonJs = path.resolve(__dirname, "..", "lib", "json.js");
 var content = fs.readFileSync(jsonJs, 'utf8');
 
 var startIdx = content.indexOf(startSep);
@@ -37,10 +37,10 @@ execFile(process.execPath, [uglifyjs, "-nc", jsonParseJs],
     ];
     var newContent = bits.join('');
     if (newContent === content) {
-      log('"'+jsonJs+'" not changed.')
+      log('"'+jsonJs+'" not changed.');
     } else {
       fs.writeFileSync(jsonJs, newContent, 'utf8');
-      log('"'+jsonJs+'" updated.')
+      log('"'+jsonJs+'" updated.');
     }
   }
 );