kirigaya/sv-parser
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustfmt

Browse Source
This commit is contained in:
dalance 2019-07-24 17:39:30 +09:00
parent 3a7daa174f
commit bba6c7cbf3
20 changed files with 106 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/parser/behavioral_statements/continuous_assignment_and_net_alias_statements.rs
View File

@ -45,13 +45,7 @@ pub struct ListOfVariableAssignments {
#[derive(Clone, Debug, Node)]
pub struct NetAlias {
pub nodes: (
Keyword,
NetLvalue,
Symbol,
List<Symbol, NetLvalue>,
Symbol,
),
pub nodes: (Keyword, NetLvalue, Symbol, List<Symbol, NetLvalue>, Symbol),
}
#[derive(Clone, Debug, Node)]

7
src/parser/behavioral_statements/procedural_blocks_and_assignments.rs
View File

@ -39,12 +39,7 @@ pub enum BlockingAssignment {
#[derive(Clone, Debug, Node)]
pub struct BlockingAssignmentVariable {
pub nodes: (
VariableLvalue,
Symbol,
DelayOrEventControl,
Expression,
),
pub nodes: (VariableLvalue, Symbol, DelayOrEventControl, Expression),
}
#[derive(Clone, Debug, Node)]

12
src/parser/declarations/block_item_declarations.rs
View File

@ -21,20 +21,12 @@ pub struct BlockItemDeclarationData {
#[derive(Clone, Debug, Node)]
pub struct BlockItemDeclarationLocalParameter {
pub nodes: (
Vec<AttributeInstance>,
LocalParameterDeclaration,
Symbol,
),
pub nodes: (Vec<AttributeInstance>, LocalParameterDeclaration, Symbol),
}
#[derive(Clone, Debug, Node)]
pub struct BlockItemDeclarationParameter {
pub nodes: (
Vec<AttributeInstance>,
ParameterDeclaration,
Symbol,
),
pub nodes: (Vec<AttributeInstance>, ParameterDeclaration, Symbol),
}
#[derive(Clone, Debug, Node)]

12
src/parser/declarations/module_parameter_declarations.rs
View File

@ -14,11 +14,7 @@ pub enum LocalParameterDeclaration {
#[derive(Clone, Debug, Node)]
pub struct LocalParameterDeclarationParam {
pub nodes: (
Keyword,
Option<DataTypeOrImplicit>,
ListOfParamAssignments,
),
pub nodes: (Keyword, Option<DataTypeOrImplicit>, ListOfParamAssignments),
}
#[derive(Clone, Debug, Node)]
@ -34,11 +30,7 @@ pub enum ParameterDeclaration {
#[derive(Clone, Debug, Node)]
pub struct ParameterDeclarationParam {
pub nodes: (
Keyword,
Option<DataTypeOrImplicit>,
ListOfParamAssignments,
),
pub nodes: (Keyword, Option<DataTypeOrImplicit>, ListOfParamAssignments),
}
#[derive(Clone, Debug, Node)]

36
src/parser/declarations/port_declarations.rs
View File

@ -9,11 +9,7 @@ use nom::IResult;
#[derive(Clone, Debug, Node)]
pub struct InoutDeclaration {
pub nodes: (
Keyword,
Option<NetPortType>,
ListOfPortIdentifiers,
),
pub nodes: (Keyword, Option<NetPortType>, ListOfPortIdentifiers),
}
#[derive(Clone, Debug, Node)]
@ -24,20 +20,12 @@ pub enum InputDeclaration {
#[derive(Clone, Debug, Node)]
pub struct InputDeclarationNet {
pub nodes: (
Keyword,
Option<NetPortType>,
ListOfPortIdentifiers,
),
pub nodes: (Keyword, Option<NetPortType>, ListOfPortIdentifiers),
}
#[derive(Clone, Debug, Node)]
pub struct InputDeclarationVariable {
pub nodes: (
Keyword,
VariablePortType,
ListOfVariableIdentifiers,
),
pub nodes: (Keyword, VariablePortType, ListOfVariableIdentifiers),
}
#[derive(Clone, Debug, Node)]
@ -48,20 +36,12 @@ pub enum OutputDeclaration {
#[derive(Clone, Debug, Node)]
pub struct OutputDeclarationNet {
pub nodes: (
Keyword,
Option<NetPortType>,
ListOfPortIdentifiers,
),
pub nodes: (Keyword, Option<NetPortType>, ListOfPortIdentifiers),
}
#[derive(Clone, Debug, Node)]
pub struct OutputDeclarationVariable {
pub nodes: (
Keyword,
VariablePortType,
ListOfVariableIdentifiers,
),
pub nodes: (Keyword, VariablePortType, ListOfVariableIdentifiers),
}
#[derive(Clone, Debug, Node)]
@ -75,11 +55,7 @@ pub struct InterfacePortDeclaration {
#[derive(Clone, Debug, Node)]
pub struct RefDeclaration {
pub nodes: (
Keyword,
VariablePortType,
ListOfVariableIdentifiers,
),
pub nodes: (Keyword, VariablePortType, ListOfVariableIdentifiers),
}
// -----------------------------------------------------------------------------

18
src/parser/declarations/type_declarations.rs
View File

@ -35,11 +35,7 @@ pub struct Const {
#[derive(Clone, Debug, Node)]
pub struct PackageImportDeclaration {
pub nodes: (
Keyword,
List<Symbol, PackageImportItem>,
Symbol,
),
pub nodes: (Keyword, List<Symbol, PackageImportItem>, Symbol),
}
#[derive(Clone, Debug, Node)]
@ -71,11 +67,7 @@ pub struct PackageExportDeclarationAsterisk {
#[derive(Clone, Debug, Node)]
pub struct PackageExportDeclarationItem {
pub nodes: (
Keyword,
List<Symbol, PackageImportItem>,
Symbol,
),
pub nodes: (Keyword, List<Symbol, PackageImportItem>, Symbol),
}
#[derive(Clone, Debug, Node)]
@ -200,11 +192,7 @@ pub struct NetTypeDeclarationDataType {
Keyword,
DataType,
NetTypeIdentifier,
Option<(
Keyword,
Option<PackageScopeOrClassScope>,
TfIdentifier,
)>,
Option<(Keyword, Option<PackageScopeOrClassScope>, TfIdentifier)>,
Symbol,
),
}

4
src/parser/instantiations/checker_instantiation.rs
View File

@ -12,7 +12,7 @@ pub struct CheckerInstantiation {
pub nodes: (
PsCheckerIdentifier,
NameOfInstance,
Paren< Option<ListOfCheckerPortConnections>>,
Paren<Option<ListOfCheckerPortConnections>>,
Symbol,
),
}
@ -50,7 +50,7 @@ pub struct NamedCheckerPortConnectionIdentifier {
Vec<AttributeInstance>,
Symbol,
FormalPortIdentifier,
Option<Paren< Option<PropertyActualArg>>>,
Option<Paren<Option<PropertyActualArg>>>,
),
}

40
src/parser/instantiations/generated_instantiation.rs
View File

@ -17,28 +17,20 @@ pub struct GenerateRegion {
pub struct LoopGenerateConstruct {
pub nodes: (
Keyword,
Paren<
(
GenvarInitialization,
Symbol,
GenvarExpression,
Symbol,
GenvarIteration,
),
>,
Paren<(
GenvarInitialization,
Symbol,
GenvarExpression,
Symbol,
GenvarIteration,
)>,
GenerateBlock,
),
}
#[derive(Clone, Debug, Node)]
pub struct GenvarInitialization {
pub nodes: (
Option<Genvar>,
GenvarIdentifier,
Symbol,
ConstantExpression,
),
pub nodes: (Option<Genvar>, GenvarIdentifier, Symbol, ConstantExpression),
}
#[derive(Clone, Debug, Node)]
@ -55,11 +47,7 @@ pub enum GenvarIteration {
#[derive(Clone, Debug, Node)]
pub struct GenvarIterationAssignment {
pub nodes: (
GenvarIdentifier,
AssignmentOperator,
GenvarExpression,
),
pub nodes: (GenvarIdentifier, AssignmentOperator, GenvarExpression),
}
#[derive(Clone, Debug, Node)]
@ -82,7 +70,7 @@ pub enum ConditionalGenerateConstruct {
pub struct IfGenerateConstruct {
pub nodes: (
Keyword,
Paren< ConstantExpression>,
Paren<ConstantExpression>,
GenerateBlock,
Option<(Keyword, GenerateBlock)>,
),
@ -92,7 +80,7 @@ pub struct IfGenerateConstruct {
pub struct CaseGenerateConstruct {
pub nodes: (
Keyword,
Paren< ConstantExpression>,
Paren<ConstantExpression>,
Vec<CaseGenerateItem>,
Keyword,
),
@ -106,11 +94,7 @@ pub enum CaseGenerateItem {
#[derive(Clone, Debug, Node)]
pub struct CaseGenerateItemNondefault {
pub nodes: (
List<Symbol, ConstantExpression>,
Symbol,
GenerateBlock,
),
pub nodes: (List<Symbol, ConstantExpression>, Symbol, GenerateBlock),
}
#[derive(Clone, Debug, Node)]

18
src/parser/instantiations/module_instantiation.rs
View File

@ -19,10 +19,7 @@ pub struct ModuleInstantiation {
#[derive(Clone, Debug, Node)]
pub struct ParameterValueAssignment {
pub nodes: (
Symbol,
Paren< Option<ListOfParameterAssignments>>,
),
pub nodes: (Symbol, Paren<Option<ListOfParameterAssignments>>),
}
#[derive(Clone, Debug, Node)]
@ -48,19 +45,12 @@ pub struct OrderedParameterAssignment {
#[derive(Clone, Debug, Node)]
pub struct NamedParameterAssignment {
pub nodes: (
Symbol,
ParameterIdentifier,
Paren< Option<ParamExpression>>,
),
pub nodes: (Symbol, ParameterIdentifier, Paren<Option<ParamExpression>>),
}
#[derive(Clone, Debug, Node)]
pub struct HierarchicalInstance {
pub nodes: (
NameOfInstance,
Paren< Option<ListOfPortConnections>>,
),
pub nodes: (NameOfInstance, Paren<Option<ListOfPortConnections>>),
}
#[derive(Clone, Debug, Node)]
@ -101,7 +91,7 @@ pub struct NamedPortConnectionIdentifier {
Vec<AttributeInstance>,
Symbol,
PortIdentifier,
Option<Paren< Option<Expression>>>,
Option<Paren<Option<Expression>>>,
),
}

94
src/parser/primitive_instances/primitive_instantiation_and_instances.rs
View File

@ -85,11 +85,7 @@ pub struct GateInstantiationPassEn {
#[derive(Clone, Debug, Node)]
pub struct GateInstantiationPass {
pub nodes: (
PassSwitchtype,
List<Symbol, PassSwitchInstance>,
Symbol,
),
pub nodes: (PassSwitchtype, List<Symbol, PassSwitchInstance>, Symbol),
}
#[derive(Clone, Debug, Node)]
@ -116,18 +112,15 @@ pub struct GateInstantiationPullup {
pub struct CmosSwitchInstance {
pub nodes: (
Option<NameOfInstance>,
Paren<
(
OutputTerminal,
Symbol,
InputTerminal,
Symbol,
NcontrolTerminal,
Symbol,
PcontrolTerminal,
),
>,
Paren<(
OutputTerminal,
Symbol,
InputTerminal,
Symbol,
NcontrolTerminal,
Symbol,
PcontrolTerminal,
)>,
),
}
@ -135,16 +128,13 @@ pub struct CmosSwitchInstance {
pub struct EnableGateInstance {
pub nodes: (
Option<NameOfInstance>,
Paren<
(
OutputTerminal,
Symbol,
InputTerminal,
Symbol,
EnableTerminal,
),
>,
Paren<(
OutputTerminal,
Symbol,
InputTerminal,
Symbol,
EnableTerminal,
)>,
),
}
@ -152,16 +142,13 @@ pub struct EnableGateInstance {
pub struct MosSwitchInstance {
pub nodes: (
Option<NameOfInstance>,
Paren<
(
OutputTerminal,
Symbol,
InputTerminal,
Symbol,
EnableTerminal,
),
>,
Paren<(
OutputTerminal,
Symbol,
InputTerminal,
Symbol,
EnableTerminal,
)>,
),
}
@ -169,14 +156,7 @@ pub struct MosSwitchInstance {
pub struct NInputGateInstance {
pub nodes: (
Option<NameOfInstance>,
Paren<
(
OutputTerminal,
Symbol,
List<Symbol, InputTerminal>,
),
>,
Paren<(OutputTerminal, Symbol, List<Symbol, InputTerminal>)>,
),
}
@ -184,14 +164,7 @@ pub struct NInputGateInstance {
pub struct NOutputGateInstance {
pub nodes: (
Option<NameOfInstance>,
Paren<
(
List<Symbol, OutputTerminal>,
Symbol,
InputTerminal,
),
>,
Paren<(List<Symbol, OutputTerminal>, Symbol, InputTerminal)>,
),
}
@ -199,7 +172,7 @@ pub struct NOutputGateInstance {
pub struct PassSwitchInstance {
pub nodes: (
Option<NameOfInstance>,
Paren< (InoutTerminal, Symbol, InoutTerminal)>,
Paren<(InoutTerminal, Symbol, InoutTerminal)>,
),
}
@ -207,22 +180,13 @@ pub struct PassSwitchInstance {
pub struct PassEnableSwitchInstance {
pub nodes: (
Option<NameOfInstance>,
Paren<
(
InoutTerminal,
Symbol,
InoutTerminal,
Symbol,
EnableTerminal,
),
>,
Paren<(InoutTerminal, Symbol, InoutTerminal, Symbol, EnableTerminal)>,
),
}
#[derive(Clone, Debug, Node)]
pub struct PullGateInstance {
pub nodes: (Option<NameOfInstance>, Paren< OutputTerminal>),
pub nodes: (Option<NameOfInstance>, Paren<OutputTerminal>),
}
// -----------------------------------------------------------------------------

12
src/parser/primitive_instances/primitive_strengths.rs
View File

@ -14,17 +14,17 @@ pub enum PulldownStrength {
#[derive(Clone, Debug, Node)]
pub struct PulldownStrength01 {
pub nodes: (Paren< (Strength0, Symbol, Strength1)>,),
pub nodes: (Paren<(Strength0, Symbol, Strength1)>,),
}
#[derive(Clone, Debug, Node)]
pub struct PulldownStrength10 {
pub nodes: (Paren< (Strength1, Symbol, Strength0)>,),
pub nodes: (Paren<(Strength1, Symbol, Strength0)>,),
}
#[derive(Clone, Debug, Node)]
pub struct PulldownStrength0 {
pub nodes: (Paren< Strength0>,),
pub nodes: (Paren<Strength0>,),
}
#[derive(Clone, Debug, Node)]
@ -36,17 +36,17 @@ pub enum PullupStrength {
#[derive(Clone, Debug, Node)]
pub struct PullupStrength01 {
pub nodes: (Paren< (Strength0, Symbol, Strength1)>,),
pub nodes: (Paren<(Strength0, Symbol, Strength1)>,),
}
#[derive(Clone, Debug, Node)]
pub struct PullupStrength10 {
pub nodes: (Paren< (Strength1, Symbol, Strength0)>,),
pub nodes: (Paren<(Strength1, Symbol, Strength0)>,),
}
#[derive(Clone, Debug, Node)]
pub struct PullupStrength1 {
pub nodes: (Paren< Strength1>,),
pub nodes: (Paren<Strength1>,),
}
// -----------------------------------------------------------------------------

8
src/parser/source_text/checker_items.rs
View File

@ -73,13 +73,7 @@ pub struct CheckerOrGenerateItemDeclarationClocking {
#[derive(Clone, Debug, Node)]
pub struct CheckerOrGenerateItemDeclarationDisable {
pub nodes: (
Keyword,
Keyword,
Keyword,
ExpressionOrDist,
Symbol,
),
pub nodes: (Keyword, Keyword, Keyword, ExpressionOrDist, Symbol),
}
#[derive(Clone, Debug, Node)]

24
src/parser/source_text/class_items.rs
View File

@ -101,12 +101,7 @@ pub struct ClassMethodPureVirtual {
#[derive(Clone, Debug, Node)]
pub struct ClassMethodExternMethod {
pub nodes: (
Keyword,
Vec<MethodQualifier>,
MethodPrototype,
Symbol,
),
pub nodes: (Keyword, Vec<MethodQualifier>, MethodPrototype, Symbol),
}
#[derive(Clone, Debug, Node)]
@ -116,21 +111,12 @@ pub struct ClassMethodConstructor {
#[derive(Clone, Debug, Node)]
pub struct ClassMethodExternConstructor {
pub nodes: (
Keyword,
Vec<MethodQualifier>,
ClassConstructorPrototype,
),
pub nodes: (Keyword, Vec<MethodQualifier>, ClassConstructorPrototype),
}
#[derive(Clone, Debug, Node)]
pub struct ClassConstructorPrototype {
pub nodes: (
Keyword,
Keyword,
Option<Paren< Option<TfPortList>>>,
Symbol,
),
pub nodes: (Keyword, Keyword, Option<Paren<Option<TfPortList>>>, Symbol),
}
#[derive(Clone, Debug, Node)]
@ -177,14 +163,14 @@ pub struct ClassConstructorDeclaration {
Keyword,
Option<ClassScope>,
Keyword,
Option<Paren< Option<TfPortList>>>,
Option<Paren<Option<TfPortList>>>,
Symbol,
Vec<BlockItemDeclaration>,
Option<(
Keyword,
Symbol,
Keyword,
Option<Paren< ListOfArguments>>,
Option<Paren<ListOfArguments>>,
Symbol,
)>,
Vec<FunctionStatementOrNull>,

16
src/parser/source_text/configuration_source_text.rs
View File

@ -26,10 +26,7 @@ pub struct ConfigDeclaration {
pub struct DesignStatement {
pub nodes: (
Keyword,
Vec<(
Option<(LibraryIdentifier, Symbol)>,
CellIdentifier,
)>,
Vec<(Option<(LibraryIdentifier, Symbol)>, CellIdentifier)>,
Symbol,
),
}
@ -80,19 +77,12 @@ pub struct InstClause {
#[derive(Clone, Debug, Node)]
pub struct InstName {
pub nodes: (
TopmoduleIdentifier,
Vec<(Symbol, InstanceIdentifier)>,
),
pub nodes: (TopmoduleIdentifier, Vec<(Symbol, InstanceIdentifier)>),
}
#[derive(Clone, Debug, Node)]
pub struct CellClause {
pub nodes: (
Keyword,
Option<(LibraryIdentifier, Symbol)>,
CellIdentifier,
),
pub nodes: (Keyword, Option<(LibraryIdentifier, Symbol)>, CellIdentifier),
}
#[derive(Clone, Debug, Node)]

24
src/parser/source_text/constraints.rs
View File

@ -25,7 +25,7 @@ pub struct Static {
#[derive(Clone, Debug, Node)]
pub struct ConstraintBlock {
pub nodes: (Brace< Vec<ConstraintBlockItem>>,),
pub nodes: (Brace<Vec<ConstraintBlockItem>>,),
}
#[derive(Clone, Debug, Node)]
@ -36,13 +36,7 @@ pub enum ConstraintBlockItem {
#[derive(Clone, Debug, Node)]
pub struct ConstraintBlockItemSolve {
pub nodes: (
Keyword,
SolveBeforeList,
Keyword,
SolveBeforeList,
Symbol,
),
pub nodes: (Keyword, SolveBeforeList, Keyword, SolveBeforeList, Symbol),
}
#[derive(Clone, Debug, Node)]
@ -88,7 +82,7 @@ pub struct ConstraintExpressionArrow {
pub struct ConstraintExpressionIf {
pub nodes: (
Keyword,
Paren< Expression>,
Paren<Expression>,
ConstraintSet,
Option<(Keyword, ConstraintSet)>,
),
@ -98,13 +92,7 @@ pub struct ConstraintExpressionIf {
pub struct ConstraintExpressionForeach {
pub nodes: (
Keyword,
Paren<
(
PsOrHierarchicalArrayIdentifier,
Bracket< LoopVariables>,
),
>,
Paren<(PsOrHierarchicalArrayIdentifier, Bracket<LoopVariables>)>,
ConstraintSet,
),
}
@ -116,7 +104,7 @@ pub struct ConstraintExpressionDisable {
#[derive(Clone, Debug, Node)]
pub struct UniquenessConstraint {
pub nodes: (Keyword, Brace< OpenRangeList>),
pub nodes: (Keyword, Brace<OpenRangeList>),
}
#[derive(Clone, Debug, Node)]
@ -127,7 +115,7 @@ pub enum ConstraintSet {
#[derive(Clone, Debug, Node)]
pub struct ConstraintSetBrace {
pub nodes: (Brace< Vec<ConstraintExpression>>,),
pub nodes: (Brace<Vec<ConstraintExpression>>,),
}
#[derive(Clone, Debug, Node)]

37
src/parser/source_text/module_parameters_and_ports.rs
View File

@ -19,22 +19,16 @@ pub enum ParameterPortList {
pub struct ParameterPortListAssignment {
pub nodes: (
Symbol,
Paren<
(
ListOfParamAssignments,
Vec<(Symbol, ParameterPortDeclaration)>,
),
>,
Paren<(
ListOfParamAssignments,
Vec<(Symbol, ParameterPortDeclaration)>,
)>,
),
}
#[derive(Clone, Debug, Node)]
pub struct ParameterPortListDeclaration {
pub nodes: (
Symbol,
Paren< List<Symbol, ParameterPortDeclaration>>,
),
pub nodes: (Symbol, Paren<List<Symbol, ParameterPortDeclaration>>),
}
#[derive(Clone, Debug, Node)]
@ -57,14 +51,12 @@ pub struct ParameterPortDeclarationTypeList {
#[derive(Clone, Debug, Node)]
pub struct ListOfPorts {
pub nodes: (Paren< List<Symbol, Port>>,),
pub nodes: (Paren<List<Symbol, Port>>,),
}
#[derive(Clone, Debug, Node)]
pub struct ListOfPortDeclarations {
pub nodes: (
Paren< Option<List<Symbol, (Vec<AttributeInstance>, AnsiPortDeclaration)>>>,
),
pub nodes: (Paren<Option<List<Symbol, (Vec<AttributeInstance>, AnsiPortDeclaration)>>>,),
}
#[derive(Clone, Debug, Node)]
@ -114,11 +106,7 @@ pub struct PortNonNamed {
#[derive(Clone, Debug, Node)]
pub struct PortNamed {
pub nodes: (
Symbol,
PortIdentifier,
Paren< Option<PortExpression>>,
),
pub nodes: (Symbol, PortIdentifier, Paren<Option<PortExpression>>),
}
#[derive(Clone, Debug, Node)]
@ -129,7 +117,7 @@ pub enum PortExpression {
#[derive(Clone, Debug, Node)]
pub struct PortExpressionBrace {
pub nodes: (Brace< List<Symbol, PortReference>>,),
pub nodes: (Brace<List<Symbol, PortReference>>,),
}
#[derive(Clone, Debug, Node)]
@ -163,10 +151,7 @@ pub enum InterfacePortHeader {
#[derive(Clone, Debug, Node)]
pub struct InterfacePortHeaderIdentifier {
pub nodes: (
InterfaceIdentifier,
Option<(Symbol, ModportIdentifier)>,
),
pub nodes: (InterfaceIdentifier, Option<(Symbol, ModportIdentifier)>),
}
#[derive(Clone, Debug, Node)]
@ -212,7 +197,7 @@ pub struct AnsiPortDeclarationParen {
Option<PortDirection>,
Symbol,
PortIdentifier,
Paren< Option<Expression>>,
Paren<Option<Expression>>,
),
}

7
src/parser/source_text/package_items.rs
View File

@ -36,12 +36,7 @@ pub enum PackageOrGenerateItemDeclaration {
#[derive(Clone, Debug, Node)]
pub struct AnonymousProgram {
pub nodes: (
Keyword,
Symbol,
Vec<AnonymousProgramItem>,
Keyword,
),
pub nodes: (Keyword, Symbol, Vec<AnonymousProgramItem>, Keyword),
}
#[derive(Clone, Debug, Node)]

5
src/parser/source_text/program_items.rs
View File

@ -32,10 +32,7 @@ pub struct NonPortProgramItemAssign {
#[derive(Clone, Debug, Node)]
pub struct NonPortProgramItemModule {
pub nodes: (
Vec<AttributeInstance>,
ModuleOrGenerateItemDeclaration,
),
pub nodes: (Vec<AttributeInstance>, ModuleOrGenerateItemDeclaration),
}
#[derive(Clone, Debug, Node)]

39
src/parser/source_text/system_verilog_source_text.rs
View File

@ -101,7 +101,7 @@ pub struct ModuleDeclarationWildcard {
ModuleKeyword,
Option<Lifetime>,
ModuleIdentifier,
Paren< Symbol>,
Paren<Symbol>,
Symbol,
Option<TimeunitsDeclaration>,
Vec<ModuleItem>,
@ -164,7 +164,7 @@ pub struct InterfaceDeclarationWildcard {
Keyword,
Option<Lifetime>,
InterfaceIdentifier,
Paren< Symbol>,
Paren<Symbol>,
Symbol,
Option<TimeunitsDeclaration>,
Vec<InterfaceItem>,
@ -248,7 +248,7 @@ pub struct ProgramDeclarationWildcard {
Vec<AttributeInstance>,
Keyword,
ProgramIdentifier,
Paren< Symbol>,
Paren<Symbol>,
Symbol,
Option<TimeunitsDeclaration>,
Vec<ProgramItem>,
@ -300,7 +300,7 @@ pub struct CheckerDeclaration {
pub nodes: (
Keyword,
CheckerIdentifier,
Option<Paren< Option<CheckerPortList>>>,
Option<Paren<Option<CheckerPortList>>>,
Symbol,
Vec<(Vec<AttributeInstance>, CheckerOrGenerateItem)>,
Keyword,
@ -316,11 +316,7 @@ pub struct ClassDeclaration {
Option<Lifetime>,
ClassIdentifier,
Option<ParameterPortList>,
Option<(
Keyword,
ClassType,
Option<Paren< ListOfArguments>>,
)>,
Option<(Keyword, ClassType, Option<Paren<ListOfArguments>>)>,
Option<(Keyword, List<Symbol, InterfaceClassType>)>,
Symbol,
Vec<ClassItem>,
@ -398,12 +394,7 @@ pub enum TimeunitsDeclaration {
#[derive(Clone, Debug, Node)]
pub struct TimeunitsDeclarationTimeunit {
pub nodes: (
Keyword,
TimeLiteral,
Option<(Symbol, TimeLiteral)>,
Symbol,
),
pub nodes: (Keyword, TimeLiteral, Option<(Symbol, TimeLiteral)>, Symbol),
}
#[derive(Clone, Debug, Node)]
@ -413,26 +404,12 @@ pub struct TimeunitsDeclarationTimeprecision {
#[derive(Clone, Debug, Node)]
pub struct TimeunitsDeclarationTimeunitTimeprecision {
pub nodes: (
Keyword,
TimeLiteral,
Symbol,
Keyword,
TimeLiteral,
Symbol,
),
pub nodes: (Keyword, TimeLiteral, Symbol, Keyword, TimeLiteral, Symbol),
}
#[derive(Clone, Debug, Node)]
pub struct TimeunitsDeclarationTimeprecisionTimeunit {
pub nodes: (
Keyword,
TimeLiteral,
Symbol,
Keyword,
TimeLiteral,
Symbol,
),
pub nodes: (Keyword, TimeLiteral, Symbol, Keyword, TimeLiteral, Symbol),
}
// -----------------------------------------------------------------------------

12
src/parser/udp_declaration_and_instantiation/udp_ports.rs
View File

@ -57,20 +57,12 @@ pub struct UdpOutputDeclarationReg {
#[derive(Clone, Debug, Node)]
pub struct UdpInputDeclaration {
pub nodes: (
Vec<AttributeInstance>,
Keyword,
ListOfUdpPortIdentifiers,
),
pub nodes: (Vec<AttributeInstance>, Keyword, ListOfUdpPortIdentifiers),
}
#[derive(Clone, Debug, Node)]
pub struct UdpRegDeclaration {
pub nodes: (
Vec<AttributeInstance>,
Keyword,
VariableIdentifier,
),
pub nodes: (Vec<AttributeInstance>, Keyword, VariableIdentifier),
}
// -----------------------------------------------------------------------------