swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-10-05 12:49:21 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix test262-parser-tests

Browse Source
This commit is contained in:
강동윤 2018-03-08 11:17:41 +09:00
parent 442302553d
commit 4d5efb4a9b
14 changed files with 66 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ecmascript/parser/tests/test262-error-references/fail/06272e1e03d6ced7.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/06272e1e03d6ced7.js:1:5
--> $DIR/tests/test262-parser/fail/06272e1e03d6ced7.js:1:2
|
1 | [...x,,] = 0
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/14d6adc74d396c58.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/14d6adc74d396c58.js:1:5
--> $DIR/tests/test262-parser/fail/14d6adc74d396c58.js:1:2
|
1 | [...x, y] = 0
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/346316bef54d805a.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/346316bef54d805a.js:1:8
--> $DIR/tests/test262-parser/fail/346316bef54d805a.js:1:5
|
1 | ([a,...b,])=>0;
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/4485930b35bf8cb6.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/4485930b35bf8cb6.js:1:5
--> $DIR/tests/test262-parser/fail/4485930b35bf8cb6.js:1:2
|
1 | [...a, b] = c
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/531ee852cc8ed0a7.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/531ee852cc8ed0a7.js:1:5
--> $DIR/tests/test262-parser/fail/531ee852cc8ed0a7.js:1:2
|
1 | [...0,a]=0
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/88f3d521fae776b9.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/88f3d521fae776b9.js:1:5
--> $DIR/tests/test262-parser/fail/88f3d521fae776b9.js:1:2
|
1 | [...0,...{a=0}]=0
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/976b6247ca78ab51.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/976b6247ca78ab51.js:1:5
--> $DIR/tests/test262-parser/fail/976b6247ca78ab51.js:1:2
|
1 | [...{a=0},]=0
| ^^^^^
| ^^^^^^^^

4
ecmascript/parser/tests/test262-error-references/fail/9fa56398be8a1769.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/9fa56398be8a1769.js:1:5
--> $DIR/tests/test262-parser/fail/9fa56398be8a1769.js:1:2
|
1 | [...x, ...y] = 0
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/ae0a7ac275bc9f5c.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/ae0a7ac275bc9f5c.js:1:5
--> $DIR/tests/test262-parser/fail/ae0a7ac275bc9f5c.js:1:2
|
1 | [...a, ] = b
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/b02cbe75ce1ceb06.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/b02cbe75ce1ceb06.js:1:5
--> $DIR/tests/test262-parser/fail/b02cbe75ce1ceb06.js:1:2
|
1 | [...0,{a=0}]=0
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/bb210b308413d99c.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/bb210b308413d99c.js:1:5
--> $DIR/tests/test262-parser/fail/bb210b308413d99c.js:1:2
|
1 | (...a, ...b) => 0
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/d28e80d99f819136.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/d28e80d99f819136.js:1:10
--> $DIR/tests/test262-parser/fail/d28e80d99f819136.js:1:7
|
1 | [, x, ...y,] = 0
| ^
| ^^^^

4
ecmascript/parser/tests/test262-error-references/fail/e52f002f70dc01b2.js.stderr
View File

@ -1,6 +1,6 @@
error: Rest element must be final element
--> $DIR/tests/test262-parser/fail/e52f002f70dc01b2.js:1:5
--> $DIR/tests/test262-parser/fail/e52f002f70dc01b2.js:1:2
|
1 | (...a, b) => {}
| ^
| ^^^^

66
ecmascript/parser/tests/test262.rs
View File

@ -13,7 +13,7 @@ use std::fs::File;
use std::fs::read_dir;
use std::io::{self, Read};
use std::path::Path;
use swc_common::{FoldWith, Folder};
use swc_common::{Fold, FoldWith};
use swc_common::FileName;
use swc_common::Span;
use swc_ecma_parser::{FileMapInput, PResult, Parser, Session};
@ -293,7 +293,7 @@ where
fn normalize<T>(mut t: T) -> T
where
Normalizer: Folder<T>,
Normalizer: Fold<T>,
{
loop {
let mut n = Normalizer {
@ -309,67 +309,81 @@ where
struct Normalizer {
did_something: bool,
}
impl Folder<Span> for Normalizer {
impl Fold<Span> for Normalizer {
fn fold(&mut self, _: Span) -> Span {
Span::default()
}
}
impl Folder<Lit> for Normalizer {
fn fold(&mut self, lit: Lit) -> Lit {
match lit {
Lit::Str { value, .. } => Lit::Str {
value,
has_escape: false,
},
_ => lit,
impl Fold<Str> for Normalizer {
fn fold(&mut self, s: Str) -> Str {
Str {
span: Default::default(),
has_escape: false,
..s
}
}
}
impl Folder<ExprKind> for Normalizer {
fn fold(&mut self, e: ExprKind) -> ExprKind {
impl Fold<Expr> for Normalizer {
fn fold(&mut self, e: Expr) -> Expr {
let e = e.fold_with(self);
match e {
ExprKind::Paren(e) => self.fold(e.node),
ExprKind::New(NewExpr { callee, args: None }) => {
Expr::Paren(ParenExpr { expr, .. }) => *expr,
Expr::New(NewExpr {
callee,
args: None,
span,
}) => {
self.did_something = true;
ExprKind::New(NewExpr {
Expr::New(NewExpr {
span,
callee: self.fold(callee),
args: Some(vec![]),
})
}
ExprKind::Seq(SeqExpr { exprs }) => {
// Flatten comma expressions.
Expr::Seq(SeqExpr { exprs, span }) => {
let mut exprs = self.fold(exprs);
let need_work = exprs.iter().map(|e| &e.node).any(|n| match *n {
ExprKind::Seq { .. } => true,
let need_work = exprs.iter().any(|n| match **n {
Expr::Seq(..) => true,
_ => false,
});
if need_work {
self.did_something = true;
exprs = exprs.into_iter().fold(vec![], |mut v, e| {
match e.node {
ExprKind::Seq(SeqExpr { exprs }) => v.extend(exprs),
match *e {
Expr::Seq(SeqExpr { exprs, .. }) => v.extend(exprs),
_ => v.push(e),
}
v
});
}
ExprKind::Seq(SeqExpr { exprs })
Expr::Seq(SeqExpr { exprs, span })
}
_ => e.fold_children(self),
_ => e,
}
}
}
impl Folder<PropName> for Normalizer {
impl Fold<PropName> for Normalizer {
fn fold(&mut self, n: PropName) -> PropName {
match n {
PropName::Ident(Ident { sym, .. }) => {
self.did_something = true;
PropName::Str(String::from(&*sym))
PropName::Str(Str {
span: Default::default(),
value: sym,
has_escape: false,
})
}
PropName::Num(num) => {
self.did_something = true;
PropName::Str(num.to_string())
PropName::Str(Str {
span: Default::default(),
value: num.to_string().into(),
has_escape: false,
})
}
_ => n.fold_children(self),
}