Fixed STRINGS to remove .format WIP (derp)

.github/workflows/mdbook.yml

@@ -1,60 +1,61 @@
-# Sample workflow for building and deploying a mdBook site to GitHub Pages
+## Sample workflow for building and deploying a mdBook site to GitHub Pages
+##
+## To get started with mdBook see: https://rust-lang.github.io/mdBook/index.html
+##
+#name: Deploy mdBook site to Pages
 #
-# To get started with mdBook see: https://rust-lang.github.io/mdBook/index.html
+#on:
+#  # Runs on pushes targeting the default branch
+#  push:
+#    branches: ["main"]
 #
-name: Deploy mdBook site to Pages
-
-on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches: ["main"]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-  # Build job
-  build:
-    runs-on: ubuntu-latest
-    env:
-      MDBOOK_VERSION: 0.4.21
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install mdBook
-        run: |
-          curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf -y | sh
-          rustup update
-          cargo install --version ${MDBOOK_VERSION} mdbook
-      - name: Setup Pages
-        id: pages
-        uses: actions/configure-pages@v3
-      - name: Build with mdBook
-        run: mdbook build
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
-        with:
-          path: ./book
-
-  # Deployment job
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v2
+#  # Allows you to run this workflow manually from the Actions tab
+#  workflow_dispatch:
+#
+## Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+#permissions:
+#  contents: read
+#  pages: write
+#  id-token: write
+#
+## Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+## However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+#concurrency:
+#  group: "pages"
+#  cancel-in-progress: false
+#
+#jobs:
+#  # Build job
+#  build:
+#    runs-on: ubuntu-latest
+#    env:
+#      MDBOOK_VERSION: 0.4.21
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Install mdBook
+#        run: |
+#          curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf -y | sh
+#          rustup update
+#          cargo install --version ${MDBOOK_VERSION} mdbook
+#      - name: Setup Pages
+#        id: pages
+#        uses: actions/configure-pages@v3
+#      - name: Build with mdBook
+#        run: mdbook build
+#      - name: Upload artifact
+#        uses: actions/upload-pages-artifact@v2
+#        with:
+#          path: ./book
+#
+#  # Deployment job
+#  deploy:
+#    environment:
+#      name: github-pages
+#      url: ${{ steps.deployment.outputs.page_url }}
+#    runs-on: ubuntu-latest
+#    needs: build
+#    steps:
+#      - name: Deploy to GitHub Pages
+#        id: deployment
+#        uses: actions/deploy-pages@v2
+#

STRINGS/STRINGS.BAS

@@ -28,14 +28,13 @@ _SCREENMOVE _MIDDLE
 DIM AS STRING phrase, phrase2, target, search, replace, temp_str
 DIM AS INTEGER num_times, found, wordCount
 
+' DIM vars() AS STRING
+' CALL ARR_STR.new(vars$(), "Rick, 3")
+' PRINT STR.format("Hello %s, there are %d hours left until daybreak", vars$())
 
-DIM vars() AS STRING
-CALL ARR_STR.new(vars$(), "Rick,3")
-PRINT STR.format("Hello %s, there are %d hours left until daybreak", vars$())
-
-DIM d() AS DICTIONARY
-CALL ARR_STR.new(vars$(), "Rick,3")
-PRINT STR.format("Hello %s, there are %d hours left until daybreak", vars$())
+' DIM d() AS DICTIONARY
+' CALL ARR_STR.new(vars$(), "Rick,3")
+' PRINT STR.format("Hello %s, there are %d hours left until daybreak", vars$())
 
 temp_str$ = "Intel486"
 PRINT "Is "; CHR$(34); temp_str$; CHR$(34); " alpha numeric? ";

STRINGS/STRINGS.BI

@@ -16,29 +16,29 @@ CONST GJ_LIB_MAX_STR_POSITIONS = 50
 
 DECLARE LIBRARY
      'is an alphabet letter(isalpha(c) or isdigit(c))
