Merge branch 'master' of https://github.com/exilon/QuickLib

Author: exilon

Quick.Console.pas

@@ -943,7 +943,7 @@ procedure TConsoleMenu.AddMenu(const cMenuCaption: string; const cMenuKey: Word;
   {$IFDEF DELPHIXE7_UP}
   fConsoleMenu := fConsoleMenu + [conmenu];
   {$ELSE}
-  SetLength(fConsoleMenu,High(fConsoleMenu)+1);
+  SetLength(fConsoleMenu,Length(fConsoleMenu)+1);
   fConsoleMenu[High(fConsoleMenu)] := conmenu;
   {$ENDIF}
 end;
@@ -953,7 +953,7 @@ procedure TConsoleMenu.AddMenu(MenuOption: TConsoleMenuOption);
   {$IFDEF DELPHIXE7_UP}
   fConsoleMenu := fConsoleMenu + [MenuOption];
   {$ELSE}
-  SetLength(fConsoleMenu,High(fConsoleMenu)+1);
+  SetLength(fConsoleMenu,Length(fConsoleMenu)+1);
   fConsoleMenu[High(fConsoleMenu)] := MenuOption;
   {$ENDIF}
 end;

Quick.IOC.pas

@@ -223,6 +223,14 @@   TIocServiceLocator = class
     class function TryToGetService<T: IInterface>(aService : T) : Boolean;
   end;
 
+  Name = class(TCustomAttribute)
+  private
+    fName: string;
+  public
+    constructor Create(aName: string);
+    property Name: String read fName;
+  end;
+
   EIocRegisterError = class(Exception);
   EIocResolverError = class(Exception);
   EIocBuildError = class(Exception);
@@ -609,6 +617,8 @@ function TIocResolver.CreateInstance(aClass: TClass): TValue;
   rParam : TRttiParameter;
   value : TValue;
   values : TArray<TValue>;
+  att: TCustomAttribute;
+  attname: string;
 begin
   Result := nil;
   rtype := ctx.GetType(aClass);
@@ -627,7 +637,17 @@ function TIocResolver.CreateInstance(aClass: TClass): TValue;
       begin
         for rParam in rmethod.GetParameters do
         begin
-          value := Resolve(rParam.ParamType.Handle);
+          attname := EmptyStr;
+          for att in rParam.GetAttributes do
+          begin
+            if att is Name then
+            begin
+              attname := Name(att).Name;
+              Break;
+            end;
+          end;
+
+          value := Resolve(rParam.ParamType.Handle, attname);
           values := values + [value];
         end;
         Result := rmethod.Invoke(TRttiInstanceType(rtype).MetaclassType,values);
@@ -816,4 +836,11 @@ function TSimpleFactory<TInterface, TImplementation>.New: TInterface;
   Result := fResolver.CreateInstance(TClass(TImplementation)).AsType<TInterface>;
 end;
 
+{ Name }
+constructor Name.Create(aName: string);
+begin
+  fName := aName;
+end;
+
+
 end.

Quick.RTTI.Utils.pas

@@ -88,6 +88,7 @@ class function TRTTI.CreateInstance<T>(const Args: array of TValue): T;
   rmethod: TRttiMethod;
   rinstype: TRttiInstanceType;
 begin
+  Result := Default(T);
   rtype := fCtx.GetType(TypeInfo(T));
   for rmethod in rtype.GetMethods do
   begin

Quick.Threads.pas

@@ -685,7 +685,7 @@ procedure TThreadedQueueCS<T>.Clear;
   try
     for obj in FQueue do
     begin
-      if TypeInfo(T) = TypeInfo(TObject) then PObject(@obj){$IFNDEF FPC}.DisposeOf;{$ELSE}.Free;{$ENDIF}
+      if TypeInfo(T) = TypeInfo(TObject) then PObject(@obj){$ifndef FPC}{$IFDEF  DELPHIRX12_UP}.Free{$ELSE}.DisposeOf{$ENDIF}{$ELSE}.Free{$ENDIF};
     end;
 
     SetLength(FQueue,0);