Fix llvm highlighting of variables with : in name
#54405
Conversation
Pangoraw
changed the title
: in name
tecosaur
added
the
domain:display and printing
| @@ -353,7 +353,7 @@ const llvm_types = | |||
| const llvm_cond = r"^(?:[ou]?eq|[ou]?ne|[uso][gl][te]|ord|uno)$" # true|false | |||
|
|
|||
| function print_llvm_tokens(io, tokens) | |||
| m = match(r"^((?:[^\s:]+:)?)(\s*)(.*)", tokens) | |||
| m = match(r"^((?:[^(%\")\s:]+:)?)(\s*)(.*)", tokens) | |||
There was a problem hiding this comment.
| m = match(r"^((?:[^(%\")\s:]+:)?)(\s*)(.*)", tokens) | |
| m = match(r"^((?:[^%@][^\s:]*:)?)(\s*)(.*)", tokens) |
⚠MY SUGGESTION IS NOT TESTED
I have my doubts if your regex is what you intended.
I think it is clearer in intent that it is not a variable, i.e., it does not start with % and @.
There was a problem hiding this comment.
Indeed, this didn't match the sequence %" but rather either one of (%"). I updated with matching the % at the beginning and added a case of string labels which is valid.
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
There was a problem hiding this comment.
Yes, what I am referring to is either one of:
bla-bla: ; pred = %"another%block"
br label %"another%block"
"another%block": ; pred = %bla-bla
br label %bla-bla
Sorry, I meant matching % as actually not matching it (using [^%]), in the end I just removed % from the set of allowed character for the first case (bla-bla style).
There was a problem hiding this comment.
Instead of using an banlist, we could also use the following pattern:
what do you think?
There was a problem hiding this comment.
We do not need a formal parser or lexer, since we can assume that the output of code_llvm is syntactically correct.
There are no formal assurances, but we can easily fix the problem, as we can do with this PR.
Pangoraw
force-pushed
the
llvm_label_regex
branch
from
7043136
to
837a63c
Compare
This prevents values with `:` in their name to be printed as labels.
Pangoraw
force-pushed
the
llvm_label_regex
branch
from
837a63c
to
75b6237
Compare
Co-authored-by: kimikage <kimikage.ceo@gmail.com>
|
@kimikage does this look OK to you now? |
This prevents values with
:in their name to be printed as labels.Before
After