bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

carry self ident forward through re-parsing

Browse source 
formerly, the self identifier was being discarded during parsing, which
stymies hygiene. The best fix here seems to be to attach a self identifier
to ExplicitSelf_, a change that rippled through the rest of the compiler,
but without any obvious damage.
This commit is contained in:
John Clements 2014-07-06 15:10:57 -07:00
parent 69c27546ee
commit 19e718b34d
15 changed files with 114 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libsyntax/ast.rs
View file

@ -14,7 +14,7 @@ use codemap::{Span, Spanned, DUMMY_SP};
use abi::Abi;
use ast_util;
use owned_slice::OwnedSlice;
use parse::token::{InternedString, special_idents, str_to_ident};
use parse::token::{InternedString, str_to_ident};
use parse::token;
use std::fmt;
@ -824,8 +824,8 @@ pub struct Arg {
}
impl Arg {
pub fn new_self(span: Span, mutability: Mutability) -> Arg {
let path = Spanned{span:span,node:special_idents::self_};
pub fn new_self(span: Span, mutability: Mutability, self_ident: Ident) -> Arg {
let path = Spanned{span:span,node:self_ident};
Arg {
// HACK(eddyb) fake type for the self argument.
ty: P(Ty {
@ -874,12 +874,13 @@ pub enum RetStyle {
Return, // everything else
}
/// Represents the kind of 'self' associated with a method
#[deriving(Clone, PartialEq, Eq, Encodable, Decodable, Hash)]
pub enum ExplicitSelf_ {
SelfStatic, // no self
SelfValue, // `self`
SelfRegion(Option<Lifetime>, Mutability), // `&'lt self`, `&'lt mut self`
SelfUniq // `~self`
SelfStatic, // no self
SelfValue(Ident), // `self`
SelfRegion(Option<Lifetime>, Mutability, Ident), // `&'lt self`, `&'lt mut self`
SelfUniq(Ident), // `~self`
}
pub type ExplicitSelf = Spanned<ExplicitSelf_>;