diff --git a/src/protocol/parser/pass_definitions.rs b/src/protocol/parser/pass_definitions.rs index f1daca6c3081615e0dee6cdde1a16065d2eaf752..fa5d495991b9892f9ffaf71abd3045ce444a3ba8 100644 --- a/src/protocol/parser/pass_definitions.rs +++ b/src/protocol/parser/pass_definitions.rs @@ -98,7 +98,7 @@ impl PassDefinitions { Some(KW_ENUM) => self.visit_enum_definition(module, &mut iter, ctx)?, Some(KW_UNION) => self.visit_union_definition(module, &mut iter, ctx)?, Some(KW_FUNCTION) => self.visit_function_definition(module, &mut iter, ctx)?, - Some(KW_PRIMITIVE) | Some(KW_COMPOSITE) => self.visit_component_definition(module, &mut iter, ctx)?, + Some(KW_COMPONENT) => self.visit_component_definition(module, &mut iter, ctx)?, _ => return Err(ParseError::new_error_str_at_pos( &module.source, iter.last_valid_pos(), "unexpected symbol, expected a keyword marking the start of a definition" @@ -292,13 +292,13 @@ impl PassDefinitions { Ok(()) } - + fn visit_component_definition( &mut self, module: &Module, iter: &mut TokenIter, ctx: &mut PassCtx ) -> Result<(), ParseError> { // Consume component variant and name - let (_variant_text, _) = consume_any_ident(&module.source, iter)?; - debug_assert!(_variant_text == KW_PRIMITIVE || _variant_text == KW_COMPOSITE); + let (_component_text, _) = consume_any_ident(&module.source, iter)?; + debug_assert!(_component_text == KW_COMPONENT); let (ident_text, _) = consume_ident(&module.source, iter)?; // Retrieve preallocated definition @@ -390,7 +390,7 @@ impl PassDefinitions { let source = match kind { ProcedureKind::Function => ProcedureSource::FuncUserDefined, - ProcedureKind::Primitive | ProcedureKind::Composite => + ProcedureKind::Component => ProcedureSource::CompUserDefined, };