acw/ngr
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

better

Browse Source
This commit is contained in:
Adam Wick
2024-02-22 15:17:56 -08:00
parent 0cc2b4ea9d
commit d663af8a46
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/basic/function0002.ngr
View File

@@ -6,5 +6,5 @@ print x;
result = add_x(a); result = add_x(a);
print x; print x;
print result; print result;
result = add_x_twice(a); result2 = add_x_twice(a);
print result; print result2;

10
src/backend/into_crane.rs
View File

@@ -471,7 +471,10 @@ impl<M: Module> Backend<M> {
Some(ReferenceBuilder::Global(_, global_value)) => { Some(ReferenceBuilder::Global(_, global_value)) => {
let pointer = self.module.target_config().pointer_type(); let pointer = self.module.target_config().pointer_type();
let pointer_to = builder.ins().symbol_value(pointer, *global_value); let pointer_to = builder.ins().symbol_value(pointer, *global_value);
println!("STORE {}: cranelift_type {} origin type {:?}", name, value, value_type); println!(
"STORE {}: cranelift_type {} origin type {:?}",
name, value, value_type
);
builder.ins().store(MemFlags::new(), value, pointer_to, 0); builder.ins().store(MemFlags::new(), value, pointer_to, 0);
Ok((builder.ins().iconst(types::I64, 0), ConstantType::Void)) Ok((builder.ins().iconst(types::I64, 0), ConstantType::Void))
} }
@@ -597,7 +600,10 @@ impl<M: Module> Backend<M> {
let pointer_to = self.module.target_config().pointer_type(); let pointer_to = self.module.target_config().pointer_type();
let pointer_value = builder.ins().symbol_value(pointer_to, *gv); let pointer_value = builder.ins().symbol_value(pointer_to, *gv);
let cranelift_type = ir::Type::from(*ty); let cranelift_type = ir::Type::from(*ty);
println!("READ {}: cranelift_type {} origin type {:?}", name, cranelift_type, ty); println!(
"READ {}: cranelift_type {} origin type {:?}",
name, cranelift_type, ty
);
let value = let value =
builder builder
.ins() .ins()

4
src/type_infer/finalize.rs
View File

@@ -89,7 +89,9 @@ fn finalize_expression(
Expression::Block(loc, finalize_type(ty, resolutions), final_exprs) Expression::Block(loc, finalize_type(ty, resolutions), final_exprs)
} }
Expression::Print(loc, var) => Expression::Print(loc, finalize_val_or_ref(var, resolutions)), Expression::Print(loc, var) => {
Expression::Print(loc, finalize_val_or_ref(var, resolutions))
}
Expression::Call(loc, ty, fun, args) => Expression::Call( Expression::Call(loc, ty, fun, args) => Expression::Call(
loc, loc,

12
src/type_infer/solve.rs
View File

@@ -530,7 +530,7 @@ pub fn solve_constraints(
)); ));
} }
changed_something = true; changed_something = true;
println!("changed something because 12"); println!("changed something because 12");
} }
Constraint::Equivalent( Constraint::Equivalent(
@@ -545,10 +545,14 @@ pub fn solve_constraints(
) => { ) => {
errors.push(TypeInferenceError::NotEquivalent(loc, pt, ft)); errors.push(TypeInferenceError::NotEquivalent(loc, pt, ft));
changed_something = true; changed_something = true;
println!("changed something because 13"); println!("changed something because 13");
} }
Constraint::Equivalent(_, TypeOrVar::Variable(_, name1), TypeOrVar::Variable(_, name2)) if name1 == name2 => { Constraint::Equivalent(
_,
TypeOrVar::Variable(_, name1),
TypeOrVar::Variable(_, name2),
) if name1 == name2 => {
changed_something = true; changed_something = true;
} }
@@ -570,7 +574,7 @@ pub fn solve_constraints(
} }
changed_something = true; changed_something = true;
println!("changed something because 14"); println!("changed something because 14");
} }
Constraint::Equivalent(_, TypeOrVar::Variable(_, ref name), ref rhs) => { Constraint::Equivalent(_, TypeOrVar::Variable(_, ref name), ref rhs) => {