iface: break if overflow

RGB-WG · Apr 10, 2024 · 88b9469 · 88b9469
1 parent f663b1b
commit 88b9469
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/src/interface/inheritance.rs b/src/interface/inheritance.rs
@@ -169,7 +169,6 @@ impl Iface {
         let mut overflow = false;
         for (name, e) in ext.global_state {
             match self.global_state.get_mut(&name) {
-                None if overflow => continue,
                 None => {
                     self.global_state
                         .insert(name, e)
@@ -178,6 +177,9 @@ impl Iface {
                             errors.push(ExtensionError::GlobalOverflow)
                         })
                         .ok();
+                    if overflow {
+                        break;
+                    }
                 }
                 Some(orig) => {
                     if orig.sem_id.is_some() && e.sem_id != orig.sem_id {
@@ -194,7 +196,6 @@ impl Iface {
         overflow = false;
         for (name, e) in ext.assignments {
             match self.assignments.get_mut(&name) {
-                None if overflow => continue,
                 None => {
                     self.assignments
                         .insert(name, e)
@@ -203,6 +204,9 @@ impl Iface {
                             errors.push(ExtensionError::AssignmentOverflow)
                         })
                         .ok();
+                    if overflow {
+                        break;
+                    }
                 }
                 Some(orig) => {
                     if !orig.owned_state.is_superset(e.owned_state) {
@@ -221,7 +225,6 @@ impl Iface {
         overflow = false;
         for (name, e) in ext.valencies {
             match self.valencies.get_mut(&name) {
-                None if overflow => continue,
                 None => {
                     self.valencies
                         .insert(name, e)
@@ -230,6 +233,9 @@ impl Iface {
                             errors.push(ExtensionError::ValencyOverflow)
                         })
                         .ok();
+                    if overflow {
+                        break;
+                    }
                 }
                 Some(orig) => {
                     if orig.required > e.required {
@@ -251,7 +257,6 @@ impl Iface {
         overflow = false;
         for (name, op) in ext.transitions {
             match self.transitions.remove(&name) {
-                Ok(None) if overflow => continue,
                 Ok(None) if op.optional => continue,
                 Ok(None) => {
                     self.transitions
@@ -261,6 +266,9 @@ impl Iface {
                             errors.push(ExtensionError::TransitionOverflow)
                         })
                         .ok();
+                    if overflow {
+                        break;
+                    }
                 }
                 Ok(Some(orig)) => {
                     orig.extended(op, name.clone())
@@ -275,7 +283,6 @@ impl Iface {
         overflow = false;
         for (name, op) in ext.extensions {
             match self.extensions.remove(&name) {
-                Ok(None) if overflow => continue,
                 Ok(None) if op.optional => continue,
                 Ok(None) => {
                     self.extensions
@@ -285,6 +292,9 @@ impl Iface {
                             errors.push(ExtensionError::TransitionOverflow)
                         })
                         .ok();
+                    if overflow {
+                        break;
+                    }
                 }
                 Ok(Some(orig)) => {
                     orig.extended(op, name.clone())
@@ -341,14 +351,16 @@ fn check_occs(
     let mut overflow = false;
     for (name, occ) in ext {
         match orig.get_mut(&name) {
-            None if overflow => continue,
             None => {
                 orig.insert(name, occ)
                     .map_err(|_| {
                         overflow = true;
                         errors.push(ExtensionError::OpOverflow(op.clone(), state))
                     })
                     .ok();
+                if overflow {
+                    break;
+                }
             }
             Some(orig) => {
                 if orig.min_value() > occ.min_value() || orig.max_value() > occ.max_value() {
@@ -370,15 +382,15 @@ fn check_presence<T: Ord + ToString>(
 ) {
     let mut overflow = false;
     for name in ext {
-        if overflow {
-            continue;
-        }
         orig.push(name)
             .map_err(|_| {
                 overflow = true;
                 errors.push(ExtensionError::OpOverflow(op.clone(), state))
             })
             .ok();
+        if overflow {
+            break;
+        }
     }
 }