Merge branch 'asar_19'

Author: RPGHacker

docs/changelog/index.html

@@ -89,7 +89,7 @@ <h3>Deprecated features:</h3>
 			<li><code>rep</code> to repeat commands: Use while loops or unrolled loops instead.</li>
 			<li>Windows-specific paths (e.g. <code>incsrc dir\file.asm</code>): Use cross-platform paths instead (<code>incsrc dir/file.asm</code>).</li>
 			<li><code>table</code> command: Assign characters directly instead, like <code>'a' = $00</code>.</li>
-			<li>Labels in <code>padbyte</code> or <code>fillbyte</code> commands.</li>
+			<li>Non-static labels in <code>padbyte</code> or <code>fillbyte</code> commands.</li>
 			<li><code>spc700-raw</code> architecture: Use <code>spc700</code> with <code>norom</code> instead.</li>
 			<li><code>fastrom</code>: Has never actually worked and can be removed.</li>
 			<li><code>header</code>: Doesn't do anything and can be removed.</li>

src/asar/assembleblock.cpp

@@ -2416,7 +2416,7 @@ void assembleblock(const char * block, bool isspecialline)
 		if (is("padlong")) len=3;
 		if (is("paddword")) len=4;
 		unsigned int val=getnum(par);
-		if(foundlabel) asar_throw_warning(1, warning_id_feature_deprecated, "labels in padbyte", "just... don't.");
+		if(foundlabel && !foundlabel_static) asar_throw_warning(1, warning_id_feature_deprecated, "labels in padbyte", "just... don't.");
 		for (int i=0;i<12;i+=len)
 		{
 			unsigned int tmpval=val;
@@ -2448,7 +2448,7 @@ void assembleblock(const char * block, bool isspecialline)
 		if (is("filllong")) len=3;
 		if (is("filldword")) len=4;
 		unsigned int val= getnum(par);
-		if(foundlabel) asar_throw_warning(1, warning_id_feature_deprecated, "labels in fillbyte", "just... don't");
+		if(foundlabel && !foundlabel_static) asar_throw_warning(1, warning_id_feature_deprecated, "labels in fillbyte", "just... don't");
 		for (int i=0;i<12;i+=len)
 		{
 			unsigned int tmpval=val;

tests/labels_static_fail.asm

@@ -7,6 +7,8 @@
 ;`errEno_labels_here
 ;`errElabel_cross_assignment
 ;`errEno_labels_here
+;`warnWfeature_deprecated
+;`warnWfeature_deprecated
 ;`errEdefine_label_math
 org $008000
 ANonStaticLabel:
@@ -47,9 +49,11 @@ incbin "data/64kb.bin":(8000)-(ANonStaticLabel+2)
 
 ANewLabel = ANonStaticLabel
 
-fillbyte $EE
+Here:
+fillbyte Here
 fill ANonStaticLabel
 
-!adefine #= ANonStaticLabel
+padbyte Here
+pad ANonStaticLabel
 
-; TODO: Test incbin and more.
+!adefine #= ANonStaticLabel

tests/labels_static_pass.asm

@@ -1,8 +1,11 @@
+;`+
 ;`56 78
 ;`BA
 ;`BA
 ;`EE EE EE
 ;`03
+;`42
+;`007FFE EE EE
 ;P>Test passed. (1)
 ;P>Test passed. (2)
 ;P>Test passed. (3)
@@ -56,14 +59,27 @@ OtherFunStuff = FunStuff
 db 'a'
 db OtherFunStuff
 
+FillByte = $EE
 FillCount = 3
 
-fillbyte $EE
+fillbyte FillByte
 fill FillCount
 
 !adefine #= FillCount
 
 db !adefine
 
-; TODO: Test incbin and more.
+ArgID = 2
+
+macro in_macro(...)
+	db <...[ArgID]>
+endmacro
+
+%in_macro($40, $41, $42)
+
+
+org $00FFFE
+
+padbyte FillByte
+pad $018000