Autoref the argument to the index operator (#4920)
This commit is contained in:
parent
2c17ff7dbc
commit
069529bc5c
9 changed files with 88 additions and 49 deletions
|
|
@ -40,8 +40,8 @@ impl ops::Not<Point> for Point {
|
|||
}
|
||||
|
||||
impl ops::Index<bool,int> for Point {
|
||||
fn index(&self, +x: bool) -> int {
|
||||
if x { self.x } else { self.y }
|
||||
fn index(&self, +x: &bool) -> int {
|
||||
if *x { self.x } else { self.y }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
55
src/test/run-pass/overload-index-operator.rs
Normal file
55
src/test/run-pass/overload-index-operator.rs
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
// Copyright 2012 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.
|
||||
|
||||
// Test overloading of the `[]` operator. In particular test that it
|
||||
// takes its argument *by reference*.
|
||||
|
||||
use core::ops::Index;
|
||||
|
||||
struct AssociationList<K,V> {
|
||||
pairs: ~[AssociationPair<K,V>]
|
||||
}
|
||||
|
||||
struct AssociationPair<K,V> {
|
||||
key: K,
|
||||
value: V
|
||||
}
|
||||
|
||||
impl<K,V> AssociationList<K,V> {
|
||||
fn push(&mut self, key: K, value: V) {
|
||||
self.pairs.push(AssociationPair {key: key, value: value});
|
||||
}
|
||||
}
|
||||
|
||||
impl<K:Eq,V:Copy> Index<K,V> for AssociationList<K,V> {
|
||||
fn index(&self, index: &K) -> V {
|
||||
for self.pairs.each |pair| {
|
||||
if pair.key == *index {
|
||||
return copy pair.value;
|
||||
}
|
||||
}
|
||||
fail!(fmt!("No value found for key: %?", index));
|
||||
}
|
||||
}
|
||||
|
||||
pub fn main() {
|
||||
let foo = ~"foo";
|
||||
let bar = ~"bar";
|
||||
|
||||
let mut list = AssociationList {pairs: ~[]};
|
||||
list.push(copy foo, 22);
|
||||
list.push(copy bar, 44);
|
||||
|
||||
fail_unless!(list[foo] == 22)
|
||||
fail_unless!(list[bar] == 44)
|
||||
|
||||
fail_unless!(list[foo] == 22)
|
||||
fail_unless!(list[bar] == 44)
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue