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

REFACTOR: Code organization.

Browse Source
This commit is contained in:
Jeremy Wall 2019-07-13 10:59:10 -05:00
parent 102f0f5ae1
commit fa2ad0c5a9
3 changed files with 586 additions and 567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,8 +13,9 @@
// limitations under the License. // limitations under the License.
pub mod pointer; pub mod pointer;
pub mod scope; pub mod scope;
mod vm;
use std::rc::Rc; pub use vm::VM;
use pointer::OpPointer; use pointer::OpPointer;
use scope::Stack; use scope::Stack;
@ -29,16 +30,12 @@ pub enum Primitive {
Empty, Empty,
} }
use Primitive::{Bool, Float, Int, Str};
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub enum Composite { pub enum Composite {
List(Vec<Value>), List(Vec<Value>),
Tuple(Vec<(String, Value)>), Tuple(Vec<(String, Value)>),
} }
use Composite::{List, Tuple};
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub struct Func { pub struct Func {
ptr: OpPointer, ptr: OpPointer,
@ -68,7 +65,6 @@ pub enum Value {
// Module // Module
M(Module), M(Module),
} }
use Value::{C, F, M, P, S, T};
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub enum Op { pub enum Op {
@ -125,570 +121,11 @@ pub enum Op {
// - Import, // - Import,
// - Out, // - Out,
// - Assert, // - Assert,
// - Print, // - Convert,
} }
#[derive(Debug)] #[derive(Debug)]
pub struct Error {} pub struct Error {}
pub struct VM {
stack: Vec<Value>,
symbols: Stack,
ops: OpPointer,
}
impl<'a> VM {
pub fn new(ops: Rc<Vec<Op>>) -> Self {
Self::with_pointer(OpPointer::new(ops))
}
pub fn with_pointer(ops: OpPointer) -> Self {
Self {
stack: Vec::new(),
symbols: Stack::new(),
ops: ops,
}
}
pub fn to_scoped(self, symbols: Stack) -> Self {
Self {
stack: Vec::new(),
symbols: symbols,
ops: self.ops.clone(),
}
}
pub fn run(&mut self) -> Result<(), Error> {
loop {
let op = if let Some(op) = dbg!(self.ops.next()) {
op.clone()
} else {
break;
};
let idx = self.ops.idx()?;
match op {
Op::Val(p) => self.push(dbg!(P(p.clone())))?,
Op::Sym(s) => self.push(dbg!(S(s.clone())))?,
Op::DeRef(s) => self.op_deref(s.clone())?,
Op::Add => self.op_add()?,
Op::Sub => self.op_sub()?,
Op::Mul => self.op_mul()?,
Op::Div => self.op_div()?,
Op::Bind => self.op_bind()?,
Op::Equal => self.op_equal()?,
Op::Gt => self.op_gt()?,
Op::Lt => self.op_lt()?,
Op::GtEq => self.op_gteq()?,
Op::LtEq => self.op_lteq()?,
// Add a Composite list value to the stack
Op::InitList => self.push(C(List(Vec::new())))?,
// Add a composite tuple value to the stack
Op::InitTuple => self.push(C(Tuple(Vec::new())))?,
Op::Field => self.op_field()?,
Op::Element => self.op_element()?,
Op::Index => self.op_index()?,
Op::Cp => self.op_copy()?,
//TODO(jwall): Should this take a user provided message?
Op::Bang => return dbg!(Err(Error {})),
Op::InitThunk(jp) => self.op_thunk(idx, jp)?,
Op::Noop => {
// Do nothing
}
Op::Jump(jp) => self.op_jump(jp)?,
Op::JumpIfTrue(jp) => self.op_jump_if_true(jp)?,
Op::JumpIfFalse(jp) => self.op_jump_if_false(jp)?,
Op::SelectJump(jp) => self.op_select_jump(jp)?,
Op::Module(mptr) => self.op_module(idx, mptr)?,
Op::Func(jptr) => self.op_func(idx, jptr)?,
Op::FCall => self.op_fcall()?,
Op::Return => return Ok(()),
Op::Pop => {
self.pop()?;
}
};
}
Ok(())
}
fn op_deref(&mut self, name: String) -> Result<(), Error> {
let val = dbg!(self.get_binding(&name)?.clone());
self.push(val)
}
fn op_jump(&mut self, jp: i32) -> Result<(), Error> {
self.ops.jump(
self.ops
.ptr
.map(|v| (v as i32 + jp) as usize)
.unwrap_or(jp as usize),
)?;
Ok(())
}
fn op_jump_if_true(&mut self, jp: i32) -> Result<(), Error> {
if let P(Bool(cond)) = self.pop()? {
if cond {
self.op_jump(jp)?;
}
}
Ok(())
}
fn op_jump_if_false(&mut self, jp: i32) -> Result<(), Error> {
if let P(Bool(cond)) = self.pop()? {
if !cond {
self.op_jump(jp)?;
}
}
Ok(())
}
fn op_select_jump(&'a mut self, jp: i32) -> Result<(), Error> {
// pop field value off
let field_name = dbg!(self.pop())?;
// pop search value off
let search = dbg!(self.pop())?;
// compare them.
if dbg!(field_name != search) {
self.op_jump(dbg!(jp))?;
self.push(dbg!(search))?;
}
dbg!(self.ops.ptr.unwrap());
// if they aren't equal then push search value back on and jump
Ok(())
}
fn op_module(&'a mut self, idx: usize, jptr: usize) -> Result<(), Error> {
let (result_ptr, flds) = match self.pop()? {
C(Tuple(flds)) => (None, flds),
T(ptr) => {
if let C(Tuple(flds)) = self.pop()? {
(Some(ptr), flds)
} else {
return dbg!(Err(Error {}));
}
}
_ => {
return dbg!(Err(Error {}));
}
};
let mut ops = self.ops.clone();
ops.jump(idx)?;
self.push(M(Module {
ptr: dbg!(ops),
result_ptr: result_ptr,
flds: dbg!(flds),
}))?;
self.ops.jump(dbg!(jptr))
}
fn op_func(&mut self, idx: usize, jptr: usize) -> Result<(), Error> {
// get arity from stack
let mut scope_snapshot = self.symbols.snapshot();
scope_snapshot.push();
scope_snapshot.to_open();
eprintln!("Defining a new function");
let mut bindings = Vec::new();
// get imported symbols from stack
if let C(List(elems)) = self.pop()? {
for e in elems {
if let S(sym) = e {
bindings.push(sym);
} else {
return dbg!(Err(Error {}));
}
}
} else {
return dbg!(Err(Error {}));
}
eprintln!("Pushing function definition on stack");
let mut ops = self.ops.clone();
ops.jump(idx)?;
self.push(dbg!(F(Func {
ptr: ops, // where the function starts.
bindings: bindings,
snapshot: scope_snapshot,
})))?;
eprintln!("Jumping to {} past the function body", jptr);
self.ops.jump(jptr)
}
fn op_fcall(&mut self) -> Result<(), Error> {
let f = self.pop()?;
if let F(Func {
ptr,
bindings,
snapshot,
}) = f
{
// use the captured scope snapshot for the function.
let mut vm = Self::with_pointer(ptr).to_scoped(snapshot);
for nm in bindings {
// now put each argument on our scope stack as a binding.
let val = self.pop()?;
vm.binding_push(nm, val)?;
}
// proceed to the function body
vm.run()?;
self.push(vm.pop()?)?;
} else {
return dbg!(Err(Error {}));
}
Ok(())
}
fn op_thunk(&mut self, idx: usize, jp: i32) -> Result<(), Error> {
self.push(dbg!(T(idx)))?;
self.op_jump(jp)
}
fn op_equal(&mut self) -> Result<(), Error> {
let left = self.pop()?;
let right = self.pop()?;
self.push(P(Bool(left == right)))?;
Ok(())
}
fn op_gt(&mut self) -> Result<(), Error> {
let left = self.pop()?;
let right = self.pop()?;
match (left, right) {
(P(Int(i)), P(Int(ii))) => {
self.push(P(Bool(i > ii)))?;
}
(P(Float(f)), P(Float(ff))) => {
self.push(P(Bool(f > ff)))?;
}
_ => return Err(Error {}),
}
Ok(())
}
fn op_lt(&mut self) -> Result<(), Error> {
let left = self.pop()?;
let right = self.pop()?;
match (left, right) {
(P(Int(i)), P(Int(ii))) => {
self.push(P(Bool(i < ii)))?;
}
(P(Float(f)), P(Float(ff))) => {
self.push(P(Bool(f < ff)))?;
}
_ => return Err(Error {}),
}
Ok(())
}
fn op_lteq(&mut self) -> Result<(), Error> {
let left = self.pop()?;
let right = self.pop()?;
match (left, right) {
(P(Int(i)), P(Int(ii))) => {
self.push(P(Bool(i <= ii)))?;
}
(P(Float(f)), P(Float(ff))) => {
self.push(P(Bool(f <= ff)))?;
}
_ => return Err(Error {}),
}
Ok(())
}
fn op_gteq(&mut self) -> Result<(), Error> {
let left = self.pop()?;
let right = self.pop()?;
match (left, right) {
(P(Int(i)), P(Int(ii))) => {
self.push(P(Bool(i >= ii)))?;
}
(P(Float(f)), P(Float(ff))) => {
self.push(P(Bool(f >= ff)))?;
}
_ => return Err(Error {}),
}
Ok(())
}
fn op_add(&mut self) -> Result<(), Error> {
// Adds the previous two items in the stack.
let left = self.pop()?;
let right = self.pop()?;
// Then pushes the result onto the stack.
self.push(P(self.add(left, right)?))?;
Ok(())
}
fn op_sub(&mut self) -> Result<(), Error> {
// Subtracts the previous two items in the stack.
let left = self.pop()?;
let right = self.pop()?;
// Then pushes the result onto the stack.
self.push(P(self.sub(left, right)?))?;
Ok(())
}
fn op_mul(&mut self) -> Result<(), Error> {
// Multiplies the previous two items in the stack.
let left = self.pop()?;
let right = self.pop()?;
// Then pushes the result onto the stack.
self.push(P(self.mul(left, right)?))?;
Ok(())
}
fn op_div(&mut self) -> Result<(), Error> {
// Divides the previous two items in the stack.
let left = self.pop()?;
let right = self.pop()?;
// Then pushes the result onto the stack.
self.push(P(self.div(left, right)?))?;
Ok(())
}
fn op_bind(&mut self) -> Result<(), Error> {
// pop val off stack.
let val = dbg!(self.pop())?;
// pop name off stack.
let name = dbg!(self.pop())?;
if let S(name) = name {
self.binding_push(name, val)?;
} else {
return Err(Error {});
}
Ok(())
}
fn op_field(&mut self) -> Result<(), Error> {
// Add a Composite field value to a tuple on the stack
// get value from stack
let val = self.pop()?;
// get name from stack.
let name = if let S(s) | P(Str(s)) = self.pop()? {
s
} else {
return Err(Error {});
};
// get composite tuple from stack
let tpl = self.pop()?;
if let C(Tuple(mut flds)) = tpl {
// add name and value to tuple
self.merge_field_into_tuple(&mut flds, name, val)?;
// place composite tuple back on stack
self.push(C(Tuple(flds)))?;
} else {
return Err(Error {});
};
Ok(())
}
fn op_element(&mut self) -> Result<(), Error> {
// get element from stack.
let val = self.pop()?;
// get next value. It should be a Composite list.
let tpl = self.pop()?;
if let C(List(mut elems)) = tpl {
// add value to list
elems.push(val);
// Add that value to the list and put list back on stack.
self.push(C(List(elems)))?;
} else {
return Err(Error {});
};
Ok(())
}
fn find_in_list(&self, index: Value, elems: Vec<Value>) -> Result<Value, Error> {
let idx = match index {
P(Int(i)) => i,
_ => return dbg!(Err(Error {})),
};
match elems.get(idx as usize) {
Some(v) => Ok(v.clone()),
None => Err(Error {}),
}
}
fn find_in_flds(&self, index: Value, flds: Vec<(String, Value)>) -> Result<Value, Error> {
let idx = match index {
S(p) => p,
P(Str(p)) => p,
_ => return dbg!(Err(Error {})),
};
for f in flds.iter() {
if idx == f.0 {
return Ok(f.1.clone());
}
}
Err(Error {})
}
fn find_in_value(&self, index: Value, target: Value) -> Result<Value, Error> {
match target {
C(Tuple(flds)) => self.find_in_flds(index, flds),
C(List(elements)) => self.find_in_list(index, elements),
_ => return Err(Error {}),
}
}
fn op_index(&mut self) -> Result<(), Error> {
let path = if let C(List(elems)) = self.pop()? {
elems
} else {
return dbg!(Err(Error {}));
};
match self.pop()? {
P(_) | S(_) | T(_) | F(_) | M(_) => return dbg!(Err(Error {})),
val => {
let mut out = val;
for p in path {
let tgt = self.find_in_value(p, out)?;
out = tgt;
}
self.push(out)?;
}
};
Ok(())
}
fn op_copy(&mut self) -> Result<(), Error> {
// TODO Use Cow pointers for this?
// get next value. It should be a Module or Tuple.
let tgt = dbg!(self.pop())?;
// This value should always be a tuple
let overrides = if let C(Tuple(oflds)) = self.pop()? {
oflds
} else {
return dbg!(Err(Error {}));
};
match tgt {
C(Tuple(mut flds)) => {
for (name, val) in overrides {
dbg!(self.merge_field_into_tuple(&mut flds, name, val))?;
}
// Put the copy on the Stack
self.push(C(Tuple(flds)))?;
}
M(Module {
ptr,
result_ptr,
mut flds,
}) => {
//let this = M(Module {
// ptr: ptr.clone(),
// result_ptr: result_ptr.clone(),
// flds: flds.clone(),
//});
for (name, val) in overrides {
self.merge_field_into_tuple(&mut flds, name, val)?;
}
// FIXME(jwall): We need to populate the pkg key for modules.
//self.merge_field_into_tuple(&mut flds, "this".to_owned(), this)?;
let mut vm = Self::with_pointer(ptr);
vm.push(S("mod".to_owned()))?;
vm.push(C(Tuple(dbg!(flds))))?;
vm.run()?;
let mut flds = Vec::new();
if let Some(ptr) = dbg!(result_ptr) {
vm.ops.jump(ptr)?;
vm.run()?;
self.push(vm.pop()?)?;
} else {
for sym in vm.symbols.symbol_list() {
if sym != "mod" {
flds.push((sym.clone(), vm.symbols.get(sym).unwrap().clone()));
}
}
self.push(dbg!(C(Tuple(flds))))?;
}
}
_ => {
return Err(Error {});
}
}
Ok(())
}
fn merge_field_into_tuple(
&self,
src_fields: &'a mut Vec<(String, Value)>,
name: String,
value: Value,
) -> Result<(), Error> {
for fld in src_fields.iter_mut() {
if fld.0 == name {
fld.1 = value;
return Ok(());
}
}
src_fields.push((name, value));
Ok(())
}
fn push(&mut self, p: Value) -> Result<(), Error> {
self.stack.push(p);
Ok(())
}
fn binding_push(&mut self, name: String, val: Value) -> Result<(), Error> {
if self.symbols.is_bound(&name) {
return Err(Error {});
}
self.symbols.add(name, val);
Ok(())
}
pub fn get_binding(&'a self, name: &str) -> Result<&Value, Error> {
match self.symbols.get(name) {
Some(v) => Ok(v),
None => Err(Error {}),
}
}
fn pop(&mut self) -> Result<Value, Error> {
match self.stack.pop() {
Some(v) => Ok(v),
None => Err(Error {}),
}
}
fn mul(&self, left: Value, right: Value) -> Result<Primitive, Error> {
Ok(match (left, right) {
(P(Int(i)), P(Int(ii))) => Int(i * ii),
(P(Float(f)), P(Float(ff))) => Float(f * ff),
_ => return Err(Error {}),
})
}
fn div(&self, left: Value, right: Value) -> Result<Primitive, Error> {
Ok(match (left, right) {
(P(Int(i)), P(Int(ii))) => Int(i / ii),
(P(Float(f)), P(Float(ff))) => Float(f / ff),
_ => return Err(Error {}),
})
}
fn sub(&self, left: Value, right: Value) -> Result<Primitive, Error> {
Ok(match (left, right) {
(P(Int(i)), Value::P(Int(ii))) => Int(i - ii),
(P(Float(f)), Value::P(Float(ff))) => Float(f - ff),
_ => return Err(Error {}),
})
}
fn add(&self, left: Value, right: Value) -> Result<Primitive, Error> {
Ok(match (left, right) {
(P(Int(i)), Value::P(Int(ii))) => Int(i + ii),
(P(Float(f)), Value::P(Float(ff))) => Float(f + ff),
(P(Str(s)), Value::P(Str(ss))) => {
let mut ns = String::new();
ns.push_str(&s);
ns.push_str(&ss);
Str(ns)
}
_ => return Err(Error {}),
})
}
}
#[cfg(test)] #[cfg(test)]
mod test; mod test;

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

@ -20,7 +20,7 @@ use super::Op::{
InitThunk, InitTuple, Jump, JumpIfFalse, JumpIfTrue, Module, Mul, Noop, Pop, Return, InitThunk, InitTuple, Jump, JumpIfFalse, JumpIfTrue, Module, Mul, Noop, Pop, Return,
SelectJump, Sub, Sym, Val, SelectJump, Sub, Sym, Val,
}; };
use super::Primitive::{Bool, Empty, Float, Int, Str}; use super::Primitive::{Bool, Float, Int, Str};
use super::Value::{C, P}; use super::Value::{C, P};
use super::VM; use super::VM;

