[Pkg-javascript-commits] [node-regjsparser] 06/07: Refresh patches

Mon Feb 19 23:44:05 UTC 2018

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

jpuydt-guest pushed a commit to branch master
in repository node-regjsparser.

commit 7fa3fdbba5bb5045657c70c4ccf6e351187612c0
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Thu Jan 18 08:56:08 2018 +0100

    Refresh patches
---
 debian/changelog                                     |  1 +
 debian/patches/adapt_generate_identifier_regex.patch | 15 ---------------
 debian/patches/series                                |  1 -
 .../update_generate_identifier_regex_to_10.0.0.patch |  7 -------
 debian/patches/use_own_identifier_regex.patch        | 20 +++++++++++++++-----
 debian/rules                                         |  2 +-
 6 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f40d136..ee4a9c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ node-regjsparser (0.3.0+ds-1) UNRELEASED; urgency=medium
   * Refresh packaging:
     - Bump std-ver to 4.1.3.
     - Refresh d/copyright.
+    - Refresh patches.
 
  -- Julien Puydt <julien.puydt at laposte.net>  Thu, 18 Jan 2018 08:45:00 +0100
 
diff --git a/debian/patches/adapt_generate_identifier_regex.patch b/debian/patches/adapt_generate_identifier_regex.patch
deleted file mode 100644
index 00a5b00..0000000
--- a/debian/patches/adapt_generate_identifier_regex.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: adapt the generator to have the data we want
-Author: Julien Puydt
-Forwarded: yes
-
---- a/tools/generate-identifier-regex.js
-+++ b/tools/generate-identifier-regex.js
-@@ -45,7 +45,5 @@
- //   result.NonAsciiIdentifierStart
- // );
- console.log(
--  '// ECMAScript 5.1/Unicode v%s NonAsciiIdentifierPart:\n\n%s',
--  version,
--  result.NonAsciiIdentifierPart,
-+  result.NonAsciiIdentifierPart
- );
diff --git a/debian/patches/series b/debian/patches/series
index 6a43199..bb8e823 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 update_generate_identifier_regex_to_10.0.0.patch
-adapt_generate_identifier_regex.patch
 use_own_identifier_regex.patch
diff --git a/debian/patches/update_generate_identifier_regex_to_10.0.0.patch b/debian/patches/update_generate_identifier_regex_to_10.0.0.patch
index 9ddcafb..f0a774f 100644
--- a/debian/patches/update_generate_identifier_regex_to_10.0.0.patch
+++ b/debian/patches/update_generate_identifier_regex_to_10.0.0.patch
@@ -40,13 +40,6 @@ Forwarded: yes
  
  var generateES5Regex = function() { // ES 5.1
    // http://mathiasbynens.be/notes/javascript-identifiers#valid-identifier-names
-@@ -47,5 +47,5 @@
- console.log(
-   '// ECMAScript 5.1/Unicode v%s NonAsciiIdentifierPart:\n\n%s',
-   version,
--  result.NonAsciiIdentifierPart
-+  result.NonAsciiIdentifierPart,
- );
 --- a/package.json
 +++ b/package.json
 @@ -24,6 +24,6 @@
diff --git a/debian/patches/use_own_identifier_regex.patch b/debian/patches/use_own_identifier_regex.patch
index a134e4e..510140e 100644
--- a/debian/patches/use_own_identifier_regex.patch
+++ b/debian/patches/use_own_identifier_regex.patch
@@ -4,12 +4,22 @@ Forwarded: no
 
 --- a/parser.js
 +++ b/parser.js
-@@ -733,7 +733,7 @@
-     // Taken from the Esprima parser.
-     function isIdentifierPart(ch) {
+@@ -894,7 +894,7 @@
+ 
+     function isIdentifierStart(ch) {
        // Generated by `tools/generate-identifier-regex.js`.
--      var NonAsciiIdentifierPart = new RegExp('[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5 [...]
-+      var NonAsciiIdentifierPart = new RegExp('@debian-identifier-regex@');
+-      var NonAsciiIdentifierStart = /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\ [...]
++      var NonAsciiIdentifierPart = new RegExp('@debian-identifier-regex-part@');
  
        return (ch === 36) || (ch === 95) ||  // $ (dollar) and _ (underscore)
          (ch >= 65 && ch <= 90) ||         // A..Z
+@@ -907,7 +907,8 @@
+     // Taken from the Esprima parser.
+     function isIdentifierPart(ch) {
+       // Generated by `tools/generate-identifier-regex.js`.
+-      var NonAsciiIdentifierPartOnly = /[\u0300-\u036F\u0483-\u0487\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u0610-\u061A\u064B-\u0669\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7\u06E8\u06EA-\u06ED\u06F0-\u06F9\u0711\u0730-\u074A\u07A6-\u07B0\u07C0-\u07C9\u07EB-\u07F3\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0859-\u085B\u08E4-\u0903\u093A-\u093C\u093E-\u094F\u0951-\u0957\u0962\u0963\u0966-\u096F\u0981-\u0983\u09BC\u09BE-\u09C4\u09C7\u09C8\u09CB-\u09CD\u09D7\u09E2\u09E3\u09 [...]
++      var NonAsciiIdentifierPartOnly = new RegExp('@debian-identifier-regex-partonly@');
++
+ 
+       return isIdentifierStart(ch) ||
+         ((ch >= 0x80) && NonAsciiIdentifierPartOnly.test(String.fromCharCode(ch)));
diff --git a/debian/rules b/debian/rules
index 32ff1ab..0b9ea55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ dist/debian-identifier-regex: dist
 	sed -i 's/\\/\\\\/g' dist/debian-identifier-regex
 
 dist/parser.js: dist/debian-identifier-regex dist
-	REGEX=$$(cat dist/debian-identifier-regex); sed "s/@debian-identifier-regex@/$$REGEX/g" parser.js > dist/parser.js
+	REGEX1=$$(cat dist/debian-identifier-regex | sed -n "3p"); REGEX2=$$(cat dist/debian-identifier-regex | sed -n "7p"); sed "s/@debian-identifier-regex-part@/$$REGEX1/g;s/@debian-identifier-regex-partonly@/$$REGEX2/g" parser.js > dist/parser.js
 
 override_dh_auto_build: dist/parser.js
 	dh_auto_build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-regjsparser.git

