Skip to content

Commit

Permalink
Merge 62bdd68 into d42e413
Browse files Browse the repository at this point in the history
  • Loading branch information
@HalidOdat
HalidOdat authored May 26, 2020
2 parents d42e413 + 62bdd68 commit 3d93be3
Show file tree
Hide file tree
Showing 12 changed files with 127 additions and 189 deletions.
8 changes: 4 additions & 4 deletions boa/src/builtins/array/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use super::function::{make_builtin_fn, make_constructor_fn};
use crate::{
builtins::{
error::RangeError,
object::{ObjectKind, INSTANCE_PROTOTYPE, PROTOTYPE},
object::{ObjectData, INSTANCE_PROTOTYPE, PROTOTYPE},
property::Property,
value::{same_value_zero, ResultValue, Value, ValueData},
},
Expand All @@ -42,7 +42,7 @@ impl Array {
.get_global_object()
.expect("Could not get global object"),
));
array.set_kind(ObjectKind::Array);
array.set_data(ObjectData::Array);
array.borrow().set_internal_slot(
INSTANCE_PROTOTYPE,
interpreter
Expand Down Expand Up @@ -117,7 +117,7 @@ impl Array {
this.set_internal_slot(INSTANCE_PROTOTYPE, prototype);
// This value is used by console.log and other routines to match Object type
// to its Javascript Identifier (global constructor method name)
this.set_kind(ObjectKind::Array);
this.set_data(ObjectData::Array);

// add our arguments in
let mut length = args.len() as i32;
Expand Down Expand Up @@ -176,7 +176,7 @@ impl Array {
// 1.
ValueData::Object(ref obj) => {
// 2.
if (*obj).deref().borrow().kind == ObjectKind::Array {
if (*obj).deref().borrow().data == ObjectData::Array {
return Ok(value_true);
}
Ok(value_false)
Expand Down
45 changes: 12 additions & 33 deletions boa/src/builtins/boolean/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mod tests;
use super::function::{make_builtin_fn, make_constructor_fn};
use crate::{
builtins::{
object::{internal_methods_trait::ObjectInternalMethods, ObjectKind},
object::ObjectData,
value::{ResultValue, Value, ValueData},
},
exec::Interpreter,
Expand All @@ -35,19 +35,11 @@ impl Boolean {
args: &[Value],
_: &mut Interpreter,
) -> ResultValue {
this.set_kind(ObjectKind::Boolean);

// Get the argument, if any
if let Some(ref value) = args.get(0) {
this.set_internal_slot("BooleanData", Self::to_boolean(value));
} else {
this.set_internal_slot("BooleanData", Self::to_boolean(&Value::from(false)));
}
let data = args.get(0).map(|x| x.to_boolean()).unwrap_or(false);
this.set_data(ObjectData::Boolean(data));

match args.get(0) {
Some(ref value) => Ok(Self::to_boolean(value)),
None => Ok(Self::to_boolean(&Value::from(false))),
}
Ok(Value::from(data))
}

/// The `toString()` method returns a string representing the specified `Boolean` object.
Expand All @@ -73,22 +65,7 @@ impl Boolean {
/// [spec]: https://tc39.es/ecma262/#sec-boolean.prototype.valueof
/// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean/valueOf
pub(crate) fn value_of(this: &mut Value, _: &[Value], _: &mut Interpreter) -> ResultValue {
Ok(Self::this_boolean_value(this))
}

// === Utility Functions ===
/// [toBoolean](https://tc39.es/ecma262/#sec-toboolean)
/// Creates a new boolean value from the input
#[allow(clippy::wrong_self_convention)]
pub(crate) fn to_boolean(value: &Value) -> Value {
match *value.deref().borrow() {
ValueData::Object(_) => Value::from(true),
ValueData::String(ref s) if !s.is_empty() => Value::from(true),
ValueData::Rational(n) if n != 0.0 && !n.is_nan() => Value::from(true),
ValueData::Integer(n) if n != 0 => Value::from(true),
ValueData::Boolean(v) => Value::from(v),
_ => Value::from(false),
}
Ok(Value::from(Self::this_boolean_value(this)))
}

/// An Utility function used to get the internal BooleanData.
Expand All @@ -97,11 +74,14 @@ impl Boolean {
/// - [ECMAScript reference][spec]
///
/// [spec]: https://tc39.es/ecma262/#sec-thisbooleanvalue
pub(crate) fn this_boolean_value(value: &Value) -> Value {
pub(crate) fn this_boolean_value(value: &Value) -> bool {
match *value.deref().borrow() {
ValueData::Boolean(v) => Value::from(v),
ValueData::Object(ref v) => (v).deref().borrow().get_internal_slot("BooleanData"),
_ => Value::from(false),
ValueData::Boolean(v) => v,
ValueData::Object(ref v) => match v.deref().borrow().data {
ObjectData::Boolean(boolean) => boolean,
_ => unreachable!(),
},
_ => false,
}
}

Expand All @@ -110,7 +90,6 @@ impl Boolean {
// Create Prototype
// https://tc39.es/ecma262/#sec-properties-of-the-boolean-prototype-object
let prototype = Value::new_object(Some(global));
prototype.set_internal_slot("BooleanData", Self::to_boolean(&Value::from(false)));

make_builtin_fn(Self::to_string, "toString", &prototype, 0);
make_builtin_fn(Self::value_of, "valueOf", &prototype, 0);
Expand Down
4 changes: 2 additions & 2 deletions boa/src/builtins/error/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use crate::{
builtins::{
function::{make_builtin_fn, make_constructor_fn},
object::ObjectKind,
object::ObjectData,
value::{ResultValue, Value},
},
exec::Interpreter,
Expand Down Expand Up @@ -47,7 +47,7 @@ impl Error {
}
// This value is used by console.log and other routines to match Object type
// to its Javascript Identifier (global constructor method name)
this.set_kind(ObjectKind::Error);
this.set_data(ObjectData::Error);
Ok(Value::undefined())
}

Expand Down
4 changes: 2 additions & 2 deletions boa/src/builtins/error/range.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::{
builtins::{
function::make_builtin_fn,
function::make_constructor_fn,
object::ObjectKind,
object::ObjectData,
value::{ResultValue, Value},
},
exec::Interpreter,
Expand All @@ -38,7 +38,7 @@ impl RangeError {
}
// This value is used by console.log and other routines to match Object type
// to its Javascript Identifier (global constructor method name)
this.set_kind(ObjectKind::Error);
this.set_data(ObjectData::Error);
Ok(Value::undefined())
}

Expand Down
4 changes: 2 additions & 2 deletions boa/src/builtins/function/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use crate::{
builtins::{
array::Array,
object::{Object, ObjectInternalMethods, ObjectKind, INSTANCE_PROTOTYPE, PROTOTYPE},
object::{Object, ObjectData, ObjectInternalMethods, INSTANCE_PROTOTYPE, PROTOTYPE},
property::Property,
value::{ResultValue, Value},
},
Expand Down Expand Up @@ -368,7 +368,7 @@ pub fn create_unmapped_arguments_object(arguments_list: &[Value]) -> Value {
///
// This gets called when a new Function() is created.
pub fn make_function(this: &mut Value, _: &[Value], _: &mut Interpreter) -> ResultValue {
this.set_kind(ObjectKind::Function);
this.set_data(ObjectData::Function);
Ok(this.clone())
}

Expand Down
28 changes: 14 additions & 14 deletions boa/src/builtins/number/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,17 @@ mod tests;

use super::{
function::{make_builtin_fn, make_constructor_fn},
object::ObjectKind,
object::ObjectData,
};
use crate::{
builtins::{
object::internal_methods_trait::ObjectInternalMethods,
value::{ResultValue, Value, ValueData},
RangeError,
},
exec::Interpreter,
};
use num_traits::float::FloatCore;
use std::{borrow::Borrow, f64, ops::Deref};
use std::{f64, ops::Deref};

const BUF_SIZE: usize = 2200;

Expand All @@ -41,19 +40,22 @@ impl Number {
/// Helper function that converts a Value to a Number.
#[allow(clippy::wrong_self_convention)]
fn to_number(value: &Value) -> Value {
match *value.deref().borrow() {
match value.data() {
ValueData::Boolean(b) => {
if b {
if *b {
Value::from(1)
} else {
Value::from(0)
}
}
ValueData::Symbol(_) | ValueData::Undefined => Value::from(f64::NAN),
ValueData::Integer(i) => Value::from(f64::from(i)),
ValueData::Object(ref o) => (o).deref().borrow().get_internal_slot("NumberData"),
ValueData::Integer(i) => Value::from(f64::from(*i)),
ValueData::Object(ref o) => match (o).deref().borrow().data {
ObjectData::Number(num) => Value::from(num),
_ => unreachable!(),
},
ValueData::Null => Value::from(0),
ValueData::Rational(n) => Value::from(n),
ValueData::Rational(n) => Value::from(*n),
ValueData::BigInt(ref bigint) => Value::from(bigint.to_f64()),
ValueData::String(ref s) => match s.parse::<f64>() {
Ok(n) => Value::from(n),
Expand All @@ -80,13 +82,12 @@ impl Number {
_ctx: &mut Interpreter,
) -> ResultValue {
let data = match args.get(0) {
Some(ref value) => Self::to_number(value),
None => Self::to_number(&Value::from(0)),
Some(ref value) => Self::to_number(value).to_number(),
None => 0.0,
};
this.set_kind(ObjectKind::Number);
this.set_internal_slot("NumberData", data.clone());
this.set_data(ObjectData::Number(data));

Ok(data)
Ok(Value::from(data))
}

/// `Number.prototype.toExponential( [fractionDigits] )`
Expand Down Expand Up @@ -393,7 +394,6 @@ impl Number {
/// Create a new `Number` object
pub(crate) fn create(global: &Value) -> Value {
let prototype = Value::new_object(Some(global));
prototype.set_internal_slot("NumberData", Value::from(0));

make_builtin_fn(Self::to_exponential, "toExponential", &prototype, 1);
make_builtin_fn(Self::to_fixed, "toFixed", &prototype, 1);
Expand Down
Loading

0 comments on commit 3d93be3

Please sign in to comment.