fix #113 and fix #114: fix checks for string arguments

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "customasm"
-version = "0.11.11"
+version = "0.11.12"
 edition = "2018"
 authors = ["hlorenzi <https://hlorenzi.com>"]
 description = "An assembler for custom, user-defined instruction sets!"

src/asm/state.rs

@@ -608,7 +608,7 @@ impl State
 	{
 		let data_invoc = &invocation.get_data_invoc();
 
-		let mut resolved = self.eval_expr(
+		let resolved = self.eval_expr(
 			report.clone(),
 			&data_invoc.expr,
 			&invocation.ctx,
@@ -618,9 +618,9 @@ impl State
 
 		if let Some(elem_size) = data_invoc.elem_size
 		{
-			match resolved
+			match resolved.get_bigint()
 			{
-				expr::Value::Integer(ref mut bigint) =>
+				Some(mut bigint) =>
 				{
 					let mut size = bigint.min_size();
 					if let Some(intrinsic_size) = bigint.size
@@ -639,8 +639,9 @@ impl State
 					}
 
 					bigint.size = Some(elem_size);
+					return Ok(expr::Value::make_integer(bigint));
 				}
-				_ => {}
+				None => {}
 			}
 		}
 
@@ -900,7 +901,7 @@ impl State
 
 			asm::PatternParameterType::Unsigned(size) =>
 			{
-				if let expr::Value::Integer(value_int) = value
+				if let Some(mut value_int) = value.get_bigint()
 				{
 					if value_int.sign() == -1 ||
 						value_int.min_size() > size
@@ -913,6 +914,7 @@ impl State
 					else
 					{
 						value_int.size = Some(size);
+						*value = expr::Value::make_integer(value_int);
 						Ok(())
 					}
 				}
@@ -927,7 +929,7 @@ impl State
 
 			asm::PatternParameterType::Signed(size) =>
 			{
-				if let expr::Value::Integer(value_int) = value
+				if let Some(mut value_int) = value.get_bigint()
 				{
 					if (value_int.sign() == 0 && size == 0) ||
 						(value_int.sign() == 1 && value_int.min_size() >= size) ||
@@ -941,6 +943,7 @@ impl State
 					else
 					{
 						value_int.size = Some(size);
+						*value = expr::Value::make_integer(value_int);
 						Ok(())
 					}
 				}
@@ -955,7 +958,7 @@ impl State
 
 			asm::PatternParameterType::Integer(size) =>
 			{
-				if let expr::Value::Integer(value_int) = value
+				if let Some(mut value_int) = value.get_bigint()
 				{
 					if value_int.min_size() > size
 					{
@@ -967,6 +970,7 @@ impl State
 					else
 					{
 						value_int.size = Some(size);
+						*value = expr::Value::make_integer(value_int);
 						Ok(())
 					}
 				}

tests/data_simple/36.asm

@@ -0,0 +1,2 @@
+#d8 "a" ; = 0x61
+#d16 "b" ; = 0x0062

tests/data_simple/37.asm

@@ -0,0 +1 @@
+#d8 "abc" ; error: larger

tests/issue113/1.asm

@@ -0,0 +1,2 @@
+#d3 "test" ; error: larger
+#d8 "ü" ; error: larger

tests/rule_arg_typed/55.asm

@@ -0,0 +1,10 @@
+#ruledef test
+{
+    ld1 {x: i8} => 0xaa @ x
+    ld2 {x: s8} => 0xbb @ x
+    ld3 {x: u16} => 0xcc @ x
+}
+
+ld1 "a" ; = 0xaa61
+ld2 "b" ; = 0xbb62
+ld3 "c" ; = 0xcc0063

tests/rule_arg_typed/56.asm

@@ -0,0 +1,10 @@
+#ruledef test
+{
+    ld1 {x: i8} => 0xaa @ x
+    ld2 {x: s8} => 0xbb @ x
+    ld3 {x: u8} => 0xcc @ x
+}
+
+ld1 "abc" ; error: failed / error: out of range
+ld2 "ã" ; error: failed / error: out of range
+ld3 "ü" ; error: failed / error: out of range