| Message ID | 20200825083500.359-1-luoyonggang@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] meson: SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched. if the path are start with C:/ and E:/ | expand |
Commit message subject is waaaaay too long. Put the explanation into commit message body, not the subject line. On Tue, Aug 25, 2020 at 04:34:56PM +0800, luoyonggang@gmail.com wrote: > From: Yonggang Luo <luoyonggang@gmail.com> > > --- > scripts/ninjatool.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py > index cc77d51aa8..6ca8be6f10 100755 > --- a/scripts/ninjatool.py > +++ b/scripts/ninjatool.py > @@ -55,7 +55,7 @@ else: > > PATH_RE = r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}" > > -SIMPLE_PATH_RE = re.compile(r"[^$\s:|]+") > +SIMPLE_PATH_RE = re.compile(r"^[^$\s:|]+$") > IDENT_RE = re.compile(r"[a-zA-Z0-9_.-]+$") > STRING_RE = re.compile(r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?|.") > TOPLEVEL_RE = re.compile(r"([=:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*|.") > -- > 2.27.0.windows.1 > > Regards, Daniel
diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py index cc77d51aa8..6ca8be6f10 100755 --- a/scripts/ninjatool.py +++ b/scripts/ninjatool.py @@ -55,7 +55,7 @@ else: PATH_RE = r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}" -SIMPLE_PATH_RE = re.compile(r"[^$\s:|]+") +SIMPLE_PATH_RE = re.compile(r"^[^$\s:|]+$") IDENT_RE = re.compile(r"[a-zA-Z0-9_.-]+$") STRING_RE = re.compile(r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?|.") TOPLEVEL_RE = re.compile(r"([=:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*|.")
From: Yonggang Luo <luoyonggang@gmail.com> --- scripts/ninjatool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)