-    FUNCTION GJ_LIB_isalnum% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_isalnum% ALIAS "isalnum" (BYVAL c AS INTEGER)
     'is letter (isupper(c) or islower(c))
-    FUNCTION GJ_LIB_isalpha% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_isalpha% ALIAS "isalpha" (BYVAL c AS INTEGER)
     'is a decimal digit
-    FUNCTION GJ_LIB_isdigit% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_isdigit% ALIAS "isdigit" (BYVAL c AS INTEGER)
     'is a printing character other than space
-    FUNCTION GJ_LIB_isgraph% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_isgraph% ALIAS "isgraph" (BYVAL c AS INTEGER)
     'is a lower-case letter
-    FUNCTION GJ_LIB_islower% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_islower% ALIAS "islower" (BYVAL c AS INTEGER)
     'is printing character. ASCII: &H20 (" ") to &H7E (~)
-    FUNCTION GJ_LIB_isprint% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_isprint% ALIAS "isprint" (BYVAL c AS INTEGER)
     'is printing character other than space, letter, digit
-    FUNCTION GJ_LIB_ispunct% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_ispunct% ALIAS "ispunct" (BYVAL c AS INTEGER)
     'is space, formfeed, newline, return, tab, vertical tab
-    FUNCTION GJ_LIB_isspace% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_isspace% ALIAS "isspace" (BYVAL c AS INTEGER)
     'is only space or tab
-    FUNCTION GJ_LIB_isblank% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_isblank% ALIAS "isblank" (BYVAL c AS INTEGER)
     'is upper-case letter
-    FUNCTION GJ_LIB_isupper% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_isupper% ALIAS "isupper" (BYVAL c AS INTEGER)
     'is a hexdecimal digit character(0 thru 9 or A thru F)
-    FUNCTION GJ_LIB_isxdigit% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB_isxdigit% ALIAS "isxdigit" (BYVAL c AS INTEGER)
     'return lower-case equivalent
-    FUNCTION GJ_LIB.tolower% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB.tolower% ALIAS "tolower" (BYVAL c AS INTEGER)
     'return upper-case equivalent
-    FUNCTION GJ_LIB.toupper% (BYVAL c AS INTEGER)
+    FUNCTION GJ_LIB.toupper% ALIAS "toupper" (BYVAL c AS INTEGER)
 END DECLARE

_OPTION_TEST_FLATTENED.BAS

@@ -327,31 +327,31 @@ OPTION _EXPLICITARRAY
 
                 DECLARE LIBRARY
                      'is an alphabet letter(isalpha(c) or isdigit(c))
-                    FUNCTION GJ_LIB_isalnum% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_isalnum% ALIAS "isalnum" (BYVAL c AS INTEGER)
                     'is letter (isupper(c) or islower(c))
-                    FUNCTION GJ_LIB_isalpha% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_isalpha% ALIAS "isalpha" (BYVAL c AS INTEGER)
                     'is a decimal digit
-                    FUNCTION GJ_LIB_isdigit% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_isdigit% ALIAS "isdigit" (BYVAL c AS INTEGER)
                     'is a printing character other than space
-                    FUNCTION GJ_LIB_isgraph% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_isgraph% ALIAS "isgraph" (BYVAL c AS INTEGER)
                     'is a lower-case letter
-                    FUNCTION GJ_LIB_islower% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_islower% ALIAS "islower" (BYVAL c AS INTEGER)
                     'is printing character. ASCII: &H20 (" ") to &H7E (~)
-                    FUNCTION GJ_LIB_isprint% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_isprint% ALIAS "isprint" (BYVAL c AS INTEGER)
                     'is printing character other than space, letter, digit
-                    FUNCTION GJ_LIB_ispunct% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_ispunct% ALIAS "ispunct" (BYVAL c AS INTEGER)
                     'is space, formfeed, newline, return, tab, vertical tab
