Fix square bracket checking to account for arbitrary nested parentheses #81
Conversation
Codecov Report
@@ Coverage Diff @@
## master #81 +/- ##
==========================================
+ Coverage 82.07% 82.13% +0.06%
==========================================
Files 31 31
Lines 4865 4876 +11
==========================================
+ Hits 3993 4005 +12
+ Misses 872 871 -1
Continue to review full report at Codecov.
|
brackets checking. I had simply carried over what was there before, but it really seemed insufficient...
stix2patterns/helpers.py
Outdated
| stripped.append(char) | ||
| # There can be an arbitrary number of open parens first... skip over those | ||
| c = next(non_ws_chars, None) | ||
| while c == "(": |
There was a problem hiding this comment.
Would it be simpler to treat open parens and whitespace chars equally? Can we just check while c == "(" or c.isspace(): here instead of creating non_ws_chars?
There was a problem hiding this comment.
Yeah... that would work too. If anything more complex were happening, it might make more sense to separate the whitespace skipping from the other processing, but it does seem kinda silly here since it's so simple. I'll change it.
Fixes #80 .
The
leading_characters()approach doesn't work, since it was designed to get a specific number of non-whitespace characters. The number of characters necessary to check is unpredictable, so I've redesigned that whole approach. I renamed the function, and now it doesn't return leading characters since it seemed unnecessary. Instead, it does the check itself and returns True/False. The oldstartvariable and parameter to the STIX version-specificrun_validator()functions is removed. I didn't see any need for the latter functions to add the specialized error message when the caller could do it just as easily.There were also some minor edits to unrelated files due to pre-commit.