Merge branch 'master' into tuple_add

Author: windelbouwman

.gitignore

@@ -5,4 +5,5 @@ __pycache__
 **/*.pytest_cache
 .*sw*
 .repl_history.txt
+.vscode
 wasm-pack.log

Cargo.lock

@@ -13,6 +13,7 @@ clap = "2.31.2"
 rustpython_parser = {path = "parser"}
 rustpython_vm = {path = "vm"}
 rustyline = "2.1.0"
+xdg = "2.2.0"
 
 [profile.release]
 opt-level = "s"

Cargo.toml

@@ -56,7 +56,7 @@ If you wish to update the online documentation. Push directly to the `release` b
   - `obj`: python builtin types
 - `src`: using the other subcrates to bring rustpython to life.
 - `docs`: documentation (work in progress)
-- `py_code_object`: CPython bytecode to rustpython bytecode convertor (work in progress)
+- `py_code_object`: CPython bytecode to rustpython bytecode converter (work in progress)
 - `wasm`: Binary crate and resources for WebAssembly build
 - `tests`: integration test snippets
 
@@ -81,8 +81,8 @@ To test rustpython, there is a collection of python snippets located in the
 
 ```shell
 $ cd tests
-$ pipenv shell
-$ pytest -v
+$ pipenv install
+$ pipenv run pytest -v
 ```
 
 There also are some unittests, you can run those will cargo:

README.md

@@ -1,6 +1,6 @@
 Byterun
 
-* Builtins are exposted to frame.f_builtins
+* Builtins are exposed to frame.f_builtins
 * f_builtins is assigned during frame creation,
     self.f_builtins = f_locals['__builtins__']
     if hasattr(self.f_builtins, '__dict__'):
@@ -21,10 +21,10 @@ TODO:
 * Implement a new type NativeFunction
 * Wrap a function pointer in NativeFunction
 * Refactor the CALL_FUNCTION case so it can call both python function and native function
-* During frame creation, force push a nativefunction `print` into the namespace
+* During frame creation, force push a native function `print` into the namespace
 * Modify LOAD_* so they can search for names in builtins
 
 * Create a module type
 * In VM initialization, load the builtins module into locals
-* During frame creation, create a field that conatins the builtins dict
+* During frame creation, create a field that contains the builtins dict
 

docs/builtins.md

@@ -221,7 +221,7 @@ pub enum Expression {
 
 /*
  * In cpython this is called arguments, but we choose parameters to
- * distuingish between function parameters and actual call arguments.
+ * distinguish between function parameters and actual call arguments.
  */
 #[derive(Debug, PartialEq, Default)]
 pub struct Parameters {

parser/src/ast.rs

@@ -7,6 +7,7 @@ extern crate log;
 extern crate rustpython_parser;
 extern crate rustpython_vm;
 extern crate rustyline;
+extern crate xdg;
 
 use clap::{App, Arg};
 use rustpython_parser::parser;
@@ -154,9 +155,10 @@ fn run_shell(vm: &mut VirtualMachine) -> PyResult {
     let mut input = String::new();
     let mut rl = Editor::<()>::new();
 
-    // TODO: Store the history in a proper XDG directory
-    let repl_history_path = ".repl_history.txt";
-    if rl.load_history(repl_history_path).is_err() {
+    let xdg_dirs = xdg::BaseDirectories::with_prefix("rustpython").unwrap();
+    let repl_history_path = xdg_dirs.place_cache_file("repl_history.txt").unwrap();
+    let repl_history_path_str = repl_history_path.to_str().unwrap();
+    if rl.load_history(repl_history_path_str).is_err() {
         println!("No previous history.");
     }
 
@@ -220,7 +222,7 @@ fn run_shell(vm: &mut VirtualMachine) -> PyResult {
             }
         };
     }
-    rl.save_history(repl_history_path).unwrap();
+    rl.save_history(repl_history_path_str).unwrap();
 
     Ok(vm.get_none())
 }

src/main.rs

@@ -45,6 +45,8 @@
 assert type(a) is complex
 assert type(a + a) is complex
 
+a = 1
+assert a.conjugate() == a
 
 a = 12345
 

tests/snippets/basic_types.py

@@ -46,3 +46,5 @@ def __bool__(self):
 assert False * 7 == 0
 assert True > 0
 assert int(True) == 1
+assert True.conjugate() == 1
+assert isinstance(True.conjugate(), int)

tests/snippets/bools.py

@@ -10,6 +10,7 @@
 assert y == [2, 1, 2, 3, 1, 2, 3]
 
 assert x * 0 == [], "list __mul__ by 0 failed"
+assert x * -1 == [], "list __mul__ by -1 failed"
 assert x * 2 == [1, 2, 3, 1, 2, 3], "list __mul__ by 2 failed"
 
 assert ['a', 'b', 'c'].index('b') == 1
@@ -20,3 +21,20 @@
     pass
 else:
     assert False, "ValueError was not raised"
+
+x = [[1,0,-3], 'a', 1]
+y = [[3,2,1], 'z', 2]
+assert x < y, "list __lt__ failed"
+
+x = [5, 13, 31]
+y = [1, 10, 29]
+assert x > y, "list __gt__ failed"
+
+
+assert [1,2,'a'].pop() == 'a', "list pop failed"
+try:
+    [].pop()
+except IndexError:
+    pass
+else:
+    assert False, "IndexError was not raised"