init: Trim_Right_{String,Unicode} primitive function

Since a number of level 1 Hestia libraries use string functions, we have to port its primitive ones into HestiaKERNEL library package. Hence, let's do this. This patch ports Trim_Right_{String,Unicode} primitive function into HestiaKERNEL library in init/ directory. Co-authored-by: Shuralyov, Jean <[email protected]> Co-authored-by: Galyna, Cory <[email protected]> Co-authored-by: (Holloway) Chew, Kean Ho <[email protected]> Signed-off-by: (Holloway) Chew, Kean Ho <[email protected]>
JeanShuralyov · Nov 5, 2024 · 0250e86 · 0250e86
1 parent 00a374e
commit 0250e86
Show file tree

Hide file tree

Showing 9 changed files with 282 additions and 7 deletions.
diff --git a/init/services/HestiaKERNEL/Trim_Left_Unicode.ps1 b/init/services/HestiaKERNEL/Trim_Left_Unicode.ps1
@@ -25,14 +25,19 @@ function HestiaKERNEL-Trim-Left-Unicode {
                 ($(HestiaKERNEL-Is-Unicode $___content_unicode) -ne ${env:HestiaKERNEL_ERROR_OK}) -or
                 ($(HestiaKERNEL-Is-Unicode $___charset_unicode) -ne ${env:HestiaKERNEL_ERROR_OK})
         ) {
-                return $___unicode
+                return $___content_unicode
         }
 
 
         # execute
         [System.Collections.Generic.List[uint32]]$___converted = @()
         $___is_scanning = 0
