Skip to content

Make the REPL handle line continuation better #711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coolreader18 merged 5 commits into from
Mar 22, 2019
Merged

Make the REPL handle line continuation better #711

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
88d6926
Make the REPL handle continuation better
coolreader18 Mar 22, 2019
2c93c79
Immutable prompt variable
coolreader18 Mar 22, 2019
5c8c4a8
Merge branch 'master' into coolreader18/multiline-repl
coolreader18 Mar 22, 2019
36ff4e3
Use vm.get_attribute
coolreader18 Mar 22, 2019
18be23a
Merge branch 'master' into coolreader18/multiline-repl
coolreader18 Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use vm.get_attribute
  • Loading branch information
@coolreader18
coolreader18 committed Mar 22, 2019
commit 36ff4e37d360fe8dad35409b25e65aef34fe53d2
14 changes: 4 additions & 10 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,8 @@ extern crate rustyline;
use clap::{App, Arg};
use rustpython_parser::error::ParseError;
use rustpython_vm::{
compile,
error::CompileError,
frame::Scope,
import,
obj::objstr,
print_exception,
pyobject::{AttributeProtocol, PyResult},
util, VirtualMachine,
compile, error::CompileError, frame::Scope, import, obj::objstr, print_exception,
pyobject::PyResult, util, VirtualMachine,
};
use rustyline::{error::ReadlineError, Editor};
use std::path::{Path, PathBuf};
Expand Down Expand Up @@ -160,8 +154,8 @@ fn get_history_path() -> PathBuf {
}

fn get_prompt(vm: &mut VirtualMachine, prompt_name: &str) -> String {
vm.sys_module
.get_attr(prompt_name)
vm.get_attribute(vm.sys_module.clone(), prompt_name)
.ok()
.as_ref()
.map(objstr::get_value)
.unwrap_or_else(String::new)
Expand Down