diff --git a/src/protocol/ast.rs b/src/protocol/ast.rs index 6ad5f1ca98cfa39f02cad26fa0314df2c6f14413..87e0135bc0e117077ba4a62a7682c557ca1ae55d 100644 --- a/src/protocol/ast.rs +++ b/src/protocol/ast.rs @@ -932,7 +932,6 @@ pub struct StructDefinition { pub this: StructDefinitionId, pub defined_in: RootId, // Symbol scanning - pub span: InputSpan, pub identifier: Identifier, pub poly_vars: Vec, // Parsing @@ -941,10 +940,10 @@ pub struct StructDefinition { impl StructDefinition { pub(crate) fn new_empty( - this: StructDefinitionId, defined_in: RootId, span: InputSpan, + this: StructDefinitionId, defined_in: RootId, identifier: Identifier, poly_vars: Vec ) -> Self { - Self{ this, defined_in, span, identifier, poly_vars, fields: Vec::new() } + Self{ this, defined_in, identifier, poly_vars, fields: Vec::new() } } } @@ -965,7 +964,6 @@ pub struct EnumDefinition { pub this: EnumDefinitionId, pub defined_in: RootId, // Symbol scanning - pub span: InputSpan, pub identifier: Identifier, pub poly_vars: Vec, // Parsing @@ -974,10 +972,10 @@ pub struct EnumDefinition { impl EnumDefinition { pub(crate) fn new_empty( - this: EnumDefinitionId, defined_in: RootId, span: InputSpan, + this: EnumDefinitionId, defined_in: RootId, identifier: Identifier, poly_vars: Vec ) -> Self { - Self{ this, defined_in, span, identifier, poly_vars, variants: Vec::new() } + Self{ this, defined_in, identifier, poly_vars, variants: Vec::new() } } } @@ -993,7 +991,6 @@ pub struct UnionDefinition { pub this: UnionDefinitionId, pub defined_in: RootId, // Phase 1: symbol scanning - pub span: InputSpan, pub identifier: Identifier, pub poly_vars: Vec, // Phase 2: parsing @@ -1002,10 +999,10 @@ pub struct UnionDefinition { impl UnionDefinition { pub(crate) fn new_empty( - this: UnionDefinitionId, defined_in: RootId, span: InputSpan, + this: UnionDefinitionId, defined_in: RootId, identifier: Identifier, poly_vars: Vec ) -> Self { - Self{ this, defined_in, span, identifier, poly_vars, variants: Vec::new() } + Self{ this, defined_in, identifier, poly_vars, variants: Vec::new() } } } @@ -1111,7 +1108,6 @@ pub struct ProcedureDefinition { pub defined_in: RootId, // Symbol scanning pub kind: ProcedureKind, - pub span: InputSpan, pub identifier: Identifier, pub poly_vars: Vec, // Parser @@ -1126,12 +1122,11 @@ pub struct ProcedureDefinition { impl ProcedureDefinition { pub(crate) fn new_empty( - this: ProcedureDefinitionId, defined_in: RootId, span: InputSpan, + this: ProcedureDefinitionId, defined_in: RootId, kind: ProcedureKind, identifier: Identifier, poly_vars: Vec ) -> Self { Self { this, defined_in, - span, kind, identifier, poly_vars, source: ProcedureSource::FuncUserDefined, return_type: None,