Merge branch 'release/v1.0.21' into develop

Author: Andrei Ovsyankin

src/ScriptEngine.HostedScript/Library/Http/HttpRequestContext.cs

@@ -113,7 +113,7 @@ public IValue GetBodyAsString()
             return _body.GetAsString();
         }
 
-        [ContextMethod("ПолучитьТелоКакПоток", "GetBodyAsString")]
+        [ContextMethod("ПолучитьТелоКакПоток", "GetBodyAsStream")]
         public GenericStream GetBodyAsStream()
         {
             return new GenericStream(_body.GetDataStream());

src/ScriptEngine.HostedScript/Library/Reflector.cs

@@ -1,4 +1,4 @@
-/*----------------------------------------------------------
+/*----------------------------------------------------------
 This Source Code Form is subject to the terms of the 
 Mozilla Public License, v.2.0. If a copy of the MPL 
 was not distributed with this file, You can obtain one 
@@ -240,7 +240,7 @@ private static void FillMethodsTableForObject(IRuntimeContextInstance target, Va
         private static void FillMethodsTableForType(TypeTypeValue type, ValueTable.ValueTable result)
         {
             var clrType = GetReflectableClrType(type);
-            var clrMethods = clrType.GetMethods();
+            var clrMethods = clrType.GetMethods(BindingFlags.Instance|BindingFlags.NonPublic|BindingFlags.Public);
             FillMethodsTable(result, ConvertToOsMethods(clrMethods));
         }
 
@@ -290,22 +290,38 @@ private static void FillPropertiesTableForType(TypeTypeValue type, ValueTable.Va
                                          PropDef = x.GetCustomAttribute<ContextPropertyAttribute>(),
                                          Prop = x
                                      })
-                                     .Where(x=>x.PropDef != null)
-                                     .ToArray();
+                                     .Where(x=>x.PropDef != null);
 
-            var infos = new VariableInfo[nativeProps.Length];
-            for (int i = 0; i < nativeProps.Length; i++)
+            int indices = 0;
+            var infos = new List<VariableInfo>();
+            foreach(var prop in nativeProps)
             {
-                infos[i] = new VariableInfo();
-                infos[i].Type = SymbolType.ContextProperty;
-                infos[i].Index = i;
-                infos[i].Identifier = nativeProps[i].PropDef.GetName();
-                infos[i].Annotations = GetAnnotations(nativeProps[i].Prop.GetCustomAttributes<UserAnnotationAttribute>());
+                var info = new VariableInfo();
+                info.Type = SymbolType.ContextProperty;
+                info.Index = indices++;
+                info.Identifier = prop.PropDef.GetName();
+                info.Annotations = GetAnnotations(prop.Prop.GetCustomAttributes<UserAnnotationAttribute>());
+                infos.Add(info);
+            }
+
+            if (clrType.BaseType == typeof(ScriptDrivenObject))
+            {
+                var nativeFields = clrType.GetFields();
+                foreach(var field in nativeFields)
+                {
+                    var info = new VariableInfo();
+                    info.Type = SymbolType.ContextProperty;
+                    info.Index = indices++;
+                    info.Identifier = field.Name;
+                    info.Annotations = GetAnnotations(field.GetCustomAttributes<UserAnnotationAttribute>());
+                    infos.Add(info);
+                }
             }
 
             FillPropertiesTable(result, infos);
+
         }
-        
+
         private static void FillMethodsTable(ValueTable.ValueTable result, IEnumerable<MethodInfo> methods)
         {
             var nameColumn = result.Columns.Add("Имя", TypeDescription.StringType(), "Имя");

src/ScriptEngine.HostedScript/ScriptEngine.HostedScript.csproj

@@ -32,7 +32,7 @@
     <PackageTags>BSL 1C 1Script OneScript</PackageTags>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|net452'">
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>bin\Release\net452\ScriptEngine.HostedScript.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
 

src/ScriptEngine/Compiler/Compiler.cs

@@ -28,7 +28,6 @@ class Compiler    {
         private Parser _parser;
         private ICompilerContext _ctx;
         private ModuleImage _module;
-        private Lexem _previousExtractedLexem;
         private Lexem _lastExtractedLexem;
         private bool _inMethodScope = false;
         private bool _isMethodsDefined = false;
@@ -2008,7 +2007,6 @@ private void NextToken()
         {
             if (_lastExtractedLexem.Token != Token.EndOfText)
             {
-                _previousExtractedLexem = _lastExtractedLexem;
                 _lastExtractedLexem = _parser.NextLexem();
             }
             else

src/ScriptEngine/Machine/Contexts/DocumenterHintAttribute.cs

@@ -0,0 +1,29 @@
+/*----------------------------------------------------------
+This Source Code Form is subject to the terms of the 
+Mozilla Public License, v.2.0. If a copy of the MPL 
+was not distributed with this file, You can obtain one 
+at http://mozilla.org/MPL/2.0/.
+----------------------------------------------------------*/
+
+using System;
+
+
+namespace ScriptEngine.Machine.Contexts
+{
+    [AttributeUsage(AttributeTargets.Class|AttributeTargets.Enum)]
+    public class DocumenterHintAttribute : Attribute
+    {
+        public string Name { get; set; }
+
+        public string Alias { get; set; }
+
+        public ContextKind Kind { get; set; }
+    }
+
+    public enum ContextKind
+    {
+        Class,
+        GlobalContext,
+        Enumeration
+    }
+}

src/ScriptEngine/Machine/LoadedModule.cs

@@ -33,8 +33,17 @@ public LoadedModule(ModuleImage image)
                 var def = image.Constants[i];
                 Constants[i] = ValueFactory.Parse(def.Presentation, def.Type);
             }
