From edaa2751484d1f8799dee024020b0fde65330ac5 Mon Sep 17 00:00:00 2001
From: STC <stc@spangler-automation.de>
Date: Thu, 27 Oct 2016 18:09:15 +0200
Subject: [PATCH 1/2] named groups, but no backreferences

---
 spec/parser/javascript/subexp_spec.js | 7 +++++++
 src/js/parser/javascript/grammar.peg  | 5 ++++-
 src/js/parser/javascript/subexp.js    | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/spec/parser/javascript/subexp_spec.js b/spec/parser/javascript/subexp_spec.js
index cd559386..3073beb9 100644
--- a/spec/parser/javascript/subexp_spec.js
+++ b/spec/parser/javascript/subexp_spec.js
@@ -22,6 +22,9 @@ describe('parser/javascript/subexp.js', function() {
     '(?:test)': {
       regexp: jasmine.objectContaining({ textValue: 'test' }),
       proxy: jasmine.objectContaining({ textValue: 'test' })
+    },
+    '(?<name>test)': {
+      regexp: jasmine.objectContaining({ textValue: 'test' })
     }
   }, (content, str) => {
     it(`parses "${str}" as a Subexp`, function() {
@@ -106,6 +109,10 @@ describe('parser/javascript/subexp.js', function() {
       '(?:test)': {
         label: '',
         groupCounter: 1
+      },
+      '(?<name>test)': {
+        label: 'group \'name\'',
+        groupCounter: 1
       }
     }, (data, str) => {
       it(`generates the correct label for "${str}"`, function() {
diff --git a/src/js/parser/javascript/grammar.peg b/src/js/parser/javascript/grammar.peg
index 37ef9d5f..3f2f2d77 100644
--- a/src/js/parser/javascript/grammar.peg
+++ b/src/js/parser/javascript/grammar.peg
@@ -11,7 +11,10 @@ grammar JavascriptRegexp
   repeat_spec <- ( "{" min:[0-9]+ "," max:[0-9]+ "}"
                  / "{" min:[0-9]+ ",}"
                  / "{" exact:[0-9]+ "}" ) <RepeatSpec>
-  subexp <- "(" capture:( "?:" / "?=" / "?!" )? regexp ")" <Subexp>
+  subexp <- "(" capture:( "?:" / "?=" / "?!" / "?<" groupname:name ">" )? regexp ")" <Subexp>
+  name <- alpha (alpha / numeric)*
+  alpha <- [a-zA-Z]
+  numeric <- [0-9]
   charset <- "[" invert:"^"? parts:( charset_range / charset_terminal )* "]" <Charset>
   charset_range <- first:charset_range_terminal "-" last:charset_range_terminal <CharsetRange>
   charset_terminal <- charset_escape <CharsetEscape>
diff --git a/src/js/parser/javascript/subexp.js b/src/js/parser/javascript/subexp.js
index 9f97811f..4575f0c4 100644
--- a/src/js/parser/javascript/subexp.js
+++ b/src/js/parser/javascript/subexp.js
@@ -48,6 +48,8 @@ export default {
   label() {
     if (_.has(this.labelMap, this.properties.capture.textValue)) {
       return this.labelMap[this.properties.capture.textValue];
+    } else if (this.properties.capture.properties.groupname) {
+      return `group '${this.properties.capture.properties.groupname.textValue}'`;
     } else {
       return `group #${this.state.groupCounter++}`;
     }

From b6ecd1b865a663e8087f43e8f274ecba552c8f00 Mon Sep 17 00:00:00 2001
From: Christoph Stephan <chm.stephan@outlook.com>
Date: Thu, 27 Oct 2016 18:50:45 +0200
Subject: [PATCH 2/2] BugFix: properties were undefined

---
 src/js/parser/javascript/subexp.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/js/parser/javascript/subexp.js b/src/js/parser/javascript/subexp.js
index 4575f0c4..d271ad5e 100644
--- a/src/js/parser/javascript/subexp.js
+++ b/src/js/parser/javascript/subexp.js
@@ -48,7 +48,9 @@ export default {
   label() {
     if (_.has(this.labelMap, this.properties.capture.textValue)) {
       return this.labelMap[this.properties.capture.textValue];
-    } else if (this.properties.capture.properties.groupname) {
+    } else if (this.properties.capture != undefined
+        && this.properties.capture.properties != undefined
+        && this.properties.capture.properties.groupname) {
       return `group '${this.properties.capture.properties.groupname.textValue}'`;
     } else {
       return `group #${this.state.groupCounter++}`;