Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated refa + fixed 2 cases of exponential backtracking #2774

Merged
merged 2 commits into from Mar 5, 2021
Merged

Updated refa + fixed 2 cases of exponential backtracking #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
993ce35
Updated refa + fixed 2 cases of exp backtracking
RunDevelopment Feb 25, 2021
97e27e5
Merge branch 'master' into refa-v0.7.0-update
RunDevelopment Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/prism-asciidoc.js
View file
Open in desktop
Expand Up @@ -129,7 +129,7 @@
'function': /^[a-z\d-]+(?=:)/,
'punctuation': /^::?/,
'attributes': {
pattern: /(?:\[(?:[^\]\\"]|(["'])(?:(?!\1)[^\\]|\\.)*\1|\\.)*\])/,
pattern: /(?:\[(?:[^\]\\"']|(["'])(?:(?!\1)[^\\]|\\.)*\1|\\.)*\])/,
inside: attributes.inside
}
}
Expand All @@ -149,7 +149,7 @@
Those do not have the restrictions of the constrained quotes.
They are, in order: __emphasis__, **strong**, ++monospace++, +++passthrough+++, ##unquoted##, $$passthrough$$, ~subscript~, ^superscript^, {attribute-reference}, [[anchor]], [[[bibliography anchor]]], <<xref>>, (((indexes))) and ((indexes))
*/
pattern: /(^|[^\\])(?:(?:\B\[(?:[^\]\\"]|(["'])(?:(?!\2)[^\\]|\\.)*\2|\\.)*\])?(?:\b_(?!\s)(?: _|[^_\\\r\n]|\\.)+(?:(?:\r?\n|\r)(?: _|[^_\\\r\n]|\\.)+)*_\b|\B``(?!\s).+?(?:(?:\r?\n|\r).+?)*''\B|\B`(?!\s)(?:[^`'\s]|\s+\S)+['`]\B|\B(['*+#])(?!\s)(?: \3|(?!\3)[^\\\r\n]|\\.)+(?:(?:\r?\n|\r)(?: \3|(?!\3)[^\\\r\n]|\\.)+)*\3\B)|(?:\[(?:[^\]\\"]|(["'])(?:(?!\4)[^\\]|\\.)*\4|\\.)*\])?(?:(__|\*\*|\+\+\+?|##|\$\$|[~^]).+?(?:(?:\r?\n|\r).+?)*\5|\{[^}\r\n]+\}|\[\[\[?.+?(?:(?:\r?\n|\r).+?)*\]?\]\]|<<.+?(?:(?:\r?\n|\r).+?)*>>|\(\(\(?.+?(?:(?:\r?\n|\r).+?)*\)?\)\)))/m,
pattern: /(^|[^\\])(?:(?:\B\[(?:[^\]\\"']|(["'])(?:(?!\2)[^\\]|\\.)*\2|\\.)*\])?(?:\b_(?!\s)(?: _|[^_\\\r\n]|\\.)+(?:(?:\r?\n|\r)(?: _|[^_\\\r\n]|\\.)+)*_\b|\B``(?!\s).+?(?:(?:\r?\n|\r).+?)*''\B|\B`(?!\s)(?:[^`'\s]|\s+\S)+['`]\B|\B(['*+#])(?!\s)(?: \3|(?!\3)[^\\\r\n]|\\.)+(?:(?:\r?\n|\r)(?: \3|(?!\3)[^\\\r\n]|\\.)+)*\3\B)|(?:\[(?:[^\]\\"']|(["'])(?:(?!\4)[^\\]|\\.)*\4|\\.)*\])?(?:(__|\*\*|\+\+\+?|##|\$\$|[~^]).+?(?:(?:\r?\n|\r).+?)*\5|\{[^}\r\n]+\}|\[\[\[?.+?(?:(?:\r?\n|\r).+?)*\]?\]\]|<<.+?(?:(?:\r?\n|\r).+?)*>>|\(\(\(?.+?(?:(?:\r?\n|\r).+?)*\)?\)\)))/m,
lookbehind: true,
inside: {
'attributes': attributes,
Expand Down
2 changes: 1 addition & 1 deletion components/prism-asciidoc.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/prism-perl.js
View file
Open in desktop
Expand Up @@ -161,7 +161,7 @@ Prism.languages.perl = {
// ${...}
/[&*$@%]#?(?=\{)/,
// $foo
/[&*$@%]#?(?:(?:::)*'?(?!\d)[\w$]+)+(?:::)*/i,
/[&*$@%]#?(?:(?:::)*'?(?!\d)[\w$]+(?![\w$]))+(?:::)*/i,
// $1
/[&*$@%]\d+/,
// $_, @_, %!
Expand Down
2 changes: 1 addition & 1 deletion components/prism-perl.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@
"jsdom": "^13.0.0",
"mocha": "^6.2.0",
"pump": "^3.0.0",
"refa": "0.5.0",
"refa": "^0.7.0",
"regexpp": "^2.0.1",
"scslre": "^0.1.1",
"simple-git": "^1.107.0",
Expand Down
30 changes: 25 additions & 5 deletions tests/pattern-tests.js
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ const PrismLoader = require('./helper/prism-loader');
const { BFS, parseRegex } = require('./helper/util');
const { languages } = require('../components.json');
const { visitRegExpAST } = require('regexpp');
const { JS, Words, NFA } = require('refa');
const { transform, combineTransformers, JS, Words, NFA, Transformers } = require('refa');
const scslre = require('scslre');

/**
Expand Down Expand Up @@ -383,6 +383,22 @@ function testPatterns(Prism) {
});

it('- should not cause exponential backtracking', function () {
/** @type {Transformers.CreationOptions} */
const options = {
ignoreOrder: true,
ignoreAmbiguity: true
};
const transformer = combineTransformers([
Transformers.inline(options),
Transformers.removeDeadBranches(options),
Transformers.unionCharacters(options),
Transformers.moveUpEmpty(options),
Transformers.nestedQuantifiers(options),
Transformers.sortAssertions(options),
Transformers.removeUnnecessaryAssertions(options),
Transformers.applyAssertions(options),
]);

forEachPattern(({ pattern, ast, tokenPath }) => {
const patternStr = String(pattern);
if (expoSafeRegexes.has(patternStr)) {
Expand All @@ -398,11 +414,15 @@ function testPatterns(Prism) {
* @returns {NFA}
*/
function toNFA(element) {
const { expression, maxCharacter } = parser.parseElement(element, {
backreferences: "resolve",
lookarounds: "disable",
let { expression, maxCharacter } = parser.parseElement(element, {
maxBackreferenceWords: 1000,
backreferences: "disable"
});
return NFA.fromRegex(expression, { maxCharacter });

// try to remove assertions
expression = transform(transformer, expression);

return NFA.fromRegex(expression, { maxCharacter }, { assertions: "disable" });
}

/**
Expand Down