Update with the latest erg

This commit is contained in:
Shunsuke Shibayama 2023-01-11 18:00:03 +09:00
parent 0ccbd89070
commit fe550a51ef
3 changed files with 16 additions and 16 deletions

24
Cargo.lock generated
View File

@ -252,8 +252,8 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]]
name = "els"
version = "0.1.13"
source = "git+https://github.com/erg-lang/erg?branch=main#993bb13bb53dbeb366610cf58d57b3bbcab2b064"
version = "0.1.14-nightly.1"
source = "git+https://github.com/erg-lang/erg?branch=main#c8253e89019445766657c0270f8213dba0fa4c94"
dependencies = [
"erg_common",
"erg_compiler",
@ -273,8 +273,8 @@ dependencies = [
[[package]]
name = "erg_common"
version = "0.6.1"
source = "git+https://github.com/erg-lang/erg?branch=main#993bb13bb53dbeb366610cf58d57b3bbcab2b064"
version = "0.6.2-nightly.1"
source = "git+https://github.com/erg-lang/erg?branch=main#c8253e89019445766657c0270f8213dba0fa4c94"
dependencies = [
"backtrace-on-stack-overflow",
"hermit-abi",
@ -284,8 +284,8 @@ dependencies = [
[[package]]
name = "erg_compiler"
version = "0.6.1"
source = "git+https://github.com/erg-lang/erg?branch=main#993bb13bb53dbeb366610cf58d57b3bbcab2b064"
version = "0.6.2-nightly.1"
source = "git+https://github.com/erg-lang/erg?branch=main#c8253e89019445766657c0270f8213dba0fa4c94"
dependencies = [
"erg_common",
"erg_parser",
@ -293,8 +293,8 @@ dependencies = [
[[package]]
name = "erg_parser"
version = "0.6.1"
source = "git+https://github.com/erg-lang/erg?branch=main#993bb13bb53dbeb366610cf58d57b3bbcab2b064"
version = "0.6.2-nightly.1"
source = "git+https://github.com/erg-lang/erg?branch=main#c8253e89019445766657c0270f8213dba0fa4c94"
dependencies = [
"erg_common",
"unicode-xid 0.2.4",
@ -527,9 +527,9 @@ dependencies = [
[[package]]
name = "object"
version = "0.30.1"
version = "0.30.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d864c91689fdc196779b98dba0aceac6118594c2df6ee5d943eb6a8df4d107a"
checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83"
dependencies = [
"memchr",
]
@ -759,9 +759,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.7.0"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
dependencies = [
"aho-corasick",
"memchr",

View File

@ -7,8 +7,8 @@ use erg_compiler::artifact::{BuildRunnable, Buildable, CompleteArtifact, Incompl
use erg_compiler::context::ModuleContext;
use erg_compiler::erg_parser::ast::AST;
use erg_compiler::error::{CompileError, CompileErrors};
use erg_compiler::global::SharedCompilerResource;
use erg_compiler::lower::ASTLowerer;
use erg_compiler::module::SharedCompilerResource;
use py2erg::dump_decl_er;
use py2erg::{CheckStatus, ShadowingMode};
use rustpython_parser::parser;

View File

@ -7,7 +7,7 @@ use std::str::FromStr;
use analyze::PythonAnalyzer;
use els::Server;
use erg_common::config::{ErgConfig, Input};
use erg_common::config::{ErgConfig, ErgMode, Input};
use erg_common::spawn::exec_new_thread;
pub fn parse_args() -> ErgConfig {
@ -26,7 +26,7 @@ pub fn parse_args() -> ErgConfig {
cfg.input = Input::Str(args.next().expect("the value of `-c` is not passed"));
}
"--server" => {
cfg.mode = "server";
cfg.mode = ErgMode::LanguageServer;
cfg.quiet_repl = true;
}
"--dump-decl" => {
@ -74,7 +74,7 @@ For more information try `pylyzer --help`"
fn run() {
let cfg = parse_args();
if cfg.mode == "server" {
if cfg.mode == ErgMode::LanguageServer {
let mut lang_server = Server::<PythonAnalyzer>::new(cfg);
lang_server.run().unwrap_or_else(|_| {
std::process::exit(1);