lalrpop as default but optional dependency

youknowone · youknowone · commit d6c059a24f50 · 2022-08-23T17:47:47.000+09:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,8 +33,8 @@ ssl = ["rustpython-stdlib/ssl"]
 ssl-vendor = ["rustpython-stdlib/ssl-vendor"]
 
 [dependencies]
-rustpython-compiler = { path = "compiler", version = "0.1.1" }
-rustpython-parser = { path = "compiler/parser", version = "0.1.1" }
+rustpython-compiler = { path = "compiler", version = "0.1.1", default-features = false }
+rustpython-parser = { path = "compiler/parser", version = "0.1.1", optional = true, default-features = false }
 rustpython-stdlib = {path = "stdlib", optional = true, default-features = false}
 rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compiler"] }
 
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -1,13 +1,16 @@
 [package]
 name = "rustpython-compiler"
 version = "0.1.2"
-description = "A usability wrapper around rustpython-parser and rustpython-compiler-core"
+description = "A usability wrapper around rustpython-parser and rustpython-codegen"
 authors = ["RustPython Team"]
 edition = "2021"
 
+[features]
+default = ["rustpython-parser/lalrpop"]
+
 [dependencies]
 rustpython-compiler-core = { path = "core" }
 rustpython-codegen = { path = "codegen" }
-rustpython-parser = { path = "parser" }
+rustpython-parser = { path = "parser", default-features = false }
 
 thiserror = "1.0"
diff --git a/compiler/codegen/Cargo.toml b/compiler/codegen/Cargo.toml
@@ -20,6 +20,6 @@ num-traits = "0.2.14"
 thiserror = "1.0"
 
 [dev-dependencies]
-rustpython-parser = { path = "../parser" }
+rustpython-parser = { path = "../parser", default-features = false }
 
 insta = "1.14.0"
diff --git a/compiler/parser/Cargo.toml b/compiler/parser/Cargo.toml
@@ -8,6 +8,9 @@ repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
 edition = "2021"
 
+[features]
+default = ["lalrpop"]
+
 [build-dependencies]
 anyhow = "1.0.45"
 lalrpop = { version = "0.19.8", optional = true }
diff --git a/compiler/parser/src/error.rs b/compiler/parser/src/error.rs
@@ -195,6 +195,13 @@ impl fmt::Display for ParseErrorType {
 }
 
 impl ParseErrorType {
+    pub fn is_eof(&self) -> bool {
+        match self {
+            ParseErrorType::Lexical(LexicalErrorType::Eof) => true,
+            ParseErrorType::Eof => true,
+            _ => false,
+        }
+    }
     pub fn is_indentation_error(&self) -> bool {
         match self {
             ParseErrorType::Lexical(LexicalErrorType::IndentationError) => true,
diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -12,7 +12,7 @@ proc-macro = true
 
 [dependencies]
 rustpython-codegen = { path = "../compiler/codegen", version = "0.1.1" }
-rustpython-compiler = { path = "../compiler", version = "0.1.1" }
+rustpython-compiler = { path = "../compiler", version = "0.1.1", default-features = false }
 rustpython-compiler-core = { path = "../compiler/core", version = "0.1.1" }
 rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" }
 
diff --git a/src/shell.rs b/src/shell.rs
@@ -1,6 +1,5 @@
 mod helper;
 
-use rustpython_parser::error::{LexicalErrorType, ParseErrorType};
 use rustpython_vm::{
     builtins::PyBaseExceptionRef,
     compiler::{self, CompileError, CompileErrorBody, CompileErrorType},
@@ -24,19 +23,11 @@ fn shell_exec(vm: &VirtualMachine, source: &str, scope: Scope) -> ShellExecResul
         Err(CompileError {
             body:
                 CompileErrorBody {
-                    error: CompileErrorType::Parse(ParseErrorType::Lexical(LexicalErrorType::Eof)),
+                    error: CompileErrorType::Parse(parse_error),
                     ..
                 },
             ..
-        })
-        | Err(CompileError {
-            body:
-                CompileErrorBody {
-                    error: CompileErrorType::Parse(ParseErrorType::Eof),
-                    ..
-                },
-            ..
-        }) => ShellExecResult::Continue,
+        }) if parse_error.is_eof() => ShellExecResult::Continue,
         Err(err) => ShellExecResult::PyErr(vm.new_syntax_error(&err)),
     }
 }
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -15,7 +15,7 @@ ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"]
 [dependencies]
 # rustpython crates
 rustpython-derive = { path = "../derive" }
-rustpython-vm = { path = "../vm" }
+rustpython-vm = { path = "../vm", default-features = false }
 rustpython-common = { path = "../common" }
 
 # random
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 include = ["src/**/*.rs", "Cargo.toml", "build.rs", "Lib/**/*.py"]
 
 [features]
-default = ["compiler"]
+default = ["compiler", "rustpython-parser?/lalrpop"]
 importlib = []
 encodings = ["importlib"]
 vm-tracing-logging = []
@@ -23,9 +23,9 @@ codegen = ["rustpython-codegen", "ast"]
 parser = ["rustpython-parser", "ast"]
 
 [dependencies]
-rustpython-compiler = { path = "../compiler", optional = true, version = "0.1.2" }
+rustpython-compiler = { path = "../compiler", optional = true, version = "0.1.2", default-features = false }
 rustpython-ast = { path = "../compiler/ast", optional = true, version = "0.1" }
-rustpython-parser = { path = "../compiler/parser", optional = true, version = "0.1.2" }
+rustpython-parser = { path = "../compiler/parser", optional = true, version = "0.1.2", default-features = false }
 rustpython-codegen = { path = "../compiler/codegen", optional = true, version = "0.1.2" }
 rustpython-compiler-core = { path = "../compiler/core", version = "0.1.2" }
 rustpython-common = { path = "../common" }
diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
@@ -11,13 +11,14 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [features]
-default = ["freeze-stdlib", "rustpython-stdlib"]
+default = ["freeze-stdlib", "stdlib", "rustpython-parser/lalrpop"]
+stdlib = ["rustpython-stdlib"]
 freeze-stdlib = ["rustpython-vm/freeze-stdlib"]
 no-start-func = []
 
 [dependencies]
 rustpython-common = { path = "../../common" }
-rustpython-parser = { path = "../../compiler/parser" }
+rustpython-parser = { path = "../../compiler/parser", default-features = false }
 rustpython-stdlib = { path = "../../stdlib", default-features = false, optional = true }
 # make sure no threading! otherwise wasm build will fail
 rustpython-vm = { path = "../../vm", default-features = false, features = ["compiler", "encodings"] }
