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

Changeset - 3c33e2928fb4

Parent rev.

Child rev.

[Not reviewed]

0 4 0

MH - 4 years ago 2021-04-06 10:32:47
contact@maxhenger.nl

Fix validation/linking of nested specified polyargs

4 files changed with 31 insertions and 6 deletions:

src/protocol/ast_printer.rs

src/protocol/parser/mod.rs

src/protocol/parser/visitor_linker.rs

src/protocol/tests/utils.rs

0 comments (0 inline, 0 general)

src/protocol/ast_printer.rs

➞

Show inline comments

@@ @@ -272,13 +272,30 @@ impl ASTWriter { @@
         self.cur_definition = Some(def_id);
         let indent2 = indent + 1;
         let indent3 = indent2 + 1;
         let indent4 = indent3 + 1;
         match &heap[def_id] {
             Definition::Struct(_) => todo!("implement Definition::Struct"),
             Definition::Struct(def) => {
                 self.kv(indent).with_id(PREFIX_STRUCT_ID, def.this.0.index)
                     .with_s_key("DefinitionStruct");
                 self.kv(indent2).with_s_key("Name").with_ascii_val(&def.identifier.value);
                 for poly_var_id in &def.poly_vars {
                     self.kv(indent3).with_s_key("PolyVar").with_ascii_val(&poly_var_id.value);
+                }
                 self.kv(indent2).with_s_key("Fields");
                 for field in &def.fields {
                     self.kv(indent3).with_s_key("Field");
                     self.kv(indent4).with_s_key("Name")
                         .with_ascii_val(&field.field.value);
                     self.kv(indent4).with_s_key("Type")
                         .with_custom_val(|s| write_parser_type(s, heap, &heap[field.parser_type]));
+                }
             },
             Definition::Enum(def) => {
                 self.kv(indent).with_id(PREFIX_ENUM_ID, def.this.0.index)
                     .with_s_key("DefinitionEnum");
                 self.kv(indent2).with_s_key("Name").with_ascii_val(&def.identifier.value);
                 for poly_var_id in &def.poly_vars {
@@ @@ -287,13 +304,19 @@ impl ASTWriter { @@
                 self.kv(indent2).with_s_key("Variants");
                 for variant in &def.variants {
                     self.kv(indent3).with_s_key("Variant");
                     self.kv(indent4).with_s_key("Name")
                         .with_ascii_val(&variant.identifier.value);
                     // TODO: Attached value
                     let variant_value = self.kv(indent4).with_s_key("Value");
                     match &variant.value {
                         EnumVariantValue::None => variant_value.with_s_val("None"),
                         EnumVariantValue::Integer(value) => variant_value.with_disp_val(value),
                         EnumVariantValue::Type(parser_type_id) => variant_value
                             .with_custom_val(|s| write_parser_type(s, heap, &heap[*parser_type_id])),
                     };
+                }
             },
             Definition::Function(def) => {
                 self.kv(indent).with_id(PREFIX_FUNCTION_ID, def.this.0.index)
                     .with_s_key("DefinitionFunction");

src/protocol/parser/mod.rs

➞

Show inline comments

@@ @@ -231,15 +231,15 @@ impl Parser { @@
             let root_id = module.root_id;
             if let Err((position, message)) = Self::parse_inner(&mut self.heap, root_id) {
                 return Err(ParseError::new_error(&self.modules[0].source, position, &message))
+            }
+        }
         let mut writer = ASTWriter::new();
         let mut file = std::fs::File::create(std::path::Path::new("ast.txt")).unwrap();
         writer.write_ast(&mut file, &self.heap);
         // let mut writer = ASTWriter::new();
         // let mut file = std::fs::File::create(std::path::Path::new("ast.txt")).unwrap();
         // writer.write_ast(&mut file, &self.heap);
         Ok(())
+    }
     pub fn parse_inner(h: &mut Heap, pd: RootId) -> VisitorResult {
         // TODO: @cleanup, slowly phasing out old compiler

src/protocol/parser/visitor_linker.rs

➞

Show inline comments

@@ @@ -1184,13 +1184,14 @@ impl ValidityAndLinkerVisitor { @@
                 if num_inferred_to_allocate != 0 {
                     symbolic.poly_args2.reserve(num_inferred_to_allocate);
                     for _ in 0..num_inferred_to_allocate {
                         symbolic.poly_args2.push(self.parser_type_buffer.pop().unwrap());
+                    }
                 } else if !symbolic.identifier.poly_args.is_empty() {
                     symbolic.poly_args2.extend(&symbolic.identifier.poly_args)
                     symbolic.poly_args2.extend(&symbolic.identifier.poly_args);
                     self.parser_type_buffer.extend(&symbolic.poly_args2);
+                }
                 symbolic.variant = Some(symbolic_variant);
             } else {
                 unreachable!();
+            }
+        }

src/protocol/tests/utils.rs

➞

Show inline comments

     // Retrieve polymorphic variables, if present (since we're dealing with a
     // concrete type we only expect procedure types)
     let poly_vars = match &heap[def] {
         Definition::Function(definition) => &definition.poly_vars,
         Definition::Component(definition) => &definition.poly_vars,
         Definition::Struct(definition) => &definition.poly_vars,
         Definition::Enum(definition) => &definition.poly_vars,
         _ => unreachable!("Error in testing utility: unexpected type for concrete type serialization"),
     };
     fn serialize_recursive(
         buffer: &mut String, heap: &Heap, poly_vars: &Vec<Identifier>, concrete: &ConcreteType, mut idx: usize
     ) -> usize {

0 comments (0 inline, 0 general)