mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename @{has,matches}-literal to ...text

Browse Source 
Reasons:
1. It's shorter.
2. `@matches-literal` seems to contradict itself: a regex is
   intrinsically not a literal match, while it is still a textual match.
This commit is contained in:
Noah Lev 2022-08-09 21:52:04 -07:00
parent 2787eb05d5
commit 01408fc627
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/etc/htmldocck.py
View File

@ -41,15 +41,15 @@ There are a number of supported commands:
`PATH` is relative to the output directory. It can be given as `-` `PATH` is relative to the output directory. It can be given as `-`
which repeats the most recently used `PATH`. which repeats the most recently used `PATH`.
* `@has-literal PATH PATTERN` and `@matches-literal PATH PATTERN` checks * `@hastext PATH PATTERN` and `@matchestext PATH PATTERN` checks
for the occurrence of the given pattern `PATTERN` in the specified file. for the occurrence of the given pattern `PATTERN` in the specified file.
Only one occurrence of the pattern is enough. Only one occurrence of the pattern is enough.
For `@has-literal`, `PATTERN` is a whitespace-normalized (every consecutive For `@hastext`, `PATTERN` is a whitespace-normalized (every consecutive
whitespace being replaced by one single space character) string. whitespace being replaced by one single space character) string.
The entire file is also whitespace-normalized including newlines. The entire file is also whitespace-normalized including newlines.
For `@matches-literal`, `PATTERN` is a Python-supported regular expression. For `@matchestext`, `PATTERN` is a Python-supported regular expression.
The file remains intact but the regexp is matched without the `MULTILINE` The file remains intact but the regexp is matched without the `MULTILINE`
and `IGNORECASE` options. You can still use a prefix `(?m)` or `(?i)` and `IGNORECASE` options. You can still use a prefix `(?m)` or `(?i)`
to override them, and `\A` and `\Z` for definitely matching to override them, and `\A` and `\Z` for definitely matching
@ -542,19 +542,19 @@ ERR_COUNT = 0
def check_command(c, cache): def check_command(c, cache):
try: try:
cerr = "" cerr = ""
if c.cmd in ['has', 'has-literal', 'matches', 'matches-literal']: # string test if c.cmd in ['has', 'hastext', 'matches', 'matchestext']: # string test
regexp = c.cmd.startswith('matches') regexp = c.cmd.startswith('matches')
if len(c.args) == 1 and not regexp and 'literal' not in c.cmd: # @has <path> = file existence if len(c.args) == 1 and not regexp and 'text' not in c.cmd: # @has <path> = file existence
try: try:
cache.get_file(c.args[0]) cache.get_file(c.args[0])
ret = True ret = True
except FailedCheck as err: except FailedCheck as err:
cerr = str(err) cerr = str(err)
ret = False ret = False
elif len(c.args) == 2 and 'literal' in c.cmd: # @has-literal/matches-literal <path> <pat> = string test elif len(c.args) == 2 and 'text' in c.cmd: # @hastext/matchestext <path> <pat> = string test
cerr = "`PATTERN` did not match" cerr = "`PATTERN` did not match"
ret = check_string(cache.get_file(c.args[0]), c.args[1], regexp) ret = check_string(cache.get_file(c.args[0]), c.args[1], regexp)
elif len(c.args) == 3 and 'literal' not in c.cmd: # @has/matches <path> <pat> <match> = XML tree test elif len(c.args) == 3 and 'text' not in c.cmd: # @has/matches <path> <pat> <match> = XML tree test
cerr = "`XPATH PATTERN` did not match" cerr = "`XPATH PATTERN` did not match"
ret = get_nb_matching_elements(cache, c, regexp, True) != 0 ret = get_nb_matching_elements(cache, c, regexp, True) != 0
else: else: