From 92aa25d7dd4107731c89217367934714d67903d1 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Mon, 13 Jun 2022 18:37:56 +0200 Subject: [PATCH] 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 f65dcf5..dac14e1 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,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""""'""")