From e31a8d5e1dde4c04f9108a0a39ef0f8b2a8e4784 Mon Sep 17 00:00:00 2001 From: phil294 Date: Thu, 20 Jul 2023 11:01:59 +0200 Subject: [PATCH] Allow reading from / passing a built-in vars apart from user vars like before that's also how win ahk does it --- src/cmd/math/env-add.cr | 2 +- src/cmd/math/env-div.cr | 2 +- src/cmd/math/env-mult.cr | 2 +- src/cmd/string/reg-ex-get-pos.cr | 2 +- src/cmd/string/reg-ex-replace.cr | 2 +- src/cmd/string/string-get-pos.cr | 2 +- src/cmd/string/string-left.cr | 2 +- src/cmd/string/string-len.cr | 2 +- src/cmd/string/string-lower.cr | 2 +- src/cmd/string/string-mid.cr | 2 +- src/cmd/string/string-replace.cr | 2 +- src/cmd/string/string-right.cr | 2 +- src/cmd/string/string-upper.cr | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/cmd/math/env-add.cr b/src/cmd/math/env-add.cr index 1df58e9..6b266c1 100644 --- a/src/cmd/math/env-add.cr +++ b/src/cmd/math/env-add.cr @@ -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? diff --git a/src/cmd/math/env-div.cr b/src/cmd/math/env-div.cr index 1ea1295..c22c001 100644 --- a/src/cmd/math/env-div.cr +++ b/src/cmd/math/env-div.cr @@ -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 diff --git a/src/cmd/math/env-mult.cr b/src/cmd/math/env-mult.cr index cbf4487..ce7d3a4 100644 --- a/src/cmd/math/env-mult.cr +++ b/src/cmd/math/env-mult.cr @@ -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 diff --git a/src/cmd/string/reg-ex-get-pos.cr b/src/cmd/string/reg-ex-get-pos.cr index 3fa0b3e..50fa73d 100644 --- a/src/cmd/string/reg-ex-get-pos.cr +++ b/src/cmd/string/reg-ex-get-pos.cr @@ -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 diff --git a/src/cmd/string/reg-ex-replace.cr b/src/cmd/string/reg-ex-replace.cr index 8758937..d20a337 100644 --- a/src/cmd/string/reg-ex-replace.cr +++ b/src/cmd/string/reg-ex-replace.cr @@ -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 diff --git a/src/cmd/string/string-get-pos.cr b/src/cmd/string/string-get-pos.cr index 6cc2e3e..e83df2c 100644 --- a/src/cmd/string/string-get-pos.cr +++ b/src/cmd/string/string-get-pos.cr @@ -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 diff --git a/src/cmd/string/string-left.cr b/src/cmd/string/string-left.cr index 5f8cea0..181c446 100644 --- a/src/cmd/string/string-left.cr +++ b/src/cmd/string/string-left.cr @@ -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 diff --git a/src/cmd/string/string-len.cr b/src/cmd/string/string-len.cr index 7a1d52f..d11cf29 100644 --- a/src/cmd/string/string-len.cr +++ b/src/cmd/string/string-len.cr @@ -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 \ No newline at end of file diff --git a/src/cmd/string/string-lower.cr b/src/cmd/string/string-lower.cr index 4201bd6..ae85099 100644 --- a/src/cmd/string/string-lower.cr +++ b/src/cmd/string/string-lower.cr @@ -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 diff --git a/src/cmd/string/string-mid.cr b/src/cmd/string/string-mid.cr index 86d71f4..5cf8602 100644 --- a/src/cmd/string/string-mid.cr +++ b/src/cmd/string/string-mid.cr @@ -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) diff --git a/src/cmd/string/string-replace.cr b/src/cmd/string/string-replace.cr index 67e5ba3..bca1d9c 100644 --- a/src/cmd/string/string-replace.cr +++ b/src/cmd/string/string-replace.cr @@ -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 diff --git a/src/cmd/string/string-right.cr b/src/cmd/string/string-right.cr index 8d31c9d..205701b 100644 --- a/src/cmd/string/string-right.cr +++ b/src/cmd/string/string-right.cr @@ -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] diff --git a/src/cmd/string/string-upper.cr b/src/cmd/string/string-upper.cr index 9e88bda..fa696be 100644 --- a/src/cmd/string/string-upper.cr +++ b/src/cmd/string/string-upper.cr @@ -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