zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-24 18:39:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

DEV: LtEq, GtEq, and in operators work.

Browse Source
This commit is contained in:
Jeremy Wall 2019-08-13 18:16:00 -05:00
parent cd23430f5f
commit 8c39c3826c
4 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/build/opcode/mod.rs
View File

@ -190,7 +190,8 @@ pub enum Op {
And(i32), And(i32),
Or(i32), Or(i32),
// Spacer operation, Does nothing. // Spacer operation, Does nothing.
Index, // indexing operation Index, // indexing operation
SafeIndex, // Safe indexing operation. Does Null Coelescing
Noop, Noop,
// Pending Computation // Pending Computation
InitThunk(i32), // Basically just used for module return expressions InitThunk(i32), // Basically just used for module return expressions

4
src/build/opcode/test.rs
View File

@ -620,6 +620,8 @@ fn simple_binary_expr() {
"1<1;" => P(Bool(false)), "1<1;" => P(Bool(false)),
"2>1;" => P(Bool(true)), "2>1;" => P(Bool(true)),
"2<1;" => P(Bool(false)), "2<1;" => P(Bool(false)),
"2<=1;" => P(Bool(false)),
"2>=1;" => P(Bool(true)),
"1!=1;" => P(Bool(false)), "1!=1;" => P(Bool(false)),
"\"foo\" ~ \"bar\";" => P(Bool(false)), "\"foo\" ~ \"bar\";" => P(Bool(false)),
"\"foo\" !~ \"bar\";" => P(Bool(true)), "\"foo\" !~ \"bar\";" => P(Bool(true)),
@ -632,6 +634,8 @@ fn simple_binary_expr() {
"true || false;" => P(Bool(true)), "true || false;" => P(Bool(true)),
"false || true;" => P(Bool(true)), "false || true;" => P(Bool(true)),
"true || true;" => P(Bool(true)), "true || true;" => P(Bool(true)),
"foo in {foo = 1};" => P(Bool(true)),
"bar in {foo = 1};" => P(Bool(false)),
) )
} }

31
src/build/opcode/translate.rs
View File

@ -89,13 +89,14 @@ impl AST {
ops.push(Op::Lt); ops.push(Op::Lt);
} }
BinaryExprType::GTEqual => { BinaryExprType::GTEqual => {
// An Equal and an And Self::translate_expr(*def.right, &mut ops);
//ops.push(Op::GtEqual); Self::translate_expr(*def.left, &mut ops);
unimplemented!("Binary expressions are not implmented yet") ops.push(Op::GtEq);
} }
BinaryExprType::LTEqual => { BinaryExprType::LTEqual => {
//ops.push(Op::LtEqual); Self::translate_expr(*def.right, &mut ops);
unimplemented!("Binary expressions are not implmented yet") Self::translate_expr(*def.left, &mut ops);
ops.push(Op::LtEq);
} }
BinaryExprType::NotEqual => { BinaryExprType::NotEqual => {
Self::translate_expr(*def.right, &mut ops); Self::translate_expr(*def.right, &mut ops);
@ -144,7 +145,25 @@ impl AST {
ops.push(Op::Mod); ops.push(Op::Mod);
} }
BinaryExprType::IN => { BinaryExprType::IN => {
unimplemented!("Binary expressions are not implmented yet") // Dot expressions expect the left side to be pushed first
Self::translate_expr(*def.right, &mut ops);
// Symbols on the right side should be converted to strings to satisfy
// the Index operation contract.
match *def.left {
Expression::Simple(Value::Symbol(name)) => {
Self::translate_expr(
Expression::Simple(Value::Str(name)),
&mut ops,
);
}
expr => {
Self::translate_expr(expr, &mut ops);
}
}
ops.push(Op::SafeIndex);
ops.push(Op::Val(Primitive::Empty));
ops.push(Op::Equal);
ops.push(Op::Not);
} }
BinaryExprType::DOT => { BinaryExprType::DOT => {
// Dot expressions expect the left side to be pushed first // Dot expressions expect the left side to be pushed first

9
src/build/opcode/vm.rs
View File

@ -100,7 +100,8 @@ impl<'a> VM {
Op::InitTuple => self.push(Rc::new(C(Tuple(Vec::new()))))?, Op::InitTuple => self.push(Rc::new(C(Tuple(Vec::new()))))?,
Op::Field => self.op_field()?, Op::Field => self.op_field()?,
Op::Element => self.op_element()?, Op::Element => self.op_element()?,
Op::Index => self.op_index()?, Op::Index => self.op_index(false)?,
Op::SafeIndex => self.op_index(true)?,
Op::Cp => self.op_copy()?, Op::Cp => self.op_copy()?,
//TODO(jwall): Should this take a user provided message? //TODO(jwall): Should this take a user provided message?
Op::Bang => return dbg!(Err(Error {})), Op::Bang => return dbg!(Err(Error {})),
@ -558,7 +559,7 @@ impl<'a> VM {
} }
} }
fn op_index(&mut self) -> Result<(), Error> { fn op_index(&mut self, safe: bool) -> Result<(), Error> {
// left and then right // left and then right
let right = self.pop()?; let right = self.pop()?;
let left = self.pop()?; let left = self.pop()?;
@ -585,6 +586,10 @@ impl<'a> VM {
// noop // noop
} }
}; };
if safe {
self.push(Rc::new(P(Empty)));
return Ok(());
}
return Err(dbg!(Error {})); return Err(dbg!(Error {}));
} }