Allow strings and addresses into byte DATA arrays.

Author: dmsc

manual.md

@@ -1387,6 +1387,29 @@ General Statements
   Note that the array can be modified
   afterwards like a normal array.
 
+  *Advanced Usage*
+
+  Byte DATA arrays can be used to
+  include assembler routines (to call
+  via `USR`, see the example above),
+  display lists and any other type of
+  binary data.
+
+  To facilitate this, you can include
+  constant strings and the address of
+  other byte DATA array by name.
+
+  All the bytes of the string, including
+  the initial length byte are included
+  into the DATA array.
+
+  Example:
+
+      DATA str() B. = "Hello", "World"
+      X = ADR(str)
+      ? $(X), $(X+6)
+      DATA ad() B. = $AD,str,$A2,0,$60
+      ? USR(ADR(ad)), str(0)
 
 **Decrements variable by 1**  
 **DEC _var_ / DE.**

src/basic.syn

@@ -555,15 +555,18 @@ DATA_WORDS: data word
         "," E_NUMBER_WORD DATA_WORDS
         pass
 
+DATA_BYTE:
+        "\"" E_CONST_STRING
+        E_NUMBER_BYTE
+        emit { VT_ARRAY_BYTE } E_LABEL
+
 DATA_BYTES: data byte
         # To store bytes, simply remove upper part
-        "," E_NUMBER_BYTE DATA_BYTES
-        pass
+        DATA_BYTE "," DATA_BYTES
+        DATA_BYTE
 
 DATA_TYPE: data type
-        # Note: E_VAR_SET_TYPE skips white space, this allows spaces between
-        #       the data type and the "=".
-        TYPE_BYTE EQUAL E_LABEL_SET_TYPE E_NUMBER_BYTE DATA_BYTES
+        TYPE_BYTE EQUAL E_LABEL_SET_TYPE DATA_BYTES
         TYPE_WORD EQUAL E_LABEL_SET_TYPE E_NUMBER_WORD DATA_WORDS
 
 DATA_END:

testsuite/tests/stmt-data.bas

@@ -22,3 +22,8 @@ a = adr(arr2)
 ? : ? "2: "; dpeek(a);
 for i=1 to 8 : a = a + 2:  ? ", "; dpeek(a); : next
 ?
+
+data arr4() b. = "String", arr1, "Code"
+? $(ADR(arr4))
+? adr(arr1) - dpeek(ADR(arr4)+1+LEN($(ADR(arr4))))
+

testsuite/tests/stmt-data.chk

@@ -6,3 +6,5 @@ Start
 2: -7, -5, -3, -1, 0, 7, 123, 22136, -1
 1: 1, 2, 3, 4, 254, 255, 0, 123, 134, 65, 255, 10
 2: -7, -5, -3, -1, 0, 7, 123, 22136, -1
+String
+0