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

refactor(ast): add explicit enum discriminants. #4689

Merged
merged 1 commit into from
Aug 6, 2024
Merged

refactor(ast): add explicit enum discriminants. #4689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 47 additions & 47 deletions crates/oxc_ast/src/ast/js.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,9 @@ pub struct ObjectExpression<'a> {
#[serde(untagged)]
pub enum ObjectPropertyKind<'a> {
/// `a: 1` in `const obj = { a: 1 };`
ObjectProperty(Box<'a, ObjectProperty<'a>>),
ObjectProperty(Box<'a, ObjectProperty<'a>>) = 0,
/// `...{ a: 1 }` in `const obj = { ...{ a: 1 } };`
SpreadProperty(Box<'a, SpreadElement<'a>>),
SpreadProperty(Box<'a, SpreadElement<'a>>) = 1,
}

/// `a: 1` in `const obj = { a: 1 };`
Expand Down Expand Up @@ -416,11 +416,11 @@ pub enum PropertyKey<'a> {
#[serde(rename_all = "camelCase")]
pub enum PropertyKind {
/// `a: 1` in `const obj = { a: 1 };`
Init,
Init = 0,
/// `get a() { return 1; }` in `const obj = { get a() { return 1; } };`
Get,
Get = 1,
/// `set a(value) { this._a = value; }` in `const obj = { set a(value) { this._a = value; } };`
Set,
Set = 2,
}

/// `` `Hello, ${name}` `` in `` const foo = `Hello, ${name}` ``
Expand Down Expand Up @@ -935,8 +935,8 @@ pub struct AssignmentTargetWithDefault<'a> {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[serde(untagged)]
pub enum AssignmentTargetProperty<'a> {
AssignmentTargetPropertyIdentifier(Box<'a, AssignmentTargetPropertyIdentifier<'a>>),
AssignmentTargetPropertyProperty(Box<'a, AssignmentTargetPropertyProperty<'a>>),
AssignmentTargetPropertyIdentifier(Box<'a, AssignmentTargetPropertyIdentifier<'a>>) = 0,
AssignmentTargetPropertyProperty(Box<'a, AssignmentTargetPropertyProperty<'a>>) = 1,
}

/// `foo` in `({ foo } = obj);`
Expand Down Expand Up @@ -1186,9 +1186,9 @@ pub struct VariableDeclaration<'a> {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[serde(rename_all = "camelCase")]
pub enum VariableDeclarationKind {
Var,
Const,
Let,
Var = 0,
Const = 1,
Let = 2,
}

#[ast(visit)]
Expand Down Expand Up @@ -1522,16 +1522,16 @@ pub struct BindingPattern<'a> {
#[serde(untagged)]
pub enum BindingPatternKind<'a> {
/// `const a = 1`
BindingIdentifier(Box<'a, BindingIdentifier<'a>>),
BindingIdentifier(Box<'a, BindingIdentifier<'a>>) = 0,
/// `const {a} = 1`
ObjectPattern(Box<'a, ObjectPattern<'a>>),
ObjectPattern(Box<'a, ObjectPattern<'a>>) = 1,
/// `const [a] = 1`
ArrayPattern(Box<'a, ArrayPattern<'a>>),
ArrayPattern(Box<'a, ArrayPattern<'a>>) = 2,
/// A defaulted binding pattern, i.e.:
/// `const {a = 1} = 1`
/// the assignment pattern is `a = 1`
/// it has an inner left that has a BindingIdentifier
AssignmentPattern(Box<'a, AssignmentPattern<'a>>),
AssignmentPattern(Box<'a, AssignmentPattern<'a>>) = 3,
}

#[ast(visit)]
Expand Down Expand Up @@ -1641,11 +1641,11 @@ pub struct Function<'a> {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub enum FunctionType {
FunctionDeclaration,
FunctionExpression,
TSDeclareFunction,
FunctionDeclaration = 0,
FunctionExpression = 1,
TSDeclareFunction = 2,
/// <https://github.com/typescript-eslint/typescript-eslint/pull/1289>
TSEmptyBodyFunctionExpression,
TSEmptyBodyFunctionExpression = 3,
}

/// <https://tc39.es/ecma262/#prod-FormalParameters>
Expand Down Expand Up @@ -1683,13 +1683,13 @@ pub struct FormalParameter<'a> {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub enum FormalParameterKind {
/// <https://tc39.es/ecma262/#prod-FormalParameters>
FormalParameter,
FormalParameter = 0,
/// <https://tc39.es/ecma262/#prod-UniqueFormalParameters>
UniqueFormalParameters,
UniqueFormalParameters = 1,
/// <https://tc39.es/ecma262/#prod-ArrowFormalParameters>
ArrowFormalParameters,
ArrowFormalParameters = 2,
/// Part of TypeScript type signatures
Signature,
Signature = 3,
}