-            
-            // Resolve annotation constants
+
+            ResolveAnnotationConstants();
+        }
+
+        private void ResolveAnnotationConstants()
+        {
+            for (int i = 0; i < Variables.Count; i++)
+            {
+                EvaluateAnnotationParametersValues(Variables[i].Annotations);
+            }
+
             for (int i = 0; i < Methods.Length; i++)
             {
                 EvaluateAnnotationParametersValues(Methods[i].Signature.Annotations);
@@ -43,7 +52,6 @@ public LoadedModule(ModuleImage image)
                     EvaluateAnnotationParametersValues(Methods[i].Signature.Params[j].Annotations);
                 }
             }
-
         }
 
         private void EvaluateAnnotationParametersValues(AnnotationDefinition[] annotations)

src/ScriptEngine/Machine/Reflection/ClassBuilder.cs

@@ -134,6 +134,14 @@ public IReflectedClassBuilder ExportScriptVariables()
                     System.Diagnostics.Debug.Assert(variable.Index == exported.Index, "indices of vars and exports are equal");
 
                 var fieldInfo = new ReflectedFieldInfo(variable, exportFlag);
+                if (variable.Annotations != null)
+                {
+                    foreach (var annotation in variable.Annotations)
+                    {
+                        fieldInfo.AddAnnotation(annotation);
+                    }
+                }
+
                 _fields.Add(fieldInfo);
             }
 

src/ScriptEngine/Machine/Reflection/ReflectedFieldInfo.cs

@@ -23,6 +23,8 @@ public class ReflectedFieldInfo : FieldInfo
         private bool _isPublic;
         private readonly VariableInfo _info;
 
+        private readonly List<UserAnnotationAttribute> _attributes = new List<UserAnnotationAttribute>();
+
         public ReflectedFieldInfo(VariableInfo info, bool isPublic)
         {
             _info = info;
@@ -34,14 +36,25 @@ public void SetDeclaringType(Type declType)
             _declaringType = declType;
         }
 
+        private IEnumerable<UserAnnotationAttribute> GetCustomAttributesInternal(bool inherit)
+        {
+            return _attributes;
+        }
+
         public override object[] GetCustomAttributes(bool inherit)
         {
-            return new object[0];
+            return GetCustomAttributesInternal(inherit).ToArray();
+        }
+
+        public override object[] GetCustomAttributes(Type attributeType, bool inherit)
+        {
+            var attribs = GetCustomAttributesInternal(inherit);
+            return attribs.Where(x => x.GetType() == attributeType).ToArray();
         }
 
         public override bool IsDefined(Type attributeType, bool inherit)
         {
-            return false;
+            return GetCustomAttributes(inherit).Any(x => x.GetType() == attributeType);
         }
 
         public override object GetValue(object obj)
@@ -92,9 +105,12 @@ public override RuntimeFieldHandle FieldHandle
             get { throw new NotImplementedException(); }
         }
 
-        public override object[] GetCustomAttributes(Type attributeType, bool inherit)
+        public void AddAnnotation(AnnotationDefinition annotation)
         {
-            return GetCustomAttributes(inherit);
+            _attributes.Add(new UserAnnotationAttribute()
+            {
+                Annotation = annotation
+            });
         }
     }
 }

src/ScriptEngine/Machine/Reflection/ReflectedParamInfo.cs

@@ -17,10 +17,11 @@ namespace ScriptEngine.Machine.Contexts
 {
     public class ReflectedParamInfo : ParameterInfo
     {
-        private readonly List<object> _attributes;
+        private readonly List<Attribute> _attributes;
 
         public ReflectedParamInfo(string name, bool isByVal)
         {
+            _attributes = new List<Attribute>();
             NameImpl = name;
             AttrsImpl = ParameterAttributes.In;
             if (!isByVal)
@@ -29,7 +30,6 @@ public ReflectedParamInfo(string name, bool isByVal)
             }
 
             ClassImpl = typeof(IValue);
-            _attributes = new List<object>();
         }
 
         internal void SetOwner(MemberInfo owner)
@@ -59,14 +59,20 @@ public void SetDefaultValue(IValue val)
 
         public override bool HasDefaultValue => DefaultValue != null;
 
+        private IEnumerable<Attribute> GetCustomAttributesInternal(bool inherit)
+        {
+            return _attributes;
+        }
+
         public override object[] GetCustomAttributes(bool inherit)
         {
-            return _attributes.ToArray();
+            return GetCustomAttributesInternal(inherit).ToArray();
         }
 
         public override object[] GetCustomAttributes(Type attributeType, bool inherit)
         {
-            return GetCustomAttributes(inherit).Where(x => x.GetType() == attributeType).ToArray();
+            var attribs = GetCustomAttributesInternal(inherit);
+            return attribs.Where(x => x.GetType() == attributeType).ToArray();
         }
 
         public override bool IsDefined(Type attributeType, bool inherit)