Merge branch 'bug-fixes'

CHANGELOG.md

@@ -28,6 +28,12 @@ Enhancements
 * `Engine::register_type_XXX` are now available even under `no_object`.
 
 
+Version 1.0.3
+=============
+
+* Fixed bug with `catch` variable used in `catch` block.
+
+
 Version 1.0.2
 =============
 

src/parse.rs

@@ -2929,6 +2929,7 @@ fn parse_try_catch(
         }
 
         let name = state.get_identifier(name);
+        state.stack.push((name.clone(), AccessMode::ReadWrite));
         Some(Ident { name, pos })
     } else {
         None

tests/throw.rs

@@ -29,6 +29,50 @@ fn test_try_catch() -> Result<(), Box<EvalAltResult>> {
         123
     );
 
+    #[cfg(not(feature = "no_function"))]
+    assert_eq!(
+        engine.eval::<INT>(
+            "
+                fn foo(x) { try { throw 42; } catch (x) { return x; } }
+                foo(0)
+            "
+        )?,
+        42
+    );
+
+    assert_eq!(
+        engine.eval::<INT>(
+            "
+                let err = 123;
+                let x = 0;
+                try { throw 42; } catch(err) { return err; }
+            "
+        )?,
+        42
+    );
+
+    assert_eq!(
+        engine.eval::<INT>(
+            "
+                let foo = 123;
+                let x = 0;
+                try { throw 42; } catch(err) { return foo; }
+            "
+        )?,
+        123
+    );
+
+    assert_eq!(
+        engine.eval::<INT>(
+            "
+                let foo = 123;
+                let x = 0;
+                try { throw 42; } catch(err) { return err; }
+            "
+        )?,
+        42
+    );
+
     #[cfg(not(feature = "unchecked"))]
     assert!(matches!(
         *engine