Finish implement $INCLUDEONCE

grymmjack · Feb 14, 2024 · 2a73102 · 2a73102
1 parent 98ec6f8
commit 2a73102
Show file tree

Hide file tree

Showing 44 changed files with 39 additions and 17,865 deletions.
diff --git a/ANSI/ANSI.BM b/ANSI/ANSI.BM
@@ -18,6 +18,7 @@
 ' @uses ANSI.BI
 ' @see https://gist.github.com/grymmjack/9dae29a60ea65f086d0b35df96fe2291
 '
+$INCLUDEONCE
 
 ''
 ' Clamps a value from going below 0

diff --git a/ARR/ARR_BYTE.BAS b/ARR/ARR_BYTE.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_DBL.BAS b/ARR/ARR_DBL.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_FLT.BAS b/ARR/ARR_FLT.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_INT.BAS b/ARR/ARR_INT.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_INT64.BAS b/ARR/ARR_INT64.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_LONG.BAS b/ARR/ARR_LONG.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_SNG.BAS b/ARR/ARR_SNG.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_STR.BAS b/ARR/ARR_STR.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_TEMPLATE.BAS b/ARR/ARR_TEMPLATE.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_UBYTE.BAS b/ARR/ARR_UBYTE.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_UINT.BAS b/ARR/ARR_UINT.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_UINT64.BAS b/ARR/ARR_UINT64.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/ARR_ULONG.BAS b/ARR/ARR_ULONG.BAS
@@ -1,4 +1,5 @@
 '$DYNAMIC
+$INCLUDEONCE
 
 ''
 ' Slice an array from source to destination starting at index and count slices

diff --git a/ARR/generate.sh b/ARR/generate.sh
@@ -3,7 +3,7 @@
 # generate was used on MacOS - so gnu-sed is needed on MacOS:
 # brew install gnu-sed
 # on linux, just replace $SED with sed
