valac-0.5.3

valac-0.5.3

svn path=/trunk/; revision=26

diff --git a/src/doclets/devhelp/doclet/template.vala b/src/doclets/devhelp/doclet/template.vala
index efe9bd78921e5a0f8c8242aedb2d706e1a3cc682..9db0f0118df58e5666a2df5f31f8c7ac16d34159 100644 (file)
--- a/src/doclets/devhelp/doclet/template.vala
+++ b/src/doclets/devhelp/doclet/template.vala
@@ -65,11 +65,11 @@ public class DevhelpFormat : Object {
        private Xml.Node* functions = null;
        private Xml.Node* chapters = null;
        private Xml.Node* current = null;
-
+/*
        ~DevhelpFormat ( ) {
                delete this.devhelp;
        }
-
+*/
        public void save_file ( string path ) {
                Xml.Doc.save_format_file ( path, this.devhelp, 1 );
        }

diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index b3e1f42414b57977c7ad200c05da5f269c467387..ae7a3502d6094755d4ceb45e942e3c315b2a8b7b 100644 (file)
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -10,8 +10,6 @@ libvaladoc_VALASOURCES = \
        parser.vala          \
        doctree.vala         \
        langlet.vala         \
-       xmlparser.vala       \
-       xmlimporter.vala     \
        $(NULL)
 
 

diff --git a/src/libvaladoc/doctree.vala b/src/libvaladoc/doctree.vala
index 72955b04efcc5b6834342784e22e86c2c86a1253..0ebae16a6f287e94361590d6fcd771fe17ffac63 100755 (executable)
--- a/src/libvaladoc/doctree.vala
+++ b/src/libvaladoc/doctree.vala
@@ -4461,10 +4461,7 @@ public class Valadoc.Package : Basic, NamespaceHandler {
 public class Valadoc.Tree : Vala.CodeVisitor {
        private Gee.ArrayList<Package> files = new Gee.ArrayList<Package>();
 
-       public Valadoc.Settings settings {
-               construct set;
-               private get;
-       }
+       private Valadoc.Settings settings;
 
        public Tree (   Valadoc.Settings settings,
                                        bool non_null_experimental,
@@ -4606,10 +4603,7 @@ public class Valadoc.Tree : Vala.CodeVisitor {
                return true;
        }
 
-       public CodeContext context {
-               construct set;
-               private get;
-       }
+       private CodeContext context;
 
        public void visit ( Doclet doclet ) {
                foreach ( Package file in this.files ) {
@@ -4695,7 +4689,7 @@ public class Valadoc.Tree : Vala.CodeVisitor {
                        return tmp;
 
                if ( element != null ) {
-                       var tmp = this.search_symbol_in_namespaces ( element, params );
+                       tmp = this.search_symbol_in_namespaces ( element, params );
                        if ( tmp != null )
                                return tmp;
                }

diff --git a/src/libvaladoc/parser.vala b/src/libvaladoc/parser.vala
index cd5f410df0988fd090d239b804fc68687cfd92e7..343b68650b50f9e203a0e29c97010855be646fa5 100644 (file)
--- a/src/libvaladoc/parser.vala
+++ b/src/libvaladoc/parser.vala
@@ -286,8 +286,8 @@ public class DocumentationTree : Object {
 
                foreach ( Gee.ArrayList<MainTaglet> tags in alst ) {
                        MainTaglet ftag = tags.get ( 0 );
-                       int max = tags.size;
-                       int i = 0;
+                       max = tags.size;
+                       i = 0;
 
                        tmp = ftag.write_block_start ( res );
                        if ( tmp == false )

diff --git a/src/libvaladoc/settings.vala b/src/libvaladoc/settings.vala
index c90e8c8d84e16e89b4f5715ed6c0371930a2b222..56cca536c400cc134c2bd18a37de7468b279baad 100755 (executable)
--- a/src/libvaladoc/settings.vala
+++ b/src/libvaladoc/settings.vala
@@ -21,7 +21,6 @@ using GLib;
 
 
 public class Valadoc.Settings : Object {
-       public Gee.ArrayList<string> files;
        private string rpath;
        public string path = "documentation/";
        public string pkg_name = null;
@@ -43,32 +42,6 @@ public class Valadoc.Settings : Object {
 
                return this.rpath;
        }
-
-       /*/
-       public bool application {
-               get {
-                       foreach ( string path in this.files ) {
-                               if ( path.has_prefix ( ".vapi" ) )
-                                       return true;
-                       }
-                       return false;
-               }
-       }
-*/
-       // remove!
-       public bool to_doc ( string name ) {
-               if ( with_deps == true )
-                       return true;
-
-               // FIXME: Compare with full path
-               string nstr = Path.get_basename ( name ) ;
-
-               foreach ( string str in this.files ) {
-                       if ( Path.get_basename ( str ) == nstr )
-                               return true;
-               }
-               return false;
-       }
 }
 
 

diff --git a/src/libvaladoc/xmlimporter.vala b/src/libvaladoc/xmlimporter.vala
deleted file mode 100644 (file)
index 3cb05a7..0000000
--- a/src/libvaladoc/xmlimporter.vala
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
-using GLib;
-using Xml;
-
-
-public class Valadoc.MergeExternalDocumentation : ExternalDocumentation {
-       private GLib.Queue<string> stack = new GLib.Queue<string> ();
-
-       public Valadoc.Tree tree {
-               construct set;
-               private get;
-       }
-
-       public MergeExternalDocumentation ( Valadoc.Tree tree ) {
-               this.tree = tree;
-       }
-
-       private string? type_path () {
-               GLib.StringBuilder str = new GLib.StringBuilder ();
-
-               for ( weak GLib.List<string> pos = this.stack.head; pos != null ; pos = pos.next ) {
-                       str.prepend ( pos.data );
-                       if ( pos.next != null )
-                               str.prepend_unichar ( '.' );
-               }
-               return str.str;
-       }
-
-
-       public override bool visit_enumvalue_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_enumvalue_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-
-       public override bool visit_errorcode_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
- 
-       public override bool visit_errorcode_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_field_start ( string name ) {
-               this.stack.push_head ( name );
-
-               Valadoc.Basic? element = this.tree.search_symbol_str ( null, this.type_path() );
-               if ( element == null )
-                       return false;
-
-
-               element.comment_string = "*\n * HOHOHOHOHOHOHOHO\n ";
-
-
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_field_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_signal_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_signal_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_method_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_method_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_constant_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_constant_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_property_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_property_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_delegate_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_delegate_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_errordomain_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_errordomain_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_class_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_class_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_struct_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_struct_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_interface_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_interface_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-
-       public override bool visit_namespace_start ( string name ) {
-               if ( name != "" )
-                       this.stack.push_head ( name );
-
-               stdout.printf ( "Namespace: %s\n", name );
-               return true;
-       }
-
-       public override bool visit_namespace_end ( string name ) {
-               if ( name != "" )
-                       this.stack.pop_head ( );
-
-               return true;
-       }
-
-       public override bool visit_enum_start ( string name ) {
-               this.stack.push_head ( name );
-               return true;
-       }
-
-       public override bool visit_enum_end ( string name ) {
-               this.stack.pop_head ( );
-               return true;
-       }
-}
-

diff --git a/src/libvaladoc/xmlparser.vala b/src/libvaladoc/xmlparser.vala
deleted file mode 100644 (file)
index 8395ff4..0000000
--- a/src/libvaladoc/xmlparser.vala
+++ /dev/null
@@ -1,718 +0,0 @@
-
-
-using GLib;
-using Xml;
-
-
-
-public class Valadoc.ExternalDocumentation : GLib.Object {
-       public virtual bool visit_namespace_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_namespace_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_enum_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_enum_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_enumvalue_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_enumvalue_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_errordomain_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_errordomain_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_errorcode_start ( string name ) {
-               return true;
-       }
- 
-       public virtual bool visit_errorcode_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_field_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_field_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_signal_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_signal_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_method_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_method_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_class_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_class_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_constant_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_constant_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_property_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_property_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_delegate_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_delegate_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_struct_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_struct_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_interface_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_interface_end ( string name ) {
-               return true;
-       }
-
-
-
-       // Comments:
-       public virtual bool visit_comment_start () {
-               stdout.printf ( "\n---------------\n" );
-               return true;
-       }
-
-       public virtual bool visit_comment_tag_start ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_comment_tag_end ( string name ) {
-               return true;
-       }
-
-       public virtual bool visit_comment_inline_tag ( string name, string content ) {
-               stdout.printf ( ">{ @%s, %s }", name, content );
-               return true;
-       }
-
-       public virtual bool visit_comment_string ( string str ) {
-               stdout.printf ( "%s", str );
-               return true;
-       }
-
-       public virtual bool visit_comment_end () {
-               stdout.printf ( "\n---------------\n" );
-               return true;
-       }
-
-       private bool parse_description ( Xml.Node* desc ) {
-               bool tmp = this.visit_comment_start ();
-               if ( tmp == false )
-                       return false;
-
-        for (Xml.Node* iter = desc->children; iter != null; iter = iter->next) {
-            if (iter->type == ElementType.ELEMENT_NODE) {
-                               if ( iter->name != "inline-taglet" )
-                                       return false;
-
-                               string? tagname = iter->get_prop ( "name" );
-                               if ( tagname == null )
-                                       return false;
-
-                               string content = iter->get_content ();
-
-                               this.visit_comment_inline_tag ( tagname, content );
-            }
-                       else if ( iter->type == ElementType.TEXT_NODE ) {
-                               string content = iter->get_content ();
-                               tmp = this.visit_comment_string ( content );
-                               if ( tmp == false )
-                                       return false;
-                       }
-        }
-
-               return this.visit_comment_end ();
-       }
-
-
-       private bool check_name ( string str ) {
-               return true;
-       }
-
-
-       private bool parse_field ( Xml.Node* field ) {
-               string fname = field->get_prop ( "name" );
-               if ( !this.check_name ( fname ) )
-                       return false;
-
-               bool tmp = this.visit_field_start ( fname );
-               if ( tmp == false )
-                       return false;
-
-               for (Xml.Node* iter = field->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       bool tmp = true;
-
-                       switch ( iter->name ) {
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_field_end ( fname );
-       }
-
-       private bool parse_delegate ( Xml.Node* _delegate ) {
-               string dname = _delegate->get_prop ( "name" );
-               if ( !this.check_name ( dname ) )
-                       return false;
-
-               bool tmp = this.visit_delegate_start ( dname );
-               if ( tmp == false )
-                       return false;
-
-               for (Xml.Node* iter = _delegate->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       bool tmp = false;
-
-                       switch ( iter->name ) {
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_delegate_end ( dname );
-       }
-
-       private bool parse_constant ( Xml.Node* constant ) {
-               string cname = constant->get_prop ( "name" );
-               if ( !this.check_name ( cname ) )
-                       return false;
-
-               bool tmp = this.visit_constant_start ( cname );
-               if ( tmp == false )
-                       return false;
-
-               for (Xml.Node* iter = constant->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       bool tmp = false;
-
-                       switch ( iter->name ) {
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_constant_end ( cname );
-       }
-
-       private bool parse_method ( Xml.Node* method ) {
-               string mname = method->get_prop ( "name" );
-               if ( !this.check_name ( mname ) )
-                       return false;
-
-               bool tmp = this.visit_method_start ( mname );
-               if ( tmp == false )
-                       return false;
-
-               for (Xml.Node* iter = method->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       bool tmp = false;
-
-                       switch ( iter->name ) {
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_method_end ( mname );
-       }
-
-       private bool parse_property ( Xml.Node* property ) {
-               string pname = property->get_prop ( "name" );
-               if ( !this.check_name ( pname ) )
-                       return false;
-
-               bool tmp = this.visit_property_start ( pname );
-               if ( tmp == false )
-                       return false;
-
-               for (Xml.Node* iter = property->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       bool tmp = false;
-
-                       switch ( iter->name ) {
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_property_end ( pname );
-       }
-
-       private bool parse_signal ( Xml.Node* _signal ) {
-               string sname = _signal->get_prop ( "name" );
-               if ( !this.check_name ( sname ) )
-                       return false;
-
-               bool tmp = this.visit_signal_start ( sname );
-               if ( tmp == false )
-                       return false;
-
-               for (Xml.Node* iter = _signal->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       bool tmp = false;
-
-                       switch ( iter->name ) {
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_signal_end ( sname );
-       }
-
-       private bool parse_errorcode ( Xml.Node* errorcode ) {
-               string ename = errorcode->get_prop ( "name" );
-               if ( !this.check_name ( ename ) )
-                       return false;
-
-               bool tmp = this.visit_errorcode_start ( ename );
-               if ( tmp == false )
-                       return false;
-
-               for (Xml.Node* iter = errorcode->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       bool tmp = false;
-
-                       switch ( iter->name ) {
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_errorcode_end ( ename );
-       }
-
-       private bool parse_enumvalue ( Xml.Node* enumvalue ) {
-               string ename = enumvalue->get_prop ( "name" );
-               if ( !this.check_name ( ename ) )
-                       return false;
-
-               for (Xml.Node* iter = enumvalue->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       bool tmp = false;
-
-                       switch ( iter->name ) {
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               bool tmp = this.visit_enumvalue_start ( ename );
-               if ( tmp == false )
-                       return false;
-
-
-               return this.visit_enumvalue_end ( ename );
-       }
-
-       private bool parse_class ( Xml.Node* _class ) {
-               string cname = _class->get_prop ( "name" );
-               if ( !this.check_name ( cname ) )
-                       return false;
-
-               bool tmp = this.visit_class_start ( cname );
-               if ( tmp == false )
-                       return false;
-
-               for (Xml.Node* iter = _class->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       bool tmp = false;
-
-                       switch ( iter->name ) {
-                       case "class":
-                               tmp = this.parse_class ( iter );
-                               break;
-                       case "struct":
-                               tmp = this.parse_struct ( iter );
-                               break;
-                       case "constant":
-                               tmp = this.parse_constant ( iter );
-                               break;
-                       case "field":
-                               tmp = this.parse_field ( iter );
-                               break;
-                       case "enum":
-                               tmp = this.parse_enum ( iter );
-                               break;
-                       case "delegate":
-                               tmp = this.parse_delegate ( iter );
-                               break;
-                       case "method":
-                               tmp = this.parse_method ( iter );
-                               break;
-                       case "signal":
-                               tmp = this.parse_signal ( iter );
-                               break;
-                       case "property":
-                               tmp = this.parse_property ( iter );
-                               break;
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_class_end ( cname );
-       }
-
-       private bool parse_struct ( Xml.Node* _struct ) {
-               string sname = _struct->get_prop ( "name" );
-               if ( !this.check_name ( sname ) )
-                       return false;
-
-               bool tmp = this.visit_struct_start ( sname );
-               if ( tmp == false )
-                       return false;
-
-               for (Xml.Node* iter = _struct->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       bool tmp = false;
-
-                       switch ( iter->name ) {
-                       case "constant":
-                               tmp = this.parse_constant ( iter );
-                               break;
-                       case "field":
-                               tmp = this.parse_field ( iter );
-                               break;
-                       case "method":
-                               tmp = this.parse_method ( iter );
-                               break;
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_struct_end ( sname );
-       }
-
-       private bool parse_interface ( Xml.Node* _interface ) {
-               string iname = _interface->get_prop ( "name" );
-               if ( !this.check_name ( iname ) )
-                       return false;
-
-               bool tmp = this.visit_interface_start ( iname );
-               if ( tmp == false )
-                       return false;
-
-
-               for (Xml.Node* iter = _interface->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       tmp = false;
-
-                       switch ( iter->name ) {
-                       case "class":
-                               tmp = this.parse_class ( iter );
-                               break;
-                       case "struct":
-                               tmp = this.parse_struct ( iter );
-                               break;
-                       case "field":
-                               tmp = this.parse_field ( iter );
-                               break;
-                       case "enum":
-                               tmp = this.parse_enum ( iter );
-                               break;
-                       case "delegate":
-                               tmp = this.parse_delegate ( iter );
-                               break;
-                       case "method":
-                               tmp = this.parse_method ( iter );
-                               break;
-                       case "signal":
-                               tmp = this.parse_signal ( iter );
-                               break;
-                       case "property":
-                               tmp = this.parse_property ( iter );
-                               break;
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_interface_end ( iname );
-       }
-
-       private bool parse_enum ( Xml.Node* _enum ) {
-               string ename = _enum->get_prop ( "name" );
-               if ( !this.check_name ( ename ) )
-                       return false;
-
-               bool tmp = this.visit_enum_start ( ename );
-               if ( tmp == false )
-                       return false;
-
-
-               for (Xml.Node* iter = _enum->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       tmp = false;
-
-                       switch ( iter->name ) {
-                       case "enumvalue":
-                               tmp = this.parse_enumvalue ( iter );
-                               break;
-                       case "method":
-                               tmp = this.parse_method ( iter );
-                               break;
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_enum_end ( ename );
-       }
-
-       private bool parse_errordomain ( Xml.Node* _errordomain ) {
-               string ename = _errordomain->get_prop ( "name" );
-               if ( !this.check_name ( ename ) )
-                       return false;
-
-               bool tmp = this.visit_errordomain_start ( ename );
-               if ( tmp == false )
-                       return false;
-
-
-               for (Xml.Node* iter = _errordomain->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       tmp = false;
-
-                       switch ( iter->name ) {
-                       case "errorcode":
-                               tmp = this.parse_errorcode ( iter );
-                               break;
-                       case "method":
-                               tmp = this.parse_method ( iter );
-                               break;
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_errordomain_end ( ename );
-       }
-
-       private bool parse_namespace ( Xml.Node* ns ) {
-               string nsname = ns->get_prop ( "name" );
-               if ( nsname == null ) {
-                       stdout.printf ( "Namespace-name is not set.\n" );
-                       return false;
-               }
-
-               bool tmp = this.visit_namespace_start ( nsname );
-               if ( tmp == false )
-                       return false;
-
-               for (Xml.Node* iter = ns->children; iter != null; iter = iter->next) {
-                       if (iter->type != ElementType.ELEMENT_NODE)
-                               continue;
-
-                       tmp = false;
-
-                       switch ( iter->name ) {
-                       case "namespace":
-                               tmp = this.parse_namespace ( iter );
-                               break;
-                       case "delegate":
-                               tmp = this.parse_delegate ( iter );
-                               break;
-                       case "field":
-                               tmp = this.parse_field ( iter );
-                               break;
-                       case "constant":
-                               tmp = this.parse_constant ( iter );
-                               break;
-                       case "method":
-                               tmp = this.parse_method ( iter );
-                               break;
-                       case "class":
-                               tmp = this.parse_class ( iter );
-                               break;
-                       case "struct":
-                               tmp = this.parse_struct ( iter );
-                               break;
-                       case "interface":
-                               tmp = this.parse_interface ( iter );
-                               break;
-                       case "enum":
-                               tmp = this.parse_enum ( iter );
-                               break;
-                       case "errordomain":
-                               tmp = this.parse_errordomain ( iter );
-                               break;
-                       case "description":
-                               tmp = this.parse_description ( iter );
-                               break;
-                       }
-
-                       if ( tmp == false )
-                               return false;
-               }
-
-               return this.visit_namespace_end ( nsname );
-       }
-
-       public bool parse ( string path ) {
-               Xml.Doc* xml_doc = Xml.Parser.parse_file ( path );
-               if ( xml_doc == null ) {
-                       stderr.printf ( "Can't open file.\n" );
-                       delete xml_doc;
-                       return false;
-               }
-
-               Xml.Node* root_node = xml_doc->get_root_element ();
-               if ( root_node == null ) {
-                       stderr.printf ( "Missing root-element.\n" );
-                       delete xml_doc;
-                       return false;
-               }
-
-               if ( root_node->name != "namespace" ) {
-                       stderr.printf ( "Wrong root-element.\n" );
-                       delete xml_doc;
-                       return false;
-               }
-
-               bool tmp = this.parse_namespace ( root_node );
-               if ( tmp == false ) {
-                       stdout.printf ( "Error.\n" );
-               }
-
-               delete xml_doc;
-               return true;
-       }
-}
-
-

diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index aba5ef08c4576af36ad1ca84098cc3a8a1e099bd..dd0b74492f78ad3b922b212e259487e1e8bdae29 100755 (executable)
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -56,10 +56,6 @@ public class ValaDoc : Object {
        [NoArrayLength ()]
        private static weak string[] tpackages;
 
-       private Gee.ArrayList<string> packages = new Gee.ArrayList<string>(); // remove
-       private Gee.ArrayList<string> sources  = new Gee.ArrayList<string>(); // remove
-
-
        private const GLib.OptionEntry[] options = {
                { "vapidir", 0, 0, OptionArg.FILENAME_ARRAY, out vapi_directories,
                        "Look for package bindings in DIRECTORY", "DIRECTORY..." },
@@ -91,27 +87,6 @@ public class ValaDoc : Object {
                }
        }
 
-/*
-       private bool check_doclet_structure ( string realpath ) {
-               bool tmp = FileUtils.test ( realpath, FileTest.IS_DIR );
-               if ( tmp == false ) {
-                       return false;
-               }
-
-               tmp = FileUtils.test ( realpath + "/libdoclet.so", FileTest.IS_EXECUTABLE );
-               if ( tmp == false ) {
-                       return false;
-               }
-
-
-               tmp = FileUtils.test ( realpath + "/taglets/", FileTest.IS_DIR );
-               if ( tmp == false ) {
-                       return false;
-               }
-
-               return true;
-       }
-*/
        private static bool check_pkg_name () {
                if ( pkg_name == null )
                        return true;
@@ -144,8 +119,6 @@ public class ValaDoc : Object {
 
                settings.add_inherited = this.add_inherited;
 
-//             settings.files = this.sort_sources ( ); /// <--- remove!
-
                settings._protected = this._protected;
                settings.with_deps = this.with_deps;
                settings._private = this._private;