Skip to content

Ошибка в операции с датой #1692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EvilBeaver merged 3 commits into from
Jun 1, 2026
Merged

Ошибка в операции с датой #1692

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f06259
ошибка в сложении с датой
Mr-Rm May 31, 2026
7f3a4dc
вычитание из даты с приведением типа
Mr-Rm May 31, 2026
09a5044
рефакторинг мелкий
Mr-Rm May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 59 additions & 94 deletions src/OneScript.Native/Runtime/DynamicOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,68 +28,39 @@ public static BslValue Add(BslValue left, BslValue right)
if (left is BslStringValue str)
return BslStringValue.Create(str + right);

if (left is BslDateValue bslDate && right is BslNumericValue num)
{
return BslDateValue.Create(bslDate - (decimal) num);
}
if (left is BslDateValue bslDate)
return BslDateValue.Create(bslDate + (decimal)right);

var dLeft = (decimal)left;
var dRight = (decimal)right;
return BslNumericValue.Create(dLeft + dRight);
return BslNumericValue.Create(dLeft + dRight); // or throw ConvertToNumberException();
}

public static BslValue Subtract(BslValue left, BslValue right)
{
if (left is BslNumericValue num)
return BslNumericValue.Create(num - (decimal)right);

if (left is BslDateValue date)
{
var result = num - (decimal)right;
return BslNumericValue.Create(result);
}
else if (left is BslDateValue date)
{
switch (right)
{
case BslNumericValue numRight:
{
var result = date - numRight;
return BslDateValue.Create(result);
}
case BslDateValue dateRight:
{
var result = date - dateRight;
return BslNumericValue.Create(result);
}
}
}
else
{
var dLeft = (decimal)left;
var dRight = (decimal)right;
return BslNumericValue.Create(dLeft - dRight);
if (right is BslDateValue dateRight)
return BslNumericValue.Create(date - dateRight);

return BslDateValue.Create(date - (decimal)right);
}

throw BslExceptions.ConvertToNumberException();
}

public static bool ToBoolean(BslValue value)
{
return (bool)value;
}

public static decimal ToNumber(BslValue value)
{
return (decimal)value;
}

public static DateTime ToDate(BslValue value)
{
return (DateTime)value;
}

public static string ToString(BslValue value)
{
return value.ToString();
}
var dLeft = (decimal)left;
var dRight = (decimal)right;
return BslNumericValue.Create(dLeft - dRight); // or throw ConvertToNumberException();
}

public static bool ToBoolean(BslValue value) => (bool)value;

public static decimal ToNumber(BslValue value) => (decimal)value;

public static DateTime ToDate(BslValue value) => (DateTime)value;

public static string ToString(BslValue value) => value.ToString();

// FIXME: тут не должно быть Null, но из-за несовершенства мира они тут бывают. Когда задолбает - надо починить и убрать отсюда проверки на null
public static bool Equality(BslValue left, BslValue right)
Expand All @@ -116,32 +87,32 @@ public static int Comparison(BslValue left, BslValue right)
}

public static BslValue WrapClrObjectToValue(object value)
{
{
return value switch
{
null => BslUndefinedValue.Instance,
string s => BslStringValue.Create(s),
decimal d => BslNumericValue.Create(d),

int n => BslNumericValue.Create(n),
uint n => BslNumericValue.Create(n),
short n => BslNumericValue.Create(n),
ushort n => BslNumericValue.Create(n),
byte n => BslNumericValue.Create(n),
sbyte n => BslNumericValue.Create(n),
long l => BslNumericValue.Create(l),
ulong l => BslNumericValue.Create(l),
double dbl => BslNumericValue.Create((decimal) dbl),
bool boolean => BslBooleanValue.Create(boolean),
DateTime date => BslDateValue.Create(date),
BslValue bslValue => bslValue,
_ => throw new TypeConversionException(new BilingualString(
$"Невозможно преобразовать {value.GetType()} в тип {nameof(BslValue)}",
$"Can't Convert {value.GetType()} to {nameof(BslValue)}"))
};
}
null => BslUndefinedValue.Instance,
string s => BslStringValue.Create(s),
decimal d => BslNumericValue.Create(d),
int n => BslNumericValue.Create(n),
uint n => BslNumericValue.Create(n),
short n => BslNumericValue.Create(n),
ushort n => BslNumericValue.Create(n),
byte n => BslNumericValue.Create(n),
sbyte n => BslNumericValue.Create(n),
long l => BslNumericValue.Create(l),
ulong l => BslNumericValue.Create(l),
double dbl => BslNumericValue.Create((decimal) dbl),
bool boolean => BslBooleanValue.Create(boolean),
DateTime date => BslDateValue.Create(date),
BslValue bslValue => bslValue,
_ => throw new TypeConversionException(new BilingualString(
$"Невозможно преобразовать {value.GetType()} в тип {nameof(BslValue)}",
$"Can't Convert {value.GetType()} to {nameof(BslValue)}"))
};
}
public static BslValue ConstructorCall(ITypeManager typeManager, IServiceContainer services, string typeName, IBslProcess process, BslValue[] args)
{
var type = typeManager.GetTypeByName(typeName);
Expand All @@ -155,39 +126,33 @@ public static BslValue ConstructorCall(ITypeManager typeManager, IServiceContain
};

return (BslValue) factory.Activate(context, args.Cast<IValue>().ToArray());
}

