diff options
| author | bors <bors@rust-lang.org> | 2015-11-27 18:41:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-27 18:41:53 +0000 |
| commit | 5dc91a74b1428cf3d09a868727bf20b347664137 (patch) | |
| tree | 1c9f0209f7ec74bc6ecbdc83ded5fda46a29c397 /src/libsyntax | |
| parent | ca6365037f2af12d7692672c17788be7e0af98cb (diff) | |
| parent | 4bb7cf11dcb7b4d106456b9c34c2e30638615f47 (diff) | |
| download | rust-5dc91a74b1428cf3d09a868727bf20b347664137.tar.gz rust-5dc91a74b1428cf3d09a868727bf20b347664137.zip | |
Auto merge of #30064 - fhartwig:macro-suggestions, r=sanxiyn
Fixes #13677
This does the same sort of suggestion for misspelt macros that we already do for misspelt identifiers.
Example. Compiling this program:
```rust
macro_rules! foo {
($e:expr) => ( $e )
}
fn main() {
fob!("hello!");
}
```
gives the following error message:
```
/Users/mcp/temp/test.rs:7:5: 7:8 error: macro undefined: 'fob!'
/Users/mcp/temp/test.rs:7 fob!("hello!");
^~~
/Users/mcp/temp/test.rs:7:5: 7:8 help: did you mean `foo`?
/Users/mcp/temp/test.rs:7 fob!("hello!");
```
I had to move the levenshtein distance function into libsyntax for this. Maybe this should live somewhere else (some utility crate?), but I couldn't find a crate to put it in that is imported by libsyntax and the other rustc crates.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 15 | ||||
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 1 | ||||
| -rw-r--r-- | src/libsyntax/lib.rs | 1 | ||||
| -rw-r--r-- | src/libsyntax/util/lev_distance.rs | 71 |
4 files changed, 88 insertions, 0 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 55f0fa5675a..cf6881ab650 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -24,6 +24,7 @@ use parse::token; use parse::token::{InternedString, intern, str_to_ident}; use ptr::P; use util::small_vector::SmallVector; +use util::lev_distance::{lev_distance, max_suggestion_distance}; use ext::mtwt; use fold::Folder; @@ -776,6 +777,20 @@ impl<'a> ExtCtxt<'a> { pub fn name_of(&self, st: &str) -> ast::Name { token::intern(st) } + + pub fn suggest_macro_name(&mut self, name: &str, span: Span) { + let mut min: Option<(Name, usize)> = None; + let max_dist = max_suggestion_distance(name); + for macro_name in self.syntax_env.names.iter() { + let dist = lev_distance(name, ¯o_name.as_str()); + if dist <= max_dist && (min.is_none() || min.unwrap().1 > dist) { + min = Some((*macro_name, dist)); + } + } + if let Some((suggestion, _)) = min { + self.fileline_help(span, &format!("did you mean `{}!`?", suggestion)); + } + } } /// Extract a string literal from the macro expanded version of `expr`, diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 9b1a7a50201..01e72cf2a8d 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -191,6 +191,7 @@ fn expand_mac_invoc<T, F, G>(mac: ast::Mac, pth.span, &format!("macro undefined: '{}!'", &extname)); + fld.cx.suggest_macro_name(&extname.as_str(), pth.span); // let compilation continue None diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 475408472ee..93daecce5dd 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -65,6 +65,7 @@ macro_rules! panictry { pub mod util { pub mod interner; + pub mod lev_distance; pub mod node_count; pub mod parser; #[cfg(test)] diff --git a/src/libsyntax/util/lev_distance.rs b/src/libsyntax/util/lev_distance.rs new file mode 100644 index 00000000000..9bf96311122 --- /dev/null +++ b/src/libsyntax/util/lev_distance.rs @@ -0,0 +1,71 @@ +// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use std::cmp; + +pub fn lev_distance(me: &str, t: &str) -> usize { + if me.is_empty() { return t.chars().count(); } + if t.is_empty() { return me.chars().count(); } + + let mut dcol: Vec<_> = (0..t.len() + 1).collect(); + let mut t_last = 0; + + for (i, sc) in me.chars().enumerate() { + + let mut current = i; + dcol[0] = current + 1; + + for (j, tc) in t.chars().enumerate() { + + let next = dcol[j + 1]; + + if sc == tc { + dcol[j + 1] = current; + } else { + dcol[j + 1] = cmp::min(current, next); + dcol[j + 1] = cmp::min(dcol[j + 1], dcol[j]) + 1; + } + + current = next; + t_last = j; + } + } + + dcol[t_last + 1] +} + +pub fn max_suggestion_distance(name: &str) -> usize { + use std::cmp::max; + // As a loose rule to avoid obviously incorrect suggestions, clamp the + // maximum edit distance we will accept for a suggestion to one third of + // the typo'd name's length. + max(name.len(), 3) / 3 +} + +#[test] +fn test_lev_distance() { + use std::char::{ from_u32, MAX }; + // Test bytelength agnosticity + for c in (0..MAX as u32) + .filter_map(|i| from_u32(i)) + .map(|i| i.to_string()) { + assert_eq!(lev_distance(&c[..], &c[..]), 0); + } + + let a = "\nMäry häd ä little lämb\n\nLittle lämb\n"; + let b = "\nMary häd ä little lämb\n\nLittle lämb\n"; + let c = "Mary häd ä little lämb\n\nLittle lämb\n"; + assert_eq!(lev_distance(a, b), 1); + assert_eq!(lev_distance(b, a), 1); + assert_eq!(lev_distance(a, c), 2); + assert_eq!(lev_distance(c, a), 2); + assert_eq!(lev_distance(b, c), 1); + assert_eq!(lev_distance(c, b), 1); +} |