/// <https://tc39.es/ecma262/#prod-FunctionBody>
Expand Down Expand Up @@ -1819,13 +1819,13 @@ pub enum ClassType {
/// ```ts
/// class Foo { }
/// ```
ClassDeclaration,
ClassDeclaration = 0,
/// Class expression
///
/// ```ts
/// const Foo = class {}
/// ```
ClassExpression,
ClassExpression = 1,
}

#[ast(visit)]
Expand Down Expand Up @@ -1861,13 +1861,13 @@ pub struct ClassBody<'a> {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[serde(untagged)]
pub enum ClassElement<'a> {
StaticBlock(Box<'a, StaticBlock<'a>>),
StaticBlock(Box<'a, StaticBlock<'a>>) = 0,
/// Class Methods
///
/// Includes static and non-static methods, constructors, getters, and setters.
MethodDefinition(Box<'a, MethodDefinition<'a>>),
PropertyDefinition(Box<'a, PropertyDefinition<'a>>),
AccessorProperty(Box<'a, AccessorProperty<'a>>),
MethodDefinition(Box<'a, MethodDefinition<'a>>) = 1,
PropertyDefinition(Box<'a, PropertyDefinition<'a>>) = 2,
AccessorProperty(Box<'a, AccessorProperty<'a>>) = 3,
/// Index Signature
///
/// ## Example
Expand All @@ -1876,7 +1876,7 @@ pub enum ClassElement<'a> {
/// [keys: string]: string
/// }
/// ```
TSIndexSignature(Box<'a, TSIndexSignature<'a>>),
TSIndexSignature(Box<'a, TSIndexSignature<'a>>) = 4,
}

#[ast(visit)]
Expand Down Expand Up @@ -1911,8 +1911,8 @@ pub struct MethodDefinition<'a> {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub enum MethodDefinitionType {
MethodDefinition,
TSAbstractMethodDefinition,
MethodDefinition = 0,
TSAbstractMethodDefinition = 1,
}

#[ast(visit)]
Expand Down Expand Up @@ -2000,8 +2000,8 @@ pub struct PropertyDefinition<'a> {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub enum PropertyDefinitionType {
PropertyDefinition,
TSAbstractPropertyDefinition,
PropertyDefinition = 0,
TSAbstractPropertyDefinition = 1,
}

#[ast]
Expand All @@ -2010,13 +2010,13 @@ pub enum PropertyDefinitionType {
#[serde(rename_all = "camelCase")]
pub enum MethodDefinitionKind {
/// Class constructor
Constructor,
Constructor = 0,
/// Static or instance method
Method,
Method = 1,
/// Getter method
Get,
Get = 2,
/// Setter method
Set,
Set = 3,
}

/// An identifier for a private class member.
Expand Down Expand Up @@ -2120,8 +2120,8 @@ pub use match_module_declaration;
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
pub enum AccessorPropertyType {
AccessorProperty,
TSAbstractAccessorProperty,
AccessorProperty = 0,
TSAbstractAccessorProperty = 1,
}

/// Class Accessor Property
Expand Down Expand Up @@ -2185,11 +2185,11 @@ pub struct ImportDeclaration<'a> {
pub enum ImportDeclarationSpecifier<'a> {
/// import {imported} from "source"
/// import {imported as local} from "source"
ImportSpecifier(Box<'a, ImportSpecifier<'a>>),
ImportSpecifier(Box<'a, ImportSpecifier<'a>>) = 0,
/// import local from "source"
ImportDefaultSpecifier(Box<'a, ImportDefaultSpecifier<'a>>),
ImportDefaultSpecifier(Box<'a, ImportDefaultSpecifier<'a>>) = 1,
/// import * as local from "source"
ImportNamespaceSpecifier(Box<'a, ImportNamespaceSpecifier<'a>>),
ImportNamespaceSpecifier(Box<'a, ImportNamespaceSpecifier<'a>>) = 2,
}

