[Qtcsharp-patches] Bugtussle/src/APILoader API.cs,1.43,1.44 CGen.bdsproj,1.6,1.7 Class.cs,1.49,1.50 Parameter.cs,1.12,1.13

[Andreas H. <ah...@us...>]

Update of /cvsroot/qtcsharp/Bugtussle/src/APILoader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15138/src/APILoader

Modified Files:
	API.cs CGen.bdsproj Class.cs Parameter.cs 
Log Message:
Update

Index: Class.cs
===================================================================
RCS file: /cvsroot/qtcsharp/Bugtussle/src/APILoader/Class.cs,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Class.cs	18 Sep 2004 08:54:31 -0000	1.49
--- Class.cs	1 Oct 2004 11:32:56 -0000	1.50
***************
*** 845,849 ****
  	}
  
! 	/* Returns true if the type if a Class or a typedef to a Class. */
  	public static bool IsClass(TypeBase tb)
  	{
--- 845,873 ----
  	}
  
! 
! 	/*! GetDefaultContructor() returns the constructor with no parameters. If
! 		there is none and @allowAlternative = true, it return the constructor
! 		with only one pointer/reference parameter. */
! 	public Constructor GetDefaultContructor(bool allowAlternative)
! 	{
! 		Constructor altContructor = null;
! 		if ( Constructors.Count > 0 )
! 		{
! 			foreach( Constructor ctr in Constructors )
! 			{
! 				if ( ctr.Parameters.Length == 0 )
! 					return ctr;
! 				else if ( ctr.Parameters.Length == 1 &&
! 						  ctr.Parameters[0].Type.Mode != PassByMode.Value )
! 					altContructor = ctr;
! 			}
! 		}
! 		if ( altContructor == null && baseClasses.Count > 0 && baseClasses[0] != null )
! 			return ((Class)baseClasses[0]).GetDefaultContructor(true);
! 		return altContructor;
! 	}
! 
! 
! 	/* Returns true if the type is a Class or a typedef to a Class. */
  	public static bool IsClass(TypeBase tb)
  	{

Index: CGen.bdsproj
===================================================================
RCS file: /cvsroot/qtcsharp/Bugtussle/src/APILoader/CGen.bdsproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CGen.bdsproj	19 Sep 2004 22:32:49 -0000	1.6
--- CGen.bdsproj	1 Oct 2004 11:32:56 -0000	1.7
***************
*** 73,77 ****
  					<Options Name="Launcher" Type="String"></Options>
  					<Options Name="UseLauncher" Type="Boolean">False</Options>
! 					<Options Name="DebugCWD" Type="String">z:\Bugtussle\src</Options>
  					<Options Name="RemotePath" Type="String"></Options>
  					<Options Name="RemoteHost" Type="String"></Options>
--- 73,77 ----
  					<Options Name="Launcher" Type="String"></Options>
  					<Options Name="UseLauncher" Type="Boolean">False</Options>
! 					<Options Name="DebugCWD" Type="String">z:\Qts\Bugtussle\src</Options>
  					<Options Name="RemotePath" Type="String"></Options>
  					<Options Name="RemoteHost" Type="String"></Options>
***************
*** 88,97 ****
  				</Options>
  			</OptionsSet>
! 		</Options>
!       
      
      <FileList>
        <File FileName="c:\windows\microsoft.net\framework\v1.1.4322\System.dll" ContainerId="DotNetAssemblyCompiler" ModuleName="System" AssemblyName="System" Version="1.0.5000.0"/>
-       <File FileName="c:\windows\microsoft.net\framework\v1.1.4322\System.Data.dll" ContainerId="DotNetAssemblyCompiler" ModuleName="System.Data" AssemblyName="System.Data" Version="1.0.5000.0"/>
        <File FileName="c:\windows\microsoft.net\framework\v1.1.4322\System.XML.dll" ContainerId="DotNetAssemblyCompiler" ModuleName="System.XML" AssemblyName="System.XML" Version="1.0.5000.0"/>
        <File FileName="AssemblyInfo.cs" ContainerId="CSharpCompiler" ModuleName="AssemblyInfo"/>
--- 88,96 ----
  				</Options>
  			</OptionsSet>
! 		</Options>  
!     
      
      <FileList>
        <File FileName="c:\windows\microsoft.net\framework\v1.1.4322\System.dll" ContainerId="DotNetAssemblyCompiler" ModuleName="System" AssemblyName="System" Version="1.0.5000.0"/>
        <File FileName="c:\windows\microsoft.net\framework\v1.1.4322\System.XML.dll" ContainerId="DotNetAssemblyCompiler" ModuleName="System.XML" AssemblyName="System.XML" Version="1.0.5000.0"/>
        <File FileName="AssemblyInfo.cs" ContainerId="CSharpCompiler" ModuleName="AssemblyInfo"/>

Index: API.cs
===================================================================
RCS file: /cvsroot/qtcsharp/Bugtussle/src/APILoader/API.cs,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** API.cs	18 Sep 2004 08:54:31 -0000	1.43
--- API.cs	1 Oct 2004 11:32:55 -0000	1.44
***************
*** 44,47 ****
--- 44,48 ----
  	public readonly Hashtable ClassMemberIgnore = new Hashtable();
  	public readonly Hashtable ClassMemberIgnoreOverrride = new Hashtable();
+ 	public readonly Hashtable ClassIgnoreOverrride = new Hashtable();
  	public readonly Hashtable ClassIgnore = new Hashtable();
  	public readonly StringCollection CIncludes = new StringCollection(); // "c:include"
***************
*** 261,265 ****
  					ClassMemberIgnore.Add( element.Attributes["name"].Value, element.ChildNodes );
  				if ( element.Attributes["ignoreoverride"] != null ) // used in Class.InitializeOverrideMethodLists()
! 					ClassMemberIgnoreOverrride.Add( element.Attributes["name"].Value, element.ChildNodes );
  			}
  			else if ( element.Name == "csharp:define" ) // used in TypeReference.TypeReference()
--- 262,271 ----
  					ClassMemberIgnore.Add( element.Attributes["name"].Value, element.ChildNodes );
  				if ( element.Attributes["ignoreoverride"] != null ) // used in Class.InitializeOverrideMethodLists()
! 				{
! 					if ( element.ChildNodes.Count == 0 )
! 						ClassIgnoreOverrride.Add( element.Attributes["name"].Value, null );
! 					else
! 						ClassMemberIgnoreOverrride.Add( element.Attributes["name"].Value, element.ChildNodes );
! 				}
  			}
  			else if ( element.Name == "csharp:define" ) // used in TypeReference.TypeReference()
***************
*** 680,684 ****
  					return true;
  			}
! 		}
  		return false;
  	}
--- 686,691 ----
  					return true;
  			}
! 		} else if ( ClassIgnoreOverrride.Contains(className) )
! 			return true;
  		return false;
  	}

Index: Parameter.cs
===================================================================
RCS file: /cvsroot/qtcsharp/Bugtussle/src/APILoader/Parameter.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Parameter.cs	18 Aug 2004 09:11:50 -0000	1.12
--- Parameter.cs	1 Oct 2004 11:32:56 -0000	1.13
***************
*** 13,17 ****
  public class Parameter
  {
! 	public readonly TypeReference Type;
  	private string name;
  	public readonly string Default;
--- 13,17 ----
  public class Parameter
  {
! 	public TypeReference Type;
  	private string name;
  	public readonly string Default;