compile() with PyCF_ONLY_AST is available without compiler

youknowone · youknowone · commit 78dce22c5130 · 2019-10-12T18:24:28.000+09:00
diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs
@@ -124,30 +124,40 @@ struct CompileArgs {
     optimize: OptionalArg<PyIntRef>,
 }
 
-#[cfg(feature = "rustpython-compiler")]
 fn builtin_compile(args: CompileArgs, vm: &VirtualMachine) -> PyResult {
     // TODO: compile::compile should probably get bytes
     let source = match &args.source {
         Either::A(string) => string.as_str(),
         Either::B(bytes) => str::from_utf8(bytes).unwrap(),
     };
 
-    let mode = args
-        .mode
-        .as_str()
-        .parse::<compile::Mode>()
-        .map_err(|err| vm.new_value_error(err.to_string()))?;
+    let mode_str = args.mode.as_str();
 
     let flags = args
         .flags
         .map_or(Ok(0), |v| i32::try_from_object(vm, v.into_object()))?;
 
     if (flags & ast::PY_COMPILE_FLAG_AST_ONLY).is_zero() {
-        vm.compile(&source, mode, args.filename.as_str().to_string())
-            .map(|o| o.into_object())
-            .map_err(|err| vm.new_syntax_error(&err))
+        #[cfg(feature = "rustpython-compiler")]
+        {
+            let mode = mode_str
+                .parse::<compile::Mode>()
+                .map_err(|err| vm.new_value_error(err.to_string()))?;
+
+            vm.compile(&source, mode, args.filename.as_str().to_string())
+                .map(|o| o.into_object())
+                .map_err(|err| vm.new_syntax_error(&err))
+        }
+        #[cfg(not(feature = "rustpython-compiler"))]
+        {
+            Err(vm.new_value_error("PyCF_ONLY_AST flag is required without compiler support"))
+        }
     } else {
-        ast::parse(&vm, &source, mode.to_parser_mode())
+        use rustpython_parser::parser;
+        let mode = mode_str
+            .parse::<parser::Mode>()
+            .map_err(|err| vm.new_value_error(err.to_string()))?;
+        ast::parse(&vm, &source, mode)
     }
 }
 
@@ -757,7 +767,6 @@ pub fn make_module(vm: &VirtualMachine, module: PyObjectRef) {
     #[cfg(feature = "rustpython-compiler")]
     {
         extend_module!(vm, module, {
-            "compile" => ctx.new_rustfunc(builtin_compile),
             "eval" => ctx.new_rustfunc(builtin_eval),
             "exec" => ctx.new_rustfunc(builtin_exec),
         });
@@ -780,6 +789,7 @@ pub fn make_module(vm: &VirtualMachine, module: PyObjectRef) {
         "callable" => ctx.new_rustfunc(builtin_callable),
         "chr" => ctx.new_rustfunc(builtin_chr),
         "classmethod" => ctx.classmethod_type(),
+        "compile" => ctx.new_rustfunc(builtin_compile),
         "complex" => ctx.complex_type(),
         "delattr" => ctx.new_rustfunc(builtin_delattr),
         "dict" => ctx.dict_type(),
