832666c45e
* Manually rename BasicBlock to BlockPredecessor BasicBlock is a pair of (Ebb, Inst) that is used to represent the basic block subcomponent of an Ebb that is a predecessor to an Ebb. Eventually we will be able to remove this struct, but for now it makes sense to give it a non-conflicting name so that we can start to transition Ebb to represent a basic block. I have not updated any comments that refer to BasicBlock, as eventually we will remove BlockPredecessor and replace with Block, which is a basic block, so the comments will become correct. * Manually rename SSABuilder block types to avoid conflict SSABuilder has its own Block and BlockData types. These along with associated identifier will cause conflicts in a later commit, so they are renamed to be more verbose here. * Automatically rename 'Ebb' to 'Block' in *.rs * Automatically rename 'EBB' to 'block' in *.rs * Automatically rename 'ebb' to 'block' in *.rs * Automatically rename 'extended basic block' to 'basic block' in *.rs * Automatically rename 'an basic block' to 'a basic block' in *.rs * Manually update comment for `Block` `Block`'s wikipedia article required an update. * Automatically rename 'an `Block`' to 'a `Block`' in *.rs * Automatically rename 'extended_basic_block' to 'basic_block' in *.rs * Automatically rename 'ebb' to 'block' in *.clif * Manually rename clif constant that contains 'ebb' as substring to avoid conflict * Automatically rename filecheck uses of 'EBB' to 'BB' 'regex: EBB' -> 'regex: BB' '$EBB' -> '$BB' * Automatically rename 'EBB' 'Ebb' to 'block' in *.clif * Automatically rename 'an block' to 'a block' in *.clif * Fix broken testcase when function name length increases Test function names are limited to 16 characters. This causes the new longer name to be truncated and fail a filecheck test. An outdated comment was also fixed.
28 lines
962 B
Rust
28 lines
962 B
Rust
/// Look for a directive in a comment string.
|
|
/// The directive is of the form "foo:" and should follow the leading `;` in the comment:
|
|
///
|
|
/// ; dominates: block3 block4
|
|
///
|
|
/// Return the comment text following the directive.
|
|
pub fn match_directive<'a>(comment: &'a str, directive: &str) -> Option<&'a str> {
|
|
assert!(
|
|
directive.ends_with(':'),
|
|
"Directive must include trailing colon"
|
|
);
|
|
let text = comment.trim_start_matches(';').trim_start();
|
|
if text.starts_with(directive) {
|
|
Some(text[directive.len()..].trim())
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_match_directive() {
|
|
assert_eq!(match_directive("; foo: bar ", "foo:"), Some("bar"));
|
|
assert_eq!(match_directive(" foo:bar", "foo:"), Some("bar"));
|
|
assert_eq!(match_directive("foo:bar", "foo:"), Some("bar"));
|
|
assert_eq!(match_directive(";x foo: bar", "foo:"), None);
|
|
assert_eq!(match_directive(";;; foo: bar", "foo:"), Some("bar"));
|
|
}
|