// TODO: Сделать прямой маппинг на статические фабрики-методы, а не через Factory.Activate
public static T StrictConstructorCall<T>(ITypeManager typeManager, IServiceContainer services, string typeName, IBslProcess process, BslValue[] args)
}

// TODO: Сделать прямой маппинг на статические фабрики-методы, а не через Factory.Activate
public static T StrictConstructorCall<T>(ITypeManager typeManager, IServiceContainer services,
string typeName, IBslProcess process, BslValue[] args)
where T : BslValue
{
return (T) ConstructorCall(typeManager, services, typeName, process, args);
}
=> (T)ConstructorCall(typeManager, services, typeName, process, args);

public static BslObjectValue GetExceptionInfo(IExceptionInfoFactory factory, Exception e)
{
return factory.GetExceptionInfo(e);
}
=> factory.GetExceptionInfo(e);

public static BslTypeValue GetTypeByName(ITypeManager manager, string name)
{
var foundType = manager.GetTypeByName(name);
return new BslTypeValue(foundType);
}
=> new(manager.GetTypeByName(name));
Copy link
Copy Markdown
Owner

@EvilBeaver EvilBeaver Jun 1, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Просьба пояснить эту магию

Copy link
Copy Markdown
Owner

@EvilBeaver EvilBeaver Jun 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Разобрался, это новый синтаксис конструктора new, просто в возвращаемом значении я к нему не привык, обычно они встречаются в инициализации полей..

Copy link
Copy Markdown
Collaborator Author

@Mr-Rm Mr-Rm Jun 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. убираем временную переменную
-            var foundType = manager.GetTypeByName(name);
-            return new BslTypeValue(foundType);
+           return new BslTypeValue(manager.GetTypeByName(name));
  1. меняем body на lambda
- {
-           return new BslTypeValue(manager.GetTypeByName(name));
- }
+  => new BslTypeValue(manager.GetTypeByName(name));
  1. используем автовывод типа (C#9)
-   => new BslTypeValue(manager.GetTypeByName(name));
+  => new(manager.GetTypeByName(name));


public static BslValue GetIndexedValue(object target, BslValue index)
{
if (!(target is IRuntimeContextInstance context) || !context.IsIndexed)
if (target is not IRuntimeContextInstance context || !context.IsIndexed)
{
throw RuntimeException.IndexedAccessIsNotSupportedException();
}

return (BslValue)context.GetIndexedValue((IValue)index);
return (BslValue)context.GetIndexedValue(index);
}

public static void SetIndexedValue(object target, BslValue index, BslValue value)
{
if (!(target is IRuntimeContextInstance context) || !context.IsIndexed)
if (target is not IRuntimeContextInstance context || !context.IsIndexed)
{
throw RuntimeException.IndexedAccessIsNotSupportedException();
}
Expand All @@ -197,7 +162,7 @@ public static void SetIndexedValue(object target, BslValue index, BslValue value

public static BslValue GetPropertyValue(object target, string propertyName)
{
if (!(target is IRuntimeContextInstance context))
if (target is not IRuntimeContextInstance context)
throw BslExceptions.ValueIsNotObjectException();

var propIndex = context.GetPropertyNumber(propertyName);
Expand All @@ -206,7 +171,7 @@ public static BslValue GetPropertyValue(object target, string propertyName)

public static BslValue TryCallContextMethod(BslValue instance, string methodName, IBslProcess process, BslValue[] arguments)
{
if (!(instance is IRuntimeContextInstance context))
if (instance is not IRuntimeContextInstance context)
throw BslExceptions.ValueIsNotObjectException();

return CallContextMethod(context, methodName, process, arguments);
Expand Down