v_include fix for non-symbol-compliant unquoted filenames

Author: msaarna

src/ops.c

@@ -416,8 +416,13 @@ v_include(char *str, MNEMONIC *dummy)
 
   programlabel();
 
-  sym = eval(str, 0);
-  if (sym->flags & SYM_STRING )
+  // only eval the string if it's compliant with symbol naming
+  if ((*str<'0')||(*str>'9')) //check could be more comprehensive
+    sym = eval(str, 0);
+  else
+    sym = NULL;
+
+  if ( (sym) && (sym->flags & SYM_STRING ) )
   {
     pushinclude(sym->string);
   }
@@ -432,7 +437,8 @@ v_include(char *str, MNEMONIC *dummy)
       free(buf);
   }
 
-  FreeSymbolList(sym);
+  if (sym)
+    FreeSymbolList(sym);
 }
 
 

test/11include.inc

@@ -0,0 +1,7 @@
+; 11include.inc - part of the symbolic include testing. 
+; To test non-symbol compliant include filenames, the name needs to begin with digits.
+; Please don't rename it.
+;
+; --Mike Saarna
+
+ .byte $11

test/include-a.inc

@@ -0,0 +1 @@
+ .byte $0A

test/include.asm

@@ -0,0 +1,25 @@
+; Test symbolic includes
+;
+; Ensure that quoted, unquoted, and symbol based includes work.
+;
+; --Mike Saarna
+
+	.processor	6502
+	.org		0
+
+TESTINCA = "include-a.inc"
+PASSFORCEA = PASSFORCEB
+
+	lda #PASSFORCEA
+	include "include-a.inc"
+	include include-a.inc
+	include TESTINCA
+	include "11include.inc"
+
+	; Non-symbol compliant filenames without quotes...
+	include 11include.inc
+
+PASSFORCEB = 1
+
+
+	.end

test/include.bin.ref

@@ -0,0 +1,2 @@
+:07000000A9010A0A0A11110F
+:00000001FF