improve error handling

RustPython · coolreader18 · Apr 18, 2025 · Apr 15, 2025 · Apr 15, 2025 · Apr 15, 2025
commit 21272025c29f17b640016c78faf640212e26a4c4
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -2158,10 +2158,7 @@ impl Compiler<'_> {
             for ident in attrs.iter().take(n_attrs).skip(i + 1) {
                 let other = ident.as_str();
                 if attr == other {
-                    todo!();
-                    // return Err(self.compiler_error(
-                    //     &format!("attribute name repeated in class pattern: {}", attr),
-                    // ));
+                    return Err(self.error(CodegenErrorType::RepeatedAttributePattern));
                 }
             }
         }
@@ -2415,15 +2412,16 @@ impl Compiler<'_> {
             } else {
                 let control_vec = control.as_ref().unwrap();
                 if nstores != control_vec.len() {
-                    todo!();
-                    // return self.compiler_error("alternative patterns bind different names");
+                    return Err(self.error(CodegenErrorType::ConflictingNameBindPattern));
                 } else if nstores > 0 {
                     // Check that the names occur in the same order.
                     for icontrol in (0..nstores).rev() {
                         let name = &control_vec[icontrol];
                         // Find the index of `name` in the current stores.
-                        let istores = pc.stores.iter().position(|n| n == name).unwrap();
-                        // .ok_or_else(|| self.compiler_error("alternative patterns bind different names"))?;
+                        let istores =
+                            pc.stores.iter().position(|n| n == name).ok_or_else(|| {
+                                self.error(CodegenErrorType::ConflictingNameBindPattern)
+                            })?;
                         if icontrol != istores {
                             // The orders differ; we must reorder.
                             assert!(istores < icontrol, "expected istores < icontrol");

diff --git a/compiler/codegen/src/error.rs b/compiler/codegen/src/error.rs
@@ -65,6 +65,8 @@ pub enum CodegenErrorType {
     ForbiddenName,
     DuplicateStore(String),
     UnreachablePattern(PatternUnreachableReason),
+    RepeatedAttributePattern,
+    ConflictingNameBindPattern,
     NotImplementedYet, // RustPython marker for unimplemented features
 }
 
@@ -119,6 +121,12 @@ impl fmt::Display for CodegenErrorType {
             UnreachablePattern(reason) => {
                 write!(f, "{reason} makes remaining patterns unreachable")
             }
+            RepeatedAttributePattern => {
+                write!(f, "attribute name repeated in class pattern")
+            }
+            ConflictingNameBindPattern => {
+                write!(f, "alternative patterns bind different names")
+            }
             NotImplementedYet => {
                 write!(f, "RustPython does not implement this feature yet")
             }