Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove symbol table #459

Closed
wants to merge 8 commits into from
Closed

Remove symbol table #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f150cee
Remove symbol table
saulshanabrook Oct 31, 2024
5d82685
Merge Alex-Fischman/main into remove-symbol
saulshanabrook Oct 31, 2024
84afa67
Make integration tests compile
saulshanabrook Oct 31, 2024
bccd524
tmp
saulshanabrook Oct 31, 2024
4c87379
Fix sexp printing
saulshanabrook Oct 31, 2024
59c7d8a
make literal_sort take typeinfo
saulshanabrook Oct 31, 2024
9365456
remove commented code
saulshanabrook Oct 31, 2024
9867c92
clippy fix
saulshanabrook Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ indexmap = "2.0"
instant = "0.1"
log = "0.4"
rustc-hash = "1.1"
symbol_table = { version = "0.4.0", features = ["global"] }
thiserror = "1"
lazy_static = "1.4"
num = "0.4.3"
Expand Down
72 changes: 43 additions & 29 deletions src/actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ use typechecking::TypeError;
use crate::{ast::Literal, core::ResolvedCall, ExtractReport, Value};

struct ActionCompiler<'a> {
types: &'a IndexMap<Symbol, ArcSort>,
types: &'a IndexMap<String, ArcSort>,
locals: IndexSet<ResolvedVar>,
instructions: Vec<Instruction>,
}

