Skip to content

Commit

Permalink
Merge 49895f4 into 8b40e9e
Browse files Browse the repository at this point in the history
  • Loading branch information
HalidOdat committed Jul 1, 2020
2 parents 8b40e9e + 49895f4 commit 1c7c066
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 7 deletions.
2 changes: 0 additions & 2 deletions boa/src/builtins/string/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,6 @@ impl String {
/// [spec]: https://tc39.es/ecma262/#sec-string.prototype.concat
/// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/concat
pub(crate) fn concat(this: &Value, args: &[Value], ctx: &mut Interpreter) -> ResultValue {
// First we get it the actual string a private field stored on the object only the engine has access to.
// Then we convert it into a Rust String by wrapping it in from_value
let object = ctx.require_object_coercible(this)?;
let mut string = ctx.to_string(object)?.to_string();

Expand Down
25 changes: 20 additions & 5 deletions boa/src/builtins/string/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,26 @@ fn concat() {
"#;
eprintln!("{}", forward(&mut engine, init));

// Todo: fix this
let _a = forward(&mut engine, "hello.concat(world, nice)");
let _b = forward(&mut engine, "hello + world + nice");
// assert_eq!(a, String::from("Hello, world! Have a nice day."));
// assert_eq!(b, String::from("Hello, world! Have a nice day."));
let a = forward(&mut engine, "hello.concat(world, nice)");
assert_eq!(a, "Hello, world! Have a nice day.");

// TODO: uncoment this when #520 lands
//let b = forward(&mut engine, "hello + world + nice");
// assert_eq!(b, "Hello, world! Have a nice day.");
}

#[test]
fn generic_concat() {
let realm = Realm::create();
let mut engine = Interpreter::new(realm);
let init = r#"
Number.prototype.concat = String.prototype.concat;
let number = new Number(100);
"#;
eprintln!("{}", forward(&mut engine, init));

let a = forward(&mut engine, "number.concat(' - 50', ' = 50')");
assert_eq!(a, "100 - 50 = 50");
}

#[allow(clippy::result_unwrap_used)]
Expand Down

0 comments on commit 1c7c066

Please sign in to comment.