-        :scan_unicode foreach ($___current in $___content_unicode) {
+        :scan_unicode for ($i = 0; $i -le $___content_unicode.Length - 1; $i++) {
+                # get current character
+                $___current = $___content_unicode[$i]
+
+
+                # it's already mismatched so prefix the remaining values
                 if ($___is_scanning -ne 0) {
                         $null = $___converted.Add($___current)
                         continue scan_unicode
@@ -46,6 +51,7 @@ function HestiaKERNEL-Trim-Left-Unicode {
                         }
                 }
 
+
                 # It's an mismatched
                 $___is_scanning = 1
                 $null = $___converted.Add($___current)

diff --git a/init/services/HestiaKERNEL/Trim_Left_Unicode.sh b/init/services/HestiaKERNEL/Trim_Left_Unicode.sh
@@ -50,6 +50,7 @@ HestiaKERNEL_Trim_Left_Unicode() {
 
                 # get char from charset character
                 ___charset_list="$___charset_unicode"
+                ___mismatched=0
                 while [ ! "$___charset_list" = "" ]; do
                         ___char="${___charset_list%%, *}"
                         ___charset_list="${___charset_list#"$___char"}"
@@ -59,18 +60,17 @@ HestiaKERNEL_Trim_Left_Unicode() {
 
                         if [ "$___current" = "$___char" ]; then
                                 ___charset_list=""
+                                ___mismatched=1
                                 break # exit early from O(m^2) timing ASAP
                         fi
                 done
 
-                if [ ! "$___current" = "$___char" ]; then
-                        # It's an mismatched
+
+                # It's a mismatch - append the rest and bail out
+                if [ $___mismatched -eq 0 ]; then
                         ___converted="${___current}, ${___content_unicode}"
                         break
                 fi
-
-
-                # it's a match - do nothing and continue to next character
         done
 
 

diff --git a/init/services/HestiaKERNEL/Trim_Right_String.ps1 b/init/services/HestiaKERNEL/Trim_Right_String.ps1
@@ -0,0 +1,53 @@
+# Copyright 2024 (Holloway) Chew, Kean Ho <[email protected]>
+#
+#
+# Licensed under (Holloway) Chew, Kean Ho’s Liberal License (the "License").
+# You must comply with the license to use the content. Get the License at:
+#
+#                 https://doi.org/10.5281/zenodo.13770769
+#
+# You MUST ensure any interaction with the content STRICTLY COMPLIES with
+# the permissions and limitations set forth in the license.
+. "${env:LIBS_HESTIA}\HestiaKERNEL\Trim_Right_Unicode.ps1"
+. "${env:LIBS_HESTIA}\HestiaKERNEL\To_Unicode_From_String.ps1"
+. "${env:LIBS_HESTIA}\HestiaKERNEL\To_String_From_Unicode.ps1"
+
+
+
+
+function HestiaKERNEL-Trim-Right-String {
+        param (
+                [string]$___input,
+                [string]$___charset
+        )
+
+
+        # validate input
+        if (
+                ($___input -eq "") -or
+                ($___charset -eq "")
+        ) {
+                return $___input
+        }
+
+
+        # execute
+        $___content = HestiaKERNEL-To-Unicode-From-String $___input
+        if ($___content.Length -eq 0) {
+                return $___input
+        }
+
+        $___chars = HestiaKERNEL-To-Unicode-From-String $___charset
+        if ($___chars.Length -eq 0) {
+                return $___input
+        }
+
+        $___content = HestiaKERNEL-Trim-Right-Unicode $___content $___chars
+        if ($___content.Length -eq 0) {
+                return $___input
+        }
+
+
+        # report status
+        return HestiaKERNEL-To-String-From-Unicode $___content
+}
diff --git a/init/services/HestiaKERNEL/Trim_Right_String.sh b/init/services/HestiaKERNEL/Trim_Right_String.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+# Copyright 2024 (Holloway) Chew, Kean Ho <[email protected]>
+#
+#
+# Licensed under (Holloway) Chew, Kean Ho’s Liberal License (the "License").
+# You must comply with the license to use the content. Get the License at:
+#
+#                 https://doi.org/10.5281/zenodo.13770769
+#
+# You MUST ensure any interaction with the content STRICTLY COMPLIES with
+# the permissions and limitations set forth in the license.
+. "${LIBS_HESTIA}/HestiaKERNEL/Error_Codes.sh"
+. "${LIBS_HESTIA}/HestiaKERNEL/Trim_Right_Unicode.sh"
+. "${LIBS_HESTIA}/HestiaKERNEL/To_Unicode_From_String.sh"
+. "${LIBS_HESTIA}/HestiaKERNEL/To_String_From_Unicode.sh"
+
+
+
+
+HestiaKERNEL_Trim_Right_String() {
+        #___content="$1"
+        #___charset="$2"
+
+
+        # validate input
+        if [ "$1" = "" ]; then
+                printf -- "%s" "$1"
+                return $HestiaKERNEL_ERROR_ENTITY_EMPTY
+        fi
+
+        if [ "$2" = "" ]; then
+                printf -- "%s" "$1"
+                return $HestiaKERNEL_ERROR_DATA_EMPTY
+        fi
+
+
+        # execute
+        ___content="$(HestiaKERNEL_To_Unicode_From_String "$1")"
+        if [ "$___content" = "" ]; then
+                printf -- "%s" "$1"
+                return $HestiaKERNEL_ERROR_DATA_INVALID
+        fi
+
+        ___chars="$(HestiaKERNEL_To_Unicode_From_String "$2")"
+        if [ "$___chars" = "" ]; then
+                printf -- "%s" "$1"
+                return $HestiaKERNEL_ERROR_DATA_INVALID
+        fi
+
+        ___content="$(HestiaKERNEL_Trim_Right_Unicode "$___content" "$___chars")"
+        if [ "$___content" = "" ]; then
+                printf -- "%s" "$1"
+                return $HestiaKERNEL_ERROR_BAD_EXEC
+        fi
+
+        ___content="$(HestiaKERNEL_To_String_From_Unicode "$___content")"
+        if [ "$___content" = "" ]; then
+                printf -- "%s" "$1"
+                return $HestiaKERNEL_ERROR_BAD_EXEC
+        fi
+        printf -- "%s" "$___content"
+
+
+        # report status
+        return $HestiaKERNEL_ERROR_OK
+}
diff --git a/init/services/HestiaKERNEL/Trim_Right_Unicode.ps1 b/init/services/HestiaKERNEL/Trim_Right_Unicode.ps1
@@ -0,0 +1,63 @@
+# Copyright 2024 (Holloway) Chew, Kean Ho <[email protected]>
+#
+#
+# Licensed under (Holloway) Chew, Kean Ho’s Liberal License (the "License").
+# You must comply with the license to use the content. Get the License at:
+#
+#                 https://doi.org/10.5281/zenodo.13770769
+#
+# You MUST ensure any interaction with the content STRICTLY COMPLIES with
+# the permissions and limitations set forth in the license.
+. "${env:LIBS_HESTIA}\HestiaKERNEL\Is_Unicode.ps1"
+
+
+
+
+function HestiaKERNEL-Trim-Right-Unicode {
+        param (
+                [uint32[]]$___content_unicode,
+                [uint32[]]$___charset_unicode
+        )
+
+
+        # validate input
+        if (
+                ($(HestiaKERNEL-Is-Unicode $___content_unicode) -ne ${env:HestiaKERNEL_ERROR_OK}) -or
+                ($(HestiaKERNEL-Is-Unicode $___charset_unicode) -ne ${env:HestiaKERNEL_ERROR_OK})
+        ) {
+                return $___content_unicode
+        }
+
+
+        # execute
+        [System.Collections.Generic.List[uint32]]$___converted = @()
+        $___is_scanning = 0
+        :scan_unicode for ($i = $___content_unicode.Length - 1; $i -ge 0; $i--) {
+                # get current character
+                $___current = $___content_unicode[$i]
+
+
+                # it's already mismatched so prefix the remaining values
+                if ($___is_scanning -ne 0) {
+                        $null = $converted.Insert(0, $___current)
+                        continue scan_unicode
+                }
+
+
+                # scan character from given charset
+                foreach ($___char in $___charset_unicode) {
+                        if ($___current -eq $___char) {
+                                continue scan_unicode # exit early from O(m^2) timing ASAP
+                        }
+                }
+
+
+                # It's an mismatched
+                $___is_scanning = 1
+                $null = $converted.Insert(0, $___current)
+        }
+
+
+        # report status
+        return [uint32[]]$___converted
+}
diff --git a/init/services/HestiaKERNEL/Trim_Right_Unicode.sh b/init/services/HestiaKERNEL/Trim_Right_Unicode.sh
@@ -0,0 +1,79 @@
+# Copyright 2024 (Holloway) Chew, Kean Ho <[email protected]>
+#
+#
+# Licensed under (Holloway) Chew, Kean Ho’s Liberal License (the "License").
+# You must comply with the license to use the content. Get the License at:
+#
+#                 https://doi.org/10.5281/zenodo.13770769
+#
+# You MUST ensure any interaction with the content STRICTLY COMPLIES with
+# the permissions and limitations set forth in the license.
+. "${LIBS_HESTIA}/HestiaKERNEL/Error_Codes.sh"
+. "${LIBS_HESTIA}/HestiaKERNEL/Is_Unicode.sh"
+
+
+
+
+HestiaKERNEL_Trim_Right_Unicode() {
+        #___content_unicode="$1"
+        #___charset_unicode="$2"
+
+
+        # validate input
+        if [ "$(HestiaKERNEL_Is_Unicode "$1")" -ne $HestiaKERNEL_ERROR_OK ]; then
+                printf -- "%s" "$1"
+                return $HestiaKERNEL_ERROR_ENTITY_EMPTY
+        fi
+
+        if [ "$(HestiaKERNEL_Is_Unicode "$2")" -ne $HestiaKERNEL_ERROR_OK ]; then
+                printf -- "%s" "$1"
+                return $HestiaKERNEL_ERROR_DATA_EMPTY
+        fi
+
+
+        # execute
+        ## IMPORTANT NOTICE
+        ## POSIX Shell's UNIX regex cannot recognize anything outside Latin-1
+        ## script. Therefore, manual algorithmic handling is required.
+        ___content_unicode="$1"
+        ___charset_unicode="$2"
+        ___converted=""
+        while [ ! "$___content_unicode" = "" ]; do
+                # get current character
+                ___current="${___content_unicode##*, }"
+                ___content_unicode="${___content_unicode%"$___current"}"
+                if [ "${___content_unicode#"${___content_unicode%?}"}" = " " ]; then
+                        ___content_unicode="${___content_unicode%, }"
+                fi
+
+
+                # get char from charset character
+                ___charset_list="$___charset_unicode"
+                ___mismatched=0
+                while [ ! "$___charset_list" = "" ]; do
+                        ___char="${___charset_list%%, *}"
+                        ___charset_list="${___charset_list#"$___char"}"
+                        if [ "${___charset_list%"${___charset_list#?}"}" = "," ]; then
+                                ___charset_list="${___charset_list#, }"
+                        fi
+
+                        if [ "$___current" = "$___char" ]; then
+                                ___charset_list=""
+                                ___mismatched=1
+                                break # exit early from O(m^2) timing ASAP
+                        fi
+                done
+
+
+                # It's a mismatch - prepend the rest and bail out
+                if [ $___mismatched -eq 0 ]; then
+                        ___converted="${___content_unicode}, ${___current}"
+                        break
+                fi
+        done
+
+
+        # report status
+        printf -- "%s" "${___converted%, }"
+        return $HestiaKERNEL_ERROR_OK
+}
diff --git a/init/services/HestiaKERNEL/Vanilla.sh.ps1 b/init/services/HestiaKERNEL/Vanilla.sh.ps1
@@ -54,7 +54,9 @@ echo \" <<'RUN_AS_POWERSHELL' >/dev/null # " | Out-Null
 . "${env:LIBS_HESTIA}\HestiaKERNEL\To_UTF16_From_Unicode.ps1"
 . "${env:LIBS_HESTIA}\HestiaKERNEL\To_UTF32_From_Unicode.ps1"
 . "${env:LIBS_HESTIA}\HestiaKERNEL\Trim_Left_String.ps1"
+. "${env:LIBS_HESTIA}\HestiaKERNEL\Trim_Right_String.ps1"
 . "${env:LIBS_HESTIA}\HestiaKERNEL\Trim_Left_Unicode.ps1"
+. "${env:LIBS_HESTIA}\HestiaKERNEL\Trim_Right_Unicode.ps1"
 . "${env:LIBS_HESTIA}\HestiaKERNEL\Unicode.ps1"
 ################################################################################
 # Windows POWERSHELL Codes                                                     #
@@ -91,7 +93,9 @@ RUN_AS_POWERSHELL
 . "${LIBS_HESTIA}/HestiaKERNEL/To_UTF16_From_Unicode.sh"
 . "${LIBS_HESTIA}/HestiaKERNEL/To_UTF32_From_Unicode.sh"
 . "${LIBS_HESTIA}/HestiaKERNEL/Trim_Left_String.sh"
+. "${LIBS_HESTIA}/HestiaKERNEL/Trim_Right_String.sh"
 . "${LIBS_HESTIA}/HestiaKERNEL/Trim_Left_Unicode.sh"
+. "${LIBS_HESTIA}/HestiaKERNEL/Trim_Right_Unicode.sh"
 . "${LIBS_HESTIA}/HestiaKERNEL/Unicode.sh"
 ################################################################################
 # Unix Main Codes                                                              #

diff --git a/init/start.ps1 b/init/start.ps1
@@ -112,6 +112,8 @@ ${env:LIBS_HESTIA} = "${env:LIBS_UPSCALER}\services"
 . "${env:LIBS_UPSCALER}\services\i18n\report-success.ps1"
 
 ### TEST ZONE
+. "${env:LIBS_HESTIA}\HestiaKERNEL\Trim_Right_String.ps1"
+Write-Host "$(HestiaKERNEL-Trim-Right-String "e你feeeff你你aerg aegE你F" "E你F")"
 . "${env:LIBS_HESTIA}\HestiaKERNEL\Trim_Left_String.ps1"
 Write-Host "$(HestiaKERNEL-Trim-Left-String "e你feeeff你你aerg aegE你F" "e你a")"
 

diff --git a/init/start.sh b/init/start.sh
@@ -102,6 +102,8 @@ LIBS_HESTIA="${LIBS_UPSCALER}/services"
 . "${LIBS_UPSCALER}/services/i18n/report-success.sh"
 
 ### TEST ZONE
+. "${LIBS_HESTIA}/HestiaKERNEL/Trim_Right_String.sh"
+1>&2 printf -- "%s\n" "$(HestiaKERNEL_Trim_Right_String "e你feeeff你你aerg aegE你F" "E你F")"
 . "${LIBS_HESTIA}/HestiaKERNEL/Trim_Left_String.sh"
 1>&2 printf -- "%s\n" "$(HestiaKERNEL_Trim_Left_String "e你feeeff你你aerg aegE你F" "e你a")"