blobs as parameters. also typecheck

2 files changed, 25 insertions, 1 deletions

diff --git a/src/compiler.rs b/src/compiler.rs
index be2fe44..83dca4a 100644
--- a/src/compiler.rs
+++ b/src/compiler.rs
@@ -850,7 +850,7 @@ impl Compiler {
                     "float" => Ok(Type::Float),
                     "bool" => Ok(Type::Bool),
                     "str" => Ok(Type::String),
-                    _ => Err(()),
+                    x => self.find_blob(x).map(|blob| Type::BlobInstance(blob)).ok_or(()),
                 }
             }
             _ => Err(()),
diff --git a/src/vm.rs b/src/vm.rs
index 4e501ba..2b5b2bf 100644
--- a/src/vm.rs
+++ b/src/vm.rs
@@ -743,6 +743,30 @@ impl VM {
                 }
             }
 
+            Op::Get(field) => {
+                let inst = self.stack.pop();
+                if let Some(Value::BlobInstance(ty, _)) = inst {
+                    let value = self.blobs[ty].name_to_field.get(&field).unwrap().1.as_value();
+                    self.stack.push(value);
+                } else {
+                    self.stack.push(Value::Nil);
+                    error!(self, ErrorKind::RuntimeTypeError(Op::Get(field.clone()), vec![inst.unwrap()]));
+                }
+            }
+
+            Op::Set(field) => {
+                let value = self.stack.pop().unwrap();
+                let inst = self.stack.pop();
+                if let Some(Value::BlobInstance(ty, _)) = inst {
+                    let ty = &self.blobs[ty].name_to_field.get(&field).unwrap().1;
+                    if ty != &Type::from(&value) {
+                        error!(self, ErrorKind::RuntimeTypeError(Op::Set(field.clone()), vec![inst.unwrap()]));
+                    }
+                } else {
+                    error!(self, ErrorKind::RuntimeTypeError(Op::Set(field.clone()), vec![inst.unwrap()]));
+                }
+            }
+
             Op::PopUpvalue => {
                 self.stack.pop().unwrap();
             }