Fix compilation without compiler feature

coolreader18 · youknowone · commit 32a54b25cfbf · 2024-08-09T01:12:10.000+09:00
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -12,12 +12,12 @@ license.workspace = true
 
 [features]
 default = ["compiler"]
-compiler = ["rustpython-vm/compiler"]
 threading = ["rustpython-common/threading", "rustpython-vm/threading"]
 zlib = ["libz-sys", "flate2/zlib"]
 bz2 = ["bzip2"]
 ssl = ["openssl", "openssl-sys", "foreign-types-shared"]
 ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"]
+compiler = ["rustpython-vm/compiler"]
 
 [dependencies]
 # rustpython crates
diff --git a/stdlib/src/dis.rs b/stdlib/src/dis.rs
@@ -13,6 +13,7 @@ mod decl {
         let co = if let Ok(co) = obj.get_attr("__code__", vm) {
             // Method or function:
             PyRef::try_from_object(vm, co)?
+<<<<<<< HEAD
         } else if let Ok(_co_str) = PyStrRef::try_from_object(vm, obj.clone()) {
             #[cfg(not(feature = "compiler"))]
             return Err(vm.new_runtime_error(
@@ -25,6 +26,27 @@ mod decl {
                 "<dis>".to_owned(),
             )
             .map_err(|err| vm.new_syntax_error(&err, Some(_co_str.as_str())))?
+||||||| parent of d98f13178 (Fix compilation without compiler feature)
+        } else if let Ok(co_str) = PyStrRef::try_from_object(vm, obj.clone()) {
+            // String:
+            vm.compile(co_str.as_str(), compiler::Mode::Exec, "<dis>".to_owned())
+                .map_err(|err| vm.new_syntax_error(&err))?
+=======
+        } else if let Ok(co_str) = PyStrRef::try_from_object(vm, obj.clone()) {
+            // String:
+            #[cfg(feature = "compiler")]
+            {
+                vm.compile(co_str.as_str(), compiler::Mode::Exec, "<dis>".to_owned())
+                    .map_err(|err| vm.new_syntax_error(&err))?
+            }
+            #[cfg(not(feature = "compiler"))]
+            {
+                let _ = co_str;
+                return Err(
+                    vm.new_not_implemented_error("compiler feature is turned off".to_owned())
+                );
+            }
+>>>>>>> d98f13178 (Fix compilation without compiler feature)
         } else {
             PyRef::try_from_object(vm, obj)?
         };
diff --git a/vm/src/vm/vm_new.rs b/vm/src/vm/vm_new.rs
@@ -256,6 +256,7 @@ impl VirtualMachine {
         self.new_exception_msg(overflow_error, msg)
     }
 
+<<<<<<< HEAD
     #[cfg(any(feature = "rustpython-parser", feature = "rustpython-codegen"))]
     pub fn new_syntax_error(
         &self,
@@ -264,6 +265,12 @@ impl VirtualMachine {
     ) -> PyBaseExceptionRef {
         use crate::source_code::SourceLocation;
 
+||||||| parent of d98f13178 (Fix compilation without compiler feature)
+    #[cfg(any(feature = "rustpython-parser", feature = "rustpython-codegen"))]
+    pub fn new_syntax_error(&self, error: &crate::compiler::CompileError) -> PyBaseExceptionRef {
+=======
+    pub fn new_syntax_error(&self, error: &crate::compiler::CompileError) -> PyBaseExceptionRef {
+>>>>>>> d98f13178 (Fix compilation without compiler feature)
         let syntax_error_type = match &error.error {
             #[cfg(feature = "rustpython-parser")]
             crate::compiler::CompileErrorType::Parse(p) if p.is_indentation_error() => {
