Update parser to specialize ConversionFlag (RustPython#4976)

Author: youknowone

Cargo.lock

@@ -29,11 +29,11 @@ rustpython-pylib = { path = "pylib" }
 rustpython-stdlib = { path = "stdlib" }
 rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" }
 
-rustpython-literal = { git = "https://github.com/youknowone/RustPython-Parser.git", rev = "dd4cc25227452178cce357b49677842efe533711" }
-rustpython-parser-core = { git = "https://github.com/youknowone/RustPython-Parser.git", rev = "dd4cc25227452178cce357b49677842efe533711" }
-rustpython-parser = { git = "https://github.com/youknowone/RustPython-Parser.git", rev = "dd4cc25227452178cce357b49677842efe533711" }
-rustpython-ast = { git = "https://github.com/youknowone/RustPython-Parser.git", rev = "dd4cc25227452178cce357b49677842efe533711" }
-rustpython-format = { git = "https://github.com/youknowone/RustPython-Parser.git", rev = "dd4cc25227452178cce357b49677842efe533711" }
+rustpython-literal = { git = "https://github.com/youknowone/RustPython-Parser.git", rev = "fc301ab1b0f5483f2b2d3e28d8d92a2845b99fec" }
+rustpython-parser-core = { git = "https://github.com/youknowone/RustPython-Parser.git", rev = "fc301ab1b0f5483f2b2d3e28d8d92a2845b99fec" }
+rustpython-parser = { git = "https://github.com/youknowone/RustPython-Parser.git", rev = "fc301ab1b0f5483f2b2d3e28d8d92a2845b99fec" }
+rustpython-ast = { git = "https://github.com/youknowone/RustPython-Parser.git", rev = "fc301ab1b0f5483f2b2d3e28d8d92a2845b99fec" }
+rustpython-format = { git = "https://github.com/youknowone/RustPython-Parser.git", rev = "fc301ab1b0f5483f2b2d3e28d8d92a2845b99fec" }
 # rustpython-literal = { path = "../RustPython-parser/literal" }
 # rustpython-parser-core = { path = "../RustPython-parser/core" }
 # rustpython-parser = { path = "../RustPython-parser/parser" }

Cargo.toml

@@ -21,10 +21,7 @@ use rustpython_compiler_core::{
     bytecode::{self, Arg as OpArgMarker, CodeObject, ConstantData, Instruction, OpArg, OpArgType},
     Mode,
 };
-use rustpython_parser_core::{
-    source_code::{LineNumber, SourceLocation},
-    ConversionFlag,
-};
+use rustpython_parser_core::source_code::{LineNumber, SourceLocation};
 use std::borrow::Cow;
 
 type CompileResult<T> = Result<T, CodegenError>;
@@ -2258,8 +2255,7 @@ impl Compiler {
                 emit!(
                     self,
                     Instruction::FormatValue {
-                        conversion: ConversionFlag::from_op_arg(conversion.to_u32())
-                            .expect("invalid conversion flag"),
+                        conversion: *conversion,
                     },
                 );
             }

compiler/codegen/src/compile.rs

@@ -336,18 +336,22 @@ impl fmt::Display for Label {
     }
 }
 
-op_arg_enum_impl!(
-    enum ConversionFlag {
-        /// No conversion
-        None = 0, // CPython uses -1 but not pleasure for us
-        /// Converts by calling `str(<value>)`.
-        Str = b's',
-        /// Converts by calling `ascii(<value>)`.
-        Ascii = b'a',
-        /// Converts by calling `repr(<value>)`.
-        Repr = b'r',
+impl OpArgType for ConversionFlag {
+    #[inline]
+    fn from_op_arg(x: u32) -> Option<Self> {
+        match x as u8 {
+            b's' => Some(ConversionFlag::Str),
+            b'a' => Some(ConversionFlag::Ascii),
+            b'r' => Some(ConversionFlag::Repr),
+            std::u8::MAX => Some(ConversionFlag::None),
+            _ => None,
+        }
     }
-);
+    #[inline]
+    fn to_op_arg(self) -> u32 {
+        self as i8 as u8 as u32
+    }
+}
 
 op_arg_enum!(
     /// The kind of Raise that occurred.