Removed the regex requirement

This commit is contained in:
Maximilien Rigaut 2022-06-13 18:37:56 +02:00
parent ffb8479e53
commit eb00ae9edc
No known key found for this signature in database
GPG Key ID: 4F14B23709ADA5B1
3 changed files with 6 additions and 7 deletions

View File

@ -33,7 +33,7 @@ You can refer to the `example_userfiles` for an idea of what the parser expects
### V1.2 ### V1.2
- Check error messages and add a real debug level to parameters ☐ - Check error messages and add a real debug level to parameters ☐
- Functioning `blockquote` Token ☐ - Functioning `blockquote` Token ☐
- Remove old regex usage ☐ - Remove old regex usage ☑
### V1.3 ### V1.3
- Add advanced lookahead logic for `*` ☐ - Add advanced lookahead logic for `*` ☐

View File

@ -9,7 +9,7 @@
import os import os
import regex # future: remove regex #import regex # future: remove regex
from io import StringIO from io import StringIO
from bootstraparse.modules import pathresolver as pr from bootstraparse.modules import pathresolver as pr
@ -179,10 +179,10 @@ class PreParser:
line_count = 0 line_count = 0
for line in self.readlines(): for line in self.readlines():
results = regex.match(_rgx_import_file, line) results = _rgx_import_file.searchString(line)
if results: if results:
for e in results.captures('file_name'): for e in results[0]:
import_list += [(e, line_count)] import_list += [(e.rstrip(), line_count)]
line_count += 1 line_count += 1
# converts relative paths to absolute and returns a table # 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] self.saved_import_list = [(self.relative_path_resolver(p), l) for p, l in import_list]

View File

@ -434,8 +434,7 @@ def readable_markup(list_of_tokens):
# Pre-parser expressions # Pre-parser expressions
rgx_import_file = regex.compile(r'::( ?\< ?(?P<file_name>[\w\-._/]+) ?\>[ \s]*)+') rgx_import_file = pps("::") + pp.OneOrMore(pps("<") + pp.SkipTo(">").set_name("file_name")("file_name") + pps(">"))
# Base elements # Base elements
quotes = pp.Word(r""""'""") quotes = pp.Word(r""""'""")