ExternalVendorCode/mo
1
0
Fork 0
mirror of https://github.com/tests-always-included/mo.git synced 2024-12-18 16:27:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Tyler Akins 2023-04-21 21:18:55 -05:00
parent 0896e2b966
commit 00af7d49f0
No known key found for this signature in database
GPG Key ID: 8F3B8C432F4393BD
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mo
View File

@ -931,7 +931,7 @@ mo::isTruthy() {
# #
# Returns nothing. # Returns nothing.
mo::evaluate() { mo::evaluate() {
local moTarget moStack moValue moType moStackSegment moIndex moCombined moResult local moTarget moStack moValue moType moIndex moCombined moResult
moTarget=$1 moTarget=$1
shift shift
@ -941,13 +941,12 @@ mo::evaluate() {
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
case "$1" in case "$1" in
PAREN|brace) PAREN|BRACE)
moType=$1 moType=$1
moValue=$2 moValue=$2
mo::debug "Combining $moValue tokens" mo::debug "Combining $moValue tokens"
moIndex=$((${#moStack[@]} - (2 * moValue))) moIndex=$((${#moStack[@]} - (2 * moValue)))
moStackSegment=("${moStack[@]:$moIndex}") mo::evaluateListOfSingles moCombined "${moStack[@]:$moIndex}"
mo::evaluateListOfSingles moCombined "${moStackSegment[@]}"
if [[ "$moType" == "PAREN" ]]; then if [[ "$moType" == "PAREN" ]]; then
moStack=("${moStack[@]:0:$moIndex}" NAME "$moCombined") moStack=("${moStack[@]:0:$moIndex}" NAME "$moCombined")
@ -1643,16 +1642,18 @@ mo::tokenizeTagContents() {
;; ;;
'('*) '('*)
moResult=("${moResult[@]}" COMMAND "${MO_UNPARSED:0:1}") # Do not tokenize the open paren - treat this as RPL
MO_UNPARSED=${MO_UNPARSED:1}
mo::tokenizeTagContents moTemp ')' mo::tokenizeTagContents moTemp ')'
moResult=("${moResult[@]}" "${moTemp[@]}" PAREN "${#moTemp[@]}") moResult=("${moResult[@]}" "${moTemp[@]}" PAREN "$((${#moTemp[@]} / 2))")
MO_UNPARSED=${MO_UNPARSED:1} MO_UNPARSED=${MO_UNPARSED:1}
;; ;;
'{'*) '{'*)
moResult=("${moResult[@]}" COMMAND "${MO_UNPARSED:0:1}") # Do not tokenize the open brace - treat this as RPL
MO_UNPARSED=${MO_UNPARSED:1}
mo::tokenizeTagContents moTemp '}' mo::tokenizeTagContents moTemp '}'
moResult=("${moResult[@]}" "${moTemp[@]}" BRACE "${#moTemp[@]}") moResult=("${moResult[@]}" "${moTemp[@]}" BRACE "$((${#moTemp[@]} / 2))")
MO_UNPARSED=${MO_UNPARSED:1} MO_UNPARSED=${MO_UNPARSED:1}
;; ;;