CSY/reowolf Changeset - b7d434ab8020 · Centrum Wiskunde & Informatica (CWI)

Changeset - b7d434ab8020

Parent rev.

Child rev.

[Not reviewed]

0 7 0

MH - 3 years ago 2022-05-13 22:06:46
contact@maxhenger.nl

Remove distinction between primitive/composite components

7 files changed with 18 insertions and 39 deletions:

src/protocol/ast.rs

src/protocol/parser/pass_definitions.rs

src/protocol/parser/pass_symbols.rs

src/protocol/parser/pass_tokenizer.rs

src/protocol/parser/pass_validation_linking.rs

src/protocol/parser/token_parsing.rs

src/runtime2/component/component.rs

0 comments (0 inline, 0 general)

src/protocol/ast.rs

➞

Show inline comments

@@ @@ -1009,8 +1009,7 @@ impl UnionDefinition { @@
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum ProcedureKind {
     Function, // with return type
     Primitive, // without return type
     Composite,
     Component,
+}
 /// Monomorphed instantiation of a procedure (or the sole instantiation of a

src/protocol/parser/pass_definitions.rs

➞

Show inline comments

@@ @@ -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"
@@ @@ -297,8 +297,8 @@ impl PassDefinitions { @@
         &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,
             };

src/protocol/parser/pass_symbols.rs

➞

Show inline comments

@@ @@ -237,14 +237,9 @@ impl PassSymbols { @@
                 definition_class = DefinitionClass::Function;
                 ast_definition_id = proc_def_id.upcast();
             },
             KW_PRIMITIVE | KW_COMPOSITE => {
                 let procedure_kind = if kw_text == KW_PRIMITIVE {
                     ProcedureKind::Primitive
                 } else {
                     ProcedureKind::Composite
                 };
             KW_COMPONENT => {
                 let proc_def_id = ctx.heap.alloc_procedure_definition(|this| {
-                    ProcedureDefinition::new_empty(this, module.root_id, procedure_kind, identifier, poly_vars)
+                    ProcedureDefinition::new_empty(this, module.root_id, ProcedureKind::Component, identifier, poly_vars)
                 });
                 definition_class = DefinitionClass::Component;
                 ast_definition_id = proc_def_id.upcast();

src/protocol/parser/pass_tokenizer.rs

➞

Show inline comments

@@ @@ -623,8 +623,7 @@ fn demarks_symbol(ident: &[u8]) -> bool { @@
             ident == KW_ENUM ||
             ident == KW_UNION ||
             ident == KW_FUNCTION ||
             ident == KW_PRIMITIVE ||
             ident == KW_COMPOSITE
             ident == KW_COMPONENT
+}
 #[inline]

src/protocol/parser/pass_validation_linking.rs

➞

Show inline comments

@@ @@ -400,10 +400,10 @@ impl Visitor for PassValidationLinking { @@
             ));
+        }
-        if self.proc_kind != ProcedureKind::Primitive {
+        if self.proc_kind != ProcedureKind::Component {
             return Err(ParseError::new_error_str_at_span(
                 &ctx.module().source, cur_sync_span,
-                "synchronous statements may only be used in primitive components"
                 "synchronous statements may only be used in components"
             ));
+        }
@@ @@ -472,10 +472,10 @@ impl Visitor for PassValidationLinking { @@
             ));
+        }
-        if self.proc_kind != ProcedureKind::Primitive {
+        if self.proc_kind != ProcedureKind::Component {
             return Err(ParseError::new_error_str_at_span(
                 &ctx.module().source, select_stmt.span,
-                "select statements may only be used in primitive components"
                 "select statements may only be used in components"
             ));
+        }
@@ @@ -558,12 +558,12 @@ impl Visitor for PassValidationLinking { @@
+    }
     fn visit_new_stmt(&mut self, ctx: &mut Ctx, id: NewStatementId) -> VisitorResult {
         // Make sure the new statement occurs inside a composite component
         if self.proc_kind != ProcedureKind::Composite {
         // Make sure the new statement occurs inside a component
         if self.proc_kind != ProcedureKind::Component {
             let new_stmt = &ctx.heap[id];
             return Err(ParseError::new_error_str_at_span(
                 &ctx.module().source, new_stmt.span,
-                "instantiating components may only be done in composite components"
                 "instantiating components may only be done in components"
             ));
+        }
@@ @@ -1113,13 +1113,11 @@ impl Visitor for PassValidationLinking { @@
         // Check whether the method is allowed to be called within the code's
         // context (in sync, definition type, etc.)
         let mut expecting_wrapping_new_stmt = false;
         let mut expecting_primitive_def = false;
         let mut expecting_wrapping_sync_stmt = false;
         let mut expecting_no_select_stmt = false;
         match call_expr.method {
             Method::Get => {
                 expecting_primitive_def = true;
                 expecting_wrapping_sync_stmt = true;
                 if !self.in_select_guard.is_invalid() {
                     // In a select guard. Take the argument (i.e. the port we're
@@ @@ -1136,12 +1134,10 @@ impl Visitor for PassValidationLinking { @@
+                }
             },
             Method::Put => {
                 expecting_primitive_def = true;
                 expecting_wrapping_sync_stmt = true;
                 expecting_no_select_stmt = true;
             },
             Method::Fires => {
                 expecting_primitive_def = true;
                 expecting_wrapping_sync_stmt = true;
             },
             Method::Create => {},
@@ @@ -1179,15 +1175,6 @@ impl Visitor for PassValidationLinking { @@
             let name = String::from_utf8_lossy(ctx.module().source.section_at_span(span)).to_string();
             return (span, name);
+        }
         if expecting_primitive_def {
             if self.proc_kind != ProcedureKind::Primitive {
                 let (call_span, func_name) = get_span_and_name(ctx, id);
                 return Err(ParseError::new_error_at_span(
                     &ctx.module().source, call_span,
                     format!("a call to '{}' may only occur in primitive component definitions", func_name)
                 ));
+            }
+        }
         if expecting_wrapping_sync_stmt {
             if self.in_sync.is_invalid() {

src/protocol/parser/token_parsing.rs

➞

Show inline comments

@@ @@ -17,8 +17,7 @@ pub(crate) const KW_STRUCT: &'static [u8] = b"struct"; @@
 pub(crate) const KW_ENUM:      &'static [u8] = b"enum";
 pub(crate) const KW_UNION:     &'static [u8] = b"union";
 pub(crate) const KW_FUNCTION:  &'static [u8] = b"func";
 pub(crate) const KW_PRIMITIVE: &'static [u8] = b"primitive";
 pub(crate) const KW_COMPOSITE: &'static [u8] = b"composite";
 pub(crate) const KW_COMPONENT: &'static [u8] = b"comp";
 pub(crate) const KW_IMPORT:    &'static [u8] = b"import";
 // Keywords - literals
@@ @@ -560,7 +559,7 @@ pub(crate) fn consume_ident_interned( @@
 fn is_reserved_definition_keyword(text: &[u8]) -> bool {
     match text {
-        KW_STRUCT | KW_ENUM | KW_UNION | KW_FUNCTION | KW_PRIMITIVE | KW_COMPOSITE => true,
+        KW_STRUCT | KW_ENUM | KW_UNION | KW_FUNCTION | KW_COMPONENT => true,
         _ => false,
+    }
+}

src/runtime2/component/component.rs

➞

Show inline comments

@@ @@ -234,7 +234,7 @@ pub(crate) fn create_component( @@
     arguments: ValueGroup, num_ports: usize
 ) -> Box<dyn Component> {
     let definition = &protocol.heap[definition_id];
-    debug_assert!(definition.kind == ProcedureKind::Primitive || definition.kind == ProcedureKind::Composite);
+    debug_assert_eq!(definition.kind, ProcedureKind::Component);
     if definition.source.is_builtin() {
         // Builtin component

0 comments (0 inline, 0 general)