Merge pull request #600 from NieDzejkob/stray-shift

Report error when shifting outside a macro

src/asm/macro.c

@@ -130,7 +130,9 @@ uint32_t macro_UseNewUniqueID(void)
 
 void macro_ShiftCurrentArgs(void)
 {
-	if (macroArgs->shift != macroArgs->nbArgs)
+	if (!macroArgs)
+		error("Cannot shift macro arguments outside of a macro\n");
+	else if (macroArgs->shift != macroArgs->nbArgs)
 		macroArgs->shift++;
 }
 

test/asm/shift-outside-macro.asm

@@ -0,0 +1 @@
+shift

test/asm/shift-outside-macro.err

@@ -0,0 +1,3 @@
+ERROR: shift-outside-macro.asm(1):
+    Cannot shift macro arguments outside of a macro
+error: Assembly aborted (1 errors)!