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

Add ECMAScript 14 to boa_tester #3273

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Add ECMAScript 14 to boa_tester #3273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c775b04
Add ECMAScript 14 to `boa_tester`
jedel1043 Jul 4, 2023
f0b2aba
Trigger actions
jedel1043 Sep 13, 2023
8e40d99
cargo clippy
jedel1043 Sep 13, 2023
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
20 changes: 12 additions & 8 deletions boa_tester/src/edition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,18 @@ static FEATURE_EDITION: phf::Map<&'static str, SpecEdition> = phf::phf_map! {
// https://github.com/tc39/proposal-iterator-helpers
"iterator-helpers" => SpecEdition::ESNext,

// Part of the next ES14 edition
// Part of the next ES15 edition
"Atomics.waitAsync" => SpecEdition::ESNext,
"array-find-from-last" => SpecEdition::ESNext,
"change-array-by-copy" => SpecEdition::ESNext,
"hashbang" => SpecEdition::ESNext,
"Intl-enumeration" => SpecEdition::ESNext,
"regexp-v-flag" => SpecEdition::ESNext,
"String.prototype.isWellFormed" => SpecEdition::ESNext,
"String.prototype.toWellFormed" => SpecEdition::ESNext,
"symbols-as-weakmap-keys" => SpecEdition::ESNext,

// Standard language features

"AggregateError" => SpecEdition::ES12,
"align-detached-buffer-semantics-with-web-reality" => SpecEdition::ES12,
"arbitrary-module-namespace-names" => SpecEdition::ES13,
"ArrayBuffer" => SpecEdition::ES6,
"array-find-from-last" => SpecEdition::ES14,
"Array.prototype.at" => SpecEdition::ES13,
"Array.prototype.flat" => SpecEdition::ES10,
"Array.prototype.flatMap" => SpecEdition::ES10,
Expand All @@ -108,6 +103,7 @@ static FEATURE_EDITION: phf::Map<&'static str, SpecEdition> = phf::phf_map! {
"Atomics" => SpecEdition::ES8,
"BigInt" => SpecEdition::ES11,
"caller" => SpecEdition::ES5,
"change-array-by-copy" => SpecEdition::ES14,
"class" => SpecEdition::ES6,
"class-fields-private" => SpecEdition::ES13,
"class-fields-private-in" => SpecEdition::ES13,
Expand Down Expand Up @@ -144,10 +140,12 @@ static FEATURE_EDITION: phf::Map<&'static str, SpecEdition> = phf::phf_map! {
"Float64Array" => SpecEdition::ES6,
"generators" => SpecEdition::ES6,
"globalThis" => SpecEdition::ES11,
"hashbang" => SpecEdition::ES14,
"import.meta" => SpecEdition::ES11,
"Int8Array" => SpecEdition::ES6,
"Int16Array" => SpecEdition::ES6,
"Int32Array" => SpecEdition::ES6,
"Intl-enumeration" => SpecEdition::ES14,
"intl-normative-optional" => SpecEdition::ES8,
"Intl.DateTimeFormat-datetimestyle" => SpecEdition::ES12,
"Intl.DateTimeFormat-dayPeriod" => SpecEdition::ES8,
Expand Down Expand Up @@ -203,6 +201,7 @@ static FEATURE_EDITION: phf::Map<&'static str, SpecEdition> = phf::phf_map! {
"String.prototype.trimStart" => SpecEdition::ES10,
"super" => SpecEdition::ES6,
"Symbol" => SpecEdition::ES6,
"symbols-as-weakmap-keys" => SpecEdition::ES14,
"Symbol.asyncIterator" => SpecEdition::ES9,
"Symbol.hasInstance" => SpecEdition::ES6,
"Symbol.isConcatSpreadable" => SpecEdition::ES6,
Expand Down Expand Up @@ -293,11 +292,15 @@ pub(crate) enum SpecEdition {
///
/// <https://262.ecma-international.org/13.0>
ES13,
/// ECMAScript 14th Edition
///
/// <https://262.ecma-international.org/14.0>
ES14,
/// The edition being worked on right now.
///
/// A draft is currently available [here](https://tc39.es/ecma262).
#[default]
ESNext,
ESNext = 255,
}

impl Display for SpecEdition {
Expand Down Expand Up @@ -355,6 +358,7 @@ impl SpecEdition {
Self::ES11,
Self::ES12,
Self::ES13,
Self::ES14,
Self::ESNext,
]
.into_iter()
Expand Down
58 changes: 57 additions & 1 deletion boa_tester/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ impl AddAssign for Statistics {
}

/// Represents tests statistics separated by ECMAScript edition
#[derive(Default, Debug, Copy, Clone, Serialize, Deserialize)]
#[derive(Default, Debug, Copy, Clone, Serialize)]
struct VersionedStats {
es5: Statistics,
es6: Statistics,
Expand All @@ -445,6 +445,58 @@ struct VersionedStats {
es11: Statistics,
es12: Statistics,
es13: Statistics,
es14: Statistics,
}

impl<'de> Deserialize<'de> for VersionedStats {
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
where
D: Deserializer<'de>,
{
#[derive(Deserialize)]
struct Inner {
es5: Statistics,
es6: Statistics,
es7: Statistics,
es8: Statistics,
es9: Statistics,
es10: Statistics,
es11: Statistics,
es12: Statistics,
es13: Statistics,
#[serde(default)]
es14: Option<Statistics>,
}

let inner = Inner::deserialize(deserializer)?;

let Inner {
es5,
es6,
es7,
es8,
es9,
es10,
es11,
es12,
es13,
es14,
} = inner;
let es14 = es14.unwrap_or(es13);

Ok(Self {
es5,
es6,
es7,
es8,
es9,
es10,
es11,
es12,
es13,
es14,
})
}
}

impl VersionedStats {
Expand All @@ -471,6 +523,7 @@ impl VersionedStats {
SpecEdition::ES11 => self.es11,
SpecEdition::ES12 => self.es12,
SpecEdition::ES13 => self.es13,
SpecEdition::ES14 => self.es14,
SpecEdition::ESNext => return None,
};
Some(stats)
Expand All @@ -489,6 +542,7 @@ impl VersionedStats {
SpecEdition::ES11 => &mut self.es11,
SpecEdition::ES12 => &mut self.es12,
SpecEdition::ES13 => &mut self.es13,
SpecEdition::ES14 => &mut self.es14,
SpecEdition::ESNext => return None,
};
Some(stats)
Expand All @@ -509,6 +563,7 @@ impl Add for VersionedStats {
es11: self.es11 + rhs.es11,
es12: self.es12 + rhs.es12,
es13: self.es13 + rhs.es13,
es14: self.es14 + rhs.es14,
}
}
}
Expand All @@ -524,6 +579,7 @@ impl AddAssign for VersionedStats {
self.es11 += rhs.es11;
self.es12 += rhs.es12;
self.es13 += rhs.es13;
self.es14 += rhs.es14;
}
}

Expand Down