-                    FUNCTION GJ_LIB_isspace% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_isspace% ALIAS "isspace" (BYVAL c AS INTEGER)
                     'is only space or tab
-                    FUNCTION GJ_LIB_isblank% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_isblank% ALIAS "isblank" (BYVAL c AS INTEGER)
                     'is upper-case letter
-                    FUNCTION GJ_LIB_isupper% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_isupper% ALIAS "isupper" (BYVAL c AS INTEGER)
                     'is a hexdecimal digit character(0 thru 9 or A thru F)
-                    FUNCTION GJ_LIB_isxdigit% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB_isxdigit% ALIAS "isxdigit" (BYVAL c AS INTEGER)
                     'return lower-case equivalent
-                    FUNCTION GJ_LIB.tolower% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB.tolower% ALIAS "tolower" (BYVAL c AS INTEGER)
                     'return upper-case equivalent
-                    FUNCTION GJ_LIB.toupper% (BYVAL c AS INTEGER)
+                    FUNCTION GJ_LIB.toupper% ALIAS "toupper" (BYVAL c AS INTEGER)
                 END DECLARE
         $END IF
         $IF GJ_LIB_PIPEPRINT_INC_BI = UNDEFINED THEN
@@ -549,31 +549,31 @@ OPTION _EXPLICITARRAY
 
                         DECLARE LIBRARY
                              'is an alphabet letter(isalpha(c) or isdigit(c))
-                            FUNCTION GJ_LIB_isalnum% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_isalnum% ALIAS "isalnum" (BYVAL c AS INTEGER)
                             'is letter (isupper(c) or islower(c))
-                            FUNCTION GJ_LIB_isalpha% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_isalpha% ALIAS "isalpha" (BYVAL c AS INTEGER)
                             'is a decimal digit
-                            FUNCTION GJ_LIB_isdigit% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_isdigit% ALIAS "isdigit" (BYVAL c AS INTEGER)
                             'is a printing character other than space
-                            FUNCTION GJ_LIB_isgraph% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_isgraph% ALIAS "isgraph" (BYVAL c AS INTEGER)
                             'is a lower-case letter
-                            FUNCTION GJ_LIB_islower% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_islower% ALIAS "islower" (BYVAL c AS INTEGER)
                             'is printing character. ASCII: &H20 (" ") to &H7E (~)
-                            FUNCTION GJ_LIB_isprint% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_isprint% ALIAS "isprint" (BYVAL c AS INTEGER)
                             'is printing character other than space, letter, digit
-                            FUNCTION GJ_LIB_ispunct% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_ispunct% ALIAS "ispunct" (BYVAL c AS INTEGER)
                             'is space, formfeed, newline, return, tab, vertical tab
-                            FUNCTION GJ_LIB_isspace% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_isspace% ALIAS "isspace" (BYVAL c AS INTEGER)
                             'is only space or tab
-                            FUNCTION GJ_LIB_isblank% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_isblank% ALIAS "isblank" (BYVAL c AS INTEGER)
                             'is upper-case letter
-                            FUNCTION GJ_LIB_isupper% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_isupper% ALIAS "isupper" (BYVAL c AS INTEGER)
                             'is a hexdecimal digit character(0 thru 9 or A thru F)
-                            FUNCTION GJ_LIB_isxdigit% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB_isxdigit% ALIAS "isxdigit" (BYVAL c AS INTEGER)
                             'return lower-case equivalent
-                            FUNCTION GJ_LIB.tolower% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB.tolower% ALIAS "tolower" (BYVAL c AS INTEGER)
                             'return upper-case equivalent
-                            FUNCTION GJ_LIB.toupper% (BYVAL c AS INTEGER)
+                            FUNCTION GJ_LIB.toupper% ALIAS "toupper" (BYVAL c AS INTEGER)
                         END DECLARE
                 $END IF