Merge pull request boriel-basic#638 from boriel/feature/add_options_t…

…o_INCBIN

Feature/add options to incbin

.gitattributes

@@ -12,7 +12,7 @@
 *.yml text
 
 *.png binary
+*.bin binary
 
 *.bas linguist-vendored
 *.asm linguist-vendored
-

.gitignore

@@ -17,3 +17,4 @@ scratch/
 htmlcov/
 build/
 venv/
+.pypi-token

.pre-commit-config.yaml

@@ -3,8 +3,11 @@ repos:
       rev: v2.3.0
       hooks:
         -   id: check-yaml
+            exclude: \.bin$
         -   id: end-of-file-fixer
+            exclude: \.bin$
         -   id: trailing-whitespace
+            exclude: \.bin$
   -   repo: https://github.com/psf/black
       rev: 22.1.0
       hooks:

src/parsetab/tabs.dbm.bak

@@ -1,4 +1,4 @@
 'zxbpp', (0, 66998)
-'asmparse', (67072, 220672)
-'zxnext_asmparse', (287744, 245099)
-'zxbparser', (532992, 641182)
+'asmparse', (67072, 222500)
+'zxnext_asmparse', (289792, 246933)
+'zxbparser', (537088, 641182)

src/parsetab/tabs.dbm.dir

@@ -1,4 +1,4 @@
 'zxbpp', (0, 66998)
-'asmparse', (67072, 220672)
-'zxnext_asmparse', (287744, 245099)
-'zxbparser', (532992, 641182)
+'asmparse', (67072, 222500)
+'zxnext_asmparse', (289792, 246933)
+'zxbparser', (537088, 641182)

src/zxbasm/asmparse.py

@@ -20,7 +20,7 @@
 from src.api import global_ as gl
 from src.api.config import OPTIONS
 from src.api.debug import __DEBUG__
-from src.api.errmsg import error
+from src.api.errmsg import error, warning
 from src.zxbasm import asmlex, basic
 from src.zxbasm import global_ as asm_gl
 from src.zxbasm.asm import Asm, Container
@@ -383,19 +383,49 @@ def p_align(p):
 
 
 def p_incbin(p):
-    """asm : INCBIN STRING"""
+    """asm : INCBIN STRING
+    | INCBIN STRING COMMA expr
+    | INCBIN STRING COMMA expr COMMA expr
+    """
+
     try:
         fname = zxbpp.search_filename(p[2], p.lineno(2), local_first=True)
         if not fname:
             p[0] = None
             return
+
         with src.api.utils.open_file(fname, "rb") as f:
             filecontent = f.read()
+
     except IOError:
         error(p.lineno(2), "cannot read file '%s'" % p[2])
         p[0] = None
         return
 
+    offset = 0
+    length = None
+
+    if len(p) > 4:
+        offset = p[4].eval()
+
+    if len(p) > 6:
+        length = p[6].eval()
+        if length < 1:
+            error(p.lineno(5), "INCBIN length must be greater than 0")
+
+    if offset < 0:
+        offset = len(filecontent) + offset
+        if offset < 0 or offset >= len(filecontent):
+            error(p.lineno(4), "INCBIN offset is out of range")
+
+    if length is None:
+        length = len(filecontent) - offset
+
+    if offset + length > len(filecontent):
+        excess = len(filecontent) - (offset + length)
+        warning(p.lineno(5), f"INCBIN length if beyond file length by {excess} bytes")
+
+    filecontent = filecontent[offset : offset + length]
     p[0] = Asm(p.lineno(1), "DEFB", filecontent)
 
 

tests/functional/incbin2.asm

@@ -0,0 +1,3 @@
+
+; Tries to include a non binary file
+incbin "incbin2.asm", 16

tests/functional/incbin2.bin

@@ -0,0 +1,2 @@
+ude a non binary file
+incbin "incbin2.asm", 16

tests/functional/incbin3.asm

@@ -0,0 +1,3 @@
+
+; Tries to include a non binary file
+incbin "incbin3.asm", 16, 2

tests/functional/incbin3.bin

@@ -0,0 +1 @@
+ud

tests/functional/incbin4.asm

@@ -0,0 +1,3 @@
+
+; Tries to include a non binary file
+incbin "incbin4.asm", -5, 2

tests/functional/incbin4.bin

@@ -0,0 +1 @@
+5,

tests/functional/incbin5.asm

@@ -0,0 +1,3 @@
+
+; Tries to include a non binary file
+incbin "incbin5.asm", -6

tests/functional/incbin5.bin

@@ -0,0 +1 @@
+", -6

tests/functional/incbin6.asm

@@ -0,0 +1,2 @@
+
+incbin "incbin6.asm", -60, 2