Merge branch 'develop' into publish/2.1.0

Author: EvilBeaver

src/OneScript.Core/Contexts/BslFieldInfo.cs

@@ -16,9 +16,9 @@ namespace OneScript.Contexts
     public abstract class BslFieldInfo : FieldInfo, INameAndAliasProvider
     {
         private AnnotationHolder _annotations;
-
-        public string Alias => null;
-        
+
+        public abstract string Alias { get; }
+
         private AnnotationHolder Annotations
         {
             get

src/OneScript.Core/Contexts/BslScriptFieldInfo.cs

@@ -23,16 +23,19 @@ public class BslScriptFieldInfo : BslFieldInfo, IBuildableMember
         private Type _declaringType;
         private bool _isExported;
         private string _name;
+        private string _alias;
         private Type _dataType = typeof(BslValue);
         private int _dispId = -1;
 
         internal BslScriptFieldInfo(string name)
         {
             _name = name;
+            _alias = null;
         }
 
         public override Type DeclaringType => _declaringType;
         public override string Name => _name;
+        public override string Alias => _alias;
         public override Type ReflectedType => _declaringType;
 
         public int DispatchId => _dispId;
@@ -63,6 +66,7 @@ void IBuildableMember.SetName(string name)
 
         void IBuildableMember.SetAlias(string alias)
         {
+            _alias = alias;
         }
 
         void IBuildableMember.SetExportFlag(bool isExport)

src/OneScript.Native/Runtime/BuiltInFunctions.cs

@@ -265,6 +265,12 @@ public static int StrEntryCount(string where, string what)
         [ContextMethod("НачалоМесяца", "BegOfMonth")]
         public static DateTime BegOfMonth(DateTime date) => new DateTime(date.Year, date.Month, 1);
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [ContextMethod("НачалоНедели", "BegOfWeek")]
+        public static DateTime BegOfWeek(DateTime date)
+            => new DateTime(date.Year, date.Month, date.Day)
+                .AddDays(-((int)date.DayOfWeek+6)%7);
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         [ContextMethod("НачалоДня", "BegOfDay")]
         public static DateTime BegOfDay(DateTime date) => new DateTime(date.Year, date.Month, date.Day);
@@ -321,6 +327,12 @@ public static DateTime EndOfMonth(DateTime date)
             return new DateTime(year, month, DateTime.DaysInMonth(year, month), 23, 59, 59);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [ContextMethod("КонецНедели", "EndOfWeek")]
+        public static DateTime EndOfWeek(DateTime date)
+            => new DateTime(date.Year, date.Month, date.Day, 23, 59, 59)
+                .AddDays((7-(int)date.DayOfWeek) % 7);
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         [ContextMethod("КонецДня", "EndOfDay")]
         public static DateTime EndOfDay(DateTime date) => new DateTime(date.Year, date.Month, date.Day, 23, 59, 59);

src/ScriptEngine/Machine/Contexts/ThisAwareScriptedObjectBase.cs

@@ -99,7 +99,7 @@ private static void CompileTimeSymbols(TypeSymbolsProviderFactory providerFactor
                 .Name(THISOBJ_RU)
                 .Alias(THISOBJ_EN)
                 .ValueType(typeof(ThisAwareScriptedObjectBase))
-                .SetDispatchingIndex(0)
+                .SetDispatchingIndex(THISOBJ_VARIABLE_INDEX)
                 .Build()
                 .ToSymbol());
         }