Merge branch 'main' of https://github.com/mech-lang/mech

mech-lang · Oct 22, 2024 · 5b9c7d8 · 5b9c7d8
2 parents 12f4819 + 6f5e3d0
commit 5b9c7d8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,10 @@
 [package]
 name = "mech"
+<<<<<<< HEAD
 version = "0.2.16"
+=======
+version = "0.2.15"
+>>>>>>> 6f5e3d0aa6ebf0ac25afb5e1704a4b776d5e89b5
 authors = ["Corey Montella <corey@mech-lang.org>"]
 description = "Mech is a reactive programming language for building robots, games, and animations."
 documentation = "https://mech-lang.org/docs"
@@ -69,7 +73,14 @@ mech-utilities = { path = 'src/utilities'}
 mech-wasm = { path = 'src/wasm'}
 
 [patch.'https://gitlab.com/mech-lang/core']
+<<<<<<< HEAD
 mech-core = { path = 'src/core', version = '0.2.16' }
 
 [patch.'https://gitlab.com/mech-lang/syntax']
-mech-syntax = { path = 'src/syntax', version = '0.2.16' }
+mech-syntax = { path = 'src/syntax', version = '0.2.16' }
+=======
+mech-core = { path = 'src/core', version = '0.2.15' }
+
+[patch.'https://gitlab.com/mech-lang/syntax']
+mech-syntax = { path = 'src/syntax', version = '0.2.15' }
+>>>>>>> 6f5e3d0aa6ebf0ac25afb5e1704a4b776d5e89b5
diff --git a/src/syntax/Cargo.toml b/src/syntax/Cargo.toml
@@ -21,7 +21,11 @@ default = []
 no-std = ["mech-core/no-std", "rlibc"]
 
 [dependencies]
+<<<<<<< HEAD
 mech-core = "0.2.16"
+=======
+mech-core = "0.2.15"
+>>>>>>> 6f5e3d0aa6ebf0ac25afb5e1704a4b776d5e89b5
 
 hashbrown = "0.15.0"
 lazy_static = "1.5.0"

diff --git a/src/syntax/tests/interpreter.rs b/src/syntax/tests/interpreter.rs
@@ -63,7 +63,11 @@ test_interpreter!(interpret_kind_math_overflow_u8, "255<u8> + 1<u8>", Value::U8(
 // New tests overflow - unsigned
 test_interpreter!(interpret_kind_math_overflow_u16, "65535<u16> + 1<u16>", Value::U16(new_ref(0)));
 test_interpreter!(interpret_kind_math_overflow_u32, "4294967295<u32> + 1<u32>", Value::U32(new_ref(0)));
+<<<<<<< HEAD
 test_interpreter!(interpret_kind_math_overflow_u64, "18446744073709551615<u64> + 1<u64>", Value::U64(new_ref(0)));
+=======
+// test_interpreter!(interpret_kind_math_overflow_u64, "18446744073709551615<u64> + 1<u64>", Value::U64(new_ref(0)));
+>>>>>>> 6f5e3d0aa6ebf0ac25afb5e1704a4b776d5e89b5
 // test_interpreter!(interpret_kind_math_overflow_u128, "340282366920938463463374607431768211455<u128> + 1<u128>", Value::U128(new_ref(0)));
 
 // New test overflow - signed