[JEDI.NET-commits] main/run Jedi.IO.Paths.pas,1.2,1.3 Jedi.System.Attributes.pas,1.2,1.3 Jedi.System
Status: Pre-Alpha
Brought to you by:
jedi_mbe
Menu
▾
▴
[JEDI.NET-commits] main/run Jedi.IO.Paths.pas,1.2,1.3 Jedi.System.Attributes.pas,1.2,1.3 Jedi.System.CommandLine.pas,1.3,1.4 Jedi.System.FrameworkResources.pas,1.1,1.2 Jedi.System.SourceVersioning.pas,1.4,1.5
|
From: Marcel B. <jed...@us...> - 2005-03-14 13:30:30
|
Update of /cvsroot/jedidotnet/main/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14773/main/run Modified Files: Jedi.IO.Paths.pas Jedi.System.Attributes.pas Jedi.System.CommandLine.pas Jedi.System.FrameworkResources.pas Jedi.System.SourceVersioning.pas Log Message: Changed occurances of '<param>: array of <type>' to '<param>: <type>Array' (and declared that array type) for each method where such a construct is the last parameter of the declaration; this avoids the compiler adding a ParamArray attribute, which implies slightly differing semantics. Index: Jedi.System.CommandLine.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.System.CommandLine.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Jedi.System.CommandLine.pas 1 Mar 2005 15:10:17 -0000 1.3 --- Jedi.System.CommandLine.pas 14 Mar 2005 13:30:13 -0000 1.4 *************** *** 128,134 **** procedure ParseImpl(commandLine: string); procedure RegisterArgument(instance: &Object; memberInfo: MemberInfo; attr: CommandLineArgumentAttribute); overload; ! procedure RegisterArgument(instance: &Object; memberInfo: MemberInfo; attributes: array of &Object); overload; procedure RegisterInstance(instance: &Object); ! procedure RegisterInstances(instances: array of &Object); procedure RegisterType(&type: &Type); overload; procedure RegisterType(&type: &Type; instance: &Object); overload; --- 128,134 ---- procedure ParseImpl(commandLine: string); procedure RegisterArgument(instance: &Object; memberInfo: MemberInfo; attr: CommandLineArgumentAttribute); overload; ! procedure RegisterArgument(instance: &Object; memberInfo: MemberInfo; attributes: ObjectArray); overload; procedure RegisterInstance(instance: &Object); ! procedure RegisterInstances(instances: ObjectArray); procedure RegisterType(&type: &Type); overload; procedure RegisterType(&type: &Type; instance: &Object); overload; *************** *** 139,144 **** class function Parse(arguments: array of &Object): StringArray; overload; static; class function Parse(arguments: array of &Object; responseFilePrefix: string): StringArray; overload; static; ! class function Parse(commandLine: string; arguments: array of &Object): StringArray; overload; static; ! class function Parse(commandLine: string; arguments: array of &Object; responseFilePrefix: string): StringArray; overload; static; {$ENDREGION} end; --- 139,145 ---- class function Parse(arguments: array of &Object): StringArray; overload; static; class function Parse(arguments: array of &Object; responseFilePrefix: string): StringArray; overload; static; ! class function Parse(commandLine: string; arguments: ObjectArray): StringArray; overload; static; ! class function Parse(commandLine: string; arguments: array of &Object; ! responseFilePrefix: string): StringArray; overload; static; {$ENDREGION} end; Index: Jedi.System.Attributes.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.System.Attributes.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jedi.System.Attributes.pas 22 Jan 2005 15:05:05 -0000 1.2 --- Jedi.System.Attributes.pas 14 Mar 2005 13:30:13 -0000 1.3 *************** *** 53,57 **** operation: AttributeCombineOperation): ArrayList; overload; static; public ! class function CombineAttributes(attributes1, attributes2: array of Attribute): AttributeArray; overload; static; class function CombineAttributes(attributes1, attributes2: array of Attribute; operation: AttributeCombineOperation): AttributeArray; overload; static; --- 53,57 ---- operation: AttributeCombineOperation): ArrayList; overload; static; public ! class function CombineAttributes(attributes1, attributes2: AttributeArray): AttributeArray; overload; static; class function CombineAttributes(attributes1, attributes2: array of Attribute; operation: AttributeCombineOperation): AttributeArray; overload; static; *************** *** 64,69 **** class function CombineAttributes(attributes1: array of Attribute; attributes2: AttributeCollection; operation: AttributeCombineOperation): AttributeArray; overload; static; ! class function CombineAttributes(attributes1: AttributeCollection; attributes2: ! array of Attribute): AttributeCollection; overload; static; class function CombineAttributes(attributes1: AttributeCollection; attributes2: array of Attribute; operation: AttributeCombineOperation): AttributeCollection; overload; static; --- 64,69 ---- class function CombineAttributes(attributes1: array of Attribute; attributes2: AttributeCollection; operation: AttributeCombineOperation): AttributeArray; overload; static; ! class function CombineAttributes(attributes1: AttributeCollection; ! attributes2: AttributeArray): AttributeCollection; overload; static; class function CombineAttributes(attributes1: AttributeCollection; attributes2: array of Attribute; operation: AttributeCombineOperation): AttributeCollection; overload; static; *************** *** 76,80 **** strict protected class function IndexOf(attrList: ArrayList; attr: System.Object): Integer; static; ! class function ToArrayList(attrs: array of Attribute): ArrayList; overload; static; class function ToArrayList(attrs: AttributeCollection): ArrayList; overload; static; {$ENDREGION} --- 76,80 ---- strict protected class function IndexOf(attrList: ArrayList; attr: System.Object): Integer; static; ! class function ToArrayList(attrs: AttributeArray): ArrayList; overload; static; class function ToArrayList(attrs: AttributeCollection): ArrayList; overload; static; {$ENDREGION} Index: Jedi.System.FrameworkResources.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.System.FrameworkResources.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.System.FrameworkResources.pas 23 Jan 2005 11:03:16 -0000 1.1 --- Jedi.System.FrameworkResources.pas 14 Mar 2005 13:30:13 -0000 1.2 *************** *** 33,36 **** --- 33,41 ---- {$ENDREGION} + {$REGION 'Helper types (Delphi only)'} + type + ObjectArray = array of &Object; + {$ENDREGION} + {$REGION 'mscorlib resources'} type *************** *** 56,62 **** class function GetResourceString(culture: CultureInfo; id: string; arg0, arg1: &Object): string; overload; static; class function GetResourceString(id: string; arg0, arg1, arg2: &Object): string; overload; static; ! class function GetResourceString(culture: CultureInfo; id: string; arg0, arg1, arg2: &Object): string; overload; static; ! class function GetResourceString(id: string; args: array of &Object): string; overload; static; ! class function GetResourceString(culture: CultureInfo; id: string; args: array of &Object): string; overload; static; {$ENDREGION} end; --- 61,68 ---- class function GetResourceString(culture: CultureInfo; id: string; arg0, arg1: &Object): string; overload; static; class function GetResourceString(id: string; arg0, arg1, arg2: &Object): string; overload; static; ! class function GetResourceString(culture: CultureInfo; id: string; arg0, arg1, ! arg2: &Object): string; overload; static; ! class function GetResourceString(id: string; args: ObjectArray): string; overload; static; ! class function GetResourceString(culture: CultureInfo; id: string; args: ObjectArray): string; overload; static; {$ENDREGION} end; *************** *** 86,92 **** class function GetResourceString(culture: CultureInfo; id: string; arg0, arg1: &Object): string; overload; static; class function GetResourceString(id: string; arg0, arg1, arg2: &Object): string; overload; static; ! class function GetResourceString(culture: CultureInfo; id: string; arg0, arg1, arg2: &Object): string; overload; static; ! class function GetResourceString(id: string; args: array of &Object): string; overload; static; ! class function GetResourceString(culture: CultureInfo; id: string; args: array of &Object): string; overload; static; {$ENDREGION} end; --- 92,99 ---- class function GetResourceString(culture: CultureInfo; id: string; arg0, arg1: &Object): string; overload; static; class function GetResourceString(id: string; arg0, arg1, arg2: &Object): string; overload; static; ! class function GetResourceString(culture: CultureInfo; id: string; arg0, arg1, ! arg2: &Object): string; overload; static; ! class function GetResourceString(id: string; args: ObjectArray): string; overload; static; ! class function GetResourceString(culture: CultureInfo; id: string; args: ObjectArray): string; overload; static; {$ENDREGION} end; Index: Jedi.System.SourceVersioning.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.System.SourceVersioning.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Jedi.System.SourceVersioning.pas 1 Mar 2005 14:22:10 -0000 1.4 --- Jedi.System.SourceVersioning.pas 14 Mar 2005 13:30:14 -0000 1.5 *************** *** 27,30 **** --- 27,34 ---- type + {$REGION 'Helper types (Delphi only)'} + IntegerArray = array of Integer; + {$ENDREGION} + {$REGION 'Forward declarations'} Revision = record; *************** *** 107,111 **** constructor Create(revision: Double); overload; constructor Create(major, minor: Integer); overload; ! constructor Create(values: array of Integer); overload; {$ENDREGION} {$REGION 'Data'} --- 111,115 ---- constructor Create(revision: Double); overload; constructor Create(major, minor: Integer); overload; ! constructor Create(values: IntegerArray); overload; {$ENDREGION} {$REGION 'Data'} *************** *** 200,208 **** {$ENDREGION} - {$REGION 'Array types'} - type - IntegerArray = array of Integer; - {$ENDREGION} - {$REGION 'CVSSourceInfoAttribute'} constructor CVSSourceInfoAttribute.Create(id: string); --- 204,207 ---- Index: Jedi.IO.Paths.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.IO.Paths.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jedi.IO.Paths.pas 22 Jan 2005 15:28:45 -0000 1.2 --- Jedi.IO.Paths.pas 14 Mar 2005 13:30:13 -0000 1.3 *************** *** 32,35 **** --- 32,36 ---- type CharArray = array of Char; + StringArray = array of string; [JediSourceInfo('$Header$')] *************** *** 48,52 **** constructor Create; overload; constructor Create(directorySeparator, altDirectorySeparator, volumeSeparator: Char; ! invalidPathChars: array of Char); overload; function AltDirectorySeparator: Char; function DirectorySeparator: Char; --- 49,53 ---- constructor Create; overload; constructor Create(directorySeparator, altDirectorySeparator, volumeSeparator: Char; ! invalidPathChars: CharArray); overload; function AltDirectorySeparator: Char; function DirectorySeparator: Char; *************** *** 62,66 **** class var SysConfig: PathConfig; public ! class function Combine(paths: array of string): string; overload; static; class function Combine(paths: array of string; config: PathConfig): string; overload; static; class function Combine(path1, path2: string): string; overload; static; --- 63,67 ---- class var SysConfig: PathConfig; public ! class function Combine(paths: StringArray): string; overload; static; class function Combine(paths: array of string; config: PathConfig): string; overload; static; class function Combine(path1, path2: string): string; overload; static; |
