Skip to content

Commit 39c84f4

Browse files
committed
Merge branch 'develop' into feture/publish-dev
# Conflicts: # src/OneScript.DebugProtocol/TcpServer/DefaultMessageServer.cs
2 parents 03eb2d4 + 3c5f0c7 commit 39c84f4

File tree

115 files changed

+49
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+49
-261
lines changed

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-dotnet@v5
2525
with:
26-
dotnet-version: '6.0.x'
26+
dotnet-version: '8.0.x'
2727

2828
- name: Установка OneScript
2929
uses: otymko/[email protected]

src/OneScript.Core/Compilation/Binding/SymbolTable.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ This Source Code Form is subject to the terms of the
77

88
using System.Collections;
99
using System.Collections.Generic;
10-
using OneScript.Contexts;
1110

1211
namespace OneScript.Compilation.Binding
1312
{

src/OneScript.Core/Contexts/ContextMethodInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ This Source Code Form is subject to the terms of the
99
using System.Globalization;
1010
using System.Linq;
1111
using System.Reflection;
12-
using System.Threading;
1312
using OneScript.Commons;
1413
using OneScript.Execution;
1514

src/OneScript.Core/Contexts/ContextPropertyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ This Source Code Form is subject to the terms of the
77

88
using System;
99
using System.Globalization;
10-
using System.Linq;
1110
using System.Reflection;
1211
using OneScript.Commons;
1312

src/OneScript.Core/Contexts/IAttachableContext.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ This Source Code Form is subject to the terms of the
55
at http://mozilla.org/MPL/2.0/.
66
----------------------------------------------------------*/
77

8-
using System;
98
using OneScript.Execution;
109

1110
namespace OneScript.Contexts
@@ -16,10 +15,6 @@ namespace OneScript.Contexts
1615
/// </summary>
1716
public interface IAttachableContext : IRuntimeContextInstance
1817
{
19-
[Obsolete]
20-
void OnAttach(out IVariable[] variables,
21-
out BslMethodInfo[] methods);
22-
2318
IVariable GetVariable(int index);
2419
BslMethodInfo GetMethod(int index);
2520

src/OneScript.Core/Exceptions/ComparisonException.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ This Source Code Form is subject to the terms of the
55
at http://mozilla.org/MPL/2.0/.
66
----------------------------------------------------------*/
77

8-
using System;
98
using OneScript.Localization;
109

1110
namespace OneScript.Exceptions

src/OneScript.Core/Values/BslDateValue.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,15 @@ public override bool Equals(BslValue other)
4343
}
4444

4545
public override int GetHashCode() => _value.GetHashCode();
46-
46+
47+
public override bool Equals(object obj)
48+
{
49+
if (obj is BslValue bsl)
50+
return Equals(bsl);
51+
52+
return false;
53+
}
54+
4755
public override TypeDescriptor SystemType => BasicTypes.Date;
4856

4957
#region Conversions

src/OneScript.Core/Values/BslObjectValue.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ This Source Code Form is subject to the terms of the
55
at http://mozilla.org/MPL/2.0/.
66
----------------------------------------------------------*/
77

8-
using OneScript.Exceptions;
9-
using OneScript.Localization;
10-
118
namespace OneScript.Values
129
{
1310
public abstract class BslObjectValue : BslValue

src/OneScript.Core/Values/BslStringValue.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ public override bool Equals(BslValue other)
4646
}
4747

4848
public override int GetHashCode() => _value.GetHashCode();
49+
50+
public override bool Equals(object obj)
51+
{
52+
if (obj is BslValue bsl)
53+
return Equals(bsl);
54+
55+
return false;
56+
}
4957

5058
public override int CompareTo(BslValue other)
5159
{

src/OneScript.Core/Values/EnumerationValue.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ This Source Code Form is subject to the terms of the
66
----------------------------------------------------------*/
77

88
using OneScript.Commons;
9-
using OneScript.Exceptions;
109
using OneScript.Localization;
1110
using OneScript.Types;
1211
using System;

0 commit comments

Comments
 (0)