Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature console crate feature #800

Merged
merged 3 commits into from
Oct 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions boa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ edition = "2018"
[features]
profiler = ["measureme", "once_cell"]

# Enable Boa's WHATWG console object implementation.
console = []

[dependencies]
gc = { version = "0.3.6", features = ["derive"] }
serde_json = "1.0.58"
Expand Down
2 changes: 1 addition & 1 deletion boa/src/builtins/console/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{
builtins::BuiltIn,
object::ObjectInitializer,
property::Attribute,
value::{display_obj, RcString, Value},
value::{display::display_obj, RcString, Value},
BoaProfiler, Context, Result,
};
use rustc_hash::FxHashMap;
Expand Down
5 changes: 3 additions & 2 deletions boa/src/builtins/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
pub mod array;
pub mod bigint;
pub mod boolean;
#[cfg(feature = "console")]
pub mod console;
pub mod date;
pub mod error;
Expand All @@ -25,7 +26,6 @@ pub(crate) use self::{
array::{array_iterator::ArrayIterator, Array},
bigint::BigInt,
boolean::Boolean,
console::Console,
date::Date,
error::{Error, RangeError, ReferenceError, SyntaxError, TypeError},
function::BuiltInFunctionObject,
Expand Down Expand Up @@ -68,7 +68,6 @@ pub fn init(context: &mut Context) {
BuiltInObjectObject::init,
Math::init,
Json::init,
Console::init,
Array::init,
BigInt::init,
Boolean::init,
Expand All @@ -83,6 +82,8 @@ pub fn init(context: &mut Context) {
ReferenceError::init,
TypeError::init,
SyntaxError::init,
#[cfg(feature = "console")]
console::Console::init,
];

let global_object = if let Value::Object(global) = context.global_object() {
Expand Down
8 changes: 7 additions & 1 deletion boa/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use crate::{
function::{Function, FunctionFlags, NativeFunction},
iterable::IteratorPrototypes,
symbol::{Symbol, WellKnownSymbols},
Console,
},
class::{Class, ClassBuilder},
exec::Interpreter,
Expand All @@ -28,6 +27,9 @@ use crate::{
};
use std::result::Result as StdResult;

#[cfg(feature = "console")]
use crate::builtins::console::Console;

/// Store a builtin constructor (such as `Object`) and its corresponding prototype.
#[derive(Debug, Clone)]
pub struct StandardConstructor {
Expand Down Expand Up @@ -172,6 +174,7 @@ pub struct Context {
symbol_count: u32,

/// console object state.
#[cfg(feature = "console")]
console: Console,

/// Cached well known symbols
Expand All @@ -193,6 +196,7 @@ impl Default for Context {
realm,
executor,
symbol_count,
#[cfg(feature = "console")]
console: Console::default(),
well_known_symbols,
iterator_prototypes: IteratorPrototypes::default(),
Expand Down Expand Up @@ -227,11 +231,13 @@ impl Context {
}

/// A helper function for getting a immutable reference to the `console` object.
#[cfg(feature = "console")]
pub(crate) fn console(&self) -> &Console {
&self.console
}

/// A helper function for getting a mutable reference to the `console` object.
#[cfg(feature = "console")]
pub(crate) fn console_mut(&mut self) -> &mut Console {
&mut self.console
}
Expand Down
10 changes: 9 additions & 1 deletion boa/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
//! This is an experimental Javascript lexer, parser and compiler written in Rust. Currently, it has support for some of the language.
/*!
This is an experimental Javascript lexer, parser and compiler written in Rust. Currently, it has support for some of the language.

# Crate Features
- **serde** - Enables serialization and deserialization of the AST (Abstract Syntax Tree).
- **console** - Enables `boa`s WHATWG `console` object implementation.
- **profiler** - Enables profiling with measureme (this is mostly internal).

**/

#![doc(
html_logo_url = "https://raw.githubusercontent.com/jasonwilliams/boa/master/assets/logo.svg",
Expand Down
3 changes: 1 addition & 2 deletions boa/src/value/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use std::{
};

mod conversions;
mod display;
pub(crate) mod display;
mod equality;
mod hash;
mod operations;
Expand All @@ -35,7 +35,6 @@ mod rcsymbol;
mod r#type;

pub use conversions::*;
pub(crate) use display::display_obj;
pub use display::ValueDisplay;
pub use equality::*;
pub use hash::*;
Expand Down
2 changes: 1 addition & 1 deletion boa_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exclude = ["../.vscode/*", "../Dockerfile", "../Makefile", "../.editorConfig"]
edition = "2018"

[dependencies]
Boa = { path = "../boa", features = ["serde"] }
Boa = { path = "../boa", features = ["serde", "console"] }
rustyline = "6.3.0"
rustyline-derive = "0.3.1"
structopt = "0.3.18"
Expand Down
2 changes: 1 addition & 1 deletion boa_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exclude = ["../.vscode/*", "../Dockerfile", "../Makefile", "../.editorConfig"]
edition = "2018"

[dependencies]
Boa = { path = "../boa" }
Boa = { path = "../boa", features = ["console"] }
wasm-bindgen = "0.2.68"

[lib]
Expand Down