Basic named capture groups support

teabyii · teabyii · commit 7c00f21fd6fb · 2016-09-30T23:06:34.000+08:00
diff --git a/lib/Builder.js b/lib/Builder.js
@@ -93,6 +93,9 @@ class Builder {
 
         /** @var {string} _implodeString String to join with. */
         this._implodeString = ''
+
+        /** @var {array} _captureNames Save capture names to map */
+        this._captureNames = []
     }
 
     /**********************************************************/
@@ -254,9 +257,14 @@ class Builder {
      * Create capture group of given conditions.
      *
      * @param  {Closure|Builder|string} condition Anonymous function with its Builder as a first parameter.
+     * @param  {String} name
      * @return {Builder}
      */
-    capture(conditions) {
+    capture(conditions, name) {
+        if (name) {
+            this._captureNames.push(name)
+        }
+
         this._validateAndAddMethodType(METHOD_TYPE_GROUP, METHOD_TYPES_ALLOWED_FOR_CHARACTERS)
 
         return this._addClosure(new Builder()._extends('(%s)'), conditions)
diff --git a/lib/Language/Helpers/methodMatch.js b/lib/Language/Helpers/methodMatch.js
@@ -6,6 +6,7 @@ const SimpleMethod = require('../Methods/SimpleMethod')
 const ToMethod = require('../Methods/ToMethod')
 const TimesMethod = require('../Methods/TimesMethod')
 const AndMethod = require('../Methods/AndMethod')
+const AsMethod = require('../Methods/AsMethod')
 
 const SyntaxException = require('../../Exceptions/Syntax')
 
@@ -49,7 +50,7 @@ const mapper = {
     'exactly': { 'class': TimesMethod, 'method': 'exactly' },
     'at least': { 'class': TimesMethod, 'method': 'atLeast' },
     'between': { 'class': AndMethod, 'method': 'between' },
-    'capture': { 'class': DefaultMethod, 'method': 'capture' }
+    'capture': { 'class': AsMethod, 'method': 'capture' }
 }
 
 /**
diff --git a/lib/Language/Methods/AsMethod.js b/lib/Language/Methods/AsMethod.js
@@ -0,0 +1,26 @@
+'use strict'
+
+const Method = require('./Method')
+
+/**
+ * Method having simple parameter(s) ignoring "as".
+ */
+class AsMethod extends Method {
+    /**
+     * @inheritdoc
+     */
+    setParameters(parameters) {
+        parameters = parameters.filter((parameter) => {
+            if (typeof parameter !== 'string') {
+                return true
+            }
+
+            const lower = parameter.toLowerCase()
+            return lower !== 'as'
+        })
+
+        return super.setParameters(parameters)
+    }
+}
+
+module.exports = AsMethod
