Extend grammar JSON with meta.regExpFlags option

Project-OSRM · Oct 4, 2017 · 044836a · 044836a
1 parent 2991bc5
commit 044836a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -136,9 +136,8 @@ module.exports = function(version, _options) {
                 // if both are the same we assume that there used to be an empty name, with the ref being filled in for it
                 // we only need to retain the ref then
                 name = '';
-            } else {
-                name = name.replace(' (' + step.ref + ')', '');
             }
+            name = name.replace(' (' + step.ref + ')', '');
 
             // In attempt to avoid using the highway name of a way,
             // check and see if the step has a class which should signal
@@ -207,8 +206,9 @@ module.exports = function(version, _options) {
                 if (rules) {
                     // Pass original name to rules' regular expressions enclosed with spaces for simplier parsing
                     var n = ' ' + name + ' ';
+                    var flags = grammars[language].meta.regExpFlags || '';
                     rules.forEach(function(rule) {
-                        var re = new RegExp(rule[0]);
+                        var re = new RegExp(rule[0], flags);
                         n = n.replace(re, rule[1]);
                     });
 

diff --git a/languages/grammar/ru.json b/languages/grammar/ru.json
@@ -1,4 +1,7 @@
 {
+    "meta": {
+        "regExpFlags": ""
+    },
     "v5": {
         "accusative": [
             ["^ (\\S+)ая [Аа]ллея ", " $1ую аллею "],

diff --git a/languages/overrides/ru.js b/languages/overrides/ru.js
@@ -29,7 +29,7 @@ function iterate(values) {
 };
 
 module.exports = function(content) {
-    // Iterate all string values recursively
-    iterate(content);
+    // Iterate all content string values recursively
+    iterate(content.v5);
     return content;
 };
diff --git a/test/grammar_test.js b/test/grammar_test.js
@@ -88,7 +88,7 @@ tape.test('verify grammar files structure', function(assert) {
                     var b = Array.isArray(e) && e.length === 2;
                     if (b) {
                         // all regular expressions from grammar should not match empty string
-                        r = new RegExp(e[0]);
+                        r = new RegExp(e[0], grammar.meta.regExpFlags);
                         b = ''.replace(r, e[1]) === '';
                     }