peepmatic: Apply some review suggestions from @bjorn3

This commit is contained in:
Nick Fitzgerald
2020-05-08 13:47:14 -07:00
parent a9b280ca3a
commit 22a070ed4f
4 changed files with 181 additions and 219 deletions

View File

@@ -53,6 +53,9 @@ pub fn bool_to_match_result(b: bool) -> MatchResult {
unsafe { Ok(NonZeroU32::new_unchecked(b + 1)) }
}
/// A partial match of an optimization's LHS and partial construction of its
/// RHS.
///
/// An increment is a matching operation, the expected result from that
/// operation to continue to the next increment, and the actions to take to
/// build up the LHS scope and RHS instructions given that we got the expected
@@ -156,17 +159,18 @@ pub struct LhsId(pub u16);
pub struct RhsId(pub u16);
/// An action to perform when transitioning between states in the automata.
///
/// When evaluating actions, the `i^th` action implicitly defines the
/// `RhsId(i)`.
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum Action {
/// Implicitly define the n^th built up RHS instruction as something from
/// the left-hand side.
/// Reuse something from the left-hand side.
GetLhs {
/// The path to the instruction or value.
path: PathId,
},
/// Implicitly define the n^th RHS instruction as the result of the
/// compile-time evaluation off this unquote operation.
/// Perform compile-time evaluation.
UnaryUnquote {
/// The unquote operator.
operator: UnquoteOperator,
@@ -174,8 +178,7 @@ pub enum Action {
operand: RhsId,
},
/// Implicitly define the n^th RHS instruction as the result of the
/// compile-time evaluation off this unquote operation.
/// Perform compile-time evaluation.
BinaryUnquote {
/// The unquote operator.
operator: UnquoteOperator,
@@ -183,7 +186,7 @@ pub enum Action {
operands: [RhsId; 2],
},
/// Implicitly define the n^th RHS as an integer constant.
/// Create an integer constant.
MakeIntegerConst {
/// The constant integer value.
value: IntegerId,
@@ -191,7 +194,7 @@ pub enum Action {
bit_width: BitWidth,
},
/// Implicitly define the n^th RHS as a boolean constant.
/// Create a boolean constant.
MakeBooleanConst {
/// The constant boolean value.
value: bool,
@@ -199,14 +202,13 @@ pub enum Action {
bit_width: BitWidth,
},
/// Implicitly defint the n^th RHS as a condition code.
/// Create a condition code.
MakeConditionCode {
/// The condition code.
cc: ConditionCode,
},
/// Implicitly define the n^th RHS instruction by making a unary
/// instruction.
/// Make a unary instruction.
MakeUnaryInst {
/// The operand for this instruction.
operand: RhsId,
@@ -216,8 +218,7 @@ pub enum Action {
operator: Operator,
},
/// Implicitly define the n^th RHS instruction by making a binary
/// instruction.
/// Make a binary instruction.
MakeBinaryInst {
/// The opcode for this instruction.
operator: Operator,
@@ -227,8 +228,7 @@ pub enum Action {
operands: [RhsId; 2],
},
/// Implicitly define the n^th RHS instruction by making a ternary
/// instruction.
/// Make a ternary instruction.
MakeTernaryInst {
/// The opcode for this instruction.
operator: Operator,

View File

@@ -54,17 +54,17 @@ pub struct PathId(u16);
/// path mapping.
#[derive(Debug, Default)]
pub struct PathInterner {
// A map from a path (whose owned data is inside `arena`) to the canonical
// `PathId` we assigned it when interning it.
/// A map from a path (whose owned data is inside `arena`) to the canonical
/// `PathId` we assigned it when interning it.
map: HashMap<UnsafePath, PathId>,
// A map from a `PathId` index to an unsafe, self-borrowed path pointing
// into `arena`. It is safe to given these out as safe `Path`s, as long as
// the lifetime is not longer than this `PathInterner`'s lifetime.
/// A map from a `PathId` index to an unsafe, self-borrowed path pointing
/// into `arena`. It is safe to given these out as safe `Path`s, as long as
/// the lifetime is not longer than this `PathInterner`'s lifetime.
paths: Vec<UnsafePath>,
// Bump allocation arena for path data. The bump arena ensures that these
// allocations never move, and are therefore safe for self-references.
/// Bump allocation arena for path data. The bump arena ensures that these
/// allocations never move, and are therefore safe for self-references.
arena: bumpalo::Bump,
}