Partial fix for issue hlorenzi#115: Partial support for labels inside…

… asm{}

src/asm/state.rs

@@ -1386,69 +1386,80 @@ impl State
 			subparser.suppress_reports();
 
 			//println!("> after subs `{:?}`", subs_tokens);
-
-			let matches = asm::parser::match_rule_invocation(
-				&self,
-				subparser,
-				inner_ctx.clone(),
-				fileserver,
-				info.report.clone())?;
-
-			let value = self.resolve_rule_invocation(
-				info.report.clone(),
-				&matches,
-				fileserver,
-				true,
-				info.args)?;
 
-			//println!("  value = {:?}", value);
-
-			let (bigint, size) = match value.get_bigint()
+			if subparser.next_is(0, syntax::TokenKind::Identifier) &&
+			subparser.next_is(1, syntax::TokenKind::Colon)
 			{
-				Some(bigint) =>
+				let label_tk = subparser.expect(syntax::TokenKind::Identifier)?;
+				let label_name = label_tk.excerpt.as_ref().unwrap();
+				info.args.set_local(
+					label_name,
+					expr::Value::make_integer(inner_ctx.bit_offset / inner_ctx.cur_wordsize)
+				);
+			} else {
+				let matches = asm::parser::match_rule_invocation(
+					&self,
+					subparser,
+					inner_ctx.clone(),
+					fileserver,
+					info.report.clone())?;
+
+				let value = self.resolve_rule_invocation(
+					info.report.clone(),
+					&matches,
+					fileserver,
+					true,
+					info.args)?;
+
+				//println!("  value = {:?}", value);
+
+				let (bigint, size) = match value.get_bigint()
 				{
-					match bigint.size
+					Some(bigint) =>
 					{
-						Some(size) => (bigint, size),
-						None =>
+						match bigint.size
 						{
-							info.report.error_span(
-								"cannot infer size of instruction",
-								&subparser_span);
+							Some(size) => (bigint, size),
+							None =>
+							{
+								info.report.error_span(
+									"cannot infer size of instruction",
+									&subparser_span);
 
-							return Err(());
+								return Err(());
+							}
 						}
 					}
-				}
 
-				_ =>
-				{
-					info.report.error_span(
-						"wrong type returned from instruction",
-						&subparser_span);
+					_ =>
+					{
+						info.report.error_span(
+							"wrong type returned from instruction",
+							&subparser_span);
 
-					return Err(());
-				}
-			};
+						return Err(());
+					}
+				};
 
-			if size > 0
-			{
-				if result.size.unwrap() == 0
+				if size > 0
 				{
-					result = bigint;
-				}
-				else
-				{
-					result = result.concat(
-						(result.size.unwrap(), 0),
-						&bigint,
-						(size, 0));
+					if result.size.unwrap() == 0
+					{
+						result = bigint;
+					}
+					else
+					{
+						result = result.concat(
+							(result.size.unwrap(), 0),
+							&bigint,
+							(size, 0));
+					}
+
+					inner_ctx.bit_offset += size;
 				}
-
-				inner_ctx.bit_offset += size;
-			}
-
+ 			}
 			parser.expect_linebreak()?;
+
 		}
 
 		//println!("  result size = {:?}", result.size);

tests/issue115/3.asm

@@ -0,0 +1,29 @@
+#ruledef {
+    emit {x:u8} => x
+
+    nested_test => asm
+    {
+        label:
+        emit $
+        label2:
+        emit $
+        emit label 
+        emit label2 
+        emit $
+        test
+    }
+
+    test => asm
+    {
+        label:
+        emit $
+        label2:
+        emit $
+        emit label 
+        emit label2 
+        emit $
+    }
+}
+
+test ;= 00_01_00_01_04
+nested_test ;= 05_06_05_06_09_0a_0b_0a_0b_0e