mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

typo-fixing and name-changes

Browse Source
This commit is contained in:
John Clements 2013-02-26 15:48:00 -08:00
parent 08b6057538
commit 6aefaf22c7
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libsyntax/ext/base.rs
View File

@ -414,8 +414,8 @@ pub fn get_exprs_from_tts(cx: ext_ctxt, tts: ~[ast::token_tree])
// a transformer env is either a base map or a map on top
// of another chain.
pub enum MapChain<K,V> {
TEC_Base(~LinearMap<K,@V>),
TEC_Cons(~LinearMap<K,@V>,@mut MapChain<K,V>)
BaseMapChain(~LinearMap<K,@V>),
ConsMapChain(~LinearMap<K,@V>,@mut MapChain<K,V>)
}
@ -424,12 +424,12 @@ impl <K: Eq + Hash + IterBytes ,V: Copy> MapChain<K,V>{
// Constructor. I don't think we need a zero-arg one.
static fn new(+init: ~LinearMap<K,@V>) -> @mut MapChain<K,V> {
@mut TEC_Base(init)
@mut BaseMapChain(init)
}
// add a new frame to the environment (functionally)
fn push_frame (@mut self) -> @mut MapChain<K,V> {
@mut TEC_Cons(~LinearMap::new() ,self)
@mut ConsMapChain(~LinearMap::new() ,self)
}
// no need for pop, it'll just be functional.
@ -440,8 +440,8 @@ impl <K: Eq + Hash + IterBytes ,V: Copy> MapChain<K,V>{
// lack of flow sensitivity.
fn get_map(&self) -> &self/LinearMap<K,@V> {
match *self {
TEC_Base (~ref map) => map,
TEC_Cons (~ref map,_) => map
BaseMapChain (~ref map) => map,
ConsMapChain (~ref map,_) => map
}
}
@ -450,8 +450,8 @@ impl <K: Eq + Hash + IterBytes ,V: Copy> MapChain<K,V>{
pure fn contains_key (&self, key: &K) -> bool {
match *self {
TEC_Base (ref map) => map.contains_key(key),
TEC_Cons (ref map,ref rest) =>
BaseMapChain (ref map) => map.contains_key(key),
ConsMapChain (ref map,ref rest) =>
(map.contains_key(key)
|| rest.contains_key(key))
}
@ -473,8 +473,8 @@ impl <K: Eq + Hash + IterBytes ,V: Copy> MapChain<K,V>{
match self.get_map().find (key) {
Some(ref v) => Some(**v),
None => match *self {
TEC_Base (_) => None,
TEC_Cons (_,ref rest) => rest.find(key)
BaseMapChain (_) => None,
ConsMapChain (_,ref rest) => rest.find(key)
}
}
}
@ -483,8 +483,8 @@ impl <K: Eq + Hash + IterBytes ,V: Copy> MapChain<K,V>{
fn insert (&mut self, +key: K, +ext: @V) -> bool {
// can't abstract over get_map because of flow sensitivity...
match *self {
TEC_Base (~ref mut map) => map.insert(key, ext),
TEC_Cons (~ref mut map,_) => map.insert(key,ext)
BaseMapChain (~ref mut map) => map.insert(key, ext),
ConsMapChain (~ref mut map,_) => map.insert(key,ext)
}
}

4
src/libsyntax/ext/expand.rs
View File

@ -195,7 +195,7 @@ fn contains_macro_escape (attrs: &[ast::attribute]) -> bool{
macro_rules! without_macro_scoping(
($extsexpr:expr,$exp:expr) =>
({
// only evaluaate this once:
// only evaluate this once:
let exts = $extsexpr;
// capture the existing binding:
let existingBlockBinding =
@ -421,8 +421,6 @@ pub fn core_macros() -> ~str {
}";
}
// could cfg just be a borrowed pointer here?
pub fn expand_crate(parse_sess: @mut parse::ParseSess,
cfg: ast::crate_cfg, c: @crate) -> @crate {
// adding *another* layer of indirection here so that the block