// import {imported} from "source"
Expand Down Expand Up @@ -2278,8 +2278,8 @@ pub struct ImportAttribute<'a> {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[serde(untagged)]
pub enum ImportAttributeKey<'a> {
Identifier(IdentifierName<'a>),
StringLiteral(StringLiteral<'a>),
Identifier(IdentifierName<'a>) = 0,
StringLiteral(StringLiteral<'a>) = 1,
}

/// Named Export Declaration
Expand Down Expand Up @@ -2410,8 +2410,8 @@ pub enum ExportDefaultDeclarationKind<'a> {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[serde(untagged)]
pub enum ModuleExportName<'a> {
IdentifierName(IdentifierName<'a>),
IdentifierName(IdentifierName<'a>) = 0,
/// For `local` in `ExportSpecifier`: `foo` in `export { foo }`
IdentifierReference(IdentifierReference<'a>),
StringLiteral(StringLiteral<'a>),
IdentifierReference(IdentifierReference<'a>) = 1,
StringLiteral(StringLiteral<'a>) = 2,
}
41 changes: 18 additions & 23 deletions crates/oxc_ast/src/ast/jsx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ pub struct JSXClosingFragment {
#[serde(untagged)]
pub enum JSXElementName<'a> {
/// `<Apple />`
Identifier(Box<'a, JSXIdentifier<'a>>),
Identifier(Box<'a, JSXIdentifier<'a>>) = 0,
/// `<Apple:Orange />`
NamespacedName(Box<'a, JSXNamespacedName<'a>>),
NamespacedName(Box<'a, JSXNamespacedName<'a>>) = 1,
/// `<Apple.Orange />`
MemberExpression(Box<'a, JSXMemberExpression<'a>>),
MemberExpression(Box<'a, JSXMemberExpression<'a>>) = 2,
}

/// JSX Namespaced Name
Expand Down Expand Up @@ -205,8 +205,8 @@ pub struct JSXMemberExpression<'a> {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[serde(untagged)]
pub enum JSXMemberExpressionObject<'a> {
Identifier(Box<'a, JSXIdentifier<'a>>),
MemberExpression(Box<'a, JSXMemberExpression<'a>>),
Identifier(Box<'a, JSXIdentifier<'a>>) = 0,
MemberExpression(Box<'a, JSXMemberExpression<'a>>) = 1,
}

/// JSX Expression Container
Expand Down Expand Up @@ -268,8 +268,8 @@ pub struct JSXEmptyExpression {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[serde(untagged)]
pub enum JSXAttributeItem<'a> {
Attribute(Box<'a, JSXAttribute<'a>>),
SpreadAttribute(Box<'a, JSXSpreadAttribute<'a>>),
Attribute(Box<'a, JSXAttribute<'a>>) = 0,
SpreadAttribute(Box<'a, JSXSpreadAttribute<'a>>) = 1,
}

/// JSX Attribute
Expand Down Expand Up @@ -315,8 +315,8 @@ pub struct JSXSpreadAttribute<'a> {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[serde(untagged)]
pub enum JSXAttributeName<'a> {
Identifier(Box<'a, JSXIdentifier<'a>>),
NamespacedName(Box<'a, JSXNamespacedName<'a>>),
Identifier(Box<'a, JSXIdentifier<'a>>) = 0,
NamespacedName(Box<'a, JSXNamespacedName<'a>>) = 1,
}

/// JSX Attribute Value
Expand All @@ -327,10 +327,10 @@ pub enum JSXAttributeName<'a> {
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[serde(untagged)]
pub enum JSXAttributeValue<'a> {
StringLiteral(Box<'a, StringLiteral<'a>>),
ExpressionContainer(Box<'a, JSXExpressionContainer<'a>>),
Element(Box<'a, JSXElement<'a>>),
Fragment(Box<'a, JSXFragment<'a>>),
StringLiteral(Box<'a, StringLiteral<'a>>) = 0,
ExpressionContainer(Box<'a, JSXExpressionContainer<'a>>) = 1,
Element(Box<'a, JSXElement<'a>>) = 2,
Fragment(Box<'a, JSXFragment<'a>>) = 3,
}

/// JSX Identifier
Expand Down Expand Up @@ -359,20 +359,15 @@ pub struct JSXIdentifier<'a> {
#[serde(untagged)]
pub enum JSXChild<'a> {
/// `<Foo>Some Text</Foo>`
Text(Box<'a, JSXText<'a>>),
Text(Box<'a, JSXText<'a>>) = 0,
/// `<Foo><Child /></Foo>`
Element(Box<'a, JSXElement<'a>>),
Element(Box<'a, JSXElement<'a>>) = 1,
/// `<Foo><></></Foo>`
Fragment(Box<'a, JSXFragment<'a>>),
Fragment(Box<'a, JSXFragment<'a>>) = 2,
/// `<Foo>{expression}</Foo>`
ExpressionContainer(Box<'a, JSXExpressionContainer<'a>>),
ExpressionContainer(Box<'a, JSXExpressionContainer<'a>>) = 3,
/// `<Foo>{...spread}</Foo>`
Spread(Box<'a, JSXSpreadChild<'a>>),
}
impl<'a> JSXChild<'a> {
pub const fn is_expression_container(&self) -> bool {
matches!(self, Self::ExpressionContainer(_))
}
Spread(Box<'a, JSXSpreadChild<'a>>) = 4,
}

/// JSX Spread Child.
Expand Down
Loading