From df4dfc5a9e9916cba97ce7b07a40418b2ce52252 Mon Sep 17 00:00:00 2001 From: Xavier Cazin Date: Sun, 1 Oct 2023 19:06:09 +0200 Subject: [PATCH] Allow ")" to be part of pragmas default values by editing matchRegExp in wiki pragma rules for macro, parameters, function, procedure and widget definitions --- core/modules/parsers/wikiparser/rules/fnprocdef.js | 4 ++-- core/modules/parsers/wikiparser/rules/macrodef.js | 2 +- core/modules/parsers/wikiparser/rules/parameters.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/modules/parsers/wikiparser/rules/fnprocdef.js b/core/modules/parsers/wikiparser/rules/fnprocdef.js index 3f21b8da7..f55f11a5e 100644 --- a/core/modules/parsers/wikiparser/rules/fnprocdef.js +++ b/core/modules/parsers/wikiparser/rules/fnprocdef.js @@ -35,7 +35,7 @@ Instantiate parse rule exports.init = function(parser) { this.parser = parser; // Regexp to match - this.matchRegExp = /\\(function|procedure|widget)\s+([^(\s]+)\((\s*([^)]*))?\)(\s*\r?\n)?/mg; + this.matchRegExp = /\\(function|procedure|widget)\s+([^(\s]+)\((\s*(.*))\)(\s*\r?\n)?/mg; }; /* @@ -94,4 +94,4 @@ exports.parse = function() { }; })(); - \ No newline at end of file + diff --git a/core/modules/parsers/wikiparser/rules/macrodef.js b/core/modules/parsers/wikiparser/rules/macrodef.js index 74a94a385..09a07e9be 100644 --- a/core/modules/parsers/wikiparser/rules/macrodef.js +++ b/core/modules/parsers/wikiparser/rules/macrodef.js @@ -27,7 +27,7 @@ Instantiate parse rule exports.init = function(parser) { this.parser = parser; // Regexp to match - this.matchRegExp = /\\define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg; + this.matchRegExp = /\\define\s+([^(\s]+)\(\s*(.*)\)(\s*\r?\n)?/mg; }; /* diff --git a/core/modules/parsers/wikiparser/rules/parameters.js b/core/modules/parsers/wikiparser/rules/parameters.js index 60bbd8901..2412d4a3e 100644 --- a/core/modules/parsers/wikiparser/rules/parameters.js +++ b/core/modules/parsers/wikiparser/rules/parameters.js @@ -26,7 +26,7 @@ Instantiate parse rule exports.init = function(parser) { this.parser = parser; // Regexp to match - this.matchRegExp = /\\parameters\s*\(([^)]*)\)(\s*\r?\n)?/mg; + this.matchRegExp = /\\parameters\s*\((.*)\)(\s*\r?\n)?/mg; }; /*