fix #1663: клонирование значений многомерного массива +тест#1664
Open
Mr-Rm wants to merge 4 commits intoEvilBeaver:developfrom
Open
fix #1663: клонирование значений многомерного массива +тест#1664Mr-Rm wants to merge 4 commits intoEvilBeaver:developfrom
Mr-Rm wants to merge 4 commits intoEvilBeaver:developfrom
Conversation
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (5)
✅ Files skipped from review due to trivial changes (3)
🚧 Files skipped from review as they are similar to previous changes (1)
📝 WalkthroughWalkthroughRefactors ArrayImpl: adds a public presized constructor, simplifies null handling in Add/Insert/Find, replaces FillArray with CreateArray, changes CloneArray to pre-size and deep-clone nested arrays, rewrites multi-dimensional Constructor validation and build logic, and adds unit tests for array behaviors. Changes
Sequence Diagram(s)(omitted) Estimated code review effort🎯 4 (Complex) | ⏱️ ~50 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@src/OneScript.StandardLibrary/Collections/ArrayImpl.cs`:
- Around line 204-223: Add a guard at the start of Constructor(IValue[]
dimensions) to handle null or empty input: check if dimensions is null or
dimensions.Length == 0 and throw an appropriate RuntimeException (e.g., a
missing/invalid argument count error) before any access to dimensions[0] or
dimensions[^1]; ensure this check comes before the existing special-case for
FixedArrayImpl and before the for-loop so subsequent uses (the null/type checks,
the AsNumber() calls, computing bound, and calling new ArrayImpl(...) /
FillArray(...)) cannot throw NullReferenceException or IndexOutOfRangeException.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: 94e5e234-0f1d-40bb-acf7-7b726525542f
📒 Files selected for processing (2)
src/OneScript.StandardLibrary/Collections/ArrayImpl.cstests/array.os
Comment on lines
+204
to
+223
| public static ArrayImpl Constructor(IValue[] dimensions) | ||
| { | ||
| if (dimensions.Length == 1 && dimensions[0] is FixedArrayImpl fa) | ||
| { | ||
| return Constructor(fa); | ||
| { | ||
| return Constructor(fa); | ||
| } | ||
| ArrayImpl cloneable = null; | ||
| for (int dim = dimensions.Length - 1; dim >= 0; dim--) | ||
|
|
||
| // fail fast | ||
| for (int dim = 0; dim < dimensions.Length; dim++) | ||
| { | ||
| if (dimensions[dim] == null) | ||
| throw RuntimeException.InvalidNthArgumentType(dim + 1); | ||
|
|
||
| int bound = (int)dimensions[dim].AsNumber(); | ||
| if (bound <= 0) | ||
| throw RuntimeException.InvalidNthArgumentType(dim + 1); | ||
|
|
||
| if ((int)dimensions[dim].AsNumber() <= 0) | ||
| throw RuntimeException.InvalidNthArgumentValue(dim + 1); | ||
|
|
||
| var newInst = new ArrayImpl(); | ||
| FillArray(newInst, bound); | ||
| if(cloneable != null) | ||
| { | ||
| for (int i = 0; i < bound; i++) | ||
| { | ||
| newInst._values[i] = CloneArray(cloneable); | ||
| } | ||
| } | ||
| cloneable = newInst; | ||
|
|
||
| } | ||
|
|
||
| int bound = (int)dimensions[^1].AsNumber(); | ||
| var newInst = new ArrayImpl(bound); | ||
| FillArray(newInst, bound); |
Contributor
There was a problem hiding this comment.
Guard Constructor(IValue[] dimensions) against null/empty input.
Line 206 and Line 221 assume dimensions is non-null and non-empty. A direct call with null or Array.Empty<IValue>() currently leaks NullReferenceException / IndexOutOfRangeException from a public entry point instead of handling the case intentionally.
🛡️ Proposed fix
[ScriptConstructor(Name = "По количеству элементов")]
public static ArrayImpl Constructor(IValue[] dimensions)
{
+ if (dimensions == null)
+ throw new ArgumentNullException(nameof(dimensions));
+ if (dimensions.Length == 0)
+ return Constructor();
+
if (dimensions.Length == 1 && dimensions[0] is FixedArrayImpl fa)
{
return Constructor(fa);
}🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@src/OneScript.StandardLibrary/Collections/ArrayImpl.cs` around lines 204 -
223, Add a guard at the start of Constructor(IValue[] dimensions) to handle null
or empty input: check if dimensions is null or dimensions.Length == 0 and throw
an appropriate RuntimeException (e.g., a missing/invalid argument count error)
before any access to dimensions[0] or dimensions[^1]; ensure this check comes
before the existing special-case for FixedArrayImpl and before the for-loop so
subsequent uses (the null/type checks, the AsNumber() calls, computing bound,
and calling new ArrayImpl(...) / FillArray(...)) cannot throw
NullReferenceException or IndexOutOfRangeException.
dmpas
approved these changes
Apr 5, 2026
Contributor
There was a problem hiding this comment.
♻️ Duplicate comments (1)
src/OneScript.StandardLibrary/Collections/ArrayImpl.cs (1)
192-194:⚠️ Potential issue | 🟡 MinorGuard
Constructor(IValue[] dimensions)againstnull.The empty-array case is fine now, but direct C# calls with
nullstill blow up on Line 194 viadimensions.Length. Add an explicit check so this public entry point fails intentionally instead of leakingNullReferenceException.🛡️ Proposed fix
[ScriptConstructor(Name = "По количеству элементов")] public static ArrayImpl Constructor(IValue[] dimensions) { + if (dimensions == null) + throw new System.ArgumentNullException(nameof(dimensions)); + if (dimensions.Length == 1 && dimensions[0] is FixedArrayImpl fa) { return Constructor(fa);🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@src/OneScript.StandardLibrary/Collections/ArrayImpl.cs` around lines 192 - 194, The public static ArrayImpl Constructor(IValue[] dimensions) currently dereferences dimensions without guarding for null; add an explicit null check at the start of the Constructor method (the ArrayImpl.Constructor(IValue[] dimensions) entry point) and throw a clear exception (e.g., ArgumentNullException for "dimensions") so callers receive an intentional, descriptive failure instead of a NullReferenceException.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Duplicate comments:
In `@src/OneScript.StandardLibrary/Collections/ArrayImpl.cs`:
- Around line 192-194: The public static ArrayImpl Constructor(IValue[]
dimensions) currently dereferences dimensions without guarding for null; add an
explicit null check at the start of the Constructor method (the
ArrayImpl.Constructor(IValue[] dimensions) entry point) and throw a clear
exception (e.g., ArgumentNullException for "dimensions") so callers receive an
intentional, descriptive failure instead of a NullReferenceException.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: 592b1f66-8c3f-4e72-a73f-b8b20ade69d7
📒 Files selected for processing (2)
src/OneScript.StandardLibrary/Collections/ArrayImpl.cstests/array.os
🚧 Files skipped from review as they are similar to previous changes (1)
- tests/array.os
Contributor
There was a problem hiding this comment.
♻️ Duplicate comments (1)
src/OneScript.StandardLibrary/Collections/ArrayImpl.cs (1)
244-248:⚠️ Potential issue | 🟡 MinorGuard
Constructor(IValue[] dimensions)againstnull.Line 246 still dereferences
dimensionsbefore any guard, so a direct C# call withnullleaksNullReferenceExceptionfrom a public entry point.🛡️ Suggested change
public static ArrayImpl Constructor(IValue[] dimensions) { + if (dimensions == null) + throw new System.ArgumentNullException(nameof(dimensions)); + if (dimensions.Length == 0) + return Constructor(); + if (dimensions.Length == 1 && dimensions[0] is FixedArrayImpl fa) { return Constructor(fa); }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@src/OneScript.StandardLibrary/Collections/ArrayImpl.cs` around lines 244 - 248, The public static method Constructor(IValue[] dimensions) currently dereferences dimensions before validating it; add a null guard at the very start of Constructor(IValue[] dimensions) (before checking dimensions.Length or pattern-matching to FixedArrayImpl) and throw an ArgumentNullException(nameof(dimensions)) (or otherwise handle null consistently with the library's API) so callers passing null get a clear, intentional exception instead of a leaked NullReferenceException; ensure the FixedArrayImpl pattern match (fa) remains after the guard.
🧹 Nitpick comments (1)
src/OneScript.StandardLibrary/Collections/ArrayImpl.cs (1)
33-36: Keep the capacity-only constructor non-public.
new ArrayImpl(3)reads like a sized-array constructor to C# callers, but it only reserves capacity and leavesCount()at 0. If this overload exists only forCreateArrayandCloneArray, make itprivateorinternal.♻️ Suggested change
- public ArrayImpl(int size) + private ArrayImpl(int size) { _values = new List<IValue>(size); }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@src/OneScript.StandardLibrary/Collections/ArrayImpl.cs` around lines 33 - 36, The public ArrayImpl(int size) constructor exposes a capacity-only ctor that leaves Count() at 0; change its accessibility to non-public (make the ArrayImpl(int size) constructor private or internal) so C# callers can't mistake it for a sized-array constructor, and update or confirm callers (e.g., CreateArray and CloneArray) still compile and reference this non-public ctor; keep the signature and behavior unchanged except for the accessibility modifier.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Duplicate comments:
In `@src/OneScript.StandardLibrary/Collections/ArrayImpl.cs`:
- Around line 244-248: The public static method Constructor(IValue[] dimensions)
currently dereferences dimensions before validating it; add a null guard at the
very start of Constructor(IValue[] dimensions) (before checking
dimensions.Length or pattern-matching to FixedArrayImpl) and throw an
ArgumentNullException(nameof(dimensions)) (or otherwise handle null consistently
with the library's API) so callers passing null get a clear, intentional
exception instead of a leaked NullReferenceException; ensure the FixedArrayImpl
pattern match (fa) remains after the guard.
---
Nitpick comments:
In `@src/OneScript.StandardLibrary/Collections/ArrayImpl.cs`:
- Around line 33-36: The public ArrayImpl(int size) constructor exposes a
capacity-only ctor that leaves Count() at 0; change its accessibility to
non-public (make the ArrayImpl(int size) constructor private or internal) so C#
callers can't mistake it for a sized-array constructor, and update or confirm
callers (e.g., CreateArray and CloneArray) still compile and reference this
non-public ctor; keep the signature and behavior unchanged except for the
accessibility modifier.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: 9dd8c8ae-71d4-4052-98ae-4a4bbfe1faee
📒 Files selected for processing (1)
src/OneScript.StandardLibrary/Collections/ArrayImpl.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Исправлено клонирование вложенных массивов при создании массива размерности > 2.
Значения во внешнем массиве не перекрываются при присваивании.
Ошибочные значения размерностей проверяются начиная с первой, а не с последней.
Summary by CodeRabbit