Support substring and replacement #8 #9
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
"Substring Expansion" is a bash'ism to extract slices from a string
in the form of:
${parameter:offset}
${parameter:offset:length}
This is a minimal implementation that only supports simple slices on
strings and does not support arrays
See https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Replacing with "/" is a bash'ism to replace a pattern with a string in
the parameter being expanded with the form of:
${parameter/pattern/string}
This is a simple and minimal implementation:
- supports only plain strings patterns (and not actual glob patterns).
- does not handle #, %, @ and * pattern modifiers.
See https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Using expand(env=None) was failing as the os module was not imported Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
This performs a simple expansion for plain $parameters (without curly
braces) and is done as a pre-processing step in expand(). This also
allows for some minimal level of parameter nesting as a $parameter can
be nested in a ${parameter}.
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
for more information, see https://pre-commit.ci
Also update module documentation Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
pombredanne
referenced
this pull request
in quepop/scancode.io
Jul 1, 2021
fix #191 Signed-off-by: Mateusz Perc <m.perc@samsung.com>
|
Note that I have tried to keep each commit mostly self-standing if you want to cherry pick some |
kojiromike
reviewed
Jul 2, 2021
kojiromike
reviewed
Jul 2, 2021
kojiromike
reviewed
Jul 2, 2021
| simple_test_cases = { | ||
| # string, env, result | ||
| "-${parameter/$aa/$bb}-": ( | ||
| dict( |
There was a problem hiding this comment.
Why dict() instead of a literal dict?
There was a problem hiding this comment.
I feel it makes it stand out more clearly as being a mapping of environment variables... but I am fine either way
kojiromike
approved these changes
Jul 2, 2021
Leaving off the final slash is valid in a substitution as in:
$ parameter=aa/bb/cc; echo "-${parameter/aa}-"
-/bb/cc-
Reported-by: Michael A. Smith <michael@smith-li.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
|
Thank you for the swift merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds minimal support for some Bash idioms for #8
In addition:
some simple nesting.
Signed-off-by: Philippe Ombredanne pombredanne@nexb.com