582
src/build/opcode/vm.rs Normal file
View File

@ -0,0 +1,582 @@
// Copyright 2019 Jeremy Wall
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
use std::rc::Rc;
use super::{Value, Op, Primitive, Error};
use super::scope::{Stack};
use super::pointer::OpPointer;
use super::Value::{C, F, M, T, S, P};
use super::Primitive::{Int, Str, Float, Bool};
use super::Composite::{List, Tuple};
use super::{Func, Module};
pub struct VM {
stack: Vec<Value>,
symbols: Stack,
ops: OpPointer,
}
impl<'a> VM {
pub fn new(ops: Rc<Vec<Op>>) -> Self {
Self::with_pointer(OpPointer::new(ops))
}
pub fn with_pointer(ops: OpPointer) -> Self {
Self {
stack: Vec::new(),
symbols: Stack::new(),
ops: ops,
}
}
pub fn to_scoped(self, symbols: Stack) -> Self {
Self {
stack: Vec::new(),
symbols: symbols,
ops: self.ops.clone(),
}
}
pub fn run(&mut self) -> Result<(), Error> {
loop {
let op = if let Some(op) = dbg!(self.ops.next()) {
op.clone()
} else {
break;
};
let idx = self.ops.idx()?;
match op {
Op::Val(p) => self.push(dbg!(P(p.clone())))?,
Op::Sym(s) => self.push(dbg!(S(s.clone())))?,
Op::DeRef(s) => self.op_deref(s.clone())?,
Op::Add => self.op_add()?,
Op::Sub => self.op_sub()?,
Op::Mul => self.op_mul()?,
Op::Div => self.op_div()?,
Op::Bind => self.op_bind()?,
Op::Equal => self.op_equal()?,
Op::Gt => self.op_gt()?,
Op::Lt => self.op_lt()?,
Op::GtEq => self.op_gteq()?,
Op::LtEq => self.op_lteq()?,
// Add a Composite list value to the stack
Op::InitList => self.push(C(List(Vec::new())))?,
// Add a composite tuple value to the stack
Op::InitTuple => self.push(C(Tuple(Vec::new())))?,
Op::Field => self.op_field()?,
Op::Element => self.op_element()?,
Op::Index => self.op_index()?,
Op::Cp => self.op_copy()?,
//TODO(jwall): Should this take a user provided message?
Op::Bang => return dbg!(Err(Error {})),
Op::InitThunk(jp) => self.op_thunk(idx, jp)?,
Op::Noop => {
// Do nothing
}
Op::Jump(jp) => self.op_jump(jp)?,
Op::JumpIfTrue(jp) => self.op_jump_if_true(jp)?,
Op::JumpIfFalse(jp) => self.op_jump_if_false(jp)?,
Op::SelectJump(jp) => self.op_select_jump(jp)?,
Op::Module(mptr) => self.op_module(idx, mptr)?,
Op::Func(jptr) => self.op_func(idx, jptr)?,
Op::FCall => self.op_fcall()?,
Op::Return => return Ok(()),
Op::Pop => {
self.pop()?;
}
};
}
Ok(())
}
fn op_deref(&mut self, name: String) -> Result<(), Error> {
let val = dbg!(self.get_binding(&name)?.clone());
self.push(val)
}
fn op_jump(&mut self, jp: i32) -> Result<(), Error> {
self.ops.jump(
self.ops
.ptr
.map(|v| (v as i32 + jp) as usize)
.unwrap_or(jp as usize),
)?;
Ok(())
}
fn op_jump_if_true(&mut self, jp: i32) -> Result<(), Error> {
if let P(Bool(cond)) = self.pop()? {
if cond {
self.op_jump(jp)?;
}
}
Ok(())
}
fn op_jump_if_false(&mut self, jp: i32) -> Result<(), Error> {
if let P(Bool(cond)) = self.pop()? {
if !cond {
self.op_jump(jp)?;
}
}
Ok(())
}
fn op_select_jump(&'a mut self, jp: i32) -> Result<(), Error> {
// pop field value off
let field_name = dbg!(self.pop())?;
// pop search value off
let search = dbg!(self.pop())?;
// compare them.
if dbg!(field_name != search) {
self.op_jump(dbg!(jp))?;
self.push(dbg!(search))?;
}
dbg!(self.ops.ptr.unwrap());
// if they aren't equal then push search value back on and jump
Ok(())
}
fn op_module(&'a mut self, idx: usize, jptr: usize) -> Result<(), Error> {
let (result_ptr, flds) = match self.pop()? {
C(Tuple(flds)) => (None, flds),
T(ptr) => {
if let C(Tuple(flds)) = self.pop()? {
(Some(ptr), flds)
} else {
return dbg!(Err(Error {}));
}
}
_ => {
return dbg!(Err(Error {}));
}
};
let mut ops = self.ops.clone();
ops.jump(idx)?;
self.push(M(Module {
ptr: dbg!(ops),
result_ptr: result_ptr,
flds: dbg!(flds),
}))?;
self.ops.jump(dbg!(jptr))
}
fn op_func(&mut self, idx: usize, jptr: usize) -> Result<(), Error> {
// get arity from stack
let mut scope_snapshot = self.symbols.snapshot();
scope_snapshot.push();
scope_snapshot.to_open();
eprintln!("Defining a new function");
let mut bindings = Vec::new();
// get imported symbols from stack
if let C(List(elems)) = self.pop()? {
for e in elems {
if let S(sym) = e {
bindings.push(sym);
} else {
return dbg!(Err(Error {}));
}
}
} else {
return dbg!(Err(Error {}));
}
eprintln!("Pushing function definition on stack");
let mut ops = self.ops.clone();
ops.jump(idx)?;
self.push(dbg!(F(Func {
ptr: ops, // where the function starts.
bindings: bindings,
snapshot: scope_snapshot,
})))?;
eprintln!("Jumping to {} past the function body", jptr);
self.ops.jump(jptr)
}
fn op_fcall(&mut self) -> Result<(), Error> {
let f = self.pop()?;
if let F(Func {
ptr,
bindings,
snapshot,
}) = f
{
// use the captured scope snapshot for the function.
let mut vm = Self::with_pointer(ptr).to_scoped(snapshot);
for nm in bindings {
// now put each argument on our scope stack as a binding.
let val = self.pop()?;
vm.binding_push(nm, val)?;
}
// proceed to the function body
vm.run()?;
self.push(vm.pop()?)?;
} else {
return dbg!(Err(Error {}));
}
Ok(())
}
fn op_thunk(&mut self, idx: usize, jp: i32) -> Result<(), Error> {
self.push(dbg!(T(idx)))?;
self.op_jump(jp)
}
fn op_equal(&mut self) -> Result<(), Error> {
let left = self.pop()?;
let right = self.pop()?;
self.push(P(Bool(left == right)))?;
Ok(())
}
fn op_gt(&mut self) -> Result<(), Error> {
let left = self.pop()?;
let right = self.pop()?;
match (left, right) {
(P(Int(i)), P(Int(ii))) => {
self.push(P(Bool(i > ii)))?;
}
(P(Float(f)), P(Float(ff))) => {
self.push(P(Bool(f > ff)))?;
}
_ => return Err(Error {}),
}
Ok(())
}
fn op_lt(&mut self) -> Result<(), Error> {
let left = self.pop()?;
let right = self.pop()?;
match (left, right) {
(P(Int(i)), P(Int(ii))) => {
self.push(P(Bool(i < ii)))?;
}
(P(Float(f)), P(Float(ff))) => {
self.push(P(Bool(f < ff)))?;
}
_ => return Err(Error {}),
}
Ok(())
}
fn op_lteq(&mut self) -> Result<(), Error> {
let left = self.pop()?;
let right = self.pop()?;
match (left, right) {
(P(Int(i)), P(Int(ii))) => {
self.push(P(Bool(i <= ii)))?;
}
(P(Float(f)), P(Float(ff))) => {
self.push(P(Bool(f <= ff)))?;
}
_ => return Err(Error {}),
}
Ok(())
}
fn op_gteq(&mut self) -> Result<(), Error> {
let left = self.pop()?;
let right = self.pop()?;
match (left, right) {
(P(Int(i)), P(Int(ii))) => {
self.push(P(Bool(i >= ii)))?;
}
(P(Float(f)), P(Float(ff))) => {
self.push(P(Bool(f >= ff)))?;
}
_ => return Err(Error {}),
}
Ok(())
}
fn op_add(&mut self) -> Result<(), Error> {
// Adds the previous two items in the stack.
let left = self.pop()?;
let right = self.pop()?;
// Then pushes the result onto the stack.
self.push(P(self.add(left, right)?))?;
Ok(())
}
fn op_sub(&mut self) -> Result<(), Error> {
// Subtracts the previous two items in the stack.
let left = self.pop()?;
let right = self.pop()?;
// Then pushes the result onto the stack.
self.push(P(self.sub(left, right)?))?;
Ok(())
}
fn op_mul(&mut self) -> Result<(), Error> {
// Multiplies the previous two items in the stack.
let left = self.pop()?;
let right = self.pop()?;
// Then pushes the result onto the stack.
self.push(P(self.mul(left, right)?))?;
Ok(())
}
fn op_div(&mut self) -> Result<(), Error> {
// Divides the previous two items in the stack.
let left = self.pop()?;
let right = self.pop()?;
// Then pushes the result onto the stack.
self.push(P(self.div(left, right)?))?;
Ok(())
}
fn op_bind(&mut self) -> Result<(), Error> {
// pop val off stack.
let val = dbg!(self.pop())?;
// pop name off stack.
let name = dbg!(self.pop())?;
if let S(name) = name {
self.binding_push(name, val)?;
} else {
return Err(Error {});
}
Ok(())
}
fn op_field(&mut self) -> Result<(), Error> {
// Add a Composite field value to a tuple on the stack
// get value from stack
let val = self.pop()?;
// get name from stack.
let name = if let S(s) | P(Str(s)) = self.pop()? {
s
} else {
return Err(Error {});
};
// get composite tuple from stack
let tpl = self.pop()?;
if let C(Tuple(mut flds)) = tpl {
// add name and value to tuple
self.merge_field_into_tuple(&mut flds, name, val)?;
// place composite tuple back on stack
self.push(C(Tuple(flds)))?;
} else {
return Err(Error {});
};
Ok(())
}
fn op_element(&mut self) -> Result<(), Error> {
// get element from stack.
let val = self.pop()?;
// get next value. It should be a Composite list.
let tpl = self.pop()?;
if let C(List(mut elems)) = tpl {
// add value to list
elems.push(val);
// Add that value to the list and put list back on stack.
self.push(C(List(elems)))?;
} else {
return Err(Error {});
};
Ok(())
}
fn find_in_list(&self, index: Value, elems: Vec<Value>) -> Result<Value, Error> {
let idx = match index {
P(Int(i)) => i,
_ => return dbg!(Err(Error {})),
};
match elems.get(idx as usize) {
Some(v) => Ok(v.clone()),
None => Err(Error {}),
}
}
fn find_in_flds(&self, index: Value, flds: Vec<(String, Value)>) -> Result<Value, Error> {
let idx = match index {
S(p) => p,
P(Str(p)) => p,
_ => return dbg!(Err(Error {})),
};
for f in flds.iter() {
if idx == f.0 {
return Ok(f.1.clone());
}
}
Err(Error {})
}
fn find_in_value(&self, index: Value, target: Value) -> Result<Value, Error> {
match target {
C(Tuple(flds)) => self.find_in_flds(index, flds),
C(List(elements)) => self.find_in_list(index, elements),
_ => return Err(Error {}),
}
}
fn op_index(&mut self) -> Result<(), Error> {
let path = if let C(List(elems)) = self.pop()? {
elems
} else {
return dbg!(Err(Error {}));
};
match self.pop()? {
P(_) | S(_) | T(_) | F(_) | M(_) => return dbg!(Err(Error {})),
val => {
let mut out = val;
for p in path {
let tgt = self.find_in_value(p, out)?;
out = tgt;
}
self.push(out)?;
}
};
Ok(())
}
fn op_copy(&mut self) -> Result<(), Error> {
// TODO Use Cow pointers for this?
// get next value. It should be a Module or Tuple.
let tgt = dbg!(self.pop())?;
// This value should always be a tuple
let overrides = if let C(Tuple(oflds)) = self.pop()? {
oflds
} else {
return dbg!(Err(Error {}));
};
match tgt {
C(Tuple(mut flds)) => {
for (name, val) in overrides {
dbg!(self.merge_field_into_tuple(&mut flds, name, val))?;
}
// Put the copy on the Stack
self.push(C(Tuple(flds)))?;
}
M(Module {
ptr,
result_ptr,
mut flds,
}) => {
//let this = M(Module {
// ptr: ptr.clone(),
// result_ptr: result_ptr.clone(),
// flds: flds.clone(),
//});
for (name, val) in overrides {
self.merge_field_into_tuple(&mut flds, name, val)?;
}
// FIXME(jwall): We need to populate the pkg key for modules.
//self.merge_field_into_tuple(&mut flds, "this".to_owned(), this)?;
let mut vm = Self::with_pointer(ptr);
vm.push(S("mod".to_owned()))?;
vm.push(C(Tuple(dbg!(flds))))?;
vm.run()?;
let mut flds = Vec::new();
if let Some(ptr) = dbg!(result_ptr) {
vm.ops.jump(ptr)?;
vm.run()?;
self.push(vm.pop()?)?;
} else {
for sym in vm.symbols.symbol_list() {
if sym != "mod" {
flds.push((sym.clone(), vm.symbols.get(sym).unwrap().clone()));
}
}
self.push(dbg!(C(Tuple(flds))))?;
}
}
_ => {
return Err(Error {});
}
}
Ok(())
}
fn merge_field_into_tuple(
&self,
src_fields: &'a mut Vec<(String, Value)>,
name: String,
value: Value,
) -> Result<(), Error> {
for fld in src_fields.iter_mut() {
if fld.0 == name {
fld.1 = value;
return Ok(());
}
}
src_fields.push((name, value));
Ok(())
}
fn push(&mut self, p: Value) -> Result<(), Error> {
self.stack.push(p);
Ok(())
}
fn binding_push(&mut self, name: String, val: Value) -> Result<(), Error> {
if self.symbols.is_bound(&name) {
return Err(Error {});
}
self.symbols.add(name, val);
Ok(())
}
pub fn get_binding(&'a self, name: &str) -> Result<&Value, Error> {
match self.symbols.get(name) {
Some(v) => Ok(v),
None => Err(Error {}),
}
}
pub fn pop(&mut self) -> Result<Value, Error> {
match self.stack.pop() {
Some(v) => Ok(v),
None => Err(Error {}),
}
}
fn mul(&self, left: Value, right: Value) -> Result<Primitive, Error> {
Ok(match (left, right) {
(P(Int(i)), P(Int(ii))) => Int(i * ii),
(P(Float(f)), P(Float(ff))) => Float(f * ff),
_ => return Err(Error {}),
})
}
fn div(&self, left: Value, right: Value) -> Result<Primitive, Error> {
Ok(match (left, right) {
(P(Int(i)), P(Int(ii))) => Int(i / ii),
(P(Float(f)), P(Float(ff))) => Float(f / ff),
_ => return Err(Error {}),
})
}
fn sub(&self, left: Value, right: Value) -> Result<Primitive, Error> {
Ok(match (left, right) {
(P(Int(i)), Value::P(Int(ii))) => Int(i - ii),
(P(Float(f)), Value::P(Float(ff))) => Float(f - ff),
_ => return Err(Error {}),
})
}
fn add(&self, left: Value, right: Value) -> Result<Primitive, Error> {
Ok(match (left, right) {
(P(Int(i)), Value::P(Int(ii))) => Int(i + ii),
(P(Float(f)), Value::P(Float(ff))) => Float(f + ff),
(P(Str(s)), Value::P(Str(ss))) => {
let mut ns = String::new();
ns.push_str(&s);
ns.push_str(&ss);
Str(ns)
}
_ => return Err(Error {}),
})
}
}