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.

Sign up for GitHub

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

Jump to bottom

Method parsing #339

Merged
merged 7 commits into from
Apr 21, 2020
Merged

Method parsing #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5640b15
parse method definitions, getters and setters
muskuloes Apr 20, 2020
41f1c01
remove unnecessary file
muskuloes Apr 20, 2020
01a903d
remove test count variable
muskuloes Apr 20, 2020
eee9319
fix typo
muskuloes Apr 20, 2020
41ba7ee
fix clippy warning
muskuloes Apr 20, 2020
5040138
add some error handling
muskuloes Apr 20, 2020
1f89da9
improve error handling
muskuloes Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 74 additions & 57 deletions boa/src/syntax/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1637,17 +1637,20 @@ impl<'a> Parser<'a> {
Ok(Node::Object(elements))
}

fn get_object_property_name(&mut self) -> Result<String, ParseError> {
let to_string = |token: &Token| match &token.kind {
TokenKind::Identifier(name) => name.clone(),
TokenKind::NumericLiteral(n) => format!("{}", n),
TokenKind::StringLiteral(s) => s.clone(),
_ => unimplemented!("{:?}", token.kind),
};
self.next_skip_lineterminator()
.map(to_string)
.ok_or(ParseError::AbruptEnd)
}

/// <https://tc39.es/ecma262/#prod-PropertyDefinition>
fn read_property_definition(&mut self) -> Result<PropertyDefinition, ParseError> {
fn to_string(kind: &TokenKind) -> String {
match kind {
TokenKind::Identifier(name) => name.clone(),
TokenKind::NumericLiteral(n) => format!("{}", n),
TokenKind::StringLiteral(s) => s.clone(),
_ => unimplemented!("{:?}", kind),
}
}

if self
.next_if_skip_lineterminator(TokenKind::Punctuator(Punctuator::Spread))
.is_some()
Expand All @@ -1656,11 +1659,7 @@ impl<'a> Parser<'a> {
return Ok(PropertyDefinition::SpreadObject(node));
}

let prop_name = self
.next_skip_lineterminator()
.map(|tok| to_string(&tok.kind))
.ok_or(ParseError::AbruptEnd)?;

let prop_name = self.get_object_property_name()?;
if self
.next_if_skip_lineterminator(TokenKind::Punctuator(Punctuator::Colon))
.is_some()
Expand All @@ -1669,55 +1668,15 @@ impl<'a> Parser<'a> {
return Ok(PropertyDefinition::Property(prop_name, val));
}

// TODO: Split into separate function: read_property_method_definition
if self
.next_if_skip_lineterminator(TokenKind::Punctuator(Punctuator::OpenParen))
.is_some()
|| ["get", "set"].contains(&prop_name.as_str())
{
let params = self.read_formal_parameters()?;

self.expect(
TokenKind::Punctuator(Punctuator::OpenBlock),
Some("property method definition"),
)?;

let body = self.read_block()?;

return Ok(PropertyDefinition::MethodDefinition(
MethodDefinitionKind::Ordinary,
prop_name,
Node::FunctionDecl(None, params, Box::new(body)),
));
let method_identifer = prop_name;
return self.read_property_method_definition(method_identifer.as_str());
}

// TODO need to revisit this
// if let TokenKind::Identifier(name) = tok.kind {
// if name == "get" || name == "set" {
// let may_identifier = self.peek_skip_lineterminator();
// if may_identifier.is_some()
// && matches!(may_identifier.unwrap().kind, TokenKind::Identifier(_))
// {
// let f = self.read_function_expression()?;
// let func_name = if let NodeBase::FunctionExpr(ref name, _, _) = f.base {
// name.clone().unwrap()
// } else {
// panic!()
// };
// return Ok(PropertyDefinition::MethodDefinition(
// if name == "get" {
// MethodDefinitionKind::Get
// } else {
// MethodDefinitionKind::Set
// },
// func_name,
// f,
// ));
// }
// }

// return Ok(PropertyDefinition::IdentifierReference(name));
// }

let pos = self
.cursor
.peek(0)
Expand All @@ -1728,4 +1687,62 @@ impl<'a> Parser<'a> {
Some(pos),
))
}

/// <https://tc39.es/ecma262/#prod-MethodDefinition>
fn read_property_method_definition(
&mut self,
identifier: &str,
) -> Result<PropertyDefinition, ParseError> {
let (methodkind, prop_name, params) = match identifier {
"get" | "set" => {
let prop_name = self.get_object_property_name()?;
self.expect(
TokenKind::Punctuator(Punctuator::OpenParen),
Some("property method definition"),
)?;
let first_param = self
.peek_skip_lineterminator()
.expect("current token disappeared")
.clone();
let params = self.read_formal_parameters()?;
if identifier == "get" {
if !params.is_empty() {
Razican marked this conversation as resolved.
Show resolved Hide resolved
return Err(ParseError::Unexpected(
first_param,
Some("getter functions must have no arguments"),
));
}
(MethodDefinitionKind::Get, prop_name, params)
} else {
if params.len() != 1 {
return Err(ParseError::Unexpected(
first_param,
Some("setter functions must have one argument"),
));
}
(MethodDefinitionKind::Set, prop_name, params)
}
}
prop_name => {
let params = self.read_formal_parameters()?;
(
MethodDefinitionKind::Ordinary,
prop_name.to_string(),
params,
)
}
};

self.expect(
TokenKind::Punctuator(Punctuator::OpenBlock),
Some("property method definition"),
)?;
let body = self.read_block()?;

Ok(PropertyDefinition::MethodDefinition(
methodkind,
prop_name,
Node::FunctionDecl(None, params, Box::new(body)),
))
}
}
53 changes: 53 additions & 0 deletions boa/src/syntax/parser/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,59 @@ fn check_object_short_function_arguments() {
)])],
);
}

#[test]
fn check_object_getter() {
let object_properties = vec![
PropertyDefinition::Property(String::from("a"), Node::Const(Const::Bool(true))),
PropertyDefinition::MethodDefinition(
MethodDefinitionKind::Get,
String::from("b"),
Node::FunctionDecl(None, Vec::new(), Box::new(Node::StatementList(Vec::new()))),
),
];

check_parser(
"const x = {
a: true,
get b() {}
};
",
&[Node::ConstDecl(vec![(
String::from("x"),
Node::Object(object_properties),
)])],
);
}

#[test]
fn check_object_setter() {
let object_properties = vec![
PropertyDefinition::Property(String::from("a"), Node::Const(Const::Bool(true))),
PropertyDefinition::MethodDefinition(
MethodDefinitionKind::Set,
String::from("b"),
Node::FunctionDecl(
None,
vec![FormalParameter::new(String::from("test"), None, false)],
Box::new(Node::StatementList(Vec::new())),
),
),
];

check_parser(
"const x = {
a: true,
set b(test) {}
};
",
&[Node::ConstDecl(vec![(
String::from("x"),
Node::Object(object_properties),
)])],
);
}

#[test]
fn check_array() {
use crate::syntax::ast::constant::Const;
Expand Down