From 9066fcac161aa99db45daf8f26de1477db38b1df Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Sun, 18 May 2003 19:24:28 +0000 Subject: [PATCH] 2003-05-18 Mike Kestner * generator/ClassBase.cs : Use QualifiedName in spew * generator/ObjectGen.cs (Validate): kill, not used svn path=/trunk/gtk-sharp/; revision=14673 --- ChangeLog | 5 +++++ generator/ClassBase.cs | 8 ++++---- generator/ObjectGen.cs | 43 ------------------------------------------ 3 files changed, 9 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32d172ddc..af15399b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-05-18 Mike Kestner + + * generator/ClassBase.cs : Use QualifiedName in spew + * generator/ObjectGen.cs (Validate): kill, not used + 2003-05-13 Mike Kestner * COPYING : Add the license. This is copied verbatim from diff --git a/generator/ClassBase.cs b/generator/ClassBase.cs index 96df1f740..cc81979b5 100644 --- a/generator/ClassBase.cs +++ b/generator/ClassBase.cs @@ -151,7 +151,7 @@ namespace GtkSharp.Generation { if (prop.Validate ()) prop.Generate (sw); else - Console.WriteLine(" in Object " + Name); + Console.WriteLine(" in Object " + QualifiedName); } } @@ -164,7 +164,7 @@ namespace GtkSharp.Generation { if (sig.Validate ()) sig.Generate (sw, implementor); else - Console.WriteLine(" in Object " + Name); + Console.WriteLine(" in Object " + QualifiedName); } } @@ -216,7 +216,7 @@ namespace GtkSharp.Generation { } } else - Console.WriteLine(" in Object " + Name); + Console.WriteLine(" in Object " + QualifiedName); } } @@ -323,7 +323,7 @@ namespace GtkSharp.Generation { has_preferred = true; } else - Console.WriteLine(" in Object " + Name); + Console.WriteLine(" in Object " + QualifiedName); } if (!has_preferred && ctors.Count > 0) diff --git a/generator/ObjectGen.cs b/generator/ObjectGen.cs index 64110920f..ee13c8689 100644 --- a/generator/ObjectGen.cs +++ b/generator/ObjectGen.cs @@ -140,49 +140,6 @@ namespace GtkSharp.Generation { Statistics.ObjectCount++; } - private bool Validate () - { - string parent = Elem.GetAttribute("parent"); - string cs_parent = SymbolTable.GetCSType(parent); - if (cs_parent == "") { - Console.WriteLine ("Object " + QualifiedName + " Unknown parent " + parent); - return false; - } - - if (ctors != null) - foreach (Ctor ctor in ctors) - if (!ctor.Validate()) { - Console.WriteLine ("in Object " + QualifiedName); - return false; - } - - if (props != null) - foreach (Property prop in props.Values) - if (!prop.Validate()) { - Console.WriteLine ("in Object " + QualifiedName); - return false; - } - - if (sigs != null) - foreach (Signal sig in sigs.Values) - if (!sig.Validate()) { - Console.WriteLine ("in Object " + QualifiedName); - return false; - } - - if (methods != null) - foreach (Method method in methods.Values) - if (!method.Validate()) { - Console.WriteLine ("in Object " + QualifiedName); - return false; - } - - if (SymbolTable.GetCSType(parent) == null) - return false; - - return true; - } - protected override void GenCtors (StreamWriter sw) { if (!Elem.HasAttribute("parent"))