impl<'a> ActionCompiler<'a> {
fn compile_action(&mut self, action: &GenericCoreAction<ResolvedCall, ResolvedVar>) {
fn compile_action(
&mut self,
action: &GenericCoreAction<ResolvedCall, ResolvedVar, ResolvedLiteral>,
) {
match action {
GenericCoreAction::Let(_ann, v, f, args) => {
self.do_call(f, args);
Expand All @@ -37,7 +40,7 @@ impl<'a> ActionCompiler<'a> {
self.do_atom_term(arg);
}
self.do_atom_term(e);
self.instructions.push(Instruction::Set(func.name));
self.instructions.push(Instruction::Set(func.name.clone()));
}
GenericCoreAction::Change(_ann, change, f, args) => {
let ResolvedCall::Func(func) = f else {
Expand All @@ -47,7 +50,7 @@ impl<'a> ActionCompiler<'a> {
self.do_atom_term(arg);
}
self.instructions
.push(Instruction::Change(*change, func.name));
.push(Instruction::Change(*change, func.name.clone()));
}
GenericCoreAction::Union(_ann, arg1, arg2) => {
let sort = self.do_atom_term(arg1);
Expand Down Expand Up @@ -83,8 +86,9 @@ impl<'a> ActionCompiler<'a> {
}
}
ResolvedAtomTerm::Literal(_ann, lit) => {
self.instructions.push(Instruction::Literal(lit.clone()));
crate::sort::literal_sort(lit)
self.instructions
.push(Instruction::Literal(lit.literal.clone()));
lit.sort.clone()
}
ResolvedAtomTerm::Global(_ann, _var) => {
panic!("Global variables should have been desugared");
Expand All @@ -94,7 +98,7 @@ impl<'a> ActionCompiler<'a> {

fn do_function(&mut self, func_type: &FuncType) {
self.instructions.push(Instruction::CallFunction(
func_type.name,
func_type.name.clone(),
func_type.has_default || func_type.is_datatype,
));
}
Expand Down Expand Up @@ -124,16 +128,16 @@ enum Instruction {
///
/// This should be set to true after we disallow lookup in rule's actions and :default keyword
/// Currently, it's true when has_default() || is_datatype()
CallFunction(Symbol, bool),
CallFunction(String, bool),
/// Pop primitive arguments off the stack, calls the primitive,
/// and push the result onto the stack.
CallPrimitive(SpecializedPrimitive, usize),
/// Pop function arguments off the stack and either deletes or subsumes the corresponding row
/// in the function.
Change(Change, Symbol),
Change(Change, String),
/// Pop the value to be set and the function arguments off the stack.
/// Set the function at the given arguments to the new value.
Set(Symbol),
Set(String),
/// Union the last `n` values on the stack.
Union(usize, ArcSort),
/// Extract the best expression. `n` is always 2.
Expand All @@ -155,12 +159,12 @@ impl EGraph {
pub(crate) fn compile_actions(
&self,
binding: &IndexSet<ResolvedVar>,
actions: &GenericCoreActions<ResolvedCall, ResolvedVar>,
actions: &GenericCoreActions<ResolvedCall, ResolvedVar, ResolvedLiteral>,
) -> Result<Program, Vec<TypeError>> {
// TODO: delete types and just keep the ordering
let mut types = IndexMap::default();
for var in binding {
types.insert(var.name, var.sort.clone());
types.insert(var.name.clone(), var.sort.clone());
}
let mut compiler = ActionCompiler {
types: &types,
Expand Down Expand Up @@ -188,7 +192,7 @@ impl EGraph {
// TODO: delete types and just keep the ordering
let mut types = IndexMap::default();
for var in binding {
types.insert(var.name, var.sort.clone());
types.insert(var.name.clone(), var.sort.clone());
}
let mut compiler = ActionCompiler {
types: &types,
Expand All @@ -206,7 +210,7 @@ impl EGraph {

fn perform_set(
&mut self,
table: Symbol,
table: String,
new_value: Value,
stack: &mut [Value],
) -> Result<(), Error> {
Expand All @@ -225,12 +229,12 @@ impl EGraph {
return Err(Error::MergeError(table, new_value, old_value));
}
MergeFn::Union => self.unionfind.union_values(
old_value,
new_value,
function.decl.schema.output,
old_value.clone(),
new_value.clone(),
function.decl.schema.output.clone(),
),
MergeFn::Expr(merge_prog) => {
let values = [old_value, new_value];
let values = [old_value.clone(), new_value.clone()];
let mut stack = vec![];
self.run_actions(&mut stack, &values, &merge_prog)?;
stack.pop().unwrap()
Expand Down Expand Up @@ -265,8 +269,8 @@ impl EGraph {
for instr in &program.0 {
match instr {
Instruction::Load(load) => match load {
Load::Stack(idx) => stack.push(stack[*idx]),
Load::Subst(idx) => stack.push(subst[*idx]),
Load::Stack(idx) => stack.push(stack[*idx].clone()),
Load::Subst(idx) => stack.push(subst[*idx].clone()),
},
Instruction::CallFunction(f, make_defaults) => {
let function = self.functions.get_mut(f).unwrap();
Expand All @@ -282,7 +286,7 @@ impl EGraph {
}

let value = if let Some(out) = function.nodes.get(values) {
out.value
out.value.clone()
} else if *make_defaults {
let ts = self.timestamp;
let out = &function.schema.output;
Expand All @@ -297,13 +301,17 @@ impl EGraph {
tag: out.name(),
bits: self.unionfind.make_set(),
};
function.insert(values, value, ts);
function.insert(values, value.clone(), ts);
value
}
Some(default) => {
let default = default.clone();
let value = self.eval_resolved_expr(&default)?;
self.functions.get_mut(f).unwrap().insert(values, value, ts);
self.functions.get_mut(f).unwrap().insert(
values,
value.clone(),
ts,
);
value
}
_ => {
Expand Down Expand Up @@ -347,7 +355,7 @@ impl EGraph {
let new_value = stack.pop().unwrap();
let new_len = stack.len() - function.schema.input.len();

self.perform_set(*f, new_value, stack)?;
self.perform_set(f.clone(), new_value, stack)?;
stack.truncate(new_len)
}
Instruction::Union(arity, sort) => {
Expand All @@ -368,7 +376,7 @@ impl EGraph {

let variants = values[1].bits as i64;
if variants == 0 {
let (cost, term) = self.extract(values[0], &mut termdag, sort);
let (cost, term) = self.extract(values[0].clone(), &mut termdag, sort);
let extracted = termdag.to_string(&term);
log::info!("extracted with cost {cost}: {extracted}");
self.print_msg(extracted);
Expand All @@ -381,8 +389,12 @@ impl EGraph {
if variants < 0 {
panic!("Cannot extract negative number of variants");
}
let terms =
self.extract_variants(sort, values[0], variants as usize, &mut termdag);
let terms = self.extract_variants(
sort,
values[0].clone(),
variants as usize,
&mut termdag,
);
log::info!("extracted variants:");
let mut msg = String::default();
msg += "(\n";
Expand All @@ -403,7 +415,9 @@ impl EGraph {
Instruction::Literal(lit) => match lit {
Literal::Int(i) => stack.push(Value::from(*i)),
Literal::F64(f) => stack.push(Value::from(*f)),
Literal::String(s) => stack.push(Value::from(*s)),
Literal::String(s) => {
stack.push(s.clone().store(&self.get_sort().unwrap()).unwrap())
}
Literal::Bool(b) => stack.push(Value::from(*b)),
Literal::Unit => stack.push(Value::unit()),
},
Expand All @@ -417,7 +431,7 @@ impl EGraph {
}
Change::Subsume => {
if function.decl.merge.is_some() {
return Err(Error::SubsumeMergeError(*f));
return Err(Error::SubsumeMergeError(f.clone()));
}
function.subsume(args);
}
Expand Down
Loading
Loading