Merge branch 'master' of github.com:shinglyu/RustPython

Author: Shing Lyu

README.md

@@ -6,17 +6,15 @@ A Python interpreter written in Rust
 # Installation
 
 ```
-virtualenv venv --python=python3
-source venv/bin/activate
-pip install bytecode
+bash init_env.sh
 ```
 
 # Run
 
 ```
 ./test.sh <path/to/file.py> # compile and run
-./test.sh --bytecode <path/to/file.py> # print the bytecode
-./test.sh --dis <path/to/file.py> # Run python -m dis
+./test.sh <path/to/file.py> --bytecode # print the bytecode in JSON
+./test.sh <path/to/file.py> --dis # Run python -m dis
 ```
 
 ## Manual
@@ -32,9 +30,11 @@ cargo run ../test.bytecode
 # Testing & debugging
 
 ```
-./test_all.sh
+./test_all.sh # Run all tests under tests/
 ```
 
+* If a test is expected to fail or raise exception, add `xfail_*` prefix to the filename.
+
 ## Logging
 
 ```
@@ -57,8 +57,8 @@ RUST_LOG=debug ./tests_all.sh
 * Runs the [pybenchmark](https://pybenchmarks.org/) benchmark test
 * Run famous/popular python modules (which?)
 
-* Compatible with CPython 2.7
+* Compatible with CPython 3.6
 
 # Rust version
-rustc 1.16.0-nightly (bf6d7b665 2017-01-15)
+rustc 1.20.0-nightly
 

RustPython/src/builtins.rs

@@ -1,21 +1,23 @@
 use NativeType;
+use std::rc::Rc;
+use std::ops::Deref;
 
-pub fn print(args: Vec<NativeType>) -> NativeType {
+pub fn print(args: Vec<Rc<NativeType>>) -> NativeType {
     for elem in args {
         // TODO: figure out how python's print vectors
-        match elem {
-            NativeType::NoneType => println!("None"),
-            NativeType::Boolean(b)=> {
-                if b {
+        match elem.deref() {
+            &NativeType::NoneType => println!("None"),
+            &NativeType::Boolean(ref b)=> {
+                if *b {
                     println!("True");
                 } else {
                     println!("False");
                 }
             },
-            NativeType::Int(x)  => println!("{}", x),
-            NativeType::Float(x)  => println!("{}", x),
-            NativeType::Str(x)  => println!("{}", x),
-            NativeType::Unicode(x)  => println!("{}", x),
+            &NativeType::Int(ref x)  => println!("{}", x),
+            &NativeType::Float(ref x)  => println!("{}", x),
+            &NativeType::Str(ref x)  => println!("{}", x),
+            &NativeType::Unicode(ref x)  => println!("{}", x),
             _ => panic!("Print for {:?} not implemented yet", elem),
             /*
             List(Vec<NativeType>),
@@ -31,11 +33,11 @@ pub fn print(args: Vec<NativeType>) -> NativeType {
     NativeType::NoneType
 }
 
-pub fn len(args: Vec<NativeType>) -> NativeType {
+pub fn len(args: Vec<Rc<NativeType>>) -> NativeType {
     if args.len() != 1 {
         panic!("len(s) expects exactly one parameter");
     }
-    let len = match &args[0] {
+    let len = match args[0].deref() {
         &NativeType::List(ref l) => l.len(),
         &NativeType::Tuple(ref t) => t.len(),
         &NativeType::Str(ref s) => s.len(),