-SED=sed
+SED=gsed
 
 TYPES=(
     BYTE

diff --git a/ASEPRITE/ASEPRITE.BI b/ASEPRITE/ASEPRITE.BI
@@ -11,6 +11,7 @@
 ' @see https://github.com/aseprite/aseprite/blob/main/docs/ase-file-specs.md
 ' @author Rick Christy <grymmjack@gmail.com>
 '
+$INCLUDEONCE
 
 TYPE ASEPRITE_IMAGE_HEADER
 ' A 128-byte header (same as FLC/FLI header, but with other magic number):

diff --git a/ASEPRITE/ASEPRITE.BM b/ASEPRITE/ASEPRITE.BM
@@ -10,6 +10,7 @@
 ' 
 ' @author Rick Christy <grymmjack@gmail.com>
 '
+$INCLUDEONCE
 
 ''
 ' Loads an ASEPRITE image into memory

diff --git a/CONSOLE/CONSOLE.BI b/CONSOLE/CONSOLE.BI
@@ -11,6 +11,7 @@
 ' @depends STRINGS/STRINGS.BI 
 ' @author Rick Christy <grymmjack@gmail.com>
 '
+$INCLUDEONCE
 $IF DEBUGGING = UNDEFINED THEN
     $LET DEBUGGING = TRUE
 $END IF

diff --git a/CONSOLE/CONSOLE.BM b/CONSOLE/CONSOLE.BM
@@ -10,6 +10,7 @@
 ' 
 ' @author Rick Christy <grymmjack@gmail.com>
 '
+$INCLUDEONCE
 
 ''
 ' Log a boxed message to console if DEBUGGING

diff --git a/DICT/DICT.BI b/DICT/DICT.BI
@@ -11,6 +11,7 @@
 ' @author Rick Christy <grymmjack@gmail.com>
 ' @uses DICT.BM
 '
+$INCLUDEONCE
 
 ' DICTIONARY type consists of keys and values and is intended for array use
 TYPE DICTIONARY

diff --git a/DICT/DICT.BM b/DICT/DICT.BM
@@ -11,6 +11,7 @@
 ' @author Rick Christy <grymmjack@gmail.com>
 ' @uses DICT.BI
 '
+$INCLUDEONCE
 '$INCLUDE:'DICT.BI'
 
 

diff --git a/DUMP/DUMP.BI b/DUMP/DUMP.BI
@@ -10,6 +10,7 @@
 ' @uses DUMP.BM
 ' @uses DICT.BI
 '
+$INCLUDEONCE
 '$INCLUDE:'../DICT/DICT.BI'
 
 $IF GJ_LIB_NL = UNDEFINED THEN

diff --git a/DUMP/DUMP.BM b/DUMP/DUMP.BM
@@ -70,6 +70,7 @@
 ' @see [0] https://www.merriam-webster.com/dictionary/dump
 ' @see [1] https://www.php.net/manual/en/function.print-r.php
 '
+$INCLUDEONCE
 
 ''
 ' Returns string with a dump of a string

diff --git a/INPUT/LIGHTBAR.BAS b/INPUT/LIGHTBAR.BAS
@@ -6,7 +6,6 @@
 ' @uses LIGHTBAR.BI
 ' @uses LIGHTBAR.BM
 '
-
 $IF GJ_LIB_UNIFIED_TESTING = DEFINED AND GJ_LIB_INC_BI <> 1 THEN
 '$INCLUDE:'../_GJ_LIB.BI'
 $END IF

diff --git a/INPUT/LIGHTBAR.BI b/INPUT/LIGHTBAR.BI
@@ -9,7 +9,7 @@
 ' @author Rick Christy <grymmjack@gmail.com>
 ' @uses LIGHTBAR.BM
 '
-$LET GJ_LIB_INPUT_LIGHTBAR_INC_BI = 1
+$INCLUDEONCE
 
 ' LIGHTBAR configuration UDT
 TYPE LIGHTBAR

diff --git a/INPUT/LIGHTBAR.BM b/INPUT/LIGHTBAR.BM
@@ -9,7 +9,7 @@
 ' @author Rick Christy <grymmjack@gmail.com>
 ' @uses LIGHTBAR.BI
 '
-$LET GJ_LIB_INPUT_LIGHTBAR_INC_BM = 1
+$INCLUDEONCE
 
 ''
 ' Render a LIGHTBAR menu

diff --git a/INPUT/LIGHTBAR32.BAS b/INPUT/LIGHTBAR32.BAS
@@ -6,13 +6,11 @@
 ' @uses LIGHTBAR32.BI
 ' @uses LIGHTBAR32.BM
 '
-
+$INCLUDEONCE
 $IF GJ_LIB_UNIFIED_TESTING = DEFINED AND GJ_LIB_INC_BI <> 1 THEN
 '$INCLUDE:'../_GJ_LIB.BI'
 $END IF
-$IF GJ_LIB_INPUT_LIGHTBAR32_INC_BI = UNDEFINED THEN
 '$INCLUDE:'LIGHTBAR32.BI'
-$END IF
 
 _TITLE "QB64_GJ_LIB - INPUT LIB - LIGHTBAR32 DEMO"
 
@@ -131,6 +129,4 @@ COLOR LB_EGA(12), LB_EGA(0) : PRINT "Thank you! Come again!"
 $IF GJ_LIB_UNIFIED_TESTING = DEFINED AND GJ_LIB_INC_BM <> 1 THEN
 '$INCLUDE:'../_GJ_LIB.BM'
 $END IF
-$IF GJ_LIB_INPUT_LIGHTBAR32_INC_BM = UNDEFINED THEN
 '$INCLUDE:'LIGHTBAR32.BM'
-$END IF
diff --git a/INPUT/LIGHTBAR32.BI b/INPUT/LIGHTBAR32.BI
@@ -9,7 +9,7 @@
 ' @author Rick Christy <grymmjack@gmail.com>
 ' @uses LIGHTBAR32.BM
 '
-$LET GJ_LIB_INPUT_LIGHTBAR32_INC_BI = 1
+$INCLUDEONCE
 
 ' LIGHTBAR configuration UDT
 TYPE LIGHTBAR32

diff --git a/INPUT/LIGHTBAR32.BM b/INPUT/LIGHTBAR32.BM
@@ -9,7 +9,7 @@
 ' @author Rick Christy <grymmjack@gmail.com>
 ' @uses LIGHTBAR32.BI
 '
-$LET GJ_LIB_INPUT_LIGHTBAR32_INC_BM = 1
+$INCLUDEONCE
 
 ''
 ' Render a LIGHTBA32R menu

diff --git a/MISC/MISC.BI b/MISC/MISC.BI
@@ -10,4 +10,4 @@
 ' 
 ' @author Rick Christy <grymmjack@gmail.com>
 '
-$LET GJ_LIB_MISC_INC_BI = 1
+$INCLUDEONCE
diff --git a/MISC/MISC.BM b/MISC/MISC.BM
@@ -10,7 +10,7 @@
 ' 
 ' @author Rick Christy <grymmjack@gmail.com>
 '
-$LET GJ_LIB_MISC_INC_BM = 1
+$INCLUDEONCE
 
 
 ''

diff --git a/PIPEPRINT/PIPEPRINT.BAS b/PIPEPRINT/PIPEPRINT.BAS
@@ -13,9 +13,7 @@ $LET GJ_LIB_UNIFIED_TESTING = 1
 $IF GJ_LIB_UNIFIED_TESTING = DEFINED AND GJ_LIB_INC_BI = UNDEFINED THEN
 '$INCLUDE:'../_GJ_LIB.BI'
 $END IF
-$IF GJ_LIB_PIPEPRINT_INC_BI = UNDEFINED THEN
 '$INCLUDE:'PIPEPRINT.BI'
-$END IF
 
 OPTION _EXPLICIT
 OPTION _EXPLICITARRAY
@@ -125,6 +123,4 @@ END SUB
 $IF GJ_LIB_UNIFIED_TESTING = DEFINED AND GJ_LIB_INC_BM = UNDEFINED THEN
 '$INCLUDE:'../_GJ_LIB.BM'
 $END IF
-$IF GJ_LIB_PIPEPRINT_INC_BM = UNDEFINED THEN
 '$INCLUDE:'PIPEPRINT.BM'
-$END IF
diff --git a/PIPEPRINT/PIPEPRINT.BI b/PIPEPRINT/PIPEPRINT.BI
@@ -16,7 +16,7 @@
 ' @uses ANSI/ANSI.BI
 ' @uses STRINGS/STRINGS.BI
 '
-$LET GJ_LIB_PIPEPRINT_INC_BI = 1
+$INCLUDEONCE
 CONST MAX_PIPES = 50
 CONST MAX_PIPES_STRIP = 50
 

diff --git a/PIPEPRINT/PIPEPRINT.BM b/PIPEPRINT/PIPEPRINT.BM
@@ -15,9 +15,7 @@
 ' @uses ANSI/ANSI.BM
 ' @uses STRINGS/STRINGS.BM
 '
-$LET GJ_LIB_PIPEPRINT_INC_BM = 1
-
-
+$INCLUDEONCE
 
 ''
 ' Parses pipe codes and returns ANSI (can emulate ANSI via QB)

diff --git a/STRINGS/STRINGS.BAS b/STRINGS/STRINGS.BAS
@@ -9,12 +9,8 @@
 $IF GJ_LIB_UNIFIED_TESTING = DEFINED AND GJ_LIB_INC_BI <> 1 THEN
 '$INCLUDE:'../_GJ_LIB.BI'
 $END IF
-$IF GJ_LIB_STRINGS_INC_BI = UNDEFINED THEN
 '$INCLUDE:'STRINGS.BI'
-$END IF
-$IF GJ_LIB_DUMP_INC_BI = UNDEFINED THEN
 '$INCLUDE:'../DUMP/DUMP.BI'
-$END IF
 '$DYNAMIC
 OPTION _EXPLICIT
 OPTION _EXPLICITARRAY
@@ -204,9 +200,5 @@ PRINT STR.implode$(words_extracted$(), " ")
 $IF GJ_LIB_UNIFIED_TESTING = DEFINED AND GJ_LIB_INC_BM <> 1 THEN
 '$INCLUDE:'../_GJ_LIB.BM'
 $END IF
-$IF GJ_LIB_STRINGS_INC_BM = UNDEFINED THEN
 '$INCLUDE:'STRINGS.BM'
-$END IF
-$IF GJ_LIB_DUMP_INC_BM = UNDEFINED THEN
 '$INCLUDE:'../DUMP/DUMP.BM'
-$END IF
diff --git a/STRINGS/STRINGS.BI b/STRINGS/STRINGS.BI
@@ -11,7 +11,8 @@
 ' @author Rick Christy <grymmjack@gmail.com>
 ' @uses STRINGS.BM
 '
-$LET GJ_LIB_STRINGS_INC_BI = 1
+$INCLUDEONCE
+
 CONST GJ_LIB_MAX_STR_POSITIONS = 50
 
 DECLARE LIBRARY

diff --git a/STRINGS/STRINGS.BM b/STRINGS/STRINGS.BM
@@ -6,10 +6,7 @@
 ' @author Rick Christy <grymmjack@gmail.com>
 ' @uses STRINGS.BI
 '
-$LET GJ_LIB_STRINGS_INC_BM = 1
-$LET DEBUGGING = 1
-
-
+$INCLUDEONCE
 
 ''
 ' Returns a string if n is true or false

diff --git a/SYS/SYS.BAS b/SYS/SYS.BAS
@@ -12,9 +12,7 @@
 $IF GJ_LIB_UNIFIED_TESTING = DEFINED AND GJ_LIB_INC_BI = UNDEFINED THEN
 '$INCLUDE:'../_GJ_LIB.BI'
 $END IF
-$IF GJ_LIB_SYS_INC_BI = UNDEFINED THEN
 '$INCLUDE:'SYS.BI'
-$END IF
 OPTION _EXPLICIT
 OPTION _EXPLICITARRAY
 
@@ -44,6 +42,4 @@ SYSTEM 1
 $IF GJ_LIB_UNIFIED_TESTING = DEFINED AND GJ_LIB_INC_BM = UNDEFINED THEN
 '$INCLUDE:'../_GJ_LIB.BM'
 $END IF
-$IF GJ_LIB_SYS_INC_BM = UNDEFINED THEN
 '$INCLUDE:'SYS.BM'
-$END IF
diff --git a/SYS/SYS.BI b/SYS/SYS.BI
@@ -10,4 +10,4 @@
 ' 
 ' @author Rick Christy <grymmjack@gmail.com>
 '
-$LET GJ_LIB_SYS_INC_BI = 1
+$INCLUDEONCE
diff --git a/SYS/SYS.BM b/SYS/SYS.BM
@@ -10,9 +10,7 @@
 ' 
 ' @author Rick Christy <grymmjack@gmail.com>
 '
-$LET GJ_LIB_SYS_INC_BM = 1
-
-
+$INCLUDEONCE
 
 ''
 ' Opens a URL in the default web browser

diff --git a/VECT2D/VECT2D.BAS b/VECT2D/VECT2D.BAS
@@ -2,9 +2,7 @@
 $IF GJ_LIB_UNIFIED_TESTING = DEFINED AND GJ_LIB_COMMON_BI = UNDEFINED THEN
 '$INCLUDE:'../_GJ_LIB_COMMON.BI'
 $END IF
-$IF GJ_LIB_VECT2D_INC_BI = UNDEFINED THEN
 '$INCLUDE:'./VECT2D.BI'
-$END IF
 
 
 DIM v1 AS VECT2D
@@ -128,6 +126,4 @@ IF b% = TRUE THEN PRINT "TRUE" ELSE PRINT "FALSE"
 b% = VECT2D.eq(v1, v1)
 IF b% = TRUE THEN PRINT "TRUE" ELSE PRINT "FALSE"
 
-$IF GJ_LIB_VECT2D_INC_BM = UNDEFINED THEN
 '$INCLUDE:'./VECT2D.BM'
-$END IF
diff --git a/VECT2D/VECT2D.BI b/VECT2D/VECT2D.BI
@@ -12,7 +12,7 @@
 ' @author Evan Shortiss <https://github.com/evanshortiss/vector2d>
 ' @support William Barnes
 '
-$LET GJ_LIB_VECT2D_INC_BI = 1
+$INCLUDEONCE
 
 TYPE VECT2D
      x AS SINGLE

diff --git a/VECT2D/VECT2D.BM b/VECT2D/VECT2D.BM
@@ -12,8 +12,7 @@
 ' @author Evan Shortiss <https://github.com/evanshortiss/vector2d>
 ' @support William Barnes
 '
-$LET GJ_LIB_VECT2D_INC_BM = 1
-
+$INCLUDEONCE
 
 ''
 ' Sets both x and y axes of the vector
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
     '
     ' @author Rick Christy <grymmjack@gmail.com>
     '
+    $INCLUDEONCE
     ''
     ' Loads an ASEPRITE image into memory
@@ Expand Down @@