From eb00ae9edc4e5ecf73b55ad16b06cd15d7151f41 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Mon, 13 Jun 2022 18:37:56 +0200 Subject: [PATCH 1/2] Removed the regex requirement --- README.md | 2 +- src/bootstraparse/modules/preparser.py | 8 ++++---- src/bootstraparse/modules/syntax.py | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 19626b6..8d09b41 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ You can refer to the `example_userfiles` for an idea of what the parser expects ### V1.2 - Check error messages and add a real debug level to parameters ☐ - Functioning `blockquote` Token ☐ -- Remove old regex usage ☐ +- Remove old regex usage ☑ ### V1.3 - Add advanced lookahead logic for `*` ☐ diff --git a/src/bootstraparse/modules/preparser.py b/src/bootstraparse/modules/preparser.py index 73441b8..841b269 100644 --- a/src/bootstraparse/modules/preparser.py +++ b/src/bootstraparse/modules/preparser.py @@ -9,7 +9,7 @@ import os -import regex # future: remove regex +#import regex # future: remove regex from io import StringIO from bootstraparse.modules import pathresolver as pr @@ -179,10 +179,10 @@ class PreParser: line_count = 0 for line in self.readlines(): - results = regex.match(_rgx_import_file, line) + results = _rgx_import_file.searchString(line) if results: - for e in results.captures('file_name'): - import_list += [(e, line_count)] + for e in results[0]: + import_list += [(e.rstrip(), line_count)] line_count += 1 # converts relative paths to absolute and returns a table self.saved_import_list = [(self.relative_path_resolver(p), l) for p, l in import_list] diff --git a/src/bootstraparse/modules/syntax.py b/src/bootstraparse/modules/syntax.py index 17e4842..af86c3b 100644 --- a/src/bootstraparse/modules/syntax.py +++ b/src/bootstraparse/modules/syntax.py @@ -434,8 +434,7 @@ def readable_markup(list_of_tokens): # Pre-parser expressions -rgx_import_file = regex.compile(r'::( ?\< ?(?P[\w\-._/]+) ?\>[ \s]*)+') - +rgx_import_file = pps("::") + pp.OneOrMore(pps("<") + pp.SkipTo(">").set_name("file_name")("file_name") + pps(">")) # Base elements quotes = pp.Word(r""""'""") From 7ba4af8d45ecea6175fa630d55fea9bc7a31d3b2 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Mon, 13 Jun 2022 19:15:15 +0200 Subject: [PATCH 2/2] Purged regex from requirements.txt --- requirements.txt | 2 -- src/bootstraparse/modules/preparser.py | 1 - src/bootstraparse/modules/syntax.py | 1 - 3 files changed, 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 610719e..19524e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,5 @@ pyyaml==6.0 rich==12.0.1 -regex==2022.3.15 pyparse~=1.1.7 pyparsing[diagrams]~=3.0.7 - pytest==7.1.1 \ No newline at end of file diff --git a/src/bootstraparse/modules/preparser.py b/src/bootstraparse/modules/preparser.py index 841b269..ad3df05 100644 --- a/src/bootstraparse/modules/preparser.py +++ b/src/bootstraparse/modules/preparser.py @@ -9,7 +9,6 @@ import os -#import regex # future: remove regex from io import StringIO from bootstraparse.modules import pathresolver as pr diff --git a/src/bootstraparse/modules/syntax.py b/src/bootstraparse/modules/syntax.py index af86c3b..db1cc63 100644 --- a/src/bootstraparse/modules/syntax.py +++ b/src/bootstraparse/modules/syntax.py @@ -16,7 +16,6 @@ from collections import namedtuple from bootstraparse.modules.error_mngr import MismatchedContainerError from bootstraparse.modules import context_mngr as cm import pyparsing as pp -import regex # future: remove regex pps = pp.Suppress