waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add string comparison and int comparison

This commit is contained in:
Kasey White 2022-10-31 01:35:14 -04:00 committed by Lucas
parent 8a99b8c071
commit 6162128427
3 changed files with 129 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
crates/project/src/lib.rs
View File

@ -460,6 +460,8 @@ impl Project {
interner.program(&mut program); interner.program(&mut program);
println!("{}", program.to_pretty());
programs.push(program.try_into().unwrap()); programs.push(program.try_into().unwrap());
} }
} }
@ -484,7 +486,7 @@ impl Project {
&ast::ModuleConstant<std::sync::Arc<tipo::Type>, String>, &ast::ModuleConstant<std::sync::Arc<tipo::Type>, String>,
>, >,
) { ) {
match dbg!(body) { match body {
TypedExpr::Int { value, .. } => {} TypedExpr::Int { value, .. } => {}
TypedExpr::String { value, .. } => {} TypedExpr::String { value, .. } => {}
TypedExpr::ByteArray { bytes, .. } => {} TypedExpr::ByteArray { bytes, .. } => {}
@ -568,9 +570,44 @@ impl Project {
name, name,
left, left,
right, right,
} => { } => match name {
todo!() ast::BinOp::And => todo!(),
ast::BinOp::Or => todo!(),
ast::BinOp::Eq => {
self.recurse_scope_level(
left,
scripts,
scope_level.clone(),
uplc_function_holder_lookup,
functions,
type_aliases,
data_types,
imports,
constants,
);
self.recurse_scope_level(
right,
scripts,
scope_level,
uplc_function_holder_lookup,
functions,
type_aliases,
data_types,
imports,
constants,
);
} }
ast::BinOp::NotEq => todo!(),
ast::BinOp::LtInt => todo!(),
ast::BinOp::LtEqInt => todo!(),
ast::BinOp::GtEqInt => todo!(),
ast::BinOp::GtInt => todo!(),
ast::BinOp::AddInt => todo!(),
ast::BinOp::SubInt => todo!(),
ast::BinOp::MultInt => todo!(),
ast::BinOp::DivInt => todo!(),
ast::BinOp::ModInt => todo!(),
},
TypedExpr::Assignment { TypedExpr::Assignment {
location, location,
tipo, tipo,
@ -933,7 +970,76 @@ impl Project {
left, left,
right, right,
} => { } => {
todo!() let left_term = self.recurse_code_gen(
left,
scripts,
scope_level.clone(),
uplc_function_holder,
uplc_function_holder_lookup,
functions,
type_aliases,
data_types,
imports,
constants,
);
let right_term = self.recurse_code_gen(
right,
scripts,
scope_level,
uplc_function_holder,
uplc_function_holder_lookup,
functions,
type_aliases,
data_types,
imports,
constants,
);
match name {
ast::BinOp::And => todo!(),
ast::BinOp::Or => todo!(),
ast::BinOp::Eq => match &*left.tipo() {
tipo::Type::App {
public,
module,
name,
args,
} => match name.as_str() {
"Int" => Term::Apply {
function: Term::Apply {
function: Term::Builtin(DefaultFunction::EqualsInteger).into(),
argument: left_term.into(),
}
.into(),
argument: right_term.into(),
},
"String" => Term::Apply {
function: Term::Apply {
function: Term::Builtin(DefaultFunction::EqualsString).into(),
argument: left_term.into(),
}
.into(),
argument: right_term.into(),
},
_ => todo!(),
},
tipo::Type::Fn { args, ret } => todo!(),
tipo::Type::Var { tipo } => todo!(),
},
ast::BinOp::NotEq => todo!(),
ast::BinOp::LtInt => todo!(),
ast::BinOp::LtEqInt => todo!(),
ast::BinOp::GtEqInt => todo!(),
ast::BinOp::GtInt => todo!(),
ast::BinOp::AddInt => todo!(),
ast::BinOp::SubInt => todo!(),
ast::BinOp::MultInt => todo!(),
ast::BinOp::DivInt => todo!(),
ast::BinOp::ModInt => todo!(),
}
} }
TypedExpr::Assignment { TypedExpr::Assignment {
location, location,

7
examples/sample/src/sample.ak
View File

@ -6,7 +6,10 @@ pub type Datum {
something: String, something: String,
} }
pub fn thing(a: Bool) { pub fn eqInt(a: Int, b: Int) {
a a == b
} }
pub fn eqString(a: String, b: String) {
a == b
}

17
examples/sample/src/scripts/swap.ak
View File

@ -9,9 +9,18 @@ pub type Redeemer {
pub fn spend(datum: sample.Datum, rdmr: Redeemer, ctx: spend.ScriptContext) -> Bool { pub fn spend(datum: sample.Datum, rdmr: Redeemer, ctx: spend.ScriptContext) -> Bool {
let a = True
let b = sample.thing(a)
let c = sample.thing(b)
c let x = "x"
let a = "y"
let b = sample.eqString(x, a)
let c = 1
let y = 1
let d = sample.eqInt(y, c)
if b {
c == 1
} else{
d
}
} }