kward 0.85.0 → 0.86.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +130 -0
- data/CONTRIBUTING.md +1 -1
- data/Gemfile.lock +6 -2
- data/README.md +3 -3
- data/Rakefile +3 -0
- data/doc/agent-tools.md +11 -0
- data/doc/api.md +4 -1
- data/doc/composer.md +4 -3
- data/doc/configuration.md +60 -11
- data/doc/extensibility.md +2 -0
- data/doc/getting-started.md +3 -3
- data/doc/git.md +1 -1
- data/doc/memory.md +1 -1
- data/doc/plugins.md +40 -5
- data/doc/providers.md +10 -4
- data/doc/rpc.md +125 -7
- data/doc/session-management.md +36 -1
- data/doc/shell.md +643 -27
- data/doc/tabs.md +2 -1
- data/doc/troubleshooting.md +1 -1
- data/doc/usage.md +21 -11
- data/examples/plugins/openrouter_proxy/README.md +103 -0
- data/examples/plugins/openrouter_proxy/fake_embeddings.rb +85 -0
- data/examples/plugins/openrouter_proxy/plugin.rb +7 -0
- data/examples/plugins/openrouter_proxy/protocol.rb +202 -0
- data/examples/plugins/openrouter_proxy/server.rb +186 -0
- data/examples/plugins/space_invaders.rb +0 -1
- data/exe/kward +2 -2
- data/exe/kwsh +7 -0
- data/kward.gemspec +3 -1
- data/lib/kward/agent.rb +43 -9
- data/lib/kward/cli/commands.rb +41 -11
- data/lib/kward/cli/interactive_turn.rb +10 -0
- data/lib/kward/cli/plugins.rb +5 -1
- data/lib/kward/cli/prompt_interface.rb +4 -1
- data/lib/kward/cli/rendering.rb +21 -28
- data/lib/kward/cli/runtime_helpers.rb +52 -34
- data/lib/kward/cli/settings/model.rb +1 -12
- data/lib/kward/cli/tabs.rb +91 -18
- data/lib/kward/cli/tool_summaries.rb +2 -0
- data/lib/kward/cli/transcript_formatter.rb +3 -10
- data/lib/kward/cli/worktrees.rb +1 -0
- data/lib/kward/cli.rb +56 -7
- data/lib/kward/config/core.rb +16 -5
- data/lib/kward/config/extensions.rb +3 -0
- data/lib/kward/config/paths.rb +11 -0
- data/lib/kward/config/settings.rb +7 -0
- data/lib/kward/conversation.rb +11 -1
- data/lib/kward/entrypoint.rb +14 -0
- data/lib/kward/events.rb +2 -0
- data/lib/kward/generated_images.rb +237 -0
- data/lib/kward/model/catalog.rb +6 -3
- data/lib/kward/model/client.rb +105 -36
- data/lib/kward/model/codex_images.rb +83 -0
- data/lib/kward/model/copilot_models.rb +8 -4
- data/lib/kward/model/model_info.rb +27 -9
- data/lib/kward/model/openrouter_model_cache.rb +4 -2
- data/lib/kward/model/payloads.rb +6 -5
- data/lib/kward/model/sources.rb +3 -1
- data/lib/kward/model/stream_parser.rb +4 -7
- data/lib/kward/pan/index.html.erb +8 -1
- data/lib/kward/pan/server.rb +13 -1
- data/lib/kward/plugins/codex_responses.rb +73 -0
- data/lib/kward/plugins/host.rb +16 -0
- data/lib/kward/plugins/http_server.rb +83 -0
- data/lib/kward/plugins/registry.rb +39 -0
- data/lib/kward/prompt_interface/composer_controller.rb +0 -1
- data/lib/kward/prompt_interface/composer_renderer.rb +159 -72
- data/lib/kward/prompt_interface/editor/controller.rb +1 -1
- data/lib/kward/prompt_interface/editor/renderer.rb +10 -7
- data/lib/kward/prompt_interface/file_overlay.rb +3 -3
- data/lib/kward/prompt_interface/generated_image_preview.rb +162 -0
- data/lib/kward/prompt_interface/git_prompt.rb +18 -11
- data/lib/kward/prompt_interface/interactive/renderer.rb +1 -1
- data/lib/kward/prompt_interface/interactive/state.rb +18 -20
- data/lib/kward/prompt_interface/key_handler.rb +108 -25
- data/lib/kward/prompt_interface/layout.rb +11 -1
- data/lib/kward/prompt_interface/overlay_renderer.rb +25 -8
- data/lib/kward/prompt_interface/project_browser.rb +27 -54
- data/lib/kward/prompt_interface/prompt_renderer.rb +27 -35
- data/lib/kward/prompt_interface/question_prompt.rb +19 -28
- data/lib/kward/prompt_interface/runtime_state.rb +31 -9
- data/lib/kward/prompt_interface/screen.rb +24 -21
- data/lib/kward/prompt_interface/selection_prompt.rb +8 -8
- data/lib/kward/prompt_interface/slash_overlay.rb +1 -1
- data/lib/kward/prompt_interface/transcript_renderer.rb +7 -6
- data/lib/kward/prompt_interface.rb +109 -39
- data/lib/kward/prompts.rb +7 -1
- data/lib/kward/pty/adaptive_output_sink.rb +38 -4
- data/lib/kward/pty/interactive_runner.rb +20 -28
- data/lib/kward/pty/transcript_normalizer.rb +65 -21
- data/lib/kward/rpc/config_manager.rb +3 -0
- data/lib/kward/rpc/server.rb +27 -5
- data/lib/kward/rpc/session_manager.rb +62 -17
- data/lib/kward/rpc/transcript_normalizer.rb +11 -7
- data/lib/kward/sessions/store.rb +30 -3
- data/lib/kward/shell/kwsh.rb +27 -7
- data/lib/kward/shell/kwshrc.rb +11 -2
- data/lib/kward/shell/native_arithmetic.rb +255 -0
- data/lib/kward/shell/native_arrays.rb +102 -0
- data/lib/kward/shell/native_braces.rb +96 -0
- data/lib/kward/shell/native_builtins.rb +476 -0
- data/lib/kward/shell/native_completion.rb +169 -0
- data/lib/kward/shell/native_condition.rb +75 -0
- data/lib/kward/shell/native_directory.rb +116 -0
- data/lib/kward/shell/native_exec_state.rb +73 -0
- data/lib/kward/shell/native_expansion.rb +252 -0
- data/lib/kward/shell/native_fields.rb +62 -0
- data/lib/kward/shell/native_glob.rb +96 -0
- data/lib/kward/shell/native_history.rb +242 -0
- data/lib/kward/shell/native_interactive.rb +164 -0
- data/lib/kward/shell/native_invocation.rb +42 -0
- data/lib/kward/shell/native_jobs.rb +250 -0
- data/lib/kward/shell/native_line_editor.rb +382 -0
- data/lib/kward/shell/native_line_terminal.rb +286 -0
- data/lib/kward/shell/native_locale.rb +109 -0
- data/lib/kward/shell/native_locals.rb +57 -0
- data/lib/kward/shell/native_pattern.rb +200 -0
- data/lib/kward/shell/native_process.rb +279 -0
- data/lib/kward/shell/native_program.rb +40 -0
- data/lib/kward/shell/native_programmable_completion.rb +115 -0
- data/lib/kward/shell/native_prompt_format.rb +89 -0
- data/lib/kward/shell/native_runtime.rb +964 -0
- data/lib/kward/shell/native_substitution.rb +110 -0
- data/lib/kward/shell/native_syntax.rb +946 -0
- data/lib/kward/shell/native_traps.rb +196 -0
- data/lib/kward/shell/native_vi.rb +407 -0
- data/lib/kward/shell/native_vi_terminal.rb +19 -0
- data/lib/kward/shell/native_worker.rb +82 -0
- data/lib/kward/shell/persistent_session.rb +184 -190
- data/lib/kward/shell/prompt.rb +14 -0
- data/lib/kward/shell/prompt_agent.rb +17 -0
- data/lib/kward/shell/script_runner.rb +244 -0
- data/lib/kward/shell/standalone_agent.rb +31 -0
- data/lib/kward/shell/standalone_link.rb +78 -0
- data/lib/kward/shell/standalone_terminal.rb +287 -0
- data/lib/kward/terminal/keys.rb +22 -1
- data/lib/kward/terminal/locale_text.rb +29 -0
- data/lib/kward/terminal/sequences.rb +45 -4
- data/lib/kward/tools/datetime.rb +85 -0
- data/lib/kward/tools/generate_image.rb +36 -0
- data/lib/kward/tools/registry.rb +35 -9
- data/lib/kward/tools/tool_call.rb +3 -1
- data/lib/kward/transcripts/markdown_transcript.rb +8 -0
- data/lib/kward/transcripts/turn_summary_formatter.rb +93 -0
- data/lib/kward/transport/gateway.rb +2 -1
- data/lib/kward/turn_summary.rb +68 -0
- data/lib/kward/version.rb +1 -1
- data/lib/main.rb +6 -3
- metadata +84 -1
data/lib/kward/shell/kwshrc.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
require "shellwords"
|
|
2
|
-
require_relative "
|
|
2
|
+
require_relative "../config/paths"
|
|
3
3
|
|
|
4
4
|
# Namespace for the Kward CLI agent runtime.
|
|
5
5
|
module Kward
|
|
@@ -8,12 +8,21 @@ module Kward
|
|
|
8
8
|
# Only aliases, exports, and source directives are handled. Other shell
|
|
9
9
|
# syntax is intentionally ignored until kwsh supports scripting.
|
|
10
10
|
class Kwshrc
|
|
11
|
+
PROMPT_BUILTINS = %w[alias capture cd pwd export source unset unalias clear exit logout pty].freeze
|
|
11
12
|
VARIABLE_NAME = /\A[A-Za-z_][A-Za-z0-9_]*\z/
|
|
12
13
|
VARIABLE_PATTERN = /[A-Za-z_][A-Za-z0-9_]*/
|
|
13
14
|
|
|
14
15
|
class ParseError < StandardError
|
|
15
16
|
end
|
|
16
17
|
|
|
18
|
+
def self.paths(primary = File.join(ConfigPaths.config_dir, "kwshrc"))
|
|
19
|
+
[primary, File.expand_path("~/.kwshrc")].uniq
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
def self.valid_alias_name?(name)
|
|
23
|
+
name.to_s.match?(/\A[A-Za-z_][A-Za-z0-9_-]*\z/) && !PROMPT_BUILTINS.include?(name.to_s)
|
|
24
|
+
end
|
|
25
|
+
|
|
17
26
|
def self.read(paths, env: ENV.to_h)
|
|
18
27
|
new(env: env).read(paths)
|
|
19
28
|
end
|
|
@@ -92,7 +101,7 @@ module Kward
|
|
|
92
101
|
def parse_aliases(words)
|
|
93
102
|
words.each do |assignment|
|
|
94
103
|
name, command = assignment.split("=", 2)
|
|
95
|
-
next unless command &&
|
|
104
|
+
next unless command && self.class.valid_alias_name?(name)
|
|
96
105
|
next if command.empty?
|
|
97
106
|
|
|
98
107
|
@aliases[name] = command
|
|
@@ -0,0 +1,255 @@
|
|
|
1
|
+
require "strscan"
|
|
2
|
+
|
|
3
|
+
module Kward
|
|
4
|
+
module NativeShell
|
|
5
|
+
# Integer arithmetic ASTs preserve short-circuiting and lvalue ownership.
|
|
6
|
+
# Parsing is independent of shell state; evaluation never uses Ruby eval.
|
|
7
|
+
module Arithmetic
|
|
8
|
+
class Error < StandardError; end
|
|
9
|
+
MAX_BITS = 4_096
|
|
10
|
+
MAX_DEPTH = 100
|
|
11
|
+
|
|
12
|
+
def self.integer(text)
|
|
13
|
+
value = text.to_s.strip
|
|
14
|
+
return 0 if value.empty?
|
|
15
|
+
unless value.match?(/\A[+-]?(?:0[xX][0-9a-fA-F]+|0[0-7]*|[1-9][0-9]*)\z/)
|
|
16
|
+
raise Error, "arithmetic requires an integer value"
|
|
17
|
+
end
|
|
18
|
+
negative = value.start_with?("-")
|
|
19
|
+
digits = value.delete_prefix("+").delete_prefix("-")
|
|
20
|
+
base = digits.start_with?("0x", "0X") ? 16 : digits.start_with?("0") ? 8 : 10
|
|
21
|
+
digits = digits[2..] if base == 16
|
|
22
|
+
digits = digits.sub(/\A0+/, "")
|
|
23
|
+
return 0 if digits.empty?
|
|
24
|
+
# More significant digits than bits cannot fit in any supported base.
|
|
25
|
+
# Reject before constructing a huge integer; leading zeros cost no bits.
|
|
26
|
+
raise Error, "arithmetic result exceeds #{MAX_BITS} bits" if digits.length > MAX_BITS
|
|
27
|
+
bounded(Integer(digits, base) * (negative ? -1 : 1))
|
|
28
|
+
end
|
|
29
|
+
|
|
30
|
+
def self.bounded(value)
|
|
31
|
+
raise Error, "arithmetic result exceeds #{MAX_BITS} bits" if value.bit_length > MAX_BITS
|
|
32
|
+
value
|
|
33
|
+
end
|
|
34
|
+
|
|
35
|
+
def self.evaluate(source, assign: nil, &variable)
|
|
36
|
+
Evaluator.new(variable, assign).evaluate(Parser.new(source).parse)
|
|
37
|
+
end
|
|
38
|
+
|
|
39
|
+
def self.binary(operator, left, right)
|
|
40
|
+
value = case operator
|
|
41
|
+
when "+" then left + right
|
|
42
|
+
when "-" then left - right
|
|
43
|
+
when "*" then left * right
|
|
44
|
+
when "/", "%"
|
|
45
|
+
raise Error, "arithmetic division by zero" if right.zero?
|
|
46
|
+
quotient = left.abs / right.abs
|
|
47
|
+
quotient = -quotient if left.negative? != right.negative?
|
|
48
|
+
operator == "/" ? quotient : left - quotient * right
|
|
49
|
+
when "**"
|
|
50
|
+
raise Error, "negative arithmetic exponent" if right.negative?
|
|
51
|
+
raise Error, "arithmetic exponent exceeds result limit" if left.abs > 1 && (left.abs.bit_length - 1) * right > MAX_BITS
|
|
52
|
+
if left == -1
|
|
53
|
+
right.odd? ? -1 : 1
|
|
54
|
+
elsif left == 0
|
|
55
|
+
right.zero? ? 1 : 0
|
|
56
|
+
elsif left == 1
|
|
57
|
+
1
|
|
58
|
+
else
|
|
59
|
+
left**right
|
|
60
|
+
end
|
|
61
|
+
when "<<", ">>"
|
|
62
|
+
raise Error, "arithmetic shift exceeds limit" unless (0..MAX_BITS).cover?(right)
|
|
63
|
+
operator == "<<" ? left << right : left >> right
|
|
64
|
+
when "&" then left & right
|
|
65
|
+
when "|" then left | right
|
|
66
|
+
when "^" then left ^ right
|
|
67
|
+
when "==" then left == right ? 1 : 0
|
|
68
|
+
when "!=" then left != right ? 1 : 0
|
|
69
|
+
when "<" then left < right ? 1 : 0
|
|
70
|
+
when "<=" then left <= right ? 1 : 0
|
|
71
|
+
when ">" then left > right ? 1 : 0
|
|
72
|
+
when ">=" then left >= right ? 1 : 0
|
|
73
|
+
when "," then right
|
|
74
|
+
else raise Error, "unknown arithmetic operator"
|
|
75
|
+
end
|
|
76
|
+
bounded(value)
|
|
77
|
+
end
|
|
78
|
+
|
|
79
|
+
class Evaluator
|
|
80
|
+
def initialize(variable, assign)
|
|
81
|
+
@variable, @assign = variable, assign
|
|
82
|
+
@depth = 0
|
|
83
|
+
@reading = []
|
|
84
|
+
end
|
|
85
|
+
|
|
86
|
+
def evaluate(node)
|
|
87
|
+
@depth += 1
|
|
88
|
+
raise Error, "arithmetic nesting exceeds #{MAX_DEPTH} levels" if @depth > MAX_DEPTH
|
|
89
|
+
kind, *args = node
|
|
90
|
+
case kind
|
|
91
|
+
when :number then args.first
|
|
92
|
+
when :variable, :parameter then read(args.first)
|
|
93
|
+
when :unary
|
|
94
|
+
operator, operand = args
|
|
95
|
+
value = evaluate(operand)
|
|
96
|
+
result = case operator
|
|
97
|
+
when "+" then value
|
|
98
|
+
when "-" then -value
|
|
99
|
+
when "!" then value.zero? ? 1 : 0
|
|
100
|
+
when "~" then ~value
|
|
101
|
+
end
|
|
102
|
+
Arithmetic.bounded(result)
|
|
103
|
+
when :update
|
|
104
|
+
name, delta, post = args
|
|
105
|
+
before = read(name)
|
|
106
|
+
after = store(name, Arithmetic.bounded(before + delta))
|
|
107
|
+
post ? before : after
|
|
108
|
+
when :assign
|
|
109
|
+
name, operator, operand = args
|
|
110
|
+
before = read(name) unless operator == "="
|
|
111
|
+
value = evaluate(operand)
|
|
112
|
+
store(name, operator == "=" ? value : Arithmetic.binary(operator.delete_suffix("="), before, value))
|
|
113
|
+
when :conditional
|
|
114
|
+
condition, yes, no = args
|
|
115
|
+
evaluate(evaluate(condition).zero? ? no : yes)
|
|
116
|
+
when :binary then binary_chain(node)
|
|
117
|
+
end
|
|
118
|
+
ensure
|
|
119
|
+
@depth -= 1
|
|
120
|
+
end
|
|
121
|
+
|
|
122
|
+
private
|
|
123
|
+
|
|
124
|
+
# A long left-associative chain is not recursive expression nesting.
|
|
125
|
+
def binary_chain(node)
|
|
126
|
+
operations = []
|
|
127
|
+
while node.first == :binary
|
|
128
|
+
_, operator, left, right = node
|
|
129
|
+
operations << [operator, right]
|
|
130
|
+
node = left
|
|
131
|
+
end
|
|
132
|
+
value = evaluate(node)
|
|
133
|
+
operations.reverse_each do |operator, right|
|
|
134
|
+
value = if operator == "&&"
|
|
135
|
+
value.zero? ? 0 : (evaluate(right).zero? ? 0 : 1)
|
|
136
|
+
elsif operator == "||"
|
|
137
|
+
value.zero? ? (evaluate(right).zero? ? 0 : 1) : 1
|
|
138
|
+
else
|
|
139
|
+
Arithmetic.binary(operator, value, evaluate(right))
|
|
140
|
+
end
|
|
141
|
+
end
|
|
142
|
+
value
|
|
143
|
+
end
|
|
144
|
+
|
|
145
|
+
def read(name)
|
|
146
|
+
raise Error, "recursive arithmetic variable: #{name}" if @reading.include?(name)
|
|
147
|
+
@reading << name
|
|
148
|
+
begin
|
|
149
|
+
value = @variable.call(name).to_s
|
|
150
|
+
value.strip.empty? ? 0 : evaluate(Parser.new(value).parse)
|
|
151
|
+
ensure
|
|
152
|
+
@reading.pop
|
|
153
|
+
end
|
|
154
|
+
end
|
|
155
|
+
|
|
156
|
+
def store(name, value)
|
|
157
|
+
raise Error, "arithmetic assignment is unavailable" unless @assign
|
|
158
|
+
@assign.call(name, value.to_s)
|
|
159
|
+
value
|
|
160
|
+
end
|
|
161
|
+
end
|
|
162
|
+
|
|
163
|
+
class Parser
|
|
164
|
+
LEVELS = [ %w[,], %w[= += -= *= /= %= <<= >>= &= ^= |=], %w[?], %w[||], %w[&&], %w[|], %w[^], %w[&], %w[== !=], %w[< <= > >=], %w[<< >>], %w[+ -], %w[* / %], %w[**] ].freeze
|
|
165
|
+
PRECEDENCE = LEVELS.each_with_index.each_with_object({}) { |(operators, index), result| operators.each { |operator| result[operator] = index + 1 } }.freeze
|
|
166
|
+
|
|
167
|
+
def initialize(source)
|
|
168
|
+
@scanner = StringScanner.new(source)
|
|
169
|
+
@depth = 0
|
|
170
|
+
advance
|
|
171
|
+
end
|
|
172
|
+
|
|
173
|
+
def parse
|
|
174
|
+
result = expression
|
|
175
|
+
raise Error, "unexpected token in arithmetic expression" if @token
|
|
176
|
+
result
|
|
177
|
+
end
|
|
178
|
+
|
|
179
|
+
private
|
|
180
|
+
|
|
181
|
+
def advance
|
|
182
|
+
@scanner.skip(/\s+/)
|
|
183
|
+
@token = if @scanner.eos?
|
|
184
|
+
nil
|
|
185
|
+
elsif (number = @scanner.scan(/0[xX][0-9a-fA-F]+|[0-9]+/))
|
|
186
|
+
[:number, Arithmetic.integer(number)]
|
|
187
|
+
elsif (name = @scanner.scan(/[A-Za-z_][A-Za-z0-9_]*/))
|
|
188
|
+
[:variable, name]
|
|
189
|
+
elsif @scanner.scan(/\$\{([A-Za-z_][A-Za-z0-9_]*|[0-9]+|[?#$])\}/) || @scanner.scan(/\$([A-Za-z_][A-Za-z0-9_]*|[0-9?#$])/)
|
|
190
|
+
[:parameter, @scanner[1]]
|
|
191
|
+
elsif (operator = @scanner.scan(/<<=|>>=|\+\+|--|\*\*|&&|\|\||<<|>>|[+*\/%&|^!<>=-]=|[+*\/%()~!<>=?:,&|^-]/))
|
|
192
|
+
operator
|
|
193
|
+
else
|
|
194
|
+
raise Error, "unsupported token in arithmetic expression"
|
|
195
|
+
end
|
|
196
|
+
end
|
|
197
|
+
|
|
198
|
+
def expression(minimum = 1)
|
|
199
|
+
@depth += 1
|
|
200
|
+
raise Error, "arithmetic nesting exceeds #{MAX_DEPTH} levels" if @depth > MAX_DEPTH
|
|
201
|
+
left = unary
|
|
202
|
+
while (precedence = PRECEDENCE[@token]) && precedence >= minimum
|
|
203
|
+
operator = @token
|
|
204
|
+
advance
|
|
205
|
+
if operator == "?"
|
|
206
|
+
yes = expression
|
|
207
|
+
raise Error, "expected : in arithmetic conditional" unless @token == ":"
|
|
208
|
+
advance
|
|
209
|
+
left = [:conditional, left, yes, expression(precedence)]
|
|
210
|
+
else
|
|
211
|
+
assignment = LEVELS[1].include?(operator)
|
|
212
|
+
name = lvalue(left) if assignment
|
|
213
|
+
right = expression(assignment || operator == "**" ? precedence : precedence + 1)
|
|
214
|
+
left = assignment ? [:assign, name, operator, right] : [:binary, operator, left, right]
|
|
215
|
+
end
|
|
216
|
+
end
|
|
217
|
+
left
|
|
218
|
+
ensure
|
|
219
|
+
@depth -= 1
|
|
220
|
+
end
|
|
221
|
+
|
|
222
|
+
def unary
|
|
223
|
+
if %w[+ - ! ~ ++ --].include?(@token)
|
|
224
|
+
operator = @token
|
|
225
|
+
advance
|
|
226
|
+
operand = expression(15)
|
|
227
|
+
return [:update, lvalue(operand), operator == "++" ? 1 : -1, false] if %w[++ --].include?(operator)
|
|
228
|
+
return [:unary, operator, operand]
|
|
229
|
+
end
|
|
230
|
+
if @token == "("
|
|
231
|
+
advance
|
|
232
|
+
value = expression
|
|
233
|
+
raise Error, "expected ) in arithmetic expression" unless @token == ")"
|
|
234
|
+
advance
|
|
235
|
+
elsif @token.is_a?(Array)
|
|
236
|
+
value = @token
|
|
237
|
+
advance
|
|
238
|
+
else
|
|
239
|
+
raise Error, "expected an integer, variable, or ( in arithmetic expression"
|
|
240
|
+
end
|
|
241
|
+
if %w[++ --].include?(@token)
|
|
242
|
+
value = [:update, lvalue(value), @token == "++" ? 1 : -1, true]
|
|
243
|
+
advance
|
|
244
|
+
end
|
|
245
|
+
value
|
|
246
|
+
end
|
|
247
|
+
|
|
248
|
+
def lvalue(node)
|
|
249
|
+
raise Error, "arithmetic assignment requires a variable" unless node.first == :variable
|
|
250
|
+
node[1]
|
|
251
|
+
end
|
|
252
|
+
end
|
|
253
|
+
end
|
|
254
|
+
end
|
|
255
|
+
end
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
module Kward
|
|
2
|
+
module NativeShell
|
|
3
|
+
module Arrays
|
|
4
|
+
ArrayValue = Struct.new(:associative, :values, keyword_init: true)
|
|
5
|
+
|
|
6
|
+
private
|
|
7
|
+
|
|
8
|
+
def declare_array(args)
|
|
9
|
+
mode = args.shift
|
|
10
|
+
raise ExecutionError, "declare: use -a for indexed or -A for associative arrays" unless %w[-a -A].include?(mode)
|
|
11
|
+
raise ExecutionError, "declare: expected an array name" if args.empty?
|
|
12
|
+
args.each do |name|
|
|
13
|
+
validate_name(name)
|
|
14
|
+
raise ExecutionError, "#{name}: readonly variable" if @readonly.include?(name)
|
|
15
|
+
existing = @arrays[name]
|
|
16
|
+
associative = mode == "-A"
|
|
17
|
+
raise ExecutionError, "#{name}: cannot change array type" if existing && existing.associative != associative
|
|
18
|
+
values = @variables.key?(name) ? { associative ? "0" : 0 => @variables.delete(name) } : {}
|
|
19
|
+
@arrays[name] ||= ArrayValue.new(associative: associative, values: values)
|
|
20
|
+
end
|
|
21
|
+
0
|
|
22
|
+
end
|
|
23
|
+
|
|
24
|
+
def array_index(reference, array)
|
|
25
|
+
value = scalar(reference.subscript)
|
|
26
|
+
if array.associative
|
|
27
|
+
raise ExpansionError, "empty associative array key" if value.empty?
|
|
28
|
+
value
|
|
29
|
+
else
|
|
30
|
+
index = arithmetic_value(value.empty? ? "0" : value).to_i
|
|
31
|
+
index += (array.values.keys.max || -1) + 1 if index.negative?
|
|
32
|
+
raise ExpansionError, "negative array index" if index.negative?
|
|
33
|
+
raise ExpansionError, "array index exceeds limit" if index > 2**31 - 1
|
|
34
|
+
index
|
|
35
|
+
end
|
|
36
|
+
end
|
|
37
|
+
|
|
38
|
+
def array_values(reference, keys: false)
|
|
39
|
+
array = @arrays[reference.name]
|
|
40
|
+
unless array
|
|
41
|
+
value = @variables[reference.name]
|
|
42
|
+
return value ? (keys ? ["0"] : [value]) : []
|
|
43
|
+
end
|
|
44
|
+
indices = array.associative ? array.values.keys : array.values.keys.sort
|
|
45
|
+
indices.map { |key| keys ? key.to_s : array.values.fetch(key) }
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
def array_read(reference)
|
|
49
|
+
return array_values(reference).join(ifs[0].to_s) if %w[@ *].include?(reference.subscript.literal)
|
|
50
|
+
array = @arrays[reference.name] || ArrayValue.new(associative: false, values: @variables.key?(reference.name) ? { 0 => @variables[reference.name] } : {})
|
|
51
|
+
array.values[array_index(reference, array)]
|
|
52
|
+
end
|
|
53
|
+
|
|
54
|
+
def array_store(reference, value)
|
|
55
|
+
validate_name(reference.name)
|
|
56
|
+
raise ExecutionError, "#{reference.name}: readonly variable" if @readonly.include?(reference.name)
|
|
57
|
+
raise ExecutionError, "cannot assign to all array elements" if %w[@ *].include?(reference.subscript.literal)
|
|
58
|
+
array = @arrays[reference.name] ||= ArrayValue.new(associative: false, values: @variables.key?(reference.name) ? { 0 => @variables.delete(reference.name) } : {})
|
|
59
|
+
key = array_index(reference, array)
|
|
60
|
+
array.values[key] = reference.append ? array.values.fetch(key, "") + value : value
|
|
61
|
+
end
|
|
62
|
+
|
|
63
|
+
def array_assignment(name, words, append = false)
|
|
64
|
+
raise ExecutionError, "#{name}: readonly variable" if @readonly.include?(name)
|
|
65
|
+
array = @arrays[name] ||= ArrayValue.new(associative: false, values: {})
|
|
66
|
+
@variables.delete(name)
|
|
67
|
+
array.values.clear unless append
|
|
68
|
+
populate_array(array, name, words, append: append)
|
|
69
|
+
end
|
|
70
|
+
|
|
71
|
+
def populate_array(array, name, words, append: false)
|
|
72
|
+
index = append && !array.associative ? (array.values.keys.max || -1) + 1 : 0
|
|
73
|
+
words.each do |word|
|
|
74
|
+
if (element = word.array_element)
|
|
75
|
+
reference, value = element
|
|
76
|
+
reference = Reference.new(name: name, subscript: reference.subscript, append: reference.append)
|
|
77
|
+
key = array_index(reference, array)
|
|
78
|
+
result = scalar(value)
|
|
79
|
+
array.values[key] = reference.append ? array.values.fetch(key, "") + result : result
|
|
80
|
+
index = key + 1 unless array.associative
|
|
81
|
+
else
|
|
82
|
+
raise ExecutionError, "associative array elements require [key]=value" if array.associative
|
|
83
|
+
expand(word).each do |value|
|
|
84
|
+
array.values[index] = value
|
|
85
|
+
index += 1
|
|
86
|
+
end
|
|
87
|
+
end
|
|
88
|
+
end
|
|
89
|
+
0
|
|
90
|
+
end
|
|
91
|
+
|
|
92
|
+
def array_fields(reference, quoted, keys: false, values: nil)
|
|
93
|
+
values ||= array_values(reference, keys: keys)
|
|
94
|
+
if reference.subscript.literal == "*" && quoted
|
|
95
|
+
[Fields.characters(values.join(ifs[0].to_s), quoted: true)]
|
|
96
|
+
else
|
|
97
|
+
values.map { |value| Fields.characters(value, quoted: quoted, split: !quoted) }
|
|
98
|
+
end
|
|
99
|
+
end
|
|
100
|
+
end
|
|
101
|
+
end
|
|
102
|
+
end
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
module Kward
|
|
2
|
+
module NativeShell
|
|
3
|
+
# Brace expansion operates on source word parts, before any substitutions.
|
|
4
|
+
# Quoted braces and braces produced by variables remain literal.
|
|
5
|
+
module Braces
|
|
6
|
+
LIMIT = 4_096
|
|
7
|
+
module_function
|
|
8
|
+
|
|
9
|
+
def expand(word)
|
|
10
|
+
atoms = word.parts.flat_map do |part|
|
|
11
|
+
if part.kind == :literal && !part.text.empty?
|
|
12
|
+
part.text.chars.map { |text| Part.new(kind: :literal, text: text, quoted: part.quoted) }
|
|
13
|
+
else
|
|
14
|
+
[part]
|
|
15
|
+
end
|
|
16
|
+
end
|
|
17
|
+
expand_atoms(atoms, 0).map { |parts| Word.new(parts: coalesce(parts)) }
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
def literal?(part, value)
|
|
21
|
+
part&.kind == :literal && !part.quoted && part.text == value
|
|
22
|
+
end
|
|
23
|
+
|
|
24
|
+
def expand_atoms(atoms, depth)
|
|
25
|
+
raise ExpansionError, "brace nesting exceeds 32 levels" if depth > 32
|
|
26
|
+
atoms.each_index do |start|
|
|
27
|
+
next unless literal?(atoms[start], "{")
|
|
28
|
+
level = 0
|
|
29
|
+
splits = []
|
|
30
|
+
finish = nil
|
|
31
|
+
((start + 1)...atoms.length).each do |index|
|
|
32
|
+
if literal?(atoms[index], "{")
|
|
33
|
+
level += 1
|
|
34
|
+
elsif literal?(atoms[index], "}")
|
|
35
|
+
if level.zero?
|
|
36
|
+
finish = index
|
|
37
|
+
break
|
|
38
|
+
end
|
|
39
|
+
level -= 1
|
|
40
|
+
elsif level.zero? && literal?(atoms[index], ",")
|
|
41
|
+
splits << index
|
|
42
|
+
end
|
|
43
|
+
end
|
|
44
|
+
next unless finish
|
|
45
|
+
alternatives = if splits.empty?
|
|
46
|
+
sequence(atoms[(start + 1)...finish])
|
|
47
|
+
else
|
|
48
|
+
([start] + splits).zip(splits + [finish]).map { |left, right| atoms[(left + 1)...right] }
|
|
49
|
+
end
|
|
50
|
+
next unless alternatives
|
|
51
|
+
result = []
|
|
52
|
+
alternatives.each do |alternative|
|
|
53
|
+
result.concat(expand_atoms(atoms[0...start] + alternative + atoms[(finish + 1)..], depth + 1))
|
|
54
|
+
raise ExpansionError, "brace expansion exceeds #{LIMIT} words" if result.length > LIMIT
|
|
55
|
+
end
|
|
56
|
+
return result
|
|
57
|
+
end
|
|
58
|
+
[atoms]
|
|
59
|
+
end
|
|
60
|
+
|
|
61
|
+
def sequence(parts)
|
|
62
|
+
return unless parts.all? { |part| part.kind == :literal && !part.quoted }
|
|
63
|
+
text = parts.map(&:text).join
|
|
64
|
+
match = text.match(/\A(-?\d+|[a-zA-Z])\.\.(-?\d+|[a-zA-Z])(?:\.\.(-?\d+))?\z/)
|
|
65
|
+
return unless match
|
|
66
|
+
first, last, step = match.captures
|
|
67
|
+
raise ExpansionError, "brace sequence exceeds numeric limit" if [first, last, step].compact.any? { |value| value.length > 128 }
|
|
68
|
+
numeric = first.match?(/\A-?\d+\z/) && last.match?(/\A-?\d+\z/)
|
|
69
|
+
return unless numeric || first.length == 1 && last.length == 1 && first.match?(/[a-zA-Z]/) && last.match?(/[a-zA-Z]/)
|
|
70
|
+
from, to = numeric ? [first.to_i, last.to_i] : [first.ord, last.ord]
|
|
71
|
+
stride = step ? step.to_i.abs : 1
|
|
72
|
+
stride = 1 if stride.zero?
|
|
73
|
+
stride = -stride if from > to
|
|
74
|
+
count = (to - from).abs / stride.abs + 1
|
|
75
|
+
raise ExpansionError, "brace expansion exceeds #{LIMIT} words" if count > LIMIT
|
|
76
|
+
padded = numeric && [first, last].any? { |value| value.match?(/\A-?0\d/) }
|
|
77
|
+
width = [first.length, last.length].max
|
|
78
|
+
from.step(to, stride).map do |value|
|
|
79
|
+
text = numeric ? (padded ? format("%0#{width}d", value) : value.to_s) : value.chr
|
|
80
|
+
[Part.new(kind: :literal, text: text, quoted: false)]
|
|
81
|
+
end
|
|
82
|
+
end
|
|
83
|
+
|
|
84
|
+
def coalesce(parts)
|
|
85
|
+
parts.each_with_object([]) do |part, result|
|
|
86
|
+
if part.kind == :literal && result.last&.kind == :literal && result.last.quoted == part.quoted
|
|
87
|
+
previous = result.pop
|
|
88
|
+
result << Part.new(kind: :literal, text: previous.text + part.text, quoted: part.quoted)
|
|
89
|
+
else
|
|
90
|
+
result << part
|
|
91
|
+
end
|
|
92
|
+
end
|
|
93
|
+
end
|
|
94
|
+
end
|
|
95
|
+
end
|
|
96
|
+
end
|