[Pkg-mozext-commits] [adblock-plus] 26/52: Issue 1772 - Convert const to var for Chrome

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit e22c39575bfad7c526611ffd38cf8ed1c6d2fb16
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Sat Jan 10 01:03:02 2015 +0100

    Issue 1772 - Convert const to var for Chrome
    
    --HG--
    extra : rebase_source : d357001ed1e487cd8854d91370d71bd66c885ef6
---
 autotest/abprewrite_source.js               | 1 +
 autotest/test_abprewrite.js.expected        | 3 ++-
 autotest/test_abprewrite_module.js.expected | 3 ++-
 scripts/abprewrite.js                       | 6 ++++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/autotest/abprewrite_source.js b/autotest/abprewrite_source.js
index a82ea4e..8044f79 100644
--- a/autotest/abprewrite_source.js
+++ b/autotest/abprewrite_source.js
@@ -12,6 +12,7 @@ let {Filter, BlockingFilter} = require("filterClasses");
 let foo;
 let bar = 2;
 var bas;
+const FOO = "FOO";
 
 let [a, b] = foo();
 [a, b] = [1, 2];
diff --git a/autotest/test_abprewrite.js.expected b/autotest/test_abprewrite.js.expected
index 718c027..60681dc 100644
--- a/autotest/test_abprewrite.js.expected
+++ b/autotest/test_abprewrite.js.expected
@@ -20,7 +20,7 @@
 // * https://hg.adblockplus.org/jshydra/
 //
 
-const Cl = Components.unknown;
+var Cl = Components.unknown;
 var Utils = require("utils").Utils;
 var _tempVar0 = require("filterClasses");
 var Filter = _tempVar0.Filter;
@@ -28,6 +28,7 @@ var BlockingFilter = _tempVar0.BlockingFilter;
 var foo;
 var bar = 2;
 var bas;
+var FOO = "FOO";
 var _tempVar1 = foo();
 var a = _tempVar1[0];
 var b = _tempVar1[1];
diff --git a/autotest/test_abprewrite_module.js.expected b/autotest/test_abprewrite_module.js.expected
index 9817960..1c45159 100644
--- a/autotest/test_abprewrite_module.js.expected
+++ b/autotest/test_abprewrite_module.js.expected
@@ -23,7 +23,7 @@
 require.scopes["abprewrite_source"] = (function()
 {
   var exports = {};
-  const Cl = Components.unknown;
+  var Cl = Components.unknown;
   var Utils = require("utils").Utils;
   var _tempVar0 = require("filterClasses");
   var Filter = _tempVar0.Filter;
@@ -31,6 +31,7 @@ require.scopes["abprewrite_source"] = (function()
   var foo;
   var bar = 2;
   var bas;
+  var FOO = "FOO";
   var _tempVar1 = foo();
   var a = _tempVar1[0];
   var b = _tempVar1[1];
diff --git a/scripts/abprewrite.js b/scripts/abprewrite.js
index 80b3f3f..6527ff9 100644
--- a/scripts/abprewrite.js
+++ b/scripts/abprewrite.js
@@ -207,12 +207,14 @@ function modifyExpressionStatement(ast)
 
 function modifyVariableDeclaration(ast)
 {
-  // Convert let variables:
+  // Convert let and const variables:
   // let foo = bar;
+  // const bas = 4;
   //
   // Change into:
   // var foo = bar;
-  if (ast.kind == "let")
+  // var bas = 4;
+  if (ast.kind == "let" || ast.kind == "const")
     ast.kind = "var";
 
   if (ast.declarations.length == 1 && ast.declarations[0].type == "VariableDeclarator")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git