Add builtin id function

windelbouwman · windelbouwman · commit dbae0b0a7156 · 2018-07-31T14:28:19.000+02:00
diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs
@@ -4,7 +4,7 @@ use std::io::{self, Write};
 
 use super::compile;
 use super::pyobject::DictProtocol;
-use super::pyobject::{Executor, PyContext, PyObject, PyObjectKind, PyObjectRef, PyResult, Scope};
+use super::pyobject::{Executor, PyContext, PyObject, PyObjectKind, PyObjectRef, PyResult, Scope, IdProtocol};
 use super::objbool;
 
 
@@ -41,6 +41,14 @@ pub fn builtin_dir(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
     }
 }
 
+pub fn builtin_id(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
+    if args.len() != 1 {
+        return Err(rt.new_exception("Expected only one argument".to_string()))
+    }
+
+    Ok(rt.context().new_int(args[0].get_id() as i32))
+}
+
 pub fn builtin_print(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
     trace!("print called with {:?}", args);
     for a in args {
@@ -88,6 +96,7 @@ pub fn len(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
 pub fn make_module(ctx: &PyContext) -> PyObjectRef {
     // scope[String::from("print")] = print;
     let mut dict = HashMap::new();
+    dict.insert(String::from("id"), ctx.new_rustfunc(builtin_id));
     dict.insert(String::from("print"), ctx.new_rustfunc(builtin_print));
     dict.insert(String::from("type"), ctx.type_type.clone());
     dict.insert(String::from("int"), ctx.int_type.clone());
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -152,6 +152,16 @@ impl Default for PyObject {
     }
 }
 
+pub trait IdProtocol {
+    fn get_id(&self) -> usize;
+}
+
+impl IdProtocol for PyObjectRef {
+    fn get_id(&self) -> usize {
+        self.as_ptr() as usize
+    }
+}
+
 pub trait ParentProtocol {
     fn has_parent(&self) -> bool;
     fn get_parent(&self) -> PyObjectRef;
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -16,7 +16,7 @@ use super::objlist;
 use super::objstr;
 use super::objtuple;
 use super::pyobject::{DictProtocol, Executor, PyContext, PyObject, PyObjectKind, PyObjectRef,
-                      PyResult, ParentProtocol, Scope};
+                      PyResult, ParentProtocol, Scope, IdProtocol};
 
 // use objects::objects;
 
@@ -409,16 +409,24 @@ impl VirtualMachine {
         Ok(result)
     }
 
+    fn _id(&mut self, a: PyObjectRef) -> usize {
+        a.get_id()
+    }
+
     fn _is(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {
         // Pointer equal:
-        let result_bool = true; // TODO: *a.as_ptr() == *b.as_ptr();
+        let id_a = self._id(a);
+        let id_b = self._id(b);
+        let result_bool = id_a == id_b;
         let result = self.ctx.new_bool(result_bool);
         Ok(result)
     }
 
     fn _is_not(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {
         // Pointer equal:
-        let result_bool = true; // TODO: *a.as_ptr() != *b.as_ptr();
+        let id_a = self._id(a);
+        let id_b = self._id(b);
+        let result_bool = id_a != id_b;
         let result = self.ctx.new_bool(result_bool);
         Ok(result)
     }
