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

Changeset - 811e0bec1c0f

Parent rev.

Child rev.

[Not reviewed]

0 4 1

MH - 3 years ago 2022-02-03 15:38:40
contact@maxhenger.nl

Initial setup of tree rewriting

5 files changed with 100 insertions and 3 deletions:

src/protocol/ast.rs

src/protocol/eval/executor.rs

src/protocol/parser/mod.rs

src/protocol/parser/pass_rewriting.rs

src/protocol/parser/pass_validation_linking.rs

0 comments (0 inline, 0 general)

src/protocol/ast.rs

➞

Show inline comments

@@ @@ -1744,20 +1744,25 @@ pub struct CallExpression { @@
     pub parent: ExpressionParent,
     pub unique_id_in_definition: i32,
+}
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Method {
     // Builtin
+    // Builtin, accessible by programmer
     Get,
     Put,
     Fires,
     Create,
     Length,
     Assert,
     Print,
     // Builtin, not accessible by programmer
     SelectStart, // SelectStart(total_num_cases, total_num_ports)
     SelectRegisterCasePort, // SelectRegisterCasePort(case_index, port_index, port_id)
     SelectWait, // SelectWait() -> u32
     // User-defined
     UserFunction,
     UserComponent,
+}
 #[derive(Debug, Clone)]
 pub struct MethodSymbolic {

src/protocol/eval/executor.rs

➞

Show inline comments

@@ @@ -731,12 +731,21 @@ impl Prompt { @@
                                     // Drop the heap-allocated value from the
                                     // store
                                     self.store.drop_heap_pos(value_heap_pos);
                                     println!("{}", message);
                                 },
                                 Method::SelectStart => {
                                     todo!("select start");
                                 },
                                 Method::SelectRegisterCasePort => {
                                     todo!("select register");
                                 },
                                 Method::SelectWait => {
                                     todo!("select wait");
                                 },
                                 Method::UserComponent => {
                                     // This is actually handled by the evaluation
                                     // of the statement.
                                     debug_assert_eq!(heap[expr.definition].parameters().len(), cur_frame.expr_values.len());
                                     debug_assert_eq!(heap[cur_frame.position].as_new().expression, expr.this)
                                 },

src/protocol/parser/mod.rs

➞

Show inline comments

@@ @@ -5,12 +5,13 @@ pub(crate) mod token_parsing; @@
 pub(crate) mod pass_tokenizer;
 pub(crate) mod pass_symbols;
 pub(crate) mod pass_imports;
 pub(crate) mod pass_definitions;
 pub(crate) mod pass_definitions_types;
 pub(crate) mod pass_validation_linking;
 pub(crate) mod pass_rewriting;
 pub(crate) mod pass_typing;
 mod visitor;
 use tokens::*;
 use crate::collections::*;
 use visitor::Visitor;
@@ @@ -33,12 +34,13 @@ pub enum ModuleCompilationPhase { @@
     Tokenized,              // source is tokenized
     SymbolsScanned,         // all definitions are linked to their type class
     ImportsResolved,        // all imports are added to the symbol table
     DefinitionsParsed,      // produced the AST for the entire module
     TypesAddedToTable,      // added all definitions to the type table
     ValidatedAndLinked,     // AST is traversed and has linked the required AST nodes
     Rewritten,              // Special AST nodes are rewritten into regular AST nodes
     // When we continue with the compiler:
     // Typed,                  // Type inference and checking has been performed
+}
 pub struct Module {
     // Buffers

src/protocol/parser/pass_rewriting.rs

➞

Show inline comments

@@ new file 100644 @@
 use crate::collections::*;
 use crate::protocol::*;
 use super::visitor::*;
 pub(crate) struct PassRewriting {
     statement_buffer: ScopedBuffer<StatementId>,
+}
 impl PassRewriting {
     pub(crate) fn new() -> Self {
         Self{
             statement_buffer: ScopedBuffer::with_capacity(16),
+        }
+    }
+}
 impl Visitor for PassRewriting {
     // --- Visiting procedures
     fn visit_component_definition(&mut self, ctx: &mut Ctx, id: ComponentDefinitionId) -> VisitorResult {
         let def = &ctx.heap[id];
         let body_id = def.body;
         return self.visit_block_stmt(ctx, body_id);
+    }
     fn visit_function_definition(&mut self, ctx: &mut Ctx, id: FunctionDefinitionId) -> VisitorResult {
         let def = &ctx.heap[id];
         let body_id = def.body;
         return self.visit_block_stmt(ctx, body_id);
+    }
     // --- Visiting statements (that are not the select statement)
     fn visit_block_stmt(&mut self, ctx: &mut Ctx, id: BlockStatementId) -> VisitorResult {
         let block_stmt = &ctx.heap[id];
         let stmt_section = self.statement_buffer.start_section_initialized(&block_stmt.statements);
         for stmt_idx in 0..stmt_section.len() {
             self.visit_stmt(ctx, stmt_section[stmt_idx])?;
+        }
         stmt_section.forget();
         return Ok(())
+    }
     fn visit_labeled_stmt(&mut self, ctx: &mut Ctx, id: LabeledStatementId) -> VisitorResult {
         let labeled_stmt = &ctx.heap[id];
         let body_id = labeled_stmt.body;
         return self.visit_stmt(ctx, body_id);
+    }
     fn visit_if_stmt(&mut self, ctx: &mut Ctx, id: IfStatementId) -> VisitorResult {
         let if_stmt = &ctx.heap[id];
         let true_body_id = if_stmt.true_body;
         let false_body_id = if_stmt.false_body;
         self.visit_block_stmt(ctx, true_body_id)?;
         if let Some(false_body_id) = false_body_id {
             self.visit_block_stmt(ctx, false_body_id)?;
+        }
         return Ok(())
+    }
     fn visit_while_stmt(&mut self, ctx: &mut Ctx, id: WhileStatementId) -> VisitorResult {
         let while_stmt = &ctx.heap[id];
         let body_id = while_stmt.body;
         return self.visit_block_stmt(ctx, body_id);
+    }
     // --- Visiting the select statement
     fn visit_select_stmt(&mut self, ctx: &mut Ctx, id: SelectStatementId) -> VisitorResult {
         let stmt = &ctx.heap[id];
         return Ok(())
+    }
+}
@@ \ No newline at end of file @@

src/protocol/parser/pass_validation_linking.rs

➞

Show inline comments

@@ @@ -275,14 +275,12 @@ impl Visitor for PassValidationLinking { @@
         let old_scope = self.push_statement_scope(ctx, Scope::Regular(id));
         // Set end of block
         let block_stmt = &ctx.heap[id];
         let end_block_id = block_stmt.end_block;
         // Copy statement IDs into buffer
         // Traverse statements in block
         let statement_section = self.statement_buffer.start_section_initialized(&block_stmt.statements);
         assign_and_replace_next_stmt!(self, ctx, id.upcast());
         for stmt_idx in 0..statement_section.len() {
             self.relative_pos_in_block = stmt_idx as i32;
@@ @@ -1209,12 +1207,15 @@ impl Visitor for PassValidationLinking { @@
                         &ctx.module().source, call_span,
                         "assert statement may only occur in components"
                     ));
+                }
             },
             Method::Print => {},
             Method::SelectStart
             | Method::SelectRegisterCasePort
             | Method::SelectWait => unreachable!(), // not usable by programmer directly
             Method::UserFunction => {},
             Method::UserComponent => {
                 expecting_wrapping_new_stmt = true;
             },
+        }

0 comments (0 inline, 0 general)