Merge with master

Author: windelbouwman

tests/snippets/basic_types.py

@@ -33,3 +33,4 @@
 except TypeError:
     pass
 
+assert int() == 0

tests/snippets/json_snippet.py

@@ -16,36 +16,35 @@ def round_trip_test(obj):
 assert '[]' == json.dumps([])
 assert '[1]' == json.dumps([1])
 assert '[[1]]' == json.dumps([[1]])
-# round_trip_test([1, "string", 1.0, True])
+round_trip_test([1, "string", 1.0, True])
 
 assert '[]' == json.dumps(())
 assert '[1]' == json.dumps((1,))
 assert '[[1]]' == json.dumps(((1,),))
 # tuples don't round-trip through json
-# assert [1, "string", 1.0, True] == json.loads(json.dumps((1, "string", 1.0, True)))
-
-# assert '{}' == json.dumps({})
-# # TODO: uncomment once dict comparison is implemented
-# # round_trip_test({'a': 'b'})
-
-# assert 1 == json.loads("1")
-# assert -1 == json.loads("-1")
-# assert 1.0 == json.loads("1.0")
-# # TODO: uncomment once negative floats are implemented
-# # assert -1.0 == json.loads("-1.0")
-# assert "str" == json.loads('"str"')
-# # TODO: Use "is" once implemented
-# assert True == json.loads('true')
-# assert False == json.loads('false')
-# # TODO: uncomment once None comparison is implemented
-# assert None == json.loads('null')
-# assert [] == json.loads('[]')
-# assert ['a'] == json.loads('["a"]')
-# assert [['a'], 'b'] == json.loads('[["a"], "b"]')
-
-# class String(str): pass
-
-# assert '"string"' == json.dumps(String("string"))
+assert [1, "string", 1.0, True] == json.loads(json.dumps((1, "string", 1.0, True)))
+
+assert '{}' == json.dumps({})
+# TODO: uncomment once dict comparison is implemented
+# round_trip_test({'a': 'b'})
+
+assert 1 == json.loads("1")
+assert -1 == json.loads("-1")
+assert 1.0 == json.loads("1.0")
+# TODO: uncomment once negative floats are implemented
+# assert -1.0 == json.loads("-1.0")
+assert "str" == json.loads('"str"')
+assert True is json.loads('true')
+assert False is json.loads('false')
+assert None is json.loads('null')
+assert [] == json.loads('[]')
+assert ['a'] == json.loads('["a"]')
+assert [['a'], 'b'] == json.loads('[["a"], "b"]')
+
+class String(str): pass
+
+assert "string" == json.loads(String('"string"'))
+assert '"string"' == json.dumps(String("string"))
 
 # TODO: Uncomment and test once int/float construction is supported
 # class Int(int): pass

vm/src/obj/objint.rs

@@ -14,14 +14,22 @@ fn int_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 }
 
 fn int_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
-    let ref cls = args.args[0];
+    arg_check!(
+        vm,
+        args,
+        required = [(cls, None)],
+        optional = [(val_option, None)]
+    );
     if !objtype::issubclass(cls, vm.ctx.int_type()) {
         return Err(vm.new_type_error(format!("{:?} is not a subtype of int", cls)));
     }
 
     // TODO: extract kwargs:
     let base = 10;
-    let val = to_int(vm, &args.args[1].clone(), base)?;
+    let val = match val_option {
+        Some(val) => to_int(vm, val, base)?,
+        None => 0,
+    };
     Ok(PyObject::new(
         PyObjectKind::Integer { value: val },
         cls.clone(),

vm/src/pyobject.rs

@@ -56,6 +56,8 @@ pub struct PyContext {
     pub float_type: PyObjectRef,
     pub bytes_type: PyObjectRef,
     pub bool_type: PyObjectRef,
+    pub true_value: PyObjectRef,
+    pub false_value: PyObjectRef,
     pub list_type: PyObjectRef,
     pub tuple_type: PyObjectRef,
     pub str_type: PyObjectRef,
@@ -127,12 +129,16 @@ impl PyContext {
             create_type("NoneType", &type_type, &object_type, &dict_type),
         );
 
+        let true_value = PyObject::new(PyObjectKind::Integer { value: 1 }, bool_type.clone());
+        let false_value = PyObject::new(PyObjectKind::Integer { value: 0 }, bool_type.clone());
         let context = PyContext {
             int_type: int_type,
             float_type: float_type,
             bytes_type: bytes_type,
             list_type: list_type,
             bool_type: bool_type,
+            true_value: true_value,
+            false_value: false_value,
             tuple_type: tuple_type,
             dict_type: dict_type,
             none: none,
@@ -220,12 +226,11 @@ impl PyContext {
     }
 
     pub fn new_bool(&self, b: bool) -> PyObjectRef {
-        PyObject::new(
-            PyObjectKind::Integer {
-                value: if b { 1 } else { 0 },
-            },
-            self.bool_type(),
-        )
+        if b {
+            self.true_value.clone()
+        } else {
+            self.false_value.clone()
+        }
     }
 
     pub fn new_tuple(&self, elements: Vec<PyObjectRef>) -> PyObjectRef {