Version 0.4

.gitignore

@@ -1,2 +1,2 @@
-*.b*
+*.bf*
 /progs/

README.md

@@ -1,4 +1,4 @@
-# Brainfuck 0.3
+# Brainfuck 0.4
 
 This is a little project that I wrote in QB64.
 It contains three CLI tools:
@@ -69,6 +69,7 @@ The calling syntax is as follows: ```bfasm <sourceFile>```
 The Brainfuck Assembler knows the following pseudo-commands:
 
 - "**;**": comment line
+- "**@**&lt;*file*&gt;": include another assembler file
 - "**.mode &lt;*mode*&gt;**": config one of the display modes:
   - "**ascii**" / "**byte**": input and output characters
   - "**digit**" / "**number**": input and output numbers
@@ -93,7 +94,7 @@ The Brainfuck Assembler knows the following commands:
 - "**dec**" / "**sub**": decrement current cell
 - "**endm**" / "**endp**": end of a macro definition
 - "**if**" / "**while**": begin a loop, if current cell is not 0
-- "**include** &lt;*file*&gt;": include another assembler file provided as following token
+- "**jmp** &lt;*address*&gt;": jump to giben adress (as a number); pre-implementation
 - "**loop**" / "**loopne**" / "**loopnz**": repeat loop, if current cell is not 0
 - "**macro** &lt;*name*&gt;" / "**proc** &lt;*name*&gt;": define a macro called *name*
 - "**nop**": perform no operation
@@ -107,7 +108,7 @@ The Brainfuck Assembler knows the following commands:
 "BF.exe" runs your compiled Brainfuck byte code.
 The calling syntax is as follows: ```bf <sourceFile>```
 \
-**Important:** Do not provide a file extension, because the interpreter assumes files having ".bc"
+**Important:** Do not provide a file extension, because the interpreter assumes files having ".bfc"
 \
 \
 The code is running inside a BVM,

src/bfasm.bas

@@ -2,8 +2,8 @@
 
 
 function Main%(cmdLine as string)
-	dim as integer	result
-	dim as string	binaryFile, fileName, messageBuffer, sourceFile
+	dim as integer	outFile, result
+	dim as string	binaryFile, fileName, messageBuffer, sourceFile, tempIncludesFile
 
 	bfasmGreeting With(VERSION)
 
@@ -13,10 +13,16 @@ function Main%(cmdLine as string)
 		exit function
 	endif
 
-	Console.writeLine "Compiling assembly code ..."
-	sourceFile = BF_AssemblerFile(fileName)
+	Console.writeLine "Step 1: Processing includes ..."
+	tempIncludesFile = fileType(fileName, "temp.includes")
+	outFile = File.open(tempIncludesFile, FileMode.ForWriting)
+	result = processIncludes(outFile, fileName)
+	File.close outFile
+
+	Console.writeLine "Step 2: Compiling assembly code ..."
 	binaryFile = BF_BinaryFile(fileName)
-	result = compileFile(sourceFile, binaryFile)
+	result = compileFile(tempIncludesFile, binaryFile)
+	Invoke File.remove(tempIncludesFile)
 
 	if result then
 		Invoke File.remove(binaryFile)

src/bfasm.bi

@@ -13,6 +13,7 @@
 '$include:'lib/bfasm/compileFile.bi'
 '$include:'lib/bfasm/fetchToken.bi'
 '$include:'lib/bfasm/mapToCode.bi'
+'$include:'lib/bfasm/processIncludes.bi'
 
 '$include:'lib/classes/Buffer.bi'
 '$include:'lib/classes/Char.bi'

src/lib/application/core/bfArrays.bi

@@ -1,2 +1,4 @@
-redim shared as string	macroCodeList(0)
-redim shared as string	macroNameList(0)
+redim shared as string		labelNameList(0)
+redim shared as unsigned long	labelPtrList(0)
+redim shared as string		macroCodeList(0)
+redim shared as string		macroNameList(0)

src/lib/application/core/versionInfo.bi

@@ -1,10 +1,10 @@
 $versioninfo:CompanyName=Der Robert
 $versioninfo:FileDescription=Brainfuck Compiler \x26 BVM
-$versioninfo:FileVersion#=0,3,0,0
+$versioninfo:FileVersion#=0,4,0,0
 $versioninfo:InternalName=Brainfuck
 $versioninfo:LegalCopyright=2023 by 'Der Robert'
 $versioninfo:OriginalFileName=bf\x5Basm\x7Cc\x5D.bas
 $versioninfo:Productname=Brainfuck
-$versioninfo:ProductVersion#=0,3,0,0
+$versioninfo:ProductVersion#=0,4,0,0
 
-const VERSION = "0.3"
+const VERSION = "0.4"

src/lib/application/hexCode.bi

@@ -1,4 +1,4 @@
-function dec2hex$(decimalNumber as integer, count as integer)
+function dec2hex$(decimalNumber as unsigned long, count as integer)
 	dim as string result, zeros
 	if count < 1 then
 		dec2hex = hex$(decimalNumber)
@@ -11,6 +11,6 @@ function dec2hex$(decimalNumber as integer, count as integer)
 	endif
 end function
 
-function hex2dec%(hexNumber as string)
+function hex2dec&&(hexNumber as string)
 	hex2Dec = val(String.concat("&H0", String.trim(hexNumber)))
 end function

src/lib/application/hexTokens.bi

@@ -10,8 +10,8 @@
 '0111	   7		input current cell (depending on config)
 '1000	   8		begin loop if current cell is not zero
 '1001	   9		repeat loop if current cell is not zero
-'1010	   A		--- (reserved for "short jump/call")
-'1010	   B		--- (reserved for "long jump/call")
+'1010	   A		--- (reserved for "jump to label")
+'1010	   B		--- (reserved for "call subroutine")
 '1100	   C		switch to ascii mode (default; text mode only!)
 '1101	   D		switch to number mode (text mode only!)
 '1110	   E		switch to text mode (default)
@@ -68,6 +68,15 @@ function HexToken_EndLoop$()
 end function
 
 
+function HexToken_JumpToLabel$()
+	HexToken_JumpToLabel = "A"
+end function
+
+function HexToken_CallSubRoutine$()
+	HexToken_CallSubRoutine = "B"
+end function
+
+
 function HexToken_SwitchToAsciiMode$()
 	HexToken_SwitchToAsciiMode = "C"
 end function

src/lib/application/labels.bi

@@ -0,0 +1,5 @@
+'$include:'labels/addLabelName.bi'
+'$include:'labels/addLabelPtr.bi'
+'$include:'labels/getLabelIndexOf.bi'
+'$include:'labels/getLabelPtr.bi'
+'$include:'labels/getLastLabelIndex.bi'

src/lib/application/labels/addLabelName.bi

@@ -0,0 +1,29 @@
+function addLabelName%(labelName as string)
+	dim as integer	index, labelCount
+	dim as string	currentLabel, normalizedName
+
+	normalizedName = String.trim(labelName)
+	if String.isEmpty(normalizedName) then
+		addLabelName = -1
+		exit function
+	endif
+
+	labelCount = ubound(labelNameList)
+	for index = 0 to labelCount
+		currentLabel = labelNameList(index)
+		if Strings.areEqual(currentLabel, normalizedName) then
+			addLabelName = index
+			exit function
+		elseif String.isEmpty(currentLabel) then
+			labelNameList(index) = normalizedName
+			addLabelName = index
+			exit function
+		endif
+	next
+
+	labelCount = labelCount + 1
+	redim preserve labelNameList(labelCount)
+	labelNameList(labelCount) = normalizedName
+
+	addLabelName = labelCount
+end function

src/lib/application/labels/addLabelPtr.bi

@@ -0,0 +1,8 @@
+sub addLabelPtr(index as integer, labelPtr as unsigned long)
+	dim as integer	labelCount
+
+	labelCount = ubound(labelPtrList)
+	if index > labelCount then redim preserve labelPtrList(index)
+
+	labelPtrList(index) = labelPtr
+end sub

src/lib/application/labels/getLabelIndexOf.bi

@@ -0,0 +1,21 @@
+function getLabelIndexOf%(labelName as string)
+	dim as integer	index, labelCount
+	dim as string	currentLabel, normalizedName
+
+	normalizedName = String.trim(labelName)
+	if String.isEmpty(normalizedName) then
+		getLabelIndexOf = -1
+		exit function
+	endif
+
+	labelCount = ubound(labelNameList)
+	for index = 0 to labelCount
+		currentLabel = labelNameList(index)
+		if Strings.areEqual(currentLabel, normalizedName) then
+			getLabelIndexOf = index
+			exit function
+		endif
+	next
+
+	getLabelIndexOf = -1
+end function

src/lib/application/labels/getLabelPtr.bi

@@ -0,0 +1,16 @@
+function getLabelPtr&&(index as integer)
+	dim as integer	labelCount
+
+	if index < 0 then
+		getLabelPtr = -1
+		exit function
+	endif
+
+	labelCount = ubound(labelPtrList)
+	if index > labelCount then
+		getLabelPtr = -1
+		exit function
+	endif
+
+	getLabelPtr = labelPtrList(index)
+end function

src/lib/application/labels/getLastLabelIndex.bi

@@ -0,0 +1,13 @@
+function getLastLabelIndex%()
+	dim as integer	labelCount
+	dim as string	currentLabel
+
+	labelCount = ubound(labelPtrList)
+	currentLabel = labelPtrList(labelCount)
+
+	if String.isNotEmpty(currentLabel) then
+		labelCount = labelCount + 1
+	endif
+
+	getLastLabelIndex = labelCount
+end function