Skip to content

Commit

Permalink
Allow reading from / passing a built-in vars apart from user vars lik…
Browse files Browse the repository at this point in the history
…e before

that's also how win ahk does it
  • Loading branch information
phil294 committed Jul 20, 2023
1 parent 463b316 commit e31a8d5
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/cmd/math/env-add.cr
Expand Up @@ -7,7 +7,7 @@ class Cmd::Math::EnvAdd < Cmd::Base
var, add_value = args
time_units = args[2]?

current_value = thread.runner.get_user_var(var)
current_value = thread.get_var(var)
pure_int = ! current_value.includes?('.') && ! add_value.includes?('.')
add_value = add_value.to_f64?

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/math/env-div.cr
Expand Up @@ -5,7 +5,7 @@ class Cmd::Math::EnvDiv < Cmd::Base

def run(thread, args)
var, div_value = args
current_value = thread.runner.get_user_var(var)
current_value = thread.get_var(var)
pure_int = ! current_value.includes?('.') && ! div_value.includes?('.')
div_value = div_value.to_f64? || 0
current_value = current_value.to_f64? || 0
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/math/env-mult.cr
Expand Up @@ -5,7 +5,7 @@ class Cmd::Math::EnvMult < Cmd::Base

def run(thread, args)
var, mult_value = args
current_value = thread.runner.get_user_var(var)
current_value = thread.get_var(var)
pure_int = ! current_value.includes?('.') && ! mult_value.includes?('.')
mult_value = mult_value.to_f64? || 0
current_value = current_value.to_f64? || 0
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/string/reg-ex-get-pos.cr
Expand Up @@ -7,7 +7,7 @@ class Cmd::String::RegExGetPos < Cmd::Base
out_var, in_var, search_text = args
search_text = Regex.new(search_text, Regex::Options::IGNORE_CASE)
opt = (args[3]? || "").downcase
text = thread.runner.get_user_var(in_var)
text = thread.get_var(in_var)
if opt == "1" || opt == "r"
i = text.rindex(search_text) || -1
else
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/string/reg-ex-replace.cr
Expand Up @@ -9,7 +9,7 @@ class Cmd::String::RegExReplace < Cmd::Base
replace_text = args[3]? || ""
opt = (args[4]? || "").downcase
replace_all = opt == "1" || opt == "a" || opt == "all"
text = thread.runner.get_user_var(in_var)
text = thread.get_var(in_var)
if replace_all
replaced = text.gsub(search_text, replace_text)
else
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/string/string-get-pos.cr
Expand Up @@ -7,7 +7,7 @@ class Cmd::String::StringGetPos < Cmd::Base
out_var, in_var, search_text = args
search_text = Regex.new(Regex.escape(search_text), Regex::Options::IGNORE_CASE)
opt = (args[3]? || "").downcase
text = thread.runner.get_user_var(in_var)
text = thread.get_var(in_var)
if opt == "1" || opt == "r"
i = text.rindex(search_text) || -1
else
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/string/string-left.cr
Expand Up @@ -5,7 +5,7 @@ class Cmd::String::StringLeft < Cmd::Base
def run(thread, args)
out_var, in_var, count = args
count = count.to_i?
text = thread.runner.get_user_var(in_var)
text = thread.get_var(in_var)
return if ! count || count < 1 || text.empty?
text = text[0, count]
return if ! text
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/string/string-len.cr
Expand Up @@ -4,7 +4,7 @@ class Cmd::String::StringLen < Cmd::Base
def self.max_args; 2 end
def run(thread, args)
out_var, in_var = args
text = thread.runner.get_user_var(in_var)
text = thread.get_var(in_var)
thread.runner.set_user_var(out_var, text.size.to_s)
end
end
2 changes: 1 addition & 1 deletion src/cmd/string/string-lower.cr
Expand Up @@ -5,7 +5,7 @@ class Cmd::String::StringLower < Cmd::Base
def run(thread, args)
out_var, in_var = args
title_case = args[2]? && args[2].downcase == "t"
text = thread.runner.get_user_var(in_var)
text = thread.get_var(in_var)
if title_case
text = text.titleize
else
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/string/string-mid.cr
Expand Up @@ -11,7 +11,7 @@ class Cmd::String::StringMid < Cmd::Base
if ! count || count < 1
text = ""
else
text = thread.runner.get_user_var(in_var)
text = thread.get_var(in_var)
text = text[start, count]
end
thread.runner.set_user_var(out_var, text)
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/string/string-replace.cr
Expand Up @@ -9,7 +9,7 @@ class Cmd::String::StringReplace < Cmd::Base
replace_text = args[3]? || ""
opt = (args[4]? || "").downcase
replace_all = opt == "1" || opt == "a" || opt == "all"
text = thread.runner.get_user_var(in_var)
text = thread.get_var(in_var)
if replace_all
replaced = text.gsub(search_text, replace_text)
else
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/string/string-right.cr
Expand Up @@ -5,7 +5,7 @@ class Cmd::String::StringRight < Cmd::Base
def run(thread, args)
out_var, in_var, count = args
count = count.to_i?
text = thread.runner.get_user_var(in_var)
text = thread.get_var(in_var)
return if ! count || count < 1 || text.empty?
count = text.size if count > text.size
text = text[text.size - count, text.size]
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/string/string-upper.cr
Expand Up @@ -5,7 +5,7 @@ class Cmd::String::StringUpper < Cmd::Base
def run(thread, args)
out_var, in_var = args
title_case = args[2]? && args[2].downcase == "t"
text = thread.runner.get_user_var(in_var)
text = thread.get_var(in_var)
if title_case
text = text.titleize
else
Expand Down

0 comments on commit e31a8d5

Please sign in to comment.