From: Florian Brosch Date: Thu, 15 Oct 2009 21:03:59 +0000 (+0200) Subject: - external libgee X-Git-Tag: 0.37.1~3^2~565 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd241ad8b540bee8a3f6dad46f2ba9783c2bbcff;p=thirdparty%2Fvala.git - external libgee --- diff --git a/src/doclets/devhelp/doclet/Makefile.am b/src/doclets/devhelp/doclet/Makefile.am index 4472c5d0f..131e3029b 100644 --- a/src/doclets/devhelp/doclet/Makefile.am +++ b/src/doclets/devhelp/doclet/Makefile.am @@ -7,6 +7,7 @@ AM_CFLAGS = -g \ -I ../../htmlhelpers/doclet/ \ -I ../ \ $(GLIB_CFLAGS) \ + $(LIBGEE_CFLAGS) \ $(LIBXML2_CFLAGS) \ $(LIBVALA_CFLAGS) \ $(NULL) @@ -36,7 +37,7 @@ libdoclet_la_SOURCES = \ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) - $(VALAC) -C --vapidir ../../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --pkg valadoc-1.0 --pkg libxml-2.0 --vapidir . --pkg docletconfig --basedir . $^ + $(VALAC) -C --vapidir ../../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --pkg valadoc-1.0 --pkg libxml-2.0 --pkg gee-1.0 --vapidir . --pkg docletconfig --basedir . $^ touch $@ @@ -46,6 +47,7 @@ libdoclet_la_LIBADD = \ $(GLIB_LIBS) \ $(LIBXML2_LIBS) \ $(LIBVALA_LIBS) \ + $(LIBGEE_LIBS) \ $(NULL) diff --git a/src/doclets/htm/doclet/Makefile.am b/src/doclets/htm/doclet/Makefile.am index 889d8fc14..38d2d4d7c 100644 --- a/src/doclets/htm/doclet/Makefile.am +++ b/src/doclets/htm/doclet/Makefile.am @@ -7,6 +7,7 @@ AM_CFLAGS = -g \ -I ../../htmlhelpers/doclet/ \ -I ../ \ $(GLIB_CFLAGS) \ + $(LIBGEE_CFLAGS) \ $(LIBVALA_CFLAGS) \ $(NULL) @@ -38,7 +39,7 @@ libdoclet_la_SOURCES = \ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) - $(VALAC) -C --vapidir ../../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --pkg valadoc-1.0 --vapidir . --pkg docletconfig --basedir . $^ + $(VALAC) -C --vapidir ../../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --pkg valadoc-1.0 --pkg gee-1.0 --vapidir . --pkg docletconfig --basedir . $^ touch $@ @@ -46,6 +47,7 @@ libdoclet_la_LIBADD = \ ../../../libvaladoc/libvaladoc.la \ ../../htmlhelpers/doclet/libhtmlhelpers.la \ $(GLIB_LIBS) \ + $(LIBGEE_LIBS) \ $(LIBVALA_LIBS) \ $(NULL) diff --git a/src/doclets/htmlhelpers/doclet/Makefile.am b/src/doclets/htmlhelpers/doclet/Makefile.am index b2fdb33cf..84688c61f 100644 --- a/src/doclets/htmlhelpers/doclet/Makefile.am +++ b/src/doclets/htmlhelpers/doclet/Makefile.am @@ -6,6 +6,7 @@ AM_CFLAGS = \ $(LIBGVC_CFLAGS) \ $(LIBVALA_CFLAGS) \ $(GLIB_CFLAGS) \ + $(LIBGEE_CFLAGS) \ $(NULL) @@ -44,7 +45,7 @@ libhtmlhelpersincludedir = $(includedir)/vala-1.0 libhtmlhelpers.vala.stamp: $(libhtmlhelpers_la_VALASOURCES) - $(VALAC) -C -H libhtmlhelpers-1.0.h --library libhtmlhelpers-1.0 --basedir . --vapidir ../../../vapi --pkg valadoc-1.0 --save-temps $^ + $(VALAC) -C -H libhtmlhelpers-1.0.h --library libhtmlhelpers-1.0 --basedir . --vapidir ../../../vapi --pkg valadoc-1.0 --pkg gee-1.0 --save-temps $^ touch $@ @@ -53,6 +54,7 @@ libhtmlhelpers_la_LIBADD = \ $(LIBGVC_LIBS) \ $(LIBVALA_LIBS) \ $(GLIB_LIBS) \ + $(LIBGEE_LIBS) \ $(NULL) diff --git a/src/doclets/htmlhelpers/doclet/libhtmlhelpers-1.0.vapi b/src/doclets/htmlhelpers/doclet/libhtmlhelpers-1.0.vapi new file mode 100644 index 000000000..80c49e0a2 --- /dev/null +++ b/src/doclets/htmlhelpers/doclet/libhtmlhelpers-1.0.vapi @@ -0,0 +1,396 @@ +/* libhtmlhelpers-1.0.vapi generated by valac, do not modify. */ + +[CCode (cprefix = "Valadoc", lower_case_cprefix = "valadoc_")] +namespace Valadoc { + [CCode (cprefix = "ValadocHtml", lower_case_cprefix = "valadoc_html_")] + namespace Html { + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public abstract class BasicDoclet : Valadoc.Doclet { + protected Valadoc.Html.HtmlRenderer _renderer; + protected Valadoc.Langlet langlet; + protected Valadoc.Settings settings; + public BasicDoclet (); + protected void fetch_subnamespace_names (Valadoc.NamespaceHandler pos, Gee.ArrayList lst); + protected string get_img_path (Valadoc.Api.Node element); + protected string get_img_real_path (Valadoc.Api.Node element); + protected string? get_link (Valadoc.Api.Node element, Valadoc.Api.Node? pos); + protected void write_child_classes (GLib.FileStream file, Valadoc.ClassHandler clh, Valadoc.Api.Node? mself); + protected void write_child_constants (GLib.FileStream file, Valadoc.ConstantHandler ch, Valadoc.Api.Node? mself); + protected void write_child_construction_methods (GLib.FileStream file, Valadoc.ConstructionMethodHandler cmh, Valadoc.Api.Node? mself); + protected void write_child_delegates (GLib.FileStream file, Valadoc.DelegateHandler dh, Valadoc.Api.Node? mself); + protected void write_child_dependencies (GLib.FileStream file, Valadoc.Package package, Valadoc.Api.Node? mself); + protected void write_child_enums (GLib.FileStream file, Valadoc.EnumHandler eh, Valadoc.Api.Node? mself); + public void write_child_error_values (GLib.FileStream file, Valadoc.ErrorDomain errdom); + protected void write_child_errordomains (GLib.FileStream file, Valadoc.ErrorDomainHandler eh, Valadoc.Api.Node? mself); + protected void write_child_fields (GLib.FileStream file, Valadoc.FieldHandler fh, Valadoc.Api.Node? mself); + protected void write_child_interfaces (GLib.FileStream file, Valadoc.InterfaceHandler ih, Valadoc.Api.Node? mself); + protected void write_child_methods (GLib.FileStream file, Valadoc.MethodHandler mh, Valadoc.Api.Node? mself); + protected void write_child_namespaces (GLib.FileStream file, Valadoc.NamespaceHandler nh, Valadoc.Api.Node? mself); + protected void write_child_properties (GLib.FileStream file, Valadoc.PropertyHandler ph, Valadoc.Api.Node? mself); + protected void write_child_signals (GLib.FileStream file, Valadoc.SignalHandler sh, Valadoc.Api.Node? mself); + protected void write_child_static_methods (GLib.FileStream file, Valadoc.MethodHandler mh, Valadoc.Api.Node? mself); + protected void write_child_structs (GLib.FileStream file, Valadoc.StructHandler struh, Valadoc.Api.Node? mself); + public void write_class_content (GLib.FileStream file, Valadoc.Class cl, Valadoc.Api.Node? mself); + public void write_constant_content (GLib.FileStream file, Valadoc.Constant constant, Valadoc.ConstantHandler parent); + public void write_delegate_content (GLib.FileStream file, Valadoc.Delegate del); + public void write_enum_content (GLib.FileStream file, Valadoc.Enum en, Valadoc.Api.Node? mself); + public void write_error_domain_content (GLib.FileStream file, Valadoc.ErrorDomain errdom, Valadoc.Api.Node? mself); + public void write_field_content (GLib.FileStream file, Valadoc.Field field, Valadoc.FieldHandler parent); + protected void write_file_content (GLib.FileStream file, Valadoc.Package f, Valadoc.Api.Node? mself, Valadoc.WikiPage? wikipage = null); + protected void write_file_footer (GLib.FileStream file); + protected void write_file_header (GLib.FileStream file, string css, string? title); + protected void write_image_block (GLib.FileStream file, Valadoc.Api.Node element); + public void write_interface_content (GLib.FileStream file, Valadoc.Interface iface, Valadoc.Api.Node? mself); + public void write_method_content (GLib.FileStream file, Valadoc.Method m, Valadoc.MethodHandler parent); + public void write_namespace_content (GLib.FileStream file, Valadoc.Namespace ns, Valadoc.Api.Node? mself); + protected void write_namespace_note (GLib.FileStream file, Valadoc.Api.Node element); + protected void write_navi_child_classes_without_childs (GLib.FileStream file, Valadoc.ClassHandler clh, Valadoc.Api.Node? mself); + protected void write_navi_child_classes_without_childs_collection (GLib.FileStream file, Gee.Collection classes, Valadoc.Api.Node? mself); + protected void write_navi_child_constants (GLib.FileStream file, Valadoc.ConstantHandler ch, Valadoc.Api.Node? mself); + protected void write_navi_child_constants_collection (GLib.FileStream file, Gee.Collection constants, Valadoc.Api.Node? mself); + protected void write_navi_child_construction_methods (GLib.FileStream file, Valadoc.ConstructionMethodHandler cmh, Valadoc.Api.Node? mself); + protected void write_navi_child_construction_methods_collection (GLib.FileStream file, Gee.Collection methods, Valadoc.Api.Node? mself); + protected void write_navi_child_delegates (GLib.FileStream file, Valadoc.DelegateHandler delh, Valadoc.Api.Node? mself); + protected void write_navi_child_delegates_collection (GLib.FileStream file, Gee.Collection delegates, Valadoc.Api.Node? mself); + protected void write_navi_child_enums_without_childs (GLib.FileStream file, Valadoc.EnumHandler eh, Valadoc.Api.Node? mself); + protected void write_navi_child_enums_without_childs_collection (GLib.FileStream file, Gee.Collection enums, Valadoc.Api.Node? mself); + protected void write_navi_child_error_domains_without_childs (GLib.FileStream file, Valadoc.Namespace errdomh, Valadoc.Api.Node? mself); + protected void write_navi_child_error_domains_without_childs_collection (GLib.FileStream file, Gee.Collection errordomains, Valadoc.Api.Node? mself); + protected void write_navi_child_fields (GLib.FileStream file, Valadoc.FieldHandler fh, Valadoc.Api.Node? mself); + protected void write_navi_child_fields_collection (GLib.FileStream file, Gee.Collection fields, Valadoc.Api.Node? mself); + protected void write_navi_child_interfaces_without_childs (GLib.FileStream file, Valadoc.Namespace ifh, Valadoc.Api.Node? mself); + protected void write_navi_child_interfaces_without_childs_collection (GLib.FileStream file, Gee.Collection interfaces, Valadoc.Api.Node? mself); + protected void write_navi_child_methods (GLib.FileStream file, Valadoc.MethodHandler mh, Valadoc.Api.Node? mself); + protected void write_navi_child_methods_collection (GLib.FileStream file, Gee.Collection methods, Valadoc.Api.Node? mself); + protected void write_navi_child_namespaces (GLib.FileStream file, Valadoc.Namespace ns, Valadoc.Api.Node? mself); + protected void write_navi_child_namespaces_inline (GLib.FileStream file, Valadoc.Namespace ns, Valadoc.Api.Node? mself); + protected void write_navi_child_namespaces_inline_withouth_block (GLib.FileStream file, Valadoc.Namespace ns, Valadoc.Api.Node? mself); + protected void write_navi_child_namespaces_without_childs (GLib.FileStream file, Valadoc.NamespaceHandler nsh, Valadoc.Api.Node? mself); + protected void write_navi_child_properties (GLib.FileStream file, Valadoc.PropertyHandler ph, Valadoc.Api.Node? mself); + protected void write_navi_child_signals (GLib.FileStream file, Valadoc.SignalHandler sh, Valadoc.Api.Node? mself); + protected void write_navi_child_static_methods (GLib.FileStream file, Valadoc.MethodHandler mh, Valadoc.Api.Node? mself); + protected void write_navi_child_static_methods_collection (GLib.FileStream file, Gee.Collection methods, Valadoc.Api.Node? mself); + protected void write_navi_child_structs_without_childs (GLib.FileStream file, Valadoc.StructHandler strh, Valadoc.Api.Node? mself); + protected void write_navi_child_structs_without_childs_collection (GLib.FileStream file, Gee.Collection structs, Valadoc.Api.Node? mself); + protected void write_navi_class (GLib.FileStream file, Valadoc.Class cl, Valadoc.Api.Node? mself); + protected void write_navi_class_inline (GLib.FileStream file, Valadoc.Class cl, Valadoc.Api.Node? mself); + protected void write_navi_constant (GLib.FileStream file, Valadoc.Constant c); + protected void write_navi_delegate (GLib.FileStream file, Valadoc.Delegate del); + protected void write_navi_entry (GLib.FileStream file, Valadoc.Api.Node element, Valadoc.Api.Node? pos, string style, bool link, bool full_name = false); + protected void write_navi_entry_html_template (GLib.FileStream file, string style, string content); + protected void write_navi_entry_html_template_with_link (GLib.FileStream file, string style, string link, string content); + protected void write_navi_enum (GLib.FileStream file, Valadoc.Enum en, Valadoc.Api.Node? mself); + protected void write_navi_enum_inline (GLib.FileStream file, Valadoc.Enum en, Valadoc.Api.Node? mself); + protected void write_navi_error_domain (GLib.FileStream file, Valadoc.ErrorDomain errdom, Valadoc.Api.Node? mself); + protected void write_navi_error_domain_inline (GLib.FileStream file, Valadoc.ErrorDomain errdom, Valadoc.Api.Node? mself = null); + protected void write_navi_field (GLib.FileStream file, Valadoc.Field f); + protected void write_navi_file (GLib.FileStream file, Valadoc.Package efile, Valadoc.Api.Node? pos); + protected void write_navi_interface (GLib.FileStream file, Valadoc.Interface iface, Valadoc.Api.Node? mself); + protected void write_navi_interface_inline (GLib.FileStream file, Valadoc.Interface iface, Valadoc.Api.Node? mself); + protected void write_navi_method (GLib.FileStream file, Valadoc.Method m); + protected void write_navi_namespace (GLib.FileStream file, Valadoc.Namespace ns); + public void write_navi_packages (GLib.FileStream file, Valadoc.Tree tree); + public void write_navi_packages_inline (GLib.FileStream file, Valadoc.Tree tree); + protected void write_navi_property (GLib.FileStream file, Valadoc.Property prop); + protected void write_navi_signal (GLib.FileStream file, Valadoc.Signal sig); + protected void write_navi_struct (GLib.FileStream file, Valadoc.Struct stru, Valadoc.Api.Node? mself); + protected void write_navi_struct_inline (GLib.FileStream file, Valadoc.Struct stru, Valadoc.Api.Node? mself); + protected void write_navi_top_entry (GLib.FileStream file, Valadoc.Api.Node element, Valadoc.Api.Node? mself); + protected void write_package_note (GLib.FileStream file, Valadoc.Api.Node element); + public void write_packages_content (GLib.FileStream file, Valadoc.Tree tree); + public void write_property_content (GLib.FileStream file, Valadoc.Property prop); + public void write_signal_content (GLib.FileStream file, Valadoc.Signal sig); + public void write_struct_content (GLib.FileStream file, Valadoc.Struct stru, Valadoc.Api.Node? mself); + protected void write_top_element_template (GLib.FileStream file, string link); + protected void write_top_elements (GLib.FileStream file, Valadoc.Api.Node element, Valadoc.Api.Node? mself); + protected void write_wiki_pages (Valadoc.Tree tree, string css_path_wiki, string contentp); + } + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public class BasicLanglet : Valadoc.Langlet { + public BasicLanglet (Valadoc.Settings settings); + public override void write_array (Valadoc.Array arr, void* fptr, Valadoc.Api.Node pos); + public override void write_class (Valadoc.Class cl, void* ptr); + public override void write_constant (Valadoc.Constant constant, Valadoc.ConstantHandler parent, void* ptr); + public override void write_delegate (Valadoc.Delegate del, void* ptr); + public override void write_enum (Valadoc.Enum en, void* ptr); + public override void write_enum_value (Valadoc.EnumValue enval, void* ptr); + public override void write_error_code (Valadoc.ErrorCode errcode, void* ptr); + public override void write_error_domain (Valadoc.ErrorDomain errdom, void* ptr); + public override void write_field (Valadoc.Field field, Valadoc.FieldHandler parent, void* ptr); + public override void write_file (Valadoc.Package file, void* ptr); + public override void write_formal_parameter (Valadoc.FormalParameter param, void* ptr); + public override void write_inheritance_list (Valadoc.Api.Node dtype, void* ptr); + public override void write_interface (Valadoc.Interface iface, void* ptr); + public override void write_method (void* ptr, Valadoc.Method m, Valadoc.MethodHandler parent); + public override void write_namespace (Valadoc.Namespace ns, void* ptr); + public override void write_parameter_list (Valadoc.ParameterListHandler thandler, void* ptr); + public override void write_pointer (Valadoc.Pointer ptr, void* fptr, Valadoc.Api.Node pos); + public override void write_property (Valadoc.Property prop, void* ptr); + public override void write_property_accessor (Valadoc.PropertyAccessor propac, void* ptr); + public override void write_signal (Valadoc.Signal sig, void* ptr); + public override void write_struct (Valadoc.Struct stru, void* ptr); + public override void write_template_parameters (Valadoc.TemplateParameterListHandler thandler, void* ptr); + public override void write_type_parameter (Valadoc.TypeParameter param, void* ptr); + public override void write_type_reference (Valadoc.TypeReference type_reference, void* ptr); + public Valadoc.Settings settings { get; set construct; } + } + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public class HtmlRenderer : Valadoc.Content.ContentRenderer { + public HtmlRenderer (Valadoc.Html.BasicDoclet doclet); + public override void render (Valadoc.Content.ContentElement element); + public override void render_children (Valadoc.Content.ContentElement element); + public void set_container (Valadoc.Documentation? container); + public void set_filestream (GLib.FileStream stream); + public override void visit_comment (Valadoc.Content.Comment element); + public override void visit_embedded (Valadoc.Content.Embedded element); + public override void visit_headline (Valadoc.Content.Headline element); + public override void visit_link (Valadoc.Content.Link element); + public override void visit_list (Valadoc.Content.List element); + public override void visit_list_item (Valadoc.Content.ListItem element); + public override void visit_page (Valadoc.Content.Page element); + public override void visit_paragraph (Valadoc.Content.Paragraph element); + public override void visit_run (Valadoc.Content.Run element); + public override void visit_source_code (Valadoc.Content.SourceCode element); + public override void visit_symbol_link (Valadoc.Content.SymbolLink element); + public override void visit_table (Valadoc.Content.Table element); + public override void visit_table_cell (Valadoc.Content.TableCell element); + public override void visit_table_row (Valadoc.Content.TableRow element); + public override void visit_taglet (Valadoc.Content.Taglet element); + public override void visit_text (Valadoc.Content.Text element); + } + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public delegate string? HtmlLink (Valadoc.Settings settings, Valadoc.Documentation element, Valadoc.Documentation? pos); + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public static Valadoc.Html.HtmlLink get_html_link_imp; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_basic_type; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_code_definition; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_abstract_class; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_abstract_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_abstract_property; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_class; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_constant; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_construction_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_delegate; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_enum; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_enumvalue; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_errorcode; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_errordomain; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_field; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_interface; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_namespace; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_property; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_signal; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_static_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_struct; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_virtual_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_link_virtual_property; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_content_literal; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_diagram; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_enum_table; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_enum_table_name; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_enum_table_text; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_errordomain_table; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_errordomain_table_name; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_errordomain_table_text; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_exception_table; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_headline_hr; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_hr; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_abstract_class; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_abstract_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_abstract_property; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_brief_description; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_class; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_constant; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_construction_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_delegate; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_enum; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_enumvalue; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_errorcode; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_errordomain; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_fields; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_interface; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_namespace; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_package; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_property; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_signal; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_static_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_struct; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_virtual_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_inline_navigation_virtual_property; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_keyword; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_cl; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_del; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_en; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_errdom; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_field; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_iface; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_m; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_ns; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_prop; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_sig; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_list_stru; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_abstract_class; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_abstract_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_abstract_prop; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_class; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_constant; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_construction_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_creation_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_del; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_enum; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_enval; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_errdomcode; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_error_domain; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_field; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_hr; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_iface; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_link; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_namespace; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_package; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_package_index; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_prop; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_sig; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_static_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_struct; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_virtual_method; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_navi_virtual_prop; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_notification_area; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_optional_parameter; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_other_type; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_parameter_table; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_parameter_table_name; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_parameter_table_text; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_see_list; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_site_header; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_source_sample; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_style_body; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_style_content; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_style_navigation; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_title; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public const string css_wiki_table; + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public static string get_html_content_link_css_class (Valadoc.Api.Item element); + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public static string get_html_inline_navigation_link_css_class (Valadoc.Api.Item element); + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public static string? get_html_link (Valadoc.Settings settings, Valadoc.Documentation element, Valadoc.Documentation? pos); + [CCode (cheader_filename = "libhtmlhelpers-1.0.h")] + public static string get_html_type_link (Valadoc.Settings settings, Valadoc.Documentation element, Valadoc.Documentation? pos); + } +} diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am index e2f3e85d2..dd15769d7 100644 --- a/src/libvaladoc/Makefile.am +++ b/src/libvaladoc/Makefile.am @@ -5,6 +5,7 @@ AM_CFLAGS = \ $(LIBGVC_CFLAGS) \ $(LIBXML2_CFLAGS) \ $(GLIB_CFLAGS) \ + $(LIBGEE_CFLAGS) \ $(LIBVALA_CFLAGS) \ $(GMODULE_CFLAGS) \ $(NULL) @@ -146,13 +147,14 @@ libvaladocincludedir = $(includedir)/ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - $(VALAC) $(VALAFLAGS) -C -H valadoc-1.0.h --pkg vala-1.0 --pkg gmodule-2.0 --vapidir ../vapi --pkg libxml-2.0 --pkg libgvc --library valadoc-1.0 --basedir $(top_srcdir)/src/libvaladoc/ --save-temps $^ + $(VALAC) $(VALAFLAGS) -C -H valadoc-1.0.h --pkg gee-1.0 --pkg vala-1.0 --pkg gmodule-2.0 --vapidir ../vapi --pkg libxml-2.0 --pkg libgvc --library valadoc-1.0 --basedir $(top_srcdir)/src/libvaladoc/ --save-temps $^ touch $@ libvaladoc_la_LIBADD = \ $(LIBGVC_LIBS) \ $(LIBXML2_LIBS) \ + $(LIBGEE_LIBS) \ $(GLIB_LIBS) \ $(LIBVALA_LIBS) \ $(GMODULE_LIBS) \ diff --git a/src/libvaladoc/apitree/apiitem.vala b/src/libvaladoc/apitree/apiitem.vala index c312f97d9..d38dac853 100644 --- a/src/libvaladoc/apitree/apiitem.vala +++ b/src/libvaladoc/apitree/apiitem.vala @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; -using Gee; using Valadoc.Content; +using Gee; + public abstract class Valadoc.Api.Item : Object { public Api.Item parent { @@ -35,3 +34,4 @@ public abstract class Valadoc.Api.Item : Object { protected virtual void process_comments (Settings settings, DocumentationParser parser) { } } + diff --git a/src/libvaladoc/apitree/apimembernode.vala b/src/libvaladoc/apitree/apimembernode.vala index f836b17e3..7e7aed25b 100644 --- a/src/libvaladoc/apitree/apimembernode.vala +++ b/src/libvaladoc/apitree/apimembernode.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using Vala; using Gee; + public abstract class Valadoc.Api.MemberNode : Api.SymbolNode { public MemberNode (Vala.Member symbol, Api.Node parent) { @@ -39,3 +39,4 @@ public abstract class Valadoc.Api.MemberNode : Api.SymbolNode { base.process_comments (settings, parser); } } + diff --git a/src/libvaladoc/apitree/apinode.vala b/src/libvaladoc/apitree/apinode.vala index 1dad86656..8a42a4c60 100644 --- a/src/libvaladoc/apitree/apinode.vala +++ b/src/libvaladoc/apitree/apinode.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using Vala; using Gee; + public enum Valadoc.Api.NodeType { CLASS, CONSTANT, @@ -54,15 +54,15 @@ public abstract class Valadoc.Api.Node : Api.Item, Visitable, Documentation { public abstract NodeType node_type { get; } private Map per_name_children; - private Map per_symbol_children; - private Map> per_type_children; + private Map per_symbol_children; + private Map> per_type_children; public Node (Api.Node? parent) { this.parent = parent; per_name_children = new HashMap (); - per_symbol_children = new HashMap (); - per_type_children = new HashMap> (int_hash, int_equal); + per_symbol_children = new HashMap (); + per_type_children = new HashMap> (int_hash, int_equal); } public abstract void accept (Doclet doclet); @@ -144,7 +144,7 @@ public abstract class Valadoc.Api.Node : Api.Item, Visitable, Documentation { return per_name_children.get (name); } - public Node? find_by_symbol (Symbol symbol) { + public Node? find_by_symbol (Vala.Symbol symbol) { return per_symbol_children.get (symbol); } @@ -211,3 +211,4 @@ public abstract class Valadoc.Api.Node : Api.Item, Visitable, Documentation { return this._full_name; } } + diff --git a/src/libvaladoc/apitree/apinodebuilder.vala b/src/libvaladoc/apitree/apinodebuilder.vala index 24d410dc7..ddc403285 100644 --- a/src/libvaladoc/apitree/apinodebuilder.vala +++ b/src/libvaladoc/apitree/apinodebuilder.vala @@ -21,12 +21,12 @@ * Didier 'Ptitjes Villevalois */ -using Vala; using Gee; -internal class Valadoc.Api.NodeBuilder : CodeVisitor { + +internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor { private Tree root; - private Gee.Collection packages; + private Collection packages; private Node current_node; internal NodeBuilder (Tree root) { @@ -212,3 +212,4 @@ internal class Valadoc.Api.NodeBuilder : CodeVisitor { process_children (node, element); } } + diff --git a/src/libvaladoc/apitree/apisymbolnode.vala b/src/libvaladoc/apitree/apisymbolnode.vala index de1e31499..20bce1211 100644 --- a/src/libvaladoc/apitree/apisymbolnode.vala +++ b/src/libvaladoc/apitree/apisymbolnode.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using Vala; using Gee; + public abstract class Valadoc.Api.SymbolNode : Api.Node, SymbolAccessibility { protected Vala.Symbol symbol { private set; get; } @@ -42,28 +42,30 @@ public abstract class Valadoc.Api.SymbolNode : Api.Node, SymbolAccessibility { } public override string? get_filename () { - SourceReference? sref = symbol.source_reference; - if ( sref == null ) + Vala.SourceReference? sref = symbol.source_reference; + if (sref == null) { return null; + } Vala.SourceFile? file = sref.file; - if ( file == null ) + if (file == null) { return null; + } string path = sref.file.filename; - return GLib.Path.get_basename ( path ); + return GLib.Path.get_basename (path); } public override bool is_visitor_accessible (Settings settings) { - if (!settings._private && this.is_private) + if (!settings._private && this.is_private) { return false; - - if (!settings._internal && this.is_internal) + } + if (!settings._internal && this.is_internal) { return false; - - if (!settings._protected && this.is_protected) + } + if (!settings._protected && this.is_protected) { return false; - + } return true; } @@ -91,3 +93,4 @@ public abstract class Valadoc.Api.SymbolNode : Api.Node, SymbolAccessibility { } } } + diff --git a/src/libvaladoc/apitree/apitree.vala b/src/libvaladoc/apitree/apitree.vala index e6152b08c..246eb12a2 100644 --- a/src/libvaladoc/apitree/apitree.vala +++ b/src/libvaladoc/apitree/apitree.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -28,10 +25,10 @@ public Valadoc.Class glib_error = null; public class Valadoc.Tree { - private Gee.ArrayList packages = new Gee.ArrayList(); + private ArrayList packages = new ArrayList(); private Package source_package = null; private Valadoc.Settings settings; - private CodeContext context; + private Vala.CodeContext context; private ErrorReporter reporter; private Package sourcefiles = null; @@ -40,24 +37,24 @@ public class Valadoc.Tree { get; } - public Gee.Collection get_package_list () { + public Collection get_package_list () { return this.packages.read_only_view; } private void add_dependencies_to_source_package () { if ( this.source_package != null ) { - Gee.ArrayList deplst = new Gee.ArrayList (); - foreach ( Package pkg in this.packages ) { - if ( pkg != this.source_package ) { - deplst.add ( pkg ); + ArrayList deplst = new ArrayList (); + foreach (Package pkg in this.packages) { + if (pkg != this.source_package) { + deplst.add (pkg); } - } - this.source_package.set_dependency_list ( deplst ); + } + this.source_package.set_dependency_list (deplst); } } - public void visit ( Doclet doclet ) { - doclet.initialisation ( this.settings, this ); + public void visit (Doclet doclet) { + doclet.initialisation (this.settings, this); } private Api.Node? search_relative_to (Api.Node element, string[] path) { @@ -100,9 +97,9 @@ public class Valadoc.Tree { return params; } - public Tree ( Valadoc.ErrorReporter reporter, Valadoc.Settings settings) { + public Tree (Valadoc.ErrorReporter reporter, Valadoc.Settings settings) { this.context = new Vala.CodeContext ( ); - CodeContext.push (context); + Vala.CodeContext.push (context); this.settings = settings; this.reporter = reporter; @@ -129,7 +126,7 @@ public class Valadoc.Tree { } if (settings.profile == "gobject-2.0" || settings.profile == "gobject" || settings.profile == null) { - context.profile = Profile.GOBJECT; + context.profile = Vala.Profile.GOBJECT; context.add_define ("GOBJECT"); } @@ -139,13 +136,13 @@ public class Valadoc.Tree { } } - if (context.profile == Profile.POSIX) { + if (context.profile == Vala.Profile.POSIX) { /* default package */ if (!add_package ("posix")) { - Report.error (null, "posix not found in specified Vala API directories"); + Vala.Report.error (null, "posix not found in specified Vala API directories"); } } - else if (context.profile == Profile.GOBJECT) { + else if (context.profile == Vala.Profile.GOBJECT) { int glib_major = 2; int glib_minor = 12; @@ -153,16 +150,16 @@ public class Valadoc.Tree { context.target_glib_major = glib_major; context.target_glib_minor = glib_minor; if (context.target_glib_major != 2) { - Report.error (null, "This version of valac only supports GLib 2"); + Vala.Report.error (null, "This version of valac only supports GLib 2"); } /* default packages */ if (!this.add_package ("glib-2.0")) { // - Report.error (null, "glib-2.0 not found in specified Vala API directories"); + Vala.Report.error (null, "glib-2.0 not found in specified Vala API directories"); } if (!this.add_package ("gobject-2.0")) { // - Report.error (null, "gobject-2.0 not found in specified Vala API directories"); + Vala.Report.error (null, "gobject-2.0 not found in specified Vala API directories"); } } } @@ -183,7 +180,7 @@ public class Valadoc.Tree { context.add_package (pkg); - var vfile = new SourceFile (context, package_path, true); + var vfile = new Vala.SourceFile (context, package_path, true); context.add_source_file (vfile); Package vdpkg = new Package (vfile, pkg, true); @@ -199,12 +196,12 @@ public class Valadoc.Tree { dep.strip (); if (dep != "") { if (!add_package (dep)) { - Report.error (null, "%s, dependency of %s, not found in specified Vala API directories".printf (dep, pkg)); + Vala.Report.error (null, "%s, dependency of %s, not found in specified Vala API directories".printf (dep, pkg)); } } } } catch (FileError e) { - Report.error (null, "Unable to read dependency file: %s".printf (e.message)); + Vala.Report.error (null, "Unable to read dependency file: %s".printf (e.message)); } } @@ -215,59 +212,58 @@ public class Valadoc.Tree { public void add_depencies (string[] packages) { foreach (string package in packages) { if (!add_package (package)) { - Report.error (null, "%s not found in specified Vala API directories".printf (package)); + Vala.Report.error (null, "%s not found in specified Vala API directories".printf (package)); } } } public void add_documented_file (string[] sources) { if (sources == null) { - return ; + return; } foreach (string source in sources) { if (FileUtils.test (source, FileTest.EXISTS)) { var rpath = realpath (source); if (source.has_suffix (".vala") || source.has_suffix (".gs")) { - var source_file = new SourceFile (context, rpath); + var source_file = new Vala.SourceFile (context, rpath); if (this.sourcefiles == null) { this.sourcefiles = new Package (source_file, settings.pkg_name, false); this.packages.add (this.sourcefiles); - } - else { + } else { this.sourcefiles.add_file (source_file); } - if (context.profile == Profile.POSIX) { + if (context.profile == Vala.Profile.POSIX) { // import the Posix namespace by default (namespace of backend-specific standard library) - var ns_ref = new UsingDirective (new UnresolvedSymbol (null, "Posix", null)); + var ns_ref = new Vala.UsingDirective (new Vala.UnresolvedSymbol (null, "Posix", null)); source_file.add_using_directive (ns_ref); context.root.add_using_directive (ns_ref); - } else if (context.profile == Profile.GOBJECT) { + } else if (context.profile == Vala.Profile.GOBJECT) { // import the GLib namespace by default (namespace of backend-specific standard library) - var ns_ref = new UsingDirective (new UnresolvedSymbol (null, "GLib", null)); + var ns_ref = new Vala.UsingDirective (new Vala.UnresolvedSymbol (null, "GLib", null)); source_file.add_using_directive (ns_ref); context.root.add_using_directive (ns_ref); } context.add_source_file (source_file); } else if (source.has_suffix (".vapi")) { - string file_name = GLib.Path.get_basename (source); + string file_name = Path.get_basename (source); file_name = file_name.ndup ( file_name.size() - ".vapi".size() ); - var vfile = new SourceFile (context, rpath, true); + var vfile = new Vala.SourceFile (context, rpath, true); Package vdpkg = new Package (vfile, file_name); context.add_source_file (vfile); this.packages.add (vdpkg); } else if (source.has_suffix (".c")) { context.add_c_source_file (rpath); } else { - Report.error (null, "%s is not a supported source file type. Only .vala, .vapi, .gs, and .c files are supported.".printf (source)); + Vala.Report.error (null, "%s is not a supported source file type. Only .vala, .vapi, .gs, and .c files are supported.".printf (source)); } } else { - Report.error (null, "%s not found".printf (source)); + Vala.Report.error (null, "%s not found".printf (source)); } } } @@ -279,20 +275,20 @@ public class Valadoc.Tree { return false; } - Vala.SymbolResolver resolver = new SymbolResolver (); + Vala.SymbolResolver resolver = new Vala.SymbolResolver (); resolver.resolve(this.context); if (this.context.report.get_errors () > 0) { return false; } - Vala.SemanticAnalyzer analyzer = new SemanticAnalyzer ( ); + Vala.SemanticAnalyzer analyzer = new Vala.SemanticAnalyzer ( ); analyzer.analyze(this.context); if (this.context.report.get_errors () > 0) { return false; } if (context.non_null_experimental) { - Vala.NullChecker null_checker = new NullChecker (); + Vala.NullChecker null_checker = new Vala.NullChecker (); null_checker.check (this.context); if (this.context.report.get_errors () > 0) { @@ -335,19 +331,22 @@ public class Valadoc.Tree { } internal Api.Node? search_vala_symbol (Vala.Symbol? vnode) { - if (vnode == null) + if (vnode == null) { return null; + } - Gee.ArrayList params = new Gee.ArrayList (); - for (Vala.Symbol iter = vnode; iter != null ; iter = iter.parent_symbol) { - if (iter is Vala.DataType) - params.insert (0, ((Vala.DataType)iter).data_type); - else + ArrayList params = new ArrayList (); + for (Vala.Symbol iter = vnode; iter != null; iter = iter.parent_symbol) { + if (iter is Vala.DataType) { + params.insert (0, ((Vala.DataType)iter).data_type); + } else { params.insert (0, iter); + } } - if (params.size == 0) + if (params.size == 0) { return null; + } if (params.size >= 2) { if (params.get(1) is Vala.Namespace) { @@ -359,7 +358,7 @@ public class Valadoc.Tree { Package file = this.find_file(vfile); Api.Node? node = file; - foreach (Symbol symbol in params) { + foreach (Vala.Symbol symbol in params) { node = node.find_by_symbol (symbol); if (node == null) { return null; diff --git a/src/libvaladoc/apitree/apitypesymbolnode.vala b/src/libvaladoc/apitree/apitypesymbolnode.vala index 5d0b0828a..df9a38a34 100644 --- a/src/libvaladoc/apitree/apitypesymbolnode.vala +++ b/src/libvaladoc/apitree/apitypesymbolnode.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using Vala; using Gee; + public abstract class Valadoc.Api.TypeSymbolNode : Api.SymbolNode { public TypeSymbolNode (Vala.TypeSymbol symbol, Api.Node parent) { @@ -39,3 +39,4 @@ public abstract class Valadoc.Api.TypeSymbolNode : Api.SymbolNode { base.process_comments (settings, parser); } } + diff --git a/src/libvaladoc/apitree/array.vala b/src/libvaladoc/apitree/array.vala index 9330cc7c6..ff805375f 100644 --- a/src/libvaladoc/apitree/array.vala +++ b/src/libvaladoc/apitree/array.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -36,10 +33,11 @@ public class Valadoc.Array : Api.Item { this.parent = parent; Vala.DataType vntype = vtyperef.element_type; - if ( vntype is Vala.ArrayType ) + if (vntype is Vala.ArrayType) { this.data_type = new Array ((Vala.ArrayType) vntype, this); - else + } else { this.data_type = new TypeReference (vntype, this); + } } public void write (Langlet langlet, void* ptr, Api.Node parent) { @@ -47,14 +45,15 @@ public class Valadoc.Array : Api.Item { } protected override void resolve_type_references (Tree root) { - if ( this.data_type == null ) + if (this.data_type == null) { /*TODO:possible?*/; - else if ( this.data_type is Array ) + } else if (this.data_type is Array) { ((Array)this.data_type).resolve_type_references (root); - else if ( this.data_type is Pointer ) + } else if (this.data_type is Pointer) { ((Pointer)this.data_type).resolve_type_references (root); - else + } else { ((TypeReference)this.data_type).resolve_type_references (root); + } } } diff --git a/src/libvaladoc/apitree/class.vala b/src/libvaladoc/apitree/class.vala index 688c0f9ac..6e8f1623a 100644 --- a/src/libvaladoc/apitree/class.vala +++ b/src/libvaladoc/apitree/class.vala @@ -17,24 +17,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; public class Valadoc.Class : Api.TypeSymbolNode, ClassHandler, StructHandler, SignalHandler, MethodHandler, EnumHandler, PropertyHandler, ConstructionMethodHandler, FieldHandler, DelegateHandler, ConstantHandler, TemplateParameterListHandler { - private Gee.ArrayList interfaces; + private ArrayList interfaces; private Vala.Class vclass; public Class (Vala.Class symbol, Api.Node parent) { base (symbol, parent); - this.interfaces = new Gee.ArrayList(); + this.interfaces = new ArrayList (); this.vclass = symbol; - if ( glib_error == null ) { - if ( this.full_name () == "GLib.Error" ) { + if (glib_error == null) { + if (this.full_name () == "GLib.Error") { glib_error = this; } } @@ -49,16 +46,16 @@ public class Valadoc.Class : Api.TypeSymbolNode, ClassHandler, StructHandler, Si return this.vclass.get_cname(); } - public Gee.Collection get_implemented_interface_list ( ) { + public Collection get_implemented_interface_list () { return this.interfaces; } - internal bool is_vclass ( Vala.Class vcl ) { + internal bool is_vclass (Vala.Class vcl) { return this.vclass == vcl; } - public void write ( Langlet langlet, void* ptr ) { - langlet.write_class ( this, ptr ); + public void write (Langlet langlet, void* ptr) { + langlet.write_class (this, ptr); } public bool is_abstract { @@ -77,17 +74,18 @@ public class Valadoc.Class : Api.TypeSymbolNode, ClassHandler, StructHandler, Si visit (doclet); } - private void set_parent_type_references (Tree root, Gee.Collection lst) { - if (this.interfaces.size != 0) - return ; + private void set_parent_type_references (Tree root, Vala.Collection lst) { + if (this.interfaces.size != 0) { + return; + } - foreach ( Vala.DataType vtyperef in lst ) { - Api.Item? element = root.search_vala_symbol ( vtyperef.data_type ); - if ( element is Class ) { + foreach (Vala.DataType vtyperef in lst) { + Api.Item? element = root.search_vala_symbol (vtyperef.data_type); + if (element is Class) { this.base_type = (Class)element; } else { - this.interfaces.add ( (Interface)element ); + this.interfaces.add ((Interface)element); } } } diff --git a/src/libvaladoc/apitree/classhandler.vala b/src/libvaladoc/apitree/classhandler.vala index ed3837830..3aff41887 100644 --- a/src/libvaladoc/apitree/classhandler.vala +++ b/src/libvaladoc/apitree/classhandler.vala @@ -17,28 +17,30 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.ClassHandler : Api.Node { - protected Class? find_vclass ( Vala.Class vcl ) { - foreach ( Class cl in get_class_list () ) { - if ( cl.is_vclass ( vcl ) ) + protected Class? find_vclass (Vala.Class vcl) { + foreach (Class cl in get_class_list ()) { + if (cl.is_vclass (vcl)) { return cl; + } - var tmp = cl.find_vclass ( vcl ); - if ( tmp != null ) + var tmp = cl.find_vclass (vcl); + if (tmp != null) { return tmp; + } } return null; } - public Gee.Collection get_class_list ( ) { + public Gee.Collection get_class_list () { return get_children_by_type (Api.NodeType.CLASS); } - public void visit_classes ( Doclet doclet ) { + public void visit_classes (Doclet doclet) { accept_children_by_type (Api.NodeType.CLASS, doclet); } } + diff --git a/src/libvaladoc/apitree/constant.vala b/src/libvaladoc/apitree/constant.vala index 2afadb3c2..af76138f1 100644 --- a/src/libvaladoc/apitree/constant.vala +++ b/src/libvaladoc/apitree/constant.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -31,8 +28,8 @@ public class Valadoc.Constant : Api.MemberNode, ReturnTypeHandler { get; } - public bool is_vconstant ( Vala.Constant vconst ) { - return ( this.vconst == vconst ); + public bool is_vconstant (Vala.Constant vconst) { + return (this.vconst == vconst); } public Constant (Vala.Constant symbol, Api.Node parent) { @@ -40,7 +37,7 @@ public class Valadoc.Constant : Api.MemberNode, ReturnTypeHandler { this.vconst = symbol; var vret = this.vconst.type_reference; - this.set_ret_type ( vret ); + this.set_ret_type (vret); } public string get_cname () { @@ -51,18 +48,18 @@ public class Valadoc.Constant : Api.MemberNode, ReturnTypeHandler { this.set_return_type_references (root); } - public void visit ( Doclet doclet, ConstantHandler? parent ) { - doclet.visit_constant ( this, parent ); + public void visit (Doclet doclet, ConstantHandler? parent) { + doclet.visit_constant (this, parent); } public override Api.NodeType node_type { get { return Api.NodeType.CONSTANT; } } public override void accept (Doclet doclet) { - visit (doclet, (ConstantHandler) parent); + visit (doclet, (ConstantHandler)parent); } - public void write ( Langlet langlet, void* ptr, ConstantHandler parent ) { - langlet.write_constant ( this, parent, ptr ); + public void write (Langlet langlet, void* ptr, ConstantHandler parent) { + langlet.write_constant (this, parent, ptr); } } diff --git a/src/libvaladoc/apitree/constanthandler.vala b/src/libvaladoc/apitree/constanthandler.vala index c9a152beb..a00579aea 100644 --- a/src/libvaladoc/apitree/constanthandler.vala +++ b/src/libvaladoc/apitree/constanthandler.vala @@ -17,12 +17,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.ConstantHandler : Api.Node { - public Gee.Collection get_constant_list () { + public Collection get_constant_list () { return get_children_by_type (Api.NodeType.CONSTANT); } diff --git a/src/libvaladoc/apitree/constructionmethodhandler.vala b/src/libvaladoc/apitree/constructionmethodhandler.vala index d54e111cd..223c87d65 100644 --- a/src/libvaladoc/apitree/constructionmethodhandler.vala +++ b/src/libvaladoc/apitree/constructionmethodhandler.vala @@ -17,12 +17,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.ConstructionMethodHandler : Api.Node { - public Gee.Collection get_construction_method_list () { + public Collection get_construction_method_list () { return get_children_by_type (Api.NodeType.CREATION_METHOD); } @@ -30,3 +29,4 @@ public interface Valadoc.ConstructionMethodHandler : Api.Node { accept_children_by_type (Api.NodeType.CREATION_METHOD, doclet); } } + diff --git a/src/libvaladoc/apitree/delegate.vala b/src/libvaladoc/apitree/delegate.vala index 6c929d9e2..316947b1c 100644 --- a/src/libvaladoc/apitree/delegate.vala +++ b/src/libvaladoc/apitree/delegate.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -32,11 +29,11 @@ public class Valadoc.Delegate : Api.TypeSymbolNode, ParameterListHandler, Return this.vdelegate = symbol; var ret = this.vdelegate.return_type; - this.set_ret_type ( ret ); + this.set_ret_type (ret); } public string? get_cname () { - return this.vdelegate.get_cname(); + return this.vdelegate.get_cname (); } public TypeReference? type_reference { @@ -44,8 +41,8 @@ public class Valadoc.Delegate : Api.TypeSymbolNode, ParameterListHandler, Return get; } - public void visit ( Doclet doclet ) { - doclet.visit_delegate ( this ); + public void visit (Doclet doclet) { + doclet.visit_delegate (this); } public override Api.NodeType node_type { get { return Api.NodeType.DELEGATE; } } diff --git a/src/libvaladoc/apitree/delegatehandler.vala b/src/libvaladoc/apitree/delegatehandler.vala index abd2306e4..1a5c774b6 100644 --- a/src/libvaladoc/apitree/delegatehandler.vala +++ b/src/libvaladoc/apitree/delegatehandler.vala @@ -17,16 +17,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.DelegateHandler : Api.Node { - public Gee.Collection get_delegate_list ( ) { + public Gee.Collection get_delegate_list () { return get_children_by_type (Api.NodeType.DELEGATE); } - public void visit_delegates ( Doclet doclet ) { + public void visit_delegates (Doclet doclet) { accept_children_by_type (Api.NodeType.DELEGATE, doclet); } } + diff --git a/src/libvaladoc/apitree/enum.vala b/src/libvaladoc/apitree/enum.vala index 6453c0b38..10be6e15d 100644 --- a/src/libvaladoc/apitree/enum.vala +++ b/src/libvaladoc/apitree/enum.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -34,16 +31,16 @@ public class Valadoc.Enum : Api.TypeSymbolNode, MethodHandler { } // rename: get_enum_value_list - public Gee.Collection get_enum_values () { + public Collection get_enum_values () { return get_children_by_type (Api.NodeType.ENUM_VALUE); } - public void visit_enum_values ( Doclet doclet ) { + public void visit_enum_values (Doclet doclet) { accept_children_by_type (Api.NodeType.ENUM_VALUE, doclet); } - public void visit ( Doclet doclet ) { - doclet.visit_enum ( this ); + public void visit (Doclet doclet) { + doclet.visit_enum (this); } public override Api.NodeType node_type { get { return Api.NodeType.ENUM; } } @@ -54,8 +51,8 @@ public class Valadoc.Enum : Api.TypeSymbolNode, MethodHandler { private Vala.Enum venum; - public void write ( Langlet langlet, void* ptr ) { - langlet.write_enum ( this, ptr ); + public void write (Langlet langlet, void* ptr) { + langlet.write_enum (this, ptr); } } diff --git a/src/libvaladoc/apitree/enumhandler.vala b/src/libvaladoc/apitree/enumhandler.vala index af8c9daf1..65ba3bc51 100644 --- a/src/libvaladoc/apitree/enumhandler.vala +++ b/src/libvaladoc/apitree/enumhandler.vala @@ -17,16 +17,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.EnumHandler : Api.Node { - public Gee.Collection get_enum_list () { + public Collection get_enum_list () { return get_children_by_type (Api.NodeType.ENUM); } - public void visit_enums ( Doclet doclet ) { + public void visit_enums (Doclet doclet) { accept_children_by_type (Api.NodeType.ENUM, doclet); } } + diff --git a/src/libvaladoc/apitree/enumvalue.vala b/src/libvaladoc/apitree/enumvalue.vala index 209698eb1..c74a8fb7e 100644 --- a/src/libvaladoc/apitree/enumvalue.vala +++ b/src/libvaladoc/apitree/enumvalue.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -44,16 +41,16 @@ public class Valadoc.EnumValue: Api.SymbolNode { return this.venval.get_cname (); } - public bool is_venumvalue ( Vala.EnumValue venval ) { - return ( this.venval == venval ); + public bool is_venumvalue (Vala.EnumValue venval) { + return this.venval == venval; } - public void write ( Langlet langlet, void* ptr ) { - langlet.write_enum_value ( this, ptr ); + public void write (Langlet langlet, void* ptr) { + langlet.write_enum_value (this, ptr); } - public void visit ( Doclet doclet ) { - doclet.visit_enum_value ( this ); + public void visit (Doclet doclet) { + doclet.visit_enum_value (this); } public override Api.NodeType node_type { get { return Api.NodeType.ENUM_VALUE; } } diff --git a/src/libvaladoc/apitree/errorcode.vala b/src/libvaladoc/apitree/errorcode.vala index b147dba51..9cbed097c 100644 --- a/src/libvaladoc/apitree/errorcode.vala +++ b/src/libvaladoc/apitree/errorcode.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -35,16 +32,16 @@ public class Valadoc.ErrorCode : Api.TypeSymbolNode { return this.verrcode.get_cname (); } - public bool is_verrorcode ( Vala.ErrorCode verrcode ) { - return ( this.verrcode == verrcode ); + public bool is_verrorcode (Vala.ErrorCode verrcode) { + return this.verrcode == verrcode; } - public void write ( Langlet langlet, void* ptr ) { - langlet.write_error_code ( this, ptr ); + public void write (Langlet langlet, void* ptr) { + langlet.write_error_code (this, ptr); } - public void visit ( Doclet doclet ) { - doclet.visit_error_code ( this ); + public void visit (Doclet doclet) { + doclet.visit_error_code (this); } public override Api.NodeType node_type { get { return Api.NodeType.ERROR_CODE; } } diff --git a/src/libvaladoc/apitree/errordomain.vala b/src/libvaladoc/apitree/errordomain.vala index 38ae95220..165812840 100644 --- a/src/libvaladoc/apitree/errordomain.vala +++ b/src/libvaladoc/apitree/errordomain.vala @@ -17,10 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public class Valadoc.ErrorDomain : Api.TypeSymbolNode, MethodHandler { private Vala.ErrorDomain verrdom; @@ -37,12 +36,12 @@ public class Valadoc.ErrorDomain : Api.TypeSymbolNode, MethodHandler { accept_children_by_type (Api.NodeType.ERROR_CODE, doclet); } - public Gee.Collection get_error_code_list () { + public Collection get_error_code_list () { return get_children_by_type (Api.NodeType.ERROR_CODE); } public void visit (Doclet doclet) { - doclet.visit_error_domain ( this ); + doclet.visit_error_domain (this); } public override Api.NodeType node_type { get { return Api.NodeType.ERROR_DOMAIN; } } @@ -51,7 +50,7 @@ public class Valadoc.ErrorDomain : Api.TypeSymbolNode, MethodHandler { visit (doclet); } - public void write ( Langlet langlet, void* ptr ) { - langlet.write_error_domain ( this, ptr ); + public void write (Langlet langlet, void* ptr) { + langlet.write_error_domain (this, ptr); } } diff --git a/src/libvaladoc/apitree/errordomainhandler.vala b/src/libvaladoc/apitree/errordomainhandler.vala index cce01bddb..39ed44924 100644 --- a/src/libvaladoc/apitree/errordomainhandler.vala +++ b/src/libvaladoc/apitree/errordomainhandler.vala @@ -17,12 +17,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.ErrorDomainHandler : Api.Node { - public Gee.Collection get_error_domain_list () { + public Collection get_error_domain_list () { return get_children_by_type (Api.NodeType.ERROR_DOMAIN); } diff --git a/src/libvaladoc/apitree/exceptionlisthandler.vala b/src/libvaladoc/apitree/exceptionlisthandler.vala index a256b30db..bb02a1086 100644 --- a/src/libvaladoc/apitree/exceptionlisthandler.vala +++ b/src/libvaladoc/apitree/exceptionlisthandler.vala @@ -17,21 +17,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + // rename to ExceptionListHandler public interface Valadoc.ExceptionHandler : Api.Node { - public Gee.Collection get_error_domains () { + public Collection get_error_domains () { return get_children_by_type (Api.NodeType.ERROR_DOMAIN); } - public void add_exception_list (Tree root, Gee.Collection vexceptions) { + public void add_exception_list (Tree root, Vala.Collection vexceptions) { foreach (Vala.DataType vtype in vexceptions) { if (((Vala.ErrorType) vtype).error_domain == null) { - add_child ( glib_error ); + add_child (glib_error); } else { ErrorDomain type = (ErrorDomain) root.search_vala_symbol (((Vala.ErrorType) vtype).error_domain); add_child (type); @@ -39,3 +38,4 @@ public interface Valadoc.ExceptionHandler : Api.Node { } } } + diff --git a/src/libvaladoc/apitree/field.vala b/src/libvaladoc/apitree/field.vala index 389416ba8..8e907614a 100644 --- a/src/libvaladoc/apitree/field.vala +++ b/src/libvaladoc/apitree/field.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -31,7 +28,7 @@ public class Valadoc.Field : Api.MemberNode, ReturnTypeHandler { this.vfield = symbol; var vret = this.vfield.field_type; - this.set_ret_type ( vret ); + this.set_ret_type (vret); } public string? get_cname () { @@ -45,8 +42,9 @@ public class Valadoc.Field : Api.MemberNode, ReturnTypeHandler { public bool is_static { get { - if ( this.parent is Namespace ) + if (this.parent is Namespace) { return false; + } return this.vfield.binding == MemberBinding.STATIC; } @@ -64,8 +62,8 @@ public class Valadoc.Field : Api.MemberNode, ReturnTypeHandler { base.resolve_type_references (root); } - public void visit ( Doclet doclet, FieldHandler? parent ) { - doclet.visit_field ( this, parent ); + public void visit (Doclet doclet, FieldHandler? parent) { + doclet.visit_field (this, parent); } public override Api.NodeType node_type { get { return Api.NodeType.FIELD; } } @@ -74,8 +72,8 @@ public class Valadoc.Field : Api.MemberNode, ReturnTypeHandler { visit (doclet, (FieldHandler) parent); } - public void write ( Langlet langlet, void* ptr, FieldHandler parent ) { - langlet.write_field ( this, parent, ptr ); + public void write (Langlet langlet, void* ptr, FieldHandler parent) { + langlet.write_field (this, parent, ptr); } } diff --git a/src/libvaladoc/apitree/fieldhandler.vala b/src/libvaladoc/apitree/fieldhandler.vala index 37605f825..669c89147 100644 --- a/src/libvaladoc/apitree/fieldhandler.vala +++ b/src/libvaladoc/apitree/fieldhandler.vala @@ -17,12 +17,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.FieldHandler : Api.Node { - public Gee.Collection get_field_list () { + public Collection get_field_list () { return get_children_by_type (Api.NodeType.FIELD); } diff --git a/src/libvaladoc/apitree/formalparameter.vala b/src/libvaladoc/apitree/formalparameter.vala index 77c3885ee..b7cb4b118 100644 --- a/src/libvaladoc/apitree/formalparameter.vala +++ b/src/libvaladoc/apitree/formalparameter.vala @@ -17,10 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public class Valadoc.FormalParameter : Api.SymbolNode, ReturnTypeHandler { private Vala.FormalParameter vformalparam; @@ -29,18 +28,18 @@ public class Valadoc.FormalParameter : Api.SymbolNode, ReturnTypeHandler { this.vformalparam = symbol; var vformparam = this.vformalparam.parameter_type; - this.set_ret_type ( vformparam ); + this.set_ret_type (vformparam); } public bool is_out { get { - return this.vformalparam.direction == ParameterDirection.OUT; + return this.vformalparam.direction == Vala.ParameterDirection.OUT; } } public bool is_ref { get { - return this.vformalparam.direction == ParameterDirection.REF; + return this.vformalparam.direction == Vala.ParameterDirection.REF; } } @@ -67,16 +66,17 @@ public class Valadoc.FormalParameter : Api.SymbolNode, ReturnTypeHandler { } protected override void resolve_type_references (Tree root) { - if (this.vformalparam.ellipsis) - return ; + if (this.vformalparam.ellipsis) { + return; + } this.set_return_type_references (root); base.resolve_type_references (root); } - public void write ( Langlet langlet, void* ptr ) { - langlet.write_formal_parameter ( this, ptr ); + public void write (Langlet langlet, void* ptr) { + langlet.write_formal_parameter (this, ptr); } } diff --git a/src/libvaladoc/apitree/interface.vala b/src/libvaladoc/apitree/interface.vala index e1ffc2ce6..0cdcef03c 100644 --- a/src/libvaladoc/apitree/interface.vala +++ b/src/libvaladoc/apitree/interface.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -29,14 +26,14 @@ public class Valadoc.Interface : Api.TypeSymbolNode, SignalHandler, PropertyHand this.vinterface = symbol; } - private Gee.ArrayList interfaces = new Gee.ArrayList(); + private ArrayList interfaces = new ArrayList (); - public Gee.Collection get_implemented_interface_list ( ) { + public Collection get_implemented_interface_list () { return this.interfaces; } public string? get_cname () { - return this.vinterface.get_cname(); + return this.vinterface.get_cname (); } protected Class? base_type { @@ -46,8 +43,8 @@ public class Valadoc.Interface : Api.TypeSymbolNode, SignalHandler, PropertyHand private Vala.Interface vinterface; - public void visit ( Doclet doclet ) { - doclet.visit_interface ( this ); + public void visit (Doclet doclet) { + doclet.visit_interface (this); } public override Api.NodeType node_type { get { return Api.NodeType.INTERFACE; } } @@ -56,20 +53,22 @@ public class Valadoc.Interface : Api.TypeSymbolNode, SignalHandler, PropertyHand visit (doclet); } - public void write ( Langlet langlet, void* ptr ) { - langlet.write_interface ( this, ptr ); + public void write (Langlet langlet, void* ptr) { + langlet.write_interface (this, ptr); } - private void set_prerequisites (Tree root, Gee.Collection lst) { - if ( ((Gee.Collection)this.interfaces).size != 0 ) - return ; + private void set_prerequisites (Tree root, Vala.Collection lst) { + if (this.interfaces.size != 0) { + return; + } - foreach ( Vala.DataType vtyperef in lst ) { - Api.Item? element = root.search_vala_symbol ( vtyperef.data_type ); - if ( element is Class ) + foreach (Vala.DataType vtyperef in lst) { + Api.Item? element = root.search_vala_symbol (vtyperef.data_type); + if (element is Class) { this.base_type = (Class)element; - else - this.interfaces.add ( (Interface)element ); + } else { + this.interfaces.add ((Interface)element); + } } } diff --git a/src/libvaladoc/apitree/interfacehandler.vala b/src/libvaladoc/apitree/interfacehandler.vala index 8e69095fa..0f13e9a5b 100644 --- a/src/libvaladoc/apitree/interfacehandler.vala +++ b/src/libvaladoc/apitree/interfacehandler.vala @@ -17,12 +17,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.InterfaceHandler : Api.Node { - public Gee.Collection get_interface_list () { + public Collection get_interface_list () { return get_children_by_type (Api.NodeType.INTERFACE); } diff --git a/src/libvaladoc/apitree/method.vala b/src/libvaladoc/apitree/method.vala index 6d3562869..58c902d82 100644 --- a/src/libvaladoc/apitree/method.vala +++ b/src/libvaladoc/apitree/method.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -74,9 +71,9 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan public bool is_static { get { - if (this.parent is Namespace || this.is_constructor) + if (this.parent is Namespace || this.is_constructor) { return false; - + } return this.vmethod.binding == MemberBinding.STATIC; } } @@ -96,10 +93,11 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan public override string? name { owned get { if (this.is_constructor) { - if (this.vmethod.name == ".new") + if (this.vmethod.name == ".new") { return ((Api.Node)this.parent).name; - else + } else { return ((Api.Node)this.parent).name + "." + this.vmethod.name; + } } else { return this.vmethod.name; @@ -129,8 +127,8 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan base.resolve_type_references (root); } - public void visit ( Doclet doclet, Valadoc.MethodHandler in_type ) { - doclet.visit_method ( this, in_type ); + public void visit (Doclet doclet, Valadoc.MethodHandler in_type) { + doclet.visit_method (this, in_type); } public override Api.NodeType node_type { @@ -143,8 +141,8 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan visit (doclet, (MethodHandler) parent); } - public void write ( Langlet langlet, void* ptr, Valadoc.MethodHandler parent ) { - langlet.write_method ( ptr, this, parent ); + public void write (Langlet langlet, void* ptr, Valadoc.MethodHandler parent) { + langlet.write_method (ptr, this, parent); } } diff --git a/src/libvaladoc/apitree/methodhandler.vala b/src/libvaladoc/apitree/methodhandler.vala index b4d9a836a..fba4a6488 100644 --- a/src/libvaladoc/apitree/methodhandler.vala +++ b/src/libvaladoc/apitree/methodhandler.vala @@ -17,16 +17,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.MethodHandler : Api.Node { public void visit_methods (Doclet doclet) { accept_children_by_type (Api.NodeType.METHOD, doclet); } - public Gee.Collection get_method_list () { + public Collection get_method_list () { return get_children_by_type (Api.NodeType.METHOD); } } + diff --git a/src/libvaladoc/apitree/namespace.vala b/src/libvaladoc/apitree/namespace.vala index 1cb91190d..a686134b2 100644 --- a/src/libvaladoc/apitree/namespace.vala +++ b/src/libvaladoc/apitree/namespace.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -27,7 +24,7 @@ public class Valadoc.Namespace : Api.SymbolNode, MethodHandler, FieldHandler, Na EnumHandler, ClassHandler, StructHandler, InterfaceHandler, DelegateHandler, ConstantHandler { - private Comment source_comment; + private Vala.Comment source_comment; public Namespace (Vala.Namespace symbol, NamespaceHandler parent) { base (symbol, parent); @@ -35,7 +32,7 @@ public class Valadoc.Namespace : Api.SymbolNode, MethodHandler, FieldHandler, Na this.vnspace = symbol; if (vnspace.source_reference != null) { - foreach (Comment c in vnspace.get_comments()) { + foreach (Vala.Comment c in vnspace.get_comments()) { if (this.package.is_vpackage (c.source_reference.file)) { this.source_comment = c; break; @@ -67,8 +64,8 @@ public class Valadoc.Namespace : Api.SymbolNode, MethodHandler, FieldHandler, Na set; } - internal bool is_vnspace ( Vala.Namespace vns ) { - return (this.vnspace == vns); + internal bool is_vnspace (Vala.Namespace vns) { + return this.vnspace == vns; } public void write (Langlet langlet, void* ptr) { diff --git a/src/libvaladoc/apitree/namespacehandler.vala b/src/libvaladoc/apitree/namespacehandler.vala index bc5cc939c..a17598600 100644 --- a/src/libvaladoc/apitree/namespacehandler.vala +++ b/src/libvaladoc/apitree/namespacehandler.vala @@ -17,24 +17,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.NamespaceHandler : Api.Node { - public Gee.Collection get_namespace_list (bool filtered = true) { + public Collection get_namespace_list (bool filtered = true) { return get_children_by_type (Api.NodeType.NAMESPACE, filtered); } - public void visit_namespaces ( Doclet doclet ) { + public void visit_namespaces (Doclet doclet) { accept_children_by_type (Api.NodeType.NAMESPACE, doclet); } - private Gee.ArrayList create_parent_vnamespace_list ( Vala.Symbol vsymbol ) { - var lst = new Gee.ArrayList (); + private ArrayList create_parent_vnamespace_list (Vala.Symbol vsymbol) { + var lst = new ArrayList (); - while ( vsymbol != null ) { - if ( vsymbol is Vala.Namespace ) { + while (vsymbol != null) { + if (vsymbol is Vala.Namespace) { lst.insert ( 0, (Vala.Namespace)vsymbol ); } vsymbol = vsymbol.parent_symbol; @@ -42,76 +41,80 @@ public interface Valadoc.NamespaceHandler : Api.Node { return lst; } - internal Namespace get_namespace_helper ( Vala.Symbol node, Gee.List vnspaces, int pos ) { - Vala.Namespace vns = vnspaces.get( pos ); + internal Namespace get_namespace_helper (Vala.Symbol node, Gee.List vnspaces, int pos) { + Vala.Namespace vns = vnspaces.get (pos); - Namespace ns = this.find_namespace_without_childs ( vns ); - if ( ns == null ) { + Namespace ns = this.find_namespace_without_childs (vns); + if (ns == null) { ns = new Namespace (vns, this); - add_child ( ns ); + add_child (ns); } - if ( vnspaces.size == pos+1 ) { + if (vnspaces.size == pos+1) { return ns; } - return ns.get_namespace_helper ( node, vnspaces, pos+1 ); + return ns.get_namespace_helper (node, vnspaces, pos+1); } - protected Namespace get_namespace ( Vala.Symbol node ) { + protected Namespace get_namespace (Vala.Symbol node) { Vala.Symbol vnd = ((Vala.Symbol)node).parent_symbol; - if ( vnd is Vala.Namespace == false ) + if (vnd is Vala.Namespace == false) { vnd = vnd.parent_symbol; + } Vala.Namespace vnspace = (Vala.Namespace)vnd; - var nspace = this.find_namespace ( vnspace ); - if ( nspace != null ) + var nspace = this.find_namespace (vnspace); + if (nspace != null) { return nspace; + } - var vnspaces = this.create_parent_vnamespace_list ( node ); + var vnspaces = this.create_parent_vnamespace_list (node); - if ( vnspaces.size > 2 ) { - return this.get_namespace_helper ( node, vnspaces, 1 ); - } - else { + if (vnspaces.size > 2) { + return this.get_namespace_helper (node, vnspaces, 1); + } else { var ns = new Namespace (vnspace, this); - add_child ( ns ); + add_child (ns); return ns; } } - internal Namespace? find_vnamespace_helper ( Gee.List vnspaces, int pos ) { - Vala.Namespace? vns = vnspaces.get ( pos ); - if ( vns == null ) + internal Namespace? find_vnamespace_helper (Gee.List vnspaces, int pos) { + Vala.Namespace? vns = vnspaces.get (pos); + if (vns == null) { return null; + } - foreach ( Namespace ns in get_namespace_list (false) ) { - if ( !ns.is_vnspace( vns ) ) - continue ; - - if ( pos+1 == vnspaces.size ) + foreach (Namespace ns in get_namespace_list (false)) { + if (!ns.is_vnspace(vns)) { + continue; + } + if (pos+1 == vnspaces.size) { return ns; - - return ns.find_vnamespace_helper ( vnspaces, pos+1 ); + } + return ns.find_vnamespace_helper (vnspaces, pos+1); } return null; } - internal Namespace find_namespace_without_childs ( Vala.Namespace vns ) { + internal Namespace find_namespace_without_childs (Vala.Namespace vns) { Namespace ns2 = null; - foreach ( Namespace ns in get_namespace_list (false) ) { - if ( ns.is_vnspace(vns) ) + foreach (Namespace ns in get_namespace_list (false)) { + if (ns.is_vnspace(vns)) { ns2 = ns; + } } return ns2; } - internal Namespace find_namespace ( Vala.Namespace vns ) { - var vnspaces = this.create_parent_vnamespace_list ( vns ); + internal Namespace find_namespace (Vala.Namespace vns) { + var vnspaces = this.create_parent_vnamespace_list (vns); - return this.find_vnamespace_helper ( vnspaces, vnspaces.index_of( vns ) ); + return this.find_vnamespace_helper (vnspaces, vnspaces.index_of (vns)); } } + diff --git a/src/libvaladoc/apitree/package.vala b/src/libvaladoc/apitree/package.vala index cbcf76a87..ce814dedd 100644 --- a/src/libvaladoc/apitree/package.vala +++ b/src/libvaladoc/apitree/package.vala @@ -17,15 +17,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; - public class Valadoc.Package : Api.Node, NamespaceHandler { - private Gee.ArrayList vfiles = new Gee.ArrayList (); + private ArrayList vfiles = new ArrayList (); internal void add_file (Vala.SourceFile vfile) { this.vfiles.add (vfile); @@ -36,35 +32,36 @@ public class Valadoc.Package : Api.Node, NamespaceHandler { get; } - internal void set_dependency_list ( Gee.ArrayList list ) { + internal void set_dependency_list (ArrayList list) { this._dependencies = list; } - private Gee.ArrayList _dependencies; + private ArrayList _dependencies; - public Gee.Collection get_full_dependency_list () { - Gee.ArrayList list = new Gee.ArrayList (); + public Collection get_full_dependency_list () { + ArrayList list = new ArrayList (); - if ( this._dependencies == null ) + if (this._dependencies == null) { return list.read_only_view; + } - foreach ( Package pkg in this._dependencies ) { - if ( list.contains ( pkg ) == false ) { - list.add ( pkg ); + foreach (Package pkg in this._dependencies) { + if (list.contains ( pkg ) == false) { + list.add (pkg); } var pkg_list = pkg.get_full_dependency_list (); - foreach ( Package pkg2 in pkg_list ) { - if ( list.contains ( pkg2 ) == false ) { - list.add ( pkg2 ); + foreach (Package pkg2 in pkg_list) { + if (list.contains (pkg2) == false) { + list.add (pkg2); } } } return list.read_only_view; } - public Gee.Collection get_dependency_list () { - if ( this._dependencies == null ) { + public Collection get_dependency_list () { + if (this._dependencies == null) { return Collection.empty (); } diff --git a/src/libvaladoc/apitree/parameterlisthandler.vala b/src/libvaladoc/apitree/parameterlisthandler.vala index 4a6263f79..4d0660c4c 100644 --- a/src/libvaladoc/apitree/parameterlisthandler.vala +++ b/src/libvaladoc/apitree/parameterlisthandler.vala @@ -17,10 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + // TODO Rename FormalParameters public interface Valadoc.ParameterListHandler : Api.Node { public Gee.List param_list { @@ -31,3 +30,4 @@ public interface Valadoc.ParameterListHandler : Api.Node { return (Gee.List) get_children_by_type (Api.NodeType.FORMAL_PARAMETER); } } + diff --git a/src/libvaladoc/apitree/pointer.vala b/src/libvaladoc/apitree/pointer.vala index d96e7ad82..e9672989c 100644 --- a/src/libvaladoc/apitree/pointer.vala +++ b/src/libvaladoc/apitree/pointer.vala @@ -17,13 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; - public class Valadoc.Pointer : Api.Item { private Vala.PointerType vtype; @@ -37,12 +33,13 @@ public class Valadoc.Pointer : Api.Item { this.parent = parent; Vala.DataType vntype = vtype.base_type; - if (vntype is Vala.PointerType) + if (vntype is Vala.PointerType) { this.data_type = new Pointer ((Vala.PointerType) vntype, this); - else if (vntype is Vala.ArrayType) + } else if (vntype is Vala.ArrayType) { this.data_type = new Array ((Vala.ArrayType) vntype, this); - else + } else { this.data_type = new TypeReference (vntype, this); + } } public void write (Langlet langlet, void* ptr, Api.Node parent) { @@ -51,14 +48,15 @@ public class Valadoc.Pointer : Api.Item { protected override void resolve_type_references (Tree root) { Api.Item type = this.data_type; - if ( type == null ) + if (type == null) { ; - else if ( type is Array ) + } else if (type is Array) { ((Array) type).resolve_type_references (root); - else if ( type is Pointer ) + } else if (type is Pointer) { ((Pointer) type ).resolve_type_references (root); - else + } else { ((TypeReference) type).resolve_type_references (root); + } } } diff --git a/src/libvaladoc/apitree/property.vala b/src/libvaladoc/apitree/property.vala index 6f7fe9056..a6526b5cc 100644 --- a/src/libvaladoc/apitree/property.vala +++ b/src/libvaladoc/apitree/property.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -51,8 +48,8 @@ public class Valadoc.Property : Api.MemberNode, ReturnTypeHandler { return this.vproperty.nick; } - public bool equals ( Property p ) { - return this.vproperty.equals ( p.vproperty ); + public bool equals (Property p) { + return this.vproperty.equals (p.vproperty); } public TypeReference? type_reference { diff --git a/src/libvaladoc/apitree/propertyaccessor.vala b/src/libvaladoc/apitree/propertyaccessor.vala index 67910b8f4..e4f2f722e 100644 --- a/src/libvaladoc/apitree/propertyaccessor.vala +++ b/src/libvaladoc/apitree/propertyaccessor.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -64,3 +61,4 @@ public class Valadoc.PropertyAccessor : Api.SymbolNode { langlet.write_property_accessor (this, ptr); } } + diff --git a/src/libvaladoc/apitree/propertyhandler.vala b/src/libvaladoc/apitree/propertyhandler.vala index 04bfd675d..e744feb79 100644 --- a/src/libvaladoc/apitree/propertyhandler.vala +++ b/src/libvaladoc/apitree/propertyhandler.vala @@ -17,26 +17,26 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.PropertyHandler : Api.Node { protected bool is_overwritten_property (Property prop) { foreach (Property p in get_property_list ()) { - if (p.parent != this) + if (p.parent != this) { continue ; - - if (!p.is_override) + } + if (!p.is_override) { continue ; - - if (p.equals (prop)) + } + if (p.equals (prop)) { return true; + } } return false; } - public Gee.Collection get_property_list () { + public Collection get_property_list () { return get_children_by_type (Api.NodeType.PROPERTY); } @@ -44,3 +44,4 @@ public interface Valadoc.PropertyHandler : Api.Node { accept_children_by_type (Api.NodeType.PROPERTY, doclet); } } + diff --git a/src/libvaladoc/apitree/returntypehandler.vala b/src/libvaladoc/apitree/returntypehandler.vala index 0314801f5..c21a9c0c7 100644 --- a/src/libvaladoc/apitree/returntypehandler.vala +++ b/src/libvaladoc/apitree/returntypehandler.vala @@ -17,10 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.ReturnTypeHandler : Api.Item { public abstract TypeReference? type_reference { protected set; @@ -40,3 +39,4 @@ public interface Valadoc.ReturnTypeHandler : Api.Item { this.type_reference = tmp; } } + diff --git a/src/libvaladoc/apitree/signal.vala b/src/libvaladoc/apitree/signal.vala index 922eaaf4a..17d72627d 100644 --- a/src/libvaladoc/apitree/signal.vala +++ b/src/libvaladoc/apitree/signal.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -70,3 +67,4 @@ public class Valadoc.Signal : Api.MemberNode, ParameterListHandler, ReturnTypeHa langlet.write_signal (this, ptr); } } + diff --git a/src/libvaladoc/apitree/signalhandler.vala b/src/libvaladoc/apitree/signalhandler.vala index 464f94a62..5ac190557 100644 --- a/src/libvaladoc/apitree/signalhandler.vala +++ b/src/libvaladoc/apitree/signalhandler.vala @@ -17,16 +17,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.SignalHandler : Api.Node { public void visit_signals (Doclet doclet) { accept_children_by_type (Api.NodeType.SIGNAL, doclet); } - public Gee.Collection get_signal_list () { + public Collection get_signal_list () { return get_children_by_type (Api.NodeType.SIGNAL); } } diff --git a/src/libvaladoc/apitree/struct.vala b/src/libvaladoc/apitree/struct.vala index fb24229f3..a70f9fe25 100644 --- a/src/libvaladoc/apitree/struct.vala +++ b/src/libvaladoc/apitree/struct.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -56,9 +53,9 @@ public class Valadoc.Struct : Api.TypeSymbolNode, MethodHandler, ConstructionMet private void set_parent_references (Tree root) { Vala.ValueType? basetype = this.vstruct.base_type as Vala.ValueType; - if (basetype == null) + if (basetype == null) { return ; - + } this.base_type = (Struct?) root.search_vala_symbol ((Vala.Struct) basetype.type_symbol); } diff --git a/src/libvaladoc/apitree/structhandler.vala b/src/libvaladoc/apitree/structhandler.vala index 64784d1d4..393a4a0ce 100644 --- a/src/libvaladoc/apitree/structhandler.vala +++ b/src/libvaladoc/apitree/structhandler.vala @@ -17,12 +17,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.StructHandler : Api.Node { - public Gee.Collection get_struct_list () { + public Collection get_struct_list () { return get_children_by_type (Api.NodeType.STRUCT); } diff --git a/src/libvaladoc/apitree/symbolaccessibility.vala b/src/libvaladoc/apitree/symbolaccessibility.vala index 17c2695e2..714d2c41f 100644 --- a/src/libvaladoc/apitree/symbolaccessibility.vala +++ b/src/libvaladoc/apitree/symbolaccessibility.vala @@ -17,10 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.SymbolAccessibility { public abstract bool is_public { get; } @@ -31,3 +30,4 @@ public interface Valadoc.SymbolAccessibility { public abstract bool is_private { get; } } + diff --git a/src/libvaladoc/apitree/templateparameterlisthandler.vala b/src/libvaladoc/apitree/templateparameterlisthandler.vala index c1d20db0f..b8414e7cb 100644 --- a/src/libvaladoc/apitree/templateparameterlisthandler.vala +++ b/src/libvaladoc/apitree/templateparameterlisthandler.vala @@ -17,12 +17,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + public interface Valadoc.TemplateParameterListHandler : Api.Node { - public Gee.Collection get_template_param_list () { + public Collection get_template_param_list () { return get_children_by_type (Api.NodeType.TYPE_PARAMETER); } } + diff --git a/src/libvaladoc/apitree/typeparameter.vala b/src/libvaladoc/apitree/typeparameter.vala index 22e9d0527..43351d9c7 100644 --- a/src/libvaladoc/apitree/typeparameter.vala +++ b/src/libvaladoc/apitree/typeparameter.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using Vala; -using GLib; using Gee; @@ -39,7 +36,8 @@ public class Valadoc.TypeParameter : Api.SymbolNode, ReturnTypeHandler { public override void accept (Doclet doclet) { } - public void write ( Langlet langlet, void* ptr ) { - langlet.write_type_parameter ( this, ptr ); + public void write (Langlet langlet, void* ptr) { + langlet.write_type_parameter (this, ptr); } } + diff --git a/src/libvaladoc/apitree/typereference.vala b/src/libvaladoc/apitree/typereference.vala index 09d0284ac..332d0303f 100644 --- a/src/libvaladoc/apitree/typereference.vala +++ b/src/libvaladoc/apitree/typereference.vala @@ -18,13 +18,11 @@ */ -using Vala; -using GLib; using Gee; public class Valadoc.TypeReference : Api.Item { - private Gee.ArrayList type_arguments = new Gee.ArrayList (); + private ArrayList type_arguments = new ArrayList (); private Vala.DataType? vtyperef; public TypeReference (Vala.DataType? vtyperef, Api.Item parent) { @@ -32,15 +30,15 @@ public class Valadoc.TypeReference : Api.Item { this.parent = parent; } - public Gee.Collection get_type_arguments ( ) { + public Gee.Collection get_type_arguments () { return this.type_arguments.read_only_view; } - private void set_template_argument_list (Tree root, Gee.Collection varguments) { - foreach ( Vala.DataType vdtype in varguments ) { + private void set_template_argument_list (Tree root, Vala.Collection varguments) { + foreach (Vala.DataType vdtype in varguments) { var dtype = new TypeReference (vdtype, this); dtype.resolve_type_references (root); - this.type_arguments.add ( dtype ); + this.type_arguments.add (dtype); } } @@ -52,15 +50,14 @@ public class Valadoc.TypeReference : Api.Item { public bool pass_ownership { get { Vala.CodeNode? node = this.vtyperef.parent_node; - if ( node == null ) + if (node == null) { return false; - - if ( node is Vala.FormalParameter ) { - return ( ((Vala.FormalParameter)node).direction == ParameterDirection.IN && - ((Vala.FormalParameter)node).parameter_type.value_owned ); } - - if ( node is Vala.Property ) { + if (node is Vala.FormalParameter) { + return (((Vala.FormalParameter)node).direction == Vala.ParameterDirection.IN && + ((Vala.FormalParameter)node).parameter_type.value_owned); + } + if (node is Vala.Property) { return ((Vala.Property)node).property_type.value_owned; } @@ -73,10 +70,10 @@ public class Valadoc.TypeReference : Api.Item { Vala.CodeNode parent = this.vtyperef.parent_node; // parameter: - if ( parent is Vala.FormalParameter ) { - if ( ((Vala.FormalParameter)parent).direction != ParameterDirection.IN ) + if (parent is Vala.FormalParameter) { + if (((Vala.FormalParameter)parent).direction != Vala.ParameterDirection.IN) { return false; - + } return ((Vala.FormalParameter)parent).parameter_type.value_owned; } return false; @@ -88,20 +85,19 @@ public class Valadoc.TypeReference : Api.Item { Vala.CodeNode parent = this.vtyperef.parent_node; // parameter: - if ( parent is Vala.FormalParameter ) { - if ( ((Vala.FormalParameter)parent).direction == ParameterDirection.IN ) + if (parent is Vala.FormalParameter) { + if (((Vala.FormalParameter)parent).direction == Vala.ParameterDirection.IN) { return false; - + } return this.is_weak_helper ( ((Vala.FormalParameter)parent).parameter_type ); } - return false; } } // from vala/valacodewriter.vala - private bool is_weak_helper ( Vala.DataType type ) { + private bool is_weak_helper (Vala.DataType type) { if (type.value_owned) { return false; } else if (type is Vala.VoidType || type is Vala.PointerType) { @@ -134,16 +130,16 @@ public class Valadoc.TypeReference : Api.Item { } if (parent is Vala.Method == true) { - return this.is_weak_helper ( ((Vala.Method)parent).return_type ); + return this.is_weak_helper (((Vala.Method)parent).return_type); } else if (parent is Vala.Signal == true) { - return this.is_weak_helper ( ((Vala.Signal)parent).return_type ); + return this.is_weak_helper (((Vala.Signal)parent).return_type); } else if (parent is Vala.Delegate == true) { - return this.is_weak_helper ( ((Vala.Delegate)parent).return_type ); + return this.is_weak_helper (((Vala.Delegate)parent).return_type); } - return ( this.vtyperef.parent_node is Field )? this.is_weak_helper( this.vtyperef ) : false; + return ( this.vtyperef.parent_node is Field )? this.is_weak_helper(this.vtyperef) : false; } } @@ -155,74 +151,73 @@ public class Valadoc.TypeReference : Api.Item { // remove private string extract_type_name ( Vala.DataType vdtype ) { - if ( vdtype is Vala.VoidType ) { - return "void"; - } - else if ( vdtype is Vala.PointerType ) { - return this.extract_type_name ( ((Vala.PointerType)vdtype).base_type ); - } - else if ( vdtype is Vala.DelegateType ) { - return ((Vala.DelegateType)this.vtyperef).delegate_symbol.name; - } - else if ( vdtype is Vala.MethodType ) { - return ((Vala.MethodType)this.vtyperef).method_symbol.name; - } - else if ( vdtype is Vala.SignalType ) { - return ((Vala.SignalType)this.vtyperef).signal_symbol.name; - } - else if ( vdtype is Vala.ArrayType ) { - this.extract_type_name ( ((Vala.ArrayType)vdtype).element_type ); - } - return vtyperef.to_string(); + if (vdtype is Vala.VoidType) { + return "void"; + } + else if (vdtype is Vala.PointerType) { + return this.extract_type_name (((Vala.PointerType)vdtype).base_type); + } + else if (vdtype is Vala.DelegateType) { + return ((Vala.DelegateType)this.vtyperef).delegate_symbol.name; + } + else if (vdtype is Vala.MethodType) { + return ((Vala.MethodType)this.vtyperef).method_symbol.name; + } + else if (vdtype is Vala.SignalType) { + return ((Vala.SignalType)this.vtyperef).signal_symbol.name; + } + else if (vdtype is Vala.ArrayType) { + this.extract_type_name (((Vala.ArrayType)vdtype).element_type); + } + return vtyperef.to_string (); } // remove public string type_name { owned get { - return this.extract_type_name ( this.vtyperef ); + return this.extract_type_name (this.vtyperef); } } protected override void resolve_type_references (Tree root) { - if ( this.vtyperef != null ) { - if ( this.vtyperef is PointerType ) + if (this.vtyperef != null) { + if ( this.vtyperef is Vala.PointerType) { this.data_type = new Pointer ((Vala.PointerType) this.vtyperef, this); - else if ( vtyperef is ArrayType ) + } else if (vtyperef is Vala.ArrayType) { this.data_type = new Array ((Vala.ArrayType) this.vtyperef, this); - else if ( vtyperef is GenericType ) + } else if (vtyperef is Vala.GenericType) { this.data_type = (TypeParameter) root.search_vala_symbol (((Vala.GenericType) this.vtyperef).type_parameter); + } } - if ( this.data_type == null ) { + if (this.data_type == null) { Vala.DataType vtype = this.vtyperef; this.set_template_argument_list (root, vtype.get_type_arguments ()); // still necessary? if ( vtype is Vala.ErrorType ) { Vala.ErrorDomain verrdom = ((Vala.ErrorType)vtype).error_domain; - if ( verrdom != null ) - this.data_type = root.search_vala_symbol ( verrdom ); - else + if (verrdom != null) { + this.data_type = root.search_vala_symbol (verrdom); + } else { this.data_type = glib_error; + } } // necessary? - else if (vtype is Vala.DelegateType ) { - this.data_type = root.search_vala_symbol ( ((Vala.DelegateType)vtype).delegate_symbol ); + else if (vtype is Vala.DelegateType) { + this.data_type = root.search_vala_symbol (((Vala.DelegateType)vtype).delegate_symbol); + } else { + this.data_type = root.search_vala_symbol (vtype.data_type); } - else { - this.data_type = root.search_vala_symbol ( vtype.data_type ); - } - } - else if ( this.data_type is Pointer ) { + } else if (this.data_type is Pointer) { ((Pointer)this.data_type).resolve_type_references (root); - } - else if ( this.data_type is Array ) { + } else if (this.data_type is Array) { ((Array)this.data_type).resolve_type_references (root); } } - public void write ( Langlet langlet, void* ptr ) { - langlet.write_type_reference ( this, ptr ); + public void write (Langlet langlet, void* ptr) { + langlet.write_type_reference (this, ptr); } } diff --git a/src/libvaladoc/apitree/visitable.vala b/src/libvaladoc/apitree/visitable.vala index bcb03d449..cd002ce8b 100644 --- a/src/libvaladoc/apitree/visitable.vala +++ b/src/libvaladoc/apitree/visitable.vala @@ -17,10 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Vala; -using GLib; using Gee; + // Rename to Browsable public interface Valadoc.Visitable : Api.Item { diff --git a/src/libvaladoc/content/block.vala b/src/libvaladoc/content/block.vala index 8c23390da..f703e7d13 100755 --- a/src/libvaladoc/content/block.vala +++ b/src/libvaladoc/content/block.vala @@ -21,8 +21,7 @@ * Didier 'Ptitjes Villevalois */ -using GLib; -using Gee; public interface Valadoc.Content.Block : ContentElement { } + diff --git a/src/libvaladoc/content/blockcontent.vala b/src/libvaladoc/content/blockcontent.vala index beece63ed..76c455509 100755 --- a/src/libvaladoc/content/blockcontent.vala +++ b/src/libvaladoc/content/blockcontent.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public abstract class Valadoc.Content.BlockContent : ContentElement { public Gee.List content { get { return _content; } } @@ -48,3 +48,4 @@ public abstract class Valadoc.Content.BlockContent : ContentElement { } } } + diff --git a/src/libvaladoc/content/comment.vala b/src/libvaladoc/content/comment.vala index 61469350b..0c4d40ddf 100755 --- a/src/libvaladoc/content/comment.vala +++ b/src/libvaladoc/content/comment.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.Comment : BlockContent { public Gee.List taglets { get { return _taglets; } } @@ -71,3 +71,4 @@ public class Valadoc.Content.Comment : BlockContent { return selected_taglets; } } + diff --git a/src/libvaladoc/content/contentelement.vala b/src/libvaladoc/content/contentelement.vala index 37efd2739..a4c7e8084 100755 --- a/src/libvaladoc/content/contentelement.vala +++ b/src/libvaladoc/content/contentelement.vala @@ -22,7 +22,7 @@ */ using GLib; -using Gee; + public abstract class Valadoc.Content.ContentElement : Object { @@ -36,3 +36,4 @@ public abstract class Valadoc.Content.ContentElement : Object { public virtual void accept_children (ContentVisitor visitor) { } } + diff --git a/src/libvaladoc/content/contentfactory.vala b/src/libvaladoc/content/contentfactory.vala index 9d7c156d9..d4b117795 100755 --- a/src/libvaladoc/content/contentfactory.vala +++ b/src/libvaladoc/content/contentfactory.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.ContentFactory : Object { public ContentFactory (Settings settings, ResourceLocator locator, ModuleLoader modules) { diff --git a/src/libvaladoc/content/contentrenderer.vala b/src/libvaladoc/content/contentrenderer.vala index 6f3b84990..1bed9ac42 100755 --- a/src/libvaladoc/content/contentrenderer.vala +++ b/src/libvaladoc/content/contentrenderer.vala @@ -22,7 +22,7 @@ */ using GLib; -using Gee; + public abstract class Valadoc.Content.ContentRenderer : ContentVisitor { @@ -30,3 +30,4 @@ public abstract class Valadoc.Content.ContentRenderer : ContentVisitor { public abstract void render_children (ContentElement element); } + diff --git a/src/libvaladoc/content/contentvisitor.vala b/src/libvaladoc/content/contentvisitor.vala index 0fff17b88..6202a45c6 100755 --- a/src/libvaladoc/content/contentvisitor.vala +++ b/src/libvaladoc/content/contentvisitor.vala @@ -22,7 +22,7 @@ */ using GLib; -using Gee; + public abstract class Valadoc.Content.ContentVisitor : Object { @@ -74,3 +74,4 @@ public abstract class Valadoc.Content.ContentVisitor : Object { public virtual void visit_text (Text element) { } } + diff --git a/src/libvaladoc/content/embedded.vala b/src/libvaladoc/content/embedded.vala index 7f7db16c5..74b64f01e 100755 --- a/src/libvaladoc/content/embedded.vala +++ b/src/libvaladoc/content/embedded.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.Embedded : ContentElement, Inline, StyleAttributes { public string url { get; set; } public string caption { get; set; } @@ -50,3 +50,4 @@ public class Valadoc.Content.Embedded : ContentElement, Inline, StyleAttributes visitor.visit_embedded (this); } } + diff --git a/src/libvaladoc/content/headline.vala b/src/libvaladoc/content/headline.vala index 0e76844c8..7cd323675 100755 --- a/src/libvaladoc/content/headline.vala +++ b/src/libvaladoc/content/headline.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.Headline : Block, InlineContent { public int level { get; set; } @@ -43,3 +43,4 @@ public class Valadoc.Content.Headline : Block, InlineContent { visitor.visit_headline (this); } } + diff --git a/src/libvaladoc/content/inline.vala b/src/libvaladoc/content/inline.vala index d225bef8e..d2f19cc91 100755 --- a/src/libvaladoc/content/inline.vala +++ b/src/libvaladoc/content/inline.vala @@ -21,8 +21,6 @@ * Didier 'Ptitjes Villevalois */ -using GLib; -using Gee; public interface Valadoc.Content.Inline : ContentElement { } diff --git a/src/libvaladoc/content/inlinecontent.vala b/src/libvaladoc/content/inlinecontent.vala index 390526b25..84f6b7271 100755 --- a/src/libvaladoc/content/inlinecontent.vala +++ b/src/libvaladoc/content/inlinecontent.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public abstract class Valadoc.Content.InlineContent : ContentElement { public Gee.List content { get { return _content; } } @@ -48,3 +48,4 @@ public abstract class Valadoc.Content.InlineContent : ContentElement { } } } + diff --git a/src/libvaladoc/content/inlinetaglet.vala b/src/libvaladoc/content/inlinetaglet.vala index 83b76bf94..e0052b929 100755 --- a/src/libvaladoc/content/inlinetaglet.vala +++ b/src/libvaladoc/content/inlinetaglet.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public abstract class Valadoc.Content.InlineTaglet : ContentElement, Taglet, Inline { protected Settings settings; protected ResourceLocator locator; @@ -59,3 +59,4 @@ public abstract class Valadoc.Content.InlineTaglet : ContentElement, Taglet, Inl element.accept (visitor); } } + diff --git a/src/libvaladoc/content/link.vala b/src/libvaladoc/content/link.vala index 613b1880a..061f53e01 100755 --- a/src/libvaladoc/content/link.vala +++ b/src/libvaladoc/content/link.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.Link : ContentElement, Inline { public string url { get; set; } public string label { get; set; } @@ -42,3 +42,4 @@ public class Valadoc.Content.Link : ContentElement, Inline { visitor.visit_link (this); } } + diff --git a/src/libvaladoc/content/list.vala b/src/libvaladoc/content/list.vala index 5a52620fe..c92f86489 100755 --- a/src/libvaladoc/content/list.vala +++ b/src/libvaladoc/content/list.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.List : ContentElement, Block { public Gee.List items { get { return _items; } } @@ -47,3 +47,4 @@ public class Valadoc.Content.List : ContentElement, Block { visitor.visit_list (this); } } + diff --git a/src/libvaladoc/content/listitem.vala b/src/libvaladoc/content/listitem.vala index 1cbcaa80d..89490e556 100755 --- a/src/libvaladoc/content/listitem.vala +++ b/src/libvaladoc/content/listitem.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.ListItem : InlineContent { public enum Bullet { NONE, @@ -55,3 +55,4 @@ public class Valadoc.Content.ListItem : InlineContent { visitor.visit_list_item (this); } } + diff --git a/src/libvaladoc/content/page.vala b/src/libvaladoc/content/page.vala index 2580bf402..54aaaa16e 100755 --- a/src/libvaladoc/content/page.vala +++ b/src/libvaladoc/content/page.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.Page : BlockContent { internal Page () { base (); @@ -33,3 +33,4 @@ public class Valadoc.Content.Page : BlockContent { visitor.visit_page (this); } } + diff --git a/src/libvaladoc/content/paragraph.vala b/src/libvaladoc/content/paragraph.vala index 85372222c..f154b14a4 100755 --- a/src/libvaladoc/content/paragraph.vala +++ b/src/libvaladoc/content/paragraph.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.Paragraph : InlineContent, Block, StyleAttributes { public HorizontalAlign? horizontal_align { get; set; } public VerticalAlign? vertical_align { get; set; } @@ -42,3 +42,4 @@ public class Valadoc.Content.Paragraph : InlineContent, Block, StyleAttributes { visitor.visit_paragraph (this); } } + diff --git a/src/libvaladoc/content/resourcelocator.vala b/src/libvaladoc/content/resourcelocator.vala index b188cb1ec..22181d34b 100755 --- a/src/libvaladoc/content/resourcelocator.vala +++ b/src/libvaladoc/content/resourcelocator.vala @@ -22,8 +22,9 @@ */ using GLib; -using Gee; + public interface Valadoc.ResourceLocator : Object { public abstract string resolve (string path); } + diff --git a/src/libvaladoc/content/run.vala b/src/libvaladoc/content/run.vala index 1728396c7..341ed9707 100755 --- a/src/libvaladoc/content/run.vala +++ b/src/libvaladoc/content/run.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.Run : InlineContent, Inline { public enum Style { NONE, @@ -53,3 +53,4 @@ public class Valadoc.Content.Run : InlineContent, Inline { visitor.visit_run (this); } } + diff --git a/src/libvaladoc/content/sourcecode.vala b/src/libvaladoc/content/sourcecode.vala index 9b0ff724a..07c262fbf 100755 --- a/src/libvaladoc/content/sourcecode.vala +++ b/src/libvaladoc/content/sourcecode.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.SourceCode : ContentElement, Block { public enum Language { GENIE, diff --git a/src/libvaladoc/content/styleattributes.vala b/src/libvaladoc/content/styleattributes.vala index 09283b9f0..c02d56296 100755 --- a/src/libvaladoc/content/styleattributes.vala +++ b/src/libvaladoc/content/styleattributes.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public enum Valadoc.Content.HorizontalAlign { LEFT, RIGHT, @@ -41,3 +41,4 @@ public interface Valadoc.Content.StyleAttributes : ContentElement { public abstract VerticalAlign? vertical_align { get; set; } public abstract string? style { get; set; } } + diff --git a/src/libvaladoc/content/symbollink.vala b/src/libvaladoc/content/symbollink.vala index 9e13f4a8f..fbed643da 100755 --- a/src/libvaladoc/content/symbollink.vala +++ b/src/libvaladoc/content/symbollink.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.SymbolLink : ContentElement, Inline { public Api.Node symbol { get; set; } public string label { get; set; } @@ -44,3 +44,4 @@ public class Valadoc.Content.SymbolLink : ContentElement, Inline { visitor.visit_symbol_link (this); } } + diff --git a/src/libvaladoc/content/table.vala b/src/libvaladoc/content/table.vala index 0acf4d500..3371faab6 100755 --- a/src/libvaladoc/content/table.vala +++ b/src/libvaladoc/content/table.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.Table : ContentElement, Block { public Gee.List rows { get { return _rows; } } @@ -53,3 +53,4 @@ public class Valadoc.Content.Table : ContentElement, Block { } } } + diff --git a/src/libvaladoc/content/tablecell.vala b/src/libvaladoc/content/tablecell.vala index 3ada7cc85..984bf57da 100755 --- a/src/libvaladoc/content/tablecell.vala +++ b/src/libvaladoc/content/tablecell.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.TableCell : InlineContent, StyleAttributes { public HorizontalAlign? horizontal_align { get; set; } public VerticalAlign? vertical_align { get; set; } @@ -46,3 +46,4 @@ public class Valadoc.Content.TableCell : InlineContent, StyleAttributes { visitor.visit_table_cell (this); } } + diff --git a/src/libvaladoc/content/tablerow.vala b/src/libvaladoc/content/tablerow.vala index 0011d19fd..86f573687 100755 --- a/src/libvaladoc/content/tablerow.vala +++ b/src/libvaladoc/content/tablerow.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.TableRow : ContentElement { public Gee.List cells { get { return _cells; } } @@ -51,3 +51,4 @@ public class Valadoc.Content.TableRow : ContentElement { } } } + diff --git a/src/libvaladoc/content/taglet.vala b/src/libvaladoc/content/taglet.vala index 098d0f020..d08867461 100755 --- a/src/libvaladoc/content/taglet.vala +++ b/src/libvaladoc/content/taglet.vala @@ -21,10 +21,11 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public interface Valadoc.Content.Taglet : ContentElement { public abstract Rule? get_parser_rule (Rule run_rule); } + diff --git a/src/libvaladoc/content/text.vala b/src/libvaladoc/content/text.vala index 00194956b..3b7d7a274 100755 --- a/src/libvaladoc/content/text.vala +++ b/src/libvaladoc/content/text.vala @@ -21,9 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; + public class Valadoc.Content.Text : ContentElement, Inline { public string content { get; set; } @@ -44,3 +44,4 @@ public class Valadoc.Content.Text : ContentElement, Inline { visitor.visit_text (this); } } + diff --git a/src/libvaladoc/doclet.vala b/src/libvaladoc/doclet.vala index 1943cae43..1d2c85baa 100755 --- a/src/libvaladoc/doclet.vala +++ b/src/libvaladoc/doclet.vala @@ -17,31 +17,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Valadoc; -using GLib; +using Gee; public static delegate Type Valadoc.DocletRegisterFunction ( ); - - public abstract class Valadoc.Doclet : GLib.Object { - public abstract void initialisation ( Settings settings, Tree tree ); - public abstract void visit_package ( Package pkg ); - public abstract void visit_namespace ( Namespace ns ); - public abstract void visit_interface ( Interface iface ); - public abstract void visit_class ( Class cl ); - public abstract void visit_struct ( Struct stru ); - public abstract void visit_error_domain ( ErrorDomain errdom ); - public abstract void visit_enum ( Enum en ); - public abstract void visit_property ( Property prop ); - public abstract void visit_field ( Field field, FieldHandler parent ); - public abstract void visit_constant ( Constant constant, ConstantHandler parent ); - public abstract void visit_error_code ( ErrorCode errcode ); - public abstract void visit_enum_value ( EnumValue enval ); - public abstract void visit_delegate ( Delegate del ); - public abstract void visit_signal ( Signal sig ); - public abstract void visit_method ( Method m, Valadoc.MethodHandler parent ); + public abstract void initialisation (Settings settings, Tree tree); + public abstract void visit_package (Package pkg); + public abstract void visit_namespace (Namespace ns); + public abstract void visit_interface (Interface iface); + public abstract void visit_class (Class cl); + public abstract void visit_struct (Struct stru); + public abstract void visit_error_domain (ErrorDomain errdom); + public abstract void visit_enum (Enum en); + public abstract void visit_property (Property prop); + public abstract void visit_field (Field field, FieldHandler parent); + public abstract void visit_constant (Constant constant, ConstantHandler parent); + public abstract void visit_error_code (ErrorCode errcode); + public abstract void visit_enum_value (EnumValue enval); + public abstract void visit_delegate (Delegate del); + public abstract void visit_signal (Signal sig); + public abstract void visit_method (Method m, Valadoc.MethodHandler parent); } diff --git a/src/libvaladoc/documentation/commentscanner.vala b/src/libvaladoc/documentation/commentscanner.vala index aa74ad785..ce0214d10 100644 --- a/src/libvaladoc/documentation/commentscanner.vala +++ b/src/libvaladoc/documentation/commentscanner.vala @@ -67,3 +67,4 @@ public class Valadoc.CommentScanner : WikiScanner { } } } + diff --git a/src/libvaladoc/documentation/documentation.vala b/src/libvaladoc/documentation/documentation.vala index 7d36140ce..f7fc9ff49 100755 --- a/src/libvaladoc/documentation/documentation.vala +++ b/src/libvaladoc/documentation/documentation.vala @@ -17,9 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using GLib; using Gee; public interface Valadoc.Documentation : Object { public abstract string? get_filename (); } + diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala index 68fd2fa3b..35d480577 100644 --- a/src/libvaladoc/documentation/documentationparser.vala +++ b/src/libvaladoc/documentation/documentationparser.vala @@ -21,8 +21,9 @@ * Didier 'Ptitjes Villevalois */ -using Gee; using Valadoc.Content; +using Gee; + public class Valadoc.DocumentationParser : Object, ResourceLocator { diff --git a/src/libvaladoc/documentation/wiki.vala b/src/libvaladoc/documentation/wiki.vala index f539239f2..7080722ac 100755 --- a/src/libvaladoc/documentation/wiki.vala +++ b/src/libvaladoc/documentation/wiki.vala @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +using Gee; public class Valadoc.WikiPage : Object, Documentation { public Content.Page documentation { @@ -40,21 +41,20 @@ public class Valadoc.WikiPage : Object, Documentation { } public string? get_filename () { - return Path.get_basename( this.path ); + return Path.get_basename(this.path); } - public WikiPage ( string name, string path ) { + public WikiPage (string name, string path) { this.name = name; this.path = path; } - public void read ( ) throws GLib.FileError { + public void read () throws GLib.FileError { try { string content; FileUtils.get_contents (this.path, out content); this.documentation_str = content; - } - catch (FileError err) { + } catch (FileError err) { throw err; } } @@ -67,26 +67,26 @@ public class Valadoc.WikiPage : Object, Documentation { public class Valadoc.WikiPageTree : Object { - private Gee.ArrayList wikipages; + private ArrayList wikipages; private ErrorReporter reporter; private Settings settings; - public WikiPageTree ( ErrorReporter reporter, Settings settings ) { + public WikiPageTree (ErrorReporter reporter, Settings settings) { this.reporter = reporter; this.settings = settings; } - public Gee.Collection get_pages () { - return this.wikipages == null ? Gee.Collection.empty () : this.wikipages.read_only_view; + public Collection get_pages () { + return this.wikipages == null ? Collection.empty () : this.wikipages.read_only_view; } - public WikiPage? search ( string name ) { - if ( this.wikipages == null ) { + public WikiPage? search (string name) { + if (this.wikipages == null) { return null; } - foreach ( WikiPage page in this.wikipages ) { - if ( page.name == name ) { + foreach (WikiPage page in this.wikipages ) { + if (page.name == name) { return page; } } @@ -102,25 +102,24 @@ public class Valadoc.WikiPageTree : Object { WikiPage wikipage = new WikiPage( (nameoffset!=null)?Path.build_filename (nameoffset, curname):curname, filename ); this.wikipages.add(wikipage); wikipage.read (); - } - else if ( FileUtils.test(filename, FileTest.IS_DIR) ) { + } else if (FileUtils.test(filename, FileTest.IS_DIR)) { this.create_tree_from_path (docparser, filename, (nameoffset!=null)?Path.build_filename (nameoffset, curname):curname); } } } - public void create_tree ( DocumentationParser docparser ) throws GLib.FileError { + public void create_tree (DocumentationParser docparser) throws GLib.FileError { try { weak string path = this.settings.wiki_directory; if (path == null) { return ; } - this.wikipages = new Gee.ArrayList (); + this.wikipages = new ArrayList (); this.create_tree_from_path (docparser, path); - foreach ( WikiPage page in this.wikipages ) { - page.parse ( docparser ); + foreach (WikiPage page in this.wikipages) { + page.parse (docparser); } } catch (FileError err) { diff --git a/src/libvaladoc/documentation/wikiscanner.vala b/src/libvaladoc/documentation/wikiscanner.vala index 1784ccd61..62e6dc7da 100644 --- a/src/libvaladoc/documentation/wikiscanner.vala +++ b/src/libvaladoc/documentation/wikiscanner.vala @@ -393,3 +393,4 @@ public class Valadoc.WikiScanner : Object, Scanner { } } } + diff --git a/src/libvaladoc/drawer.vala b/src/libvaladoc/drawer.vala index 55da15d75..85bf3c7d1 100755 --- a/src/libvaladoc/drawer.vala +++ b/src/libvaladoc/drawer.vala @@ -1,22 +1,37 @@ - +/* + * Valadoc - a documentation tool for vala. + * Copyright (C) 2008 Florian Brosch + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ using Graphviz; -using GLib; using Gee; - namespace Valadoc.Diagrams { // replace with .full_name - private static inline string get_diagram_node_name ( Api.Node type ) { + private static inline string get_diagram_node_name (Api.Node type) { string name = ""; - if ( type.nspace.full_name() != null ) { - name = type.nspace.full_name() + "."; + if (type.nspace.full_name() != null) { + name = type.nspace.full_name () + "."; } return name + type.name; } - public static void write_struct_diagram ( Struct stru, string path ) { + public static void write_struct_diagram (Struct stru, string path) { string[] params2 = new string[5]; params2[0] = ""; params2[1] = "-T"; @@ -24,29 +39,29 @@ namespace Valadoc.Diagrams { params2[3] = "-o"; params2[4] = path; - Graphviz.Context cntxt = Context.context( ); - cntxt.parse_args ( params2 ); + Graphviz.Context cntxt = Context.context (); + cntxt.parse_args (params2); - Graphviz.Graph g = Graph.open ( "g", GraphType.AGDIGRAPH ); - g.set_safe ( "rank", "", "" ); + Graphviz.Graph g = Graph.open ("g", GraphType.AGDIGRAPH); + g.set_safe ("rank", "", ""); - weak Graphviz.Node me = draw_struct ( g, stru, null ); - draw_struct_parents ( stru, g, me ); + weak Graphviz.Node me = draw_struct (g, stru, null); + draw_struct_parents (stru, g, me); - cntxt.layout_jobs ( g ); - cntxt.render_jobs ( g ); - cntxt.free_layout ( g ); + cntxt.layout_jobs (g); + cntxt.render_jobs (g); + cntxt.free_layout (g); } - private static void draw_struct_parents ( Struct stru, Graphviz.Graph g, Graphviz.Node me ) { + private static void draw_struct_parents (Struct stru, Graphviz.Graph g, Graphviz.Node me) { Struct? parent = (Struct?)stru.base_type; - if ( parent != null ) { - weak Graphviz.Node stru2 = draw_struct ( g, parent, me ); - draw_struct_parents ( parent, g, stru2 ); + if (parent != null) { + weak Graphviz.Node stru2 = draw_struct (g, parent, me); + draw_struct_parents (parent, g, stru2); } } - public static void write_interface_diagram ( Interface iface, string path ) { + public static void write_interface_diagram (Interface iface, string path) { string[] params2 = new string[5]; params2[0] = ""; params2[1] = "-T"; @@ -54,34 +69,34 @@ namespace Valadoc.Diagrams { params2[3] = "-o"; params2[4] = path; - Graphviz.Context cntxt = Context.context( ); - cntxt.parse_args ( params2 ); + Graphviz.Context cntxt = Context.context (); + cntxt.parse_args (params2); - Graphviz.Graph g = Graph.open ( "g", GraphType.AGDIGRAPH ); - g.set_safe ( "rank", "", "" ); + Graphviz.Graph g = Graph.open ("g", GraphType.AGDIGRAPH); + g.set_safe ("rank", "", ""); - weak Graphviz.Node me = draw_interface ( g, iface, null ); - draw_interface_parents ( iface, g, me ); + weak Graphviz.Node me = draw_interface (g, iface, null); + draw_interface_parents (iface, g, me); - cntxt.layout_jobs ( g ); - cntxt.render_jobs ( g ); - cntxt.free_layout ( g ); + cntxt.layout_jobs (g); + cntxt.render_jobs (g); + cntxt.free_layout (g); } - private static void draw_interface_parents ( Interface iface, Graphviz.Graph g, Graphviz.Node me ) { - Gee.Collection parentlst = iface.get_implemented_interface_list ( ); + private static void draw_interface_parents (Interface iface, Graphviz.Graph g, Graphviz.Node me) { + Collection parentlst = iface.get_implemented_interface_list (); Class? cl = (Class?)iface.base_type; - if ( cl != null ) { - weak Graphviz.Node cln = draw_class ( g, cl, me ); - draw_class_parents ( cl, g, cln ); + if (cl != null) { + weak Graphviz.Node cln = draw_class (g, cl, me); + draw_class_parents (cl, g, cln); } - foreach ( Interface type in parentlst ) { - draw_interface ( g, (Interface)type, me ); + foreach (Interface type in parentlst) { + draw_interface (g, (Interface)type, me); } } - public static void write_class_diagram ( Class cl, string path ) { + public static void write_class_diagram (Class cl, string path) { string[] params2 = new string[5]; params2[0] = ""; params2[1] = "-T"; @@ -89,87 +104,89 @@ namespace Valadoc.Diagrams { params2[3] = "-o"; params2[4] = path; - Graphviz.Context cntxt = Context.context( ); - cntxt.parse_args ( params2 ); + Graphviz.Context cntxt = Context.context (); + cntxt.parse_args (params2); - Graphviz.Graph g = Graph.open ( "g", GraphType.AGDIGRAPH ); - g.set_safe ( "rank", "", "" ); + Graphviz.Graph g = Graph.open ("g", GraphType.AGDIGRAPH); + g.set_safe ("rank", "", ""); - weak Graphviz.Node me = draw_class ( g, cl, null ); - draw_class_parents ( cl, g, me ); + weak Graphviz.Node me = draw_class (g, cl, null); + draw_class_parents (cl, g, me); - cntxt.layout_jobs ( g ); - cntxt.render_jobs ( g ); - cntxt.free_layout ( g ); + cntxt.layout_jobs (g); + cntxt.render_jobs (g); + cntxt.free_layout (g); } - private static weak Graphviz.Node draw_struct ( Graph g, Struct stru, Graphviz.Node? parent ) { - string name = get_diagram_node_name ( stru ); - weak Graphviz.Node? node = g.find_node ( name ); - if ( node == null ) { - node = g.node ( name ); - node.set_safe ( "shape", "box", "" ); - node.set_safe ( "fontname", "Times", "" ); + private static weak Graphviz.Node draw_struct (Graph g, Struct stru, Graphviz.Node? parent) { + string name = get_diagram_node_name (stru); + weak Graphviz.Node? node = g.find_node (name); + if (node == null) { + node = g.node (name); + node.set_safe ("shape", "box", ""); + node.set_safe ("fontname", "Times", ""); } - if ( parent != null ) { - weak Edge edge = g.edge ( node, parent ); - edge.set_safe ( "dir", "back", "" ); + if (parent != null) { + weak Edge edge = g.edge (node, parent); + edge.set_safe ("dir", "back", ""); } return node; } - private static weak Graphviz.Node draw_interface ( Graph g, Interface iface, Graphviz.Node? parent ) { - string name = get_diagram_node_name ( iface ); - weak Graphviz.Node? node = g.find_node ( name ); - if ( node == null ) { - node = g.node ( name ); - node.set_safe ( "shape", "box", "" ); - node.set_safe ( "fontname", "Times", "" ); + private static weak Graphviz.Node draw_interface (Graph g, Interface iface, Graphviz.Node? parent) { + string name = get_diagram_node_name (iface); + weak Graphviz.Node? node = g.find_node (name); + if (node == null) { + node = g.node (name); + node.set_safe ("shape", "box", ""); + node.set_safe ("fontname", "Times", ""); } - if ( parent != null ) { - weak Edge edge = g.edge ( node, parent ); - edge.set_safe ( "dir", "back", "" ); + if (parent != null) { + weak Edge edge = g.edge (node, parent); + edge.set_safe ("dir", "back", ""); } return node; } - private static weak Graphviz.Node draw_class ( Graph g, Class cl, Graphviz.Node? parent ) { - string name = get_diagram_node_name ( cl ); - weak Graphviz.Node? node = g.find_node ( name ); - if ( node == null ) { - node = g.node ( name ); - node.set_safe ( "style", "bold", "" ); - node.set_safe ( "shape", "box", "" ); - - if ( cl.is_abstract ) - node.set_safe ( "fontname", "Times-Italic", "" ); - else - node.set_safe ( "fontname", "Times", "" ); + private static weak Graphviz.Node draw_class (Graph g, Class cl, Graphviz.Node? parent) { + string name = get_diagram_node_name (cl); + weak Graphviz.Node? node = g.find_node (name); + if (node == null) { + node = g.node (name); + node.set_safe ("style", "bold", ""); + node.set_safe ("shape", "box", ""); + + if (cl.is_abstract) { + node.set_safe ("fontname", "Times-Italic", ""); + } else { + node.set_safe ("fontname", "Times", ""); + } } - if ( parent != null ) { - weak Edge edge = g.edge ( node, parent ); - edge.set_safe ( "dir", "back", "" ); + if (parent != null) { + weak Edge edge = g.edge (node, parent); + edge.set_safe ("dir", "back", ""); } return node; } - private static void draw_class_parents ( Class cl, Graphviz.Graph g, Graphviz.Node me ) { - Gee.Collection parents = cl.get_implemented_interface_list ( ); + private static void draw_class_parents (Class cl, Graphviz.Graph g, Graphviz.Node me) { + Collection parents = cl.get_implemented_interface_list (); Class? pcl = (Class?)cl.base_type; - if ( pcl != null ) { - weak Graphviz.Node node = draw_class ( g, pcl, me ); - draw_class_parents ( pcl, g, node ); + if (pcl != null) { + weak Graphviz.Node node = draw_class (g, pcl, me); + draw_class_parents (pcl, g, node); } - foreach ( Interface type in parents ) { - draw_interface ( g, (Valadoc.Interface)type, me ); + foreach (Interface type in parents) { + draw_interface (g, (Valadoc.Interface)type, me); } } } + diff --git a/src/libvaladoc/errorreporter.vala b/src/libvaladoc/errorreporter.vala index 82f76cd6b..a93b663be 100755 --- a/src/libvaladoc/errorreporter.vala +++ b/src/libvaladoc/errorreporter.vala @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +using Gee; public enum Valadoc.ErrorLevel { ASSUMPTION, @@ -60,10 +61,10 @@ public class Valadoc.ErrorReporter : Object { ERROR } - private inline void msg ( ErrorType type, string file, long line, long startpos, long endpos, string errline, string msg ) { - this.stream.printf ( "%s:%lu.%lu-%lu.%lu: %s: %s\n", file, line, startpos, line, endpos, (type == ErrorType.ERROR)? "error" : "warning", msg ); + private inline void msg (ErrorType type, string file, long line, long startpos, long endpos, string errline, string msg) { + this.stream.printf ("%s:%lu.%lu-%lu.%lu: %s: %s\n", file, line, startpos, line, endpos, (type == ErrorType.ERROR)? "error" : "warning", msg); if (startpos <= endpos) { - this.stream.printf ( "%s\n", errline ); + this.stream.printf ("%s\n", errline); for (int i = 0; i < errline.length; i++) { if (errline[i] == '\t') { this.stream.printf ("\t"); @@ -77,25 +78,25 @@ public class Valadoc.ErrorReporter : Object { } } - public void simple_warning ( string msg ) { - this.stream.puts ( msg ); - this.stream.putc ( '\n' ); + public void simple_warning (string msg) { + this.stream.puts (msg); + this.stream.putc ('\n'); this._warnings++; } - public void simple_error ( string msg ) { - this.stream.puts ( msg ); - this.stream.putc ( '\n' ); + public void simple_error (string msg) { + this.stream.puts (msg); + this.stream.putc ('\n'); this._errors++; } - public void error ( string file, long line, long startpos, long endpos, string errline, string msg ) { - this.msg ( ErrorType.ERROR, file, line, startpos, endpos, errline, msg ); + public void error (string file, long line, long startpos, long endpos, string errline, string msg) { + this.msg (ErrorType.ERROR, file, line, startpos, endpos, errline, msg); this._errors++; } - public void warning ( string file, long line, long startpos, long endpos, string errline, string msg ) { - this.msg ( ErrorType.WARNING, file, line, startpos, endpos, errline, msg ); + public void warning (string file, long line, long startpos, long endpos, string errline, string msg) { + this.msg (ErrorType.WARNING, file, line, startpos, endpos, errline, msg); this._warnings++; } } diff --git a/src/libvaladoc/filehelper.vala b/src/libvaladoc/filehelper.vala index 7b617ed8e..5efe9f77e 100755 --- a/src/libvaladoc/filehelper.vala +++ b/src/libvaladoc/filehelper.vala @@ -17,43 +17,41 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -using GLib; - +using Gee; namespace Valadoc { - public bool copy_file ( string src, string dest ) { - GLib.FileStream fsrc = GLib.FileStream.open ( src, "rb" ); - if ( fsrc == null ) { + public bool copy_file (string src, string dest) { + GLib.FileStream fsrc = GLib.FileStream.open (src, "rb"); + if (fsrc == null) { return false; } - GLib.FileStream fdest = GLib.FileStream.open ( dest, "wb" ); - if ( fdest == null ) { + GLib.FileStream fdest = GLib.FileStream.open (dest, "wb"); + if (fdest == null) { return false; } - for ( int c = fsrc.getc() ; !fsrc.eof() ; c = fsrc.getc() ) { - fdest.putc ( (char)c ); + for (int c = fsrc.getc() ; !fsrc.eof() ; c = fsrc.getc()) { + fdest.putc ((char)c); } return true; } - public bool copy_directory ( string src, string dest ) { - string _src = ( src.has_suffix ( "/" ) )? src : src + "/"; - string _dest = ( dest.has_suffix ( "/" ) )? dest : dest + "/"; + public bool copy_directory (string src, string dest) { + string _src = (src.has_suffix ( "/" ))? src : src + "/"; + string _dest = (dest.has_suffix ( "/" ))? dest : dest + "/"; try { - GLib.Dir dir = GLib.Dir.open ( _src ); - for ( weak string name = dir.read_name (); name != null ; name = dir.read_name () ) { - if ( !copy_file ( _src+name, _dest+name ) ) { + GLib.Dir dir = GLib.Dir.open (_src); + for (weak string name = dir.read_name (); name != null ; name = dir.read_name ()) { + if (!copy_file (_src+name, _dest+name)) { return false; } } } - catch ( GLib.FileError err ) { + catch (GLib.FileError err) { return false; } return true; diff --git a/src/libvaladoc/langlet.vala b/src/libvaladoc/langlet.vala index da68fa078..73b49ff5d 100755 --- a/src/libvaladoc/langlet.vala +++ b/src/libvaladoc/langlet.vala @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using GLib; +using Gee; // deprecated diff --git a/src/libvaladoc/moduleloader.vala b/src/libvaladoc/moduleloader.vala index 891fbdbf6..104f6f93c 100755 --- a/src/libvaladoc/moduleloader.vala +++ b/src/libvaladoc/moduleloader.vala @@ -18,7 +18,6 @@ */ using GLib.Path; -using GLib; using Gee; @@ -29,14 +28,14 @@ public static delegate void Valadoc.TagletRegisterFunction (ModuleLoader loader public class Valadoc.ModuleLoader : Object { public Doclet doclet; - public Gee.HashMap taglets = new Gee.HashMap (GLib.str_hash, GLib.str_equal); + public HashMap taglets = new HashMap (GLib.str_hash, GLib.str_equal); private Module docletmodule; private Type doclettype; - public bool load ( string path ) { - bool tmp = this.load_doclet ( path ); - if ( tmp == false ) { + public bool load (string path) { + bool tmp = this.load_doclet (path); + if (tmp == false) { return false; } return true; @@ -46,7 +45,7 @@ public class Valadoc.ModuleLoader : Object { return (Content.Taglet) GLib.Object.new (taglets.get (keyword)); } - private bool load_doclet ( string path ) { + private bool load_doclet (string path) { void* function; docletmodule = Module.open ( build_filename(path, "libdoclet.so"), ModuleFlags.BIND_LAZY); @@ -54,14 +53,15 @@ public class Valadoc.ModuleLoader : Object { return false; } - docletmodule.symbol( "register_plugin", out function ); - if ( function == null ) { + docletmodule.symbol("register_plugin", out function); + if (function == null) { return false; } Valadoc.DocletRegisterFunction doclet_register_function = (Valadoc.DocletRegisterFunction) function; - doclettype = doclet_register_function ( ); + doclettype = doclet_register_function (); this.doclet = (Doclet)GLib.Object.new (doclettype); return true; } } + diff --git a/src/libvaladoc/parser/sourcelocation.vala b/src/libvaladoc/parser/sourcelocation.vala index 0a461c197..3418e71b4 100644 --- a/src/libvaladoc/parser/sourcelocation.vala +++ b/src/libvaladoc/parser/sourcelocation.vala @@ -20,7 +20,6 @@ * Jürg Billeter */ -using GLib; /** * Represents a position in a source file. diff --git a/src/libvaladoc/settings.vala b/src/libvaladoc/settings.vala index d5129e5d7..7870ab59c 100755 --- a/src/libvaladoc/settings.vala +++ b/src/libvaladoc/settings.vala @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using GLib; - - public class Valadoc.Settings : Object { public string path = "documentation/"; public string pkg_name = null; @@ -47,5 +44,3 @@ public class Valadoc.Settings : Object { public string[] vapi_directories; } - - diff --git a/src/libvaladoc/taglets/tagletdeprecated.vala b/src/libvaladoc/taglets/tagletdeprecated.vala index cbe0da1a4..9ee71dd61 100755 --- a/src/libvaladoc/taglets/tagletdeprecated.vala +++ b/src/libvaladoc/taglets/tagletdeprecated.vala @@ -21,7 +21,6 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; using Valadoc.Content; diff --git a/src/libvaladoc/taglets/tagletinheritdoc.vala b/src/libvaladoc/taglets/tagletinheritdoc.vala index cc1371a10..1ed971161 100755 --- a/src/libvaladoc/taglets/tagletinheritdoc.vala +++ b/src/libvaladoc/taglets/tagletinheritdoc.vala @@ -21,10 +21,10 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; using Valadoc.Content; + public class Valadoc.Taglets.InheritDoc : InlineTaglet { private Api.Node? _inherited; diff --git a/src/libvaladoc/taglets/tagletinit.vala b/src/libvaladoc/taglets/tagletinit.vala index 42d914772..18b7faf13 100644 --- a/src/libvaladoc/taglets/tagletinit.vala +++ b/src/libvaladoc/taglets/tagletinit.vala @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -using Valadoc; namespace Valadoc.Taglets { public void init (ModuleLoader loader) { diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala index 256a7ab73..f08d74c84 100755 --- a/src/libvaladoc/taglets/tagletlink.vala +++ b/src/libvaladoc/taglets/tagletlink.vala @@ -21,10 +21,10 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; using Valadoc.Content; + public class Valadoc.Taglets.Link : InlineTaglet { public string symbol_name { private set; get; } diff --git a/src/libvaladoc/taglets/tagletparam.vala b/src/libvaladoc/taglets/tagletparam.vala index c646be69b..713bc21d7 100755 --- a/src/libvaladoc/taglets/tagletparam.vala +++ b/src/libvaladoc/taglets/tagletparam.vala @@ -21,10 +21,10 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; using Valadoc.Content; + public class Valadoc.Taglets.Param : InlineContent, Taglet, Block { public string parameter_name { private set; get; } diff --git a/src/libvaladoc/taglets/tagletreturn.vala b/src/libvaladoc/taglets/tagletreturn.vala index dea2dc305..5e42120b4 100755 --- a/src/libvaladoc/taglets/tagletreturn.vala +++ b/src/libvaladoc/taglets/tagletreturn.vala @@ -21,10 +21,10 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; using Valadoc.Content; + public class Valadoc.Taglets.Return : InlineContent, Taglet, Block { public Rule? get_parser_rule (Rule run_rule) { return run_rule; diff --git a/src/libvaladoc/taglets/tagletsee.vala b/src/libvaladoc/taglets/tagletsee.vala index 5b5ccf73e..82feacaf2 100755 --- a/src/libvaladoc/taglets/tagletsee.vala +++ b/src/libvaladoc/taglets/tagletsee.vala @@ -21,10 +21,10 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; using Valadoc.Content; + public class Valadoc.Taglets.See : ContentElement, Taglet, Block { public string symbol_name { private set; get; } public Api.Node symbol { private set; get; } diff --git a/src/libvaladoc/taglets/tagletsince.vala b/src/libvaladoc/taglets/tagletsince.vala index 1c83dfbe0..edcee9c8d 100755 --- a/src/libvaladoc/taglets/tagletsince.vala +++ b/src/libvaladoc/taglets/tagletsince.vala @@ -21,10 +21,10 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; using Valadoc.Content; + public class Valadoc.Taglets.Since : ContentElement, Taglet, Block { public string version; diff --git a/src/libvaladoc/taglets/tagletthrows.vala b/src/libvaladoc/taglets/tagletthrows.vala index 3f097be4a..891ecbae3 100755 --- a/src/libvaladoc/taglets/tagletthrows.vala +++ b/src/libvaladoc/taglets/tagletthrows.vala @@ -21,10 +21,10 @@ * Didier 'Ptitjes Villevalois */ -using GLib; using Gee; using Valadoc.Content; + public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block { public string error_domain_name { private set; get; } public Api.Node error_domain { private set; get; } diff --git a/src/libvaladoc/valadoc-1.0.vapi b/src/libvaladoc/valadoc-1.0.vapi new file mode 100644 index 000000000..919b82fdf --- /dev/null +++ b/src/libvaladoc/valadoc-1.0.vapi @@ -0,0 +1,1043 @@ +/* valadoc-1.0.vapi generated by valac, do not modify. */ + +[CCode (cprefix = "Valadoc", lower_case_cprefix = "valadoc_")] +namespace Valadoc { + [CCode (cprefix = "ValadocApi", lower_case_cprefix = "valadoc_api_")] + namespace Api { + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class Item : GLib.Object { + public Item (); + protected virtual void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + protected virtual void resolve_type_references (Valadoc.Tree root); + public Valadoc.Api.Item parent { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class MemberNode : Valadoc.Api.SymbolNode { + public MemberNode (Vala.Member symbol, Valadoc.Api.Node parent); + protected override void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class Node : Valadoc.Api.Item, Valadoc.Visitable, Valadoc.Documentation { + public Node (Valadoc.Api.Node? parent); + public abstract void accept (Valadoc.Doclet doclet); + public void accept_children (Valadoc.Api.NodeType[] types, Valadoc.Doclet doclet); + public void accept_children_by_type (Valadoc.Api.NodeType type, Valadoc.Doclet doclet); + protected void add_child (Valadoc.Api.SymbolNode child); + public Valadoc.Api.Node? find_by_name (string name); + public Valadoc.Api.Node? find_by_symbol (Vala.Symbol symbol); + public string? full_name (); + public Gee.List get_children_by_type (Valadoc.Api.NodeType type, bool filtered = true); + public virtual string? get_filename (); + public abstract bool is_visitor_accessible (Valadoc.Settings settings); + protected override void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + protected override void resolve_type_references (Valadoc.Tree root); + public Valadoc.Content.Comment? documentation { get; set; } + public abstract string? name { owned get; } + public abstract Valadoc.Api.NodeType node_type { get; } + public Valadoc.Namespace? nspace { get; } + public Valadoc.Package? package { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class SymbolNode : Valadoc.Api.Node, Valadoc.SymbolAccessibility { + public SymbolNode (Vala.Symbol symbol, Valadoc.Api.Node parent); + public override string? get_filename (); + public override bool is_visitor_accessible (Valadoc.Settings settings); + public override string? name { owned get; } + protected Vala.Symbol symbol { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class TypeSymbolNode : Valadoc.Api.SymbolNode { + public TypeSymbolNode (Vala.TypeSymbol symbol, Valadoc.Api.Node parent); + protected override void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + } + [CCode (cprefix = "VALADOC_API_NODE_TYPE_", cheader_filename = "valadoc-1.0.h")] + public enum NodeType { + CLASS, + CONSTANT, + CREATION_METHOD, + DELEGATE, + ENUM, + ENUM_VALUE, + ERROR_CODE, + ERROR_DOMAIN, + FIELD, + FORMAL_PARAMETER, + INTERFACE, + METHOD, + NAMESPACE, + PACKAGE, + PROPERTY, + PROPERTY_ACCESSOR, + SIGNAL, + STRUCT, + TYPE_PARAMETER + } + } + [CCode (cprefix = "ValadocContent", lower_case_cprefix = "valadoc_content_")] + namespace Content { + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class BlockContent : Valadoc.Content.ContentElement { + public override void accept_children (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public Gee.List content { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Comment : Valadoc.Content.BlockContent { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void accept_children (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public Gee.List find_taglets (Valadoc.Api.Node? container, GLib.Type taglet_type); + public Gee.List taglets { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class ContentElement : GLib.Object { + public ContentElement (); + public abstract void accept (Valadoc.Content.ContentVisitor visitor); + public virtual void accept_children (Valadoc.Content.ContentVisitor visitor); + public abstract void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public virtual void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ContentFactory : GLib.Object { + public ContentFactory (Valadoc.Settings settings, Valadoc.ResourceLocator locator, Valadoc.ModuleLoader modules); + public Valadoc.Content.Comment create_comment (); + public Valadoc.Content.Embedded create_embedded (); + public Valadoc.Content.Headline create_headline (); + public Valadoc.Content.Link create_link (); + public Valadoc.Content.List create_list (); + public Valadoc.Content.ListItem create_list_item (); + public Valadoc.Content.Page create_page (); + public Valadoc.Content.Paragraph create_paragraph (); + public Valadoc.Content.Run create_run (Valadoc.Content.Run.Style style); + public Valadoc.Content.SourceCode create_source_code (); + public Valadoc.Content.Table create_table (); + public Valadoc.Content.TableCell create_table_cell (); + public Valadoc.Content.TableRow create_table_row (); + public Valadoc.Content.Taglet create_taglet (string name); + public Valadoc.Content.Text create_text (string? text = null); + public Valadoc.Content.ContentElement set_style_attributes (Valadoc.Content.StyleAttributes element, Valadoc.Content.VerticalAlign? valign, Valadoc.Content.HorizontalAlign? halign, string? style); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class ContentRenderer : Valadoc.Content.ContentVisitor { + public ContentRenderer (); + public abstract void render (Valadoc.Content.ContentElement element); + public abstract void render_children (Valadoc.Content.ContentElement element); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class ContentVisitor : GLib.Object { + public ContentVisitor (); + public virtual void visit_comment (Valadoc.Content.Comment element); + public virtual void visit_embedded (Valadoc.Content.Embedded element); + public virtual void visit_headline (Valadoc.Content.Headline element); + public virtual void visit_link (Valadoc.Content.Link element); + public virtual void visit_list (Valadoc.Content.List element); + public virtual void visit_list_item (Valadoc.Content.ListItem element); + public virtual void visit_page (Valadoc.Content.Page element); + public virtual void visit_paragraph (Valadoc.Content.Paragraph element); + public virtual void visit_run (Valadoc.Content.Run element); + public virtual void visit_source_code (Valadoc.Content.SourceCode element); + public virtual void visit_symbol_link (Valadoc.Content.SymbolLink element); + public virtual void visit_table (Valadoc.Content.Table element); + public virtual void visit_table_cell (Valadoc.Content.TableCell element); + public virtual void visit_table_row (Valadoc.Content.TableRow element); + public virtual void visit_taglet (Valadoc.Content.Taglet element); + public virtual void visit_text (Valadoc.Content.Text element); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Embedded : Valadoc.Content.ContentElement, Valadoc.Content.Inline, Valadoc.Content.StyleAttributes { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public string caption { get; set; } + public string url { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Headline : Valadoc.Content.Block, Valadoc.Content.InlineContent { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public int level { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class InlineContent : Valadoc.Content.ContentElement { + public override void accept_children (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Gee.List content { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class InlineTaglet : Valadoc.Content.ContentElement, Valadoc.Content.Taglet, Valadoc.Content.Inline { + protected Valadoc.ResourceLocator locator; + protected Valadoc.Settings settings; + public InlineTaglet (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public abstract Valadoc.Rule? get_parser_rule (Valadoc.Rule run_rule); + public abstract Valadoc.Content.ContentElement produce_content (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Link : Valadoc.Content.ContentElement, Valadoc.Content.Inline { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public string label { get; set; } + public string url { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class List : Valadoc.Content.ContentElement, Valadoc.Content.Block { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Gee.List items { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ListItem : Valadoc.Content.InlineContent { + [CCode (cprefix = "VALADOC_CONTENT_LIST_ITEM_BULLET_", cheader_filename = "valadoc-1.0.h")] + public enum Bullet { + NONE, + UNORDERED, + ORDERED, + ORDERED_LATIN, + ORDERED_CAPITAL, + ORDERED_NUMBER, + ORDERED_LOWER_CASE + } + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Valadoc.Content.ListItem.Bullet bullet { get; set; } + public int level { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Page : Valadoc.Content.BlockContent { + public override void accept (Valadoc.Content.ContentVisitor visitor); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Paragraph : Valadoc.Content.InlineContent, Valadoc.Content.Block, Valadoc.Content.StyleAttributes { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Run : Valadoc.Content.InlineContent, Valadoc.Content.Inline { + [CCode (cprefix = "VALADOC_CONTENT_RUN_STYLE_", cheader_filename = "valadoc-1.0.h")] + public enum Style { + NONE, + BOLD, + ITALIC, + UNDERLINED, + MONOSPACED, + STROKE, + LANG_KEYWORD, + LANG_LITERAL, + LANG_TYPE + } + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Valadoc.Content.Run.Style style { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class SourceCode : Valadoc.Content.ContentElement, Valadoc.Content.Block { + [CCode (cprefix = "VALADOC_CONTENT_SOURCE_CODE_LANGUAGE_", cheader_filename = "valadoc-1.0.h")] + public enum Language { + GENIE, + VALA, + C + } + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public string code { get; set; } + public Valadoc.Content.SourceCode.Language language { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class SymbolLink : Valadoc.Content.ContentElement, Valadoc.Content.Inline { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public string label { get; set; } + public Valadoc.Api.Node symbol { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Table : Valadoc.Content.ContentElement, Valadoc.Content.Block { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void accept_children (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Gee.List rows { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class TableCell : Valadoc.Content.InlineContent, Valadoc.Content.StyleAttributes { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public int colspan { get; set; } + public int rowspan { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class TableRow : Valadoc.Content.ContentElement { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void accept_children (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Gee.List cells { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Text : Valadoc.Content.ContentElement, Valadoc.Content.Inline { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public string content { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Block : Valadoc.Content.ContentElement { + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Inline : Valadoc.Content.ContentElement { + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface StyleAttributes : Valadoc.Content.ContentElement { + public abstract Valadoc.Content.HorizontalAlign? horizontal_align { get; set; } + public abstract string? style { get; set; } + public abstract Valadoc.Content.VerticalAlign? vertical_align { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Taglet : Valadoc.Content.ContentElement { + public abstract Valadoc.Rule? get_parser_rule (Valadoc.Rule run_rule); + } + [CCode (cprefix = "VALADOC_CONTENT_HORIZONTAL_ALIGN_", cheader_filename = "valadoc-1.0.h")] + public enum HorizontalAlign { + LEFT, + RIGHT, + CENTER + } + [CCode (cprefix = "VALADOC_CONTENT_VERTICAL_ALIGN_", cheader_filename = "valadoc-1.0.h")] + public enum VerticalAlign { + TOP, + MIDDLE, + BOTTOM + } + } + [CCode (cprefix = "ValadocDiagrams", lower_case_cprefix = "valadoc_diagrams_")] + namespace Diagrams { + [CCode (cheader_filename = "valadoc-1.0.h")] + public static void write_class_diagram (Valadoc.Class cl, string path); + [CCode (cheader_filename = "valadoc-1.0.h")] + public static void write_interface_diagram (Valadoc.Interface iface, string path); + [CCode (cheader_filename = "valadoc-1.0.h")] + public static void write_struct_diagram (Valadoc.Struct stru, string path); + } + [CCode (cprefix = "ValadocTaglets", lower_case_cprefix = "valadoc_taglets_")] + namespace Taglets { + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Deprecated : Valadoc.Content.InlineContent, Valadoc.Content.Taglet, Valadoc.Content.Block { + public Deprecated (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class InheritDoc : Valadoc.Content.InlineTaglet { + public InheritDoc (); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override Valadoc.Rule? get_parser_rule (Valadoc.Rule run_rule); + public override Valadoc.Content.ContentElement produce_content (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Link : Valadoc.Content.InlineTaglet { + public Link (); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override Valadoc.Rule? get_parser_rule (Valadoc.Rule run_rule); + public override Valadoc.Content.ContentElement produce_content (); + public string symbol_name { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Param : Valadoc.Content.InlineContent, Valadoc.Content.Taglet, Valadoc.Content.Block { + public Param (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public string parameter_name { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Return : Valadoc.Content.InlineContent, Valadoc.Content.Taglet, Valadoc.Content.Block { + public Return (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class See : Valadoc.Content.ContentElement, Valadoc.Content.Taglet, Valadoc.Content.Block { + public See (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Valadoc.Api.Node symbol { get; set; } + public string symbol_name { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Since : Valadoc.Content.ContentElement, Valadoc.Content.Taglet, Valadoc.Content.Block { + public string version; + public Since (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Throws : Valadoc.Content.InlineContent, Valadoc.Content.Taglet, Valadoc.Content.Block { + public Throws (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Valadoc.Api.Node error_domain { get; set; } + public string error_domain_name { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public static void init (Valadoc.ModuleLoader loader); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Array : Valadoc.Api.Item { + public Array (Vala.ArrayType vtyperef, Valadoc.Api.Item parent); + protected override void resolve_type_references (Valadoc.Tree root); + public void write (Valadoc.Langlet langlet, void* ptr, Valadoc.Api.Node parent); + public Valadoc.Api.Item data_type { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Class : Valadoc.Api.TypeSymbolNode, Valadoc.ClassHandler, Valadoc.StructHandler, Valadoc.SignalHandler, Valadoc.MethodHandler, Valadoc.EnumHandler, Valadoc.PropertyHandler, Valadoc.ConstructionMethodHandler, Valadoc.FieldHandler, Valadoc.DelegateHandler, Valadoc.ConstantHandler, Valadoc.TemplateParameterListHandler { + public Class (Vala.Class symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + public Gee.Collection get_implemented_interface_list (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + protected Valadoc.Class? base_type { get; set; } + public bool is_abstract { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class CommentScanner : Valadoc.WikiScanner { + public CommentScanner (Valadoc.Settings settings); + protected override void accept (unichar c) throws Valadoc.ParserError; + public override int get_line_start_column (); + public override void reset (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Constant : Valadoc.Api.MemberNode, Valadoc.ReturnTypeHandler { + public Constant (Vala.Constant symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string get_cname (); + public bool is_vconstant (Vala.Constant vconst); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet, Valadoc.ConstantHandler? parent); + public void write (Valadoc.Langlet langlet, void* ptr, Valadoc.ConstantHandler parent); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Delegate : Valadoc.Api.TypeSymbolNode, Valadoc.ParameterListHandler, Valadoc.ReturnTypeHandler, Valadoc.TemplateParameterListHandler, Valadoc.ExceptionHandler { + public Delegate (Vala.Delegate symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public bool is_static { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class Doclet : GLib.Object { + public Doclet (); + public abstract void initialisation (Valadoc.Settings settings, Valadoc.Tree tree); + public abstract void visit_class (Valadoc.Class cl); + public abstract void visit_constant (Valadoc.Constant constant, Valadoc.ConstantHandler parent); + public abstract void visit_delegate (Valadoc.Delegate del); + public abstract void visit_enum (Valadoc.Enum en); + public abstract void visit_enum_value (Valadoc.EnumValue enval); + public abstract void visit_error_code (Valadoc.ErrorCode errcode); + public abstract void visit_error_domain (Valadoc.ErrorDomain errdom); + public abstract void visit_field (Valadoc.Field field, Valadoc.FieldHandler parent); + public abstract void visit_interface (Valadoc.Interface iface); + public abstract void visit_method (Valadoc.Method m, Valadoc.MethodHandler parent); + public abstract void visit_namespace (Valadoc.Namespace ns); + public abstract void visit_package (Valadoc.Package pkg); + public abstract void visit_property (Valadoc.Property prop); + public abstract void visit_signal (Valadoc.Signal sig); + public abstract void visit_struct (Valadoc.Struct stru); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class DocumentationParser : GLib.Object, Valadoc.ResourceLocator { + public DocumentationParser (Valadoc.Settings settings, Valadoc.ErrorReporter reporter, Valadoc.Tree tree, Valadoc.ModuleLoader modules); + public Valadoc.Content.Comment? parse (Valadoc.Api.Node element, Vala.Comment source_comment); + public Valadoc.Content.Page? parse_wikipage (Valadoc.WikiPage page); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Enum : Valadoc.Api.TypeSymbolNode, Valadoc.MethodHandler { + public Enum (Vala.Enum symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + public Gee.Collection get_enum_values (); + public void visit (Valadoc.Doclet doclet); + public void visit_enum_values (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class EnumValue : Valadoc.Api.SymbolNode { + public EnumValue (Vala.EnumValue symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string get_cname (); + public bool is_venumvalue (Vala.EnumValue venval); + protected override void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ErrorCode : Valadoc.Api.TypeSymbolNode { + public ErrorCode (Vala.ErrorCode symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string get_cname (); + public bool is_verrorcode (Vala.ErrorCode verrcode); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ErrorDomain : Valadoc.Api.TypeSymbolNode, Valadoc.MethodHandler { + public ErrorDomain (Vala.ErrorDomain symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + public Gee.Collection get_error_code_list (); + public void visit (Valadoc.Doclet doclet); + public void visit_error_codes (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ErrorReporter : GLib.Object { + public ErrorReporter (); + public void error (string file, long line, long startpos, long endpos, string errline, string msg); + public void simple_error (string msg); + public void simple_warning (string msg); + public void warning (string file, long line, long startpos, long endpos, string errline, string msg); + public int errors { get; } + public GLib.FileStream stream { get; set; } + public Vala.Report? vreporter { get; set; } + public int warnings { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Field : Valadoc.Api.MemberNode, Valadoc.ReturnTypeHandler { + public Field (Vala.Field symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet, Valadoc.FieldHandler? parent); + public void write (Valadoc.Langlet langlet, void* ptr, Valadoc.FieldHandler parent); + public bool is_static { get; } + public bool is_volatile { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class FormalParameter : Valadoc.Api.SymbolNode, Valadoc.ReturnTypeHandler { + public FormalParameter (Vala.FormalParameter symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + protected override void resolve_type_references (Valadoc.Tree root); + public void write (Valadoc.Langlet langlet, void* ptr); + public bool ellipsis { get; } + public bool has_default_value { get; } + public bool is_out { get; } + public bool is_ref { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Interface : Valadoc.Api.TypeSymbolNode, Valadoc.SignalHandler, Valadoc.PropertyHandler, Valadoc.FieldHandler, Valadoc.ConstantHandler, Valadoc.TemplateParameterListHandler, Valadoc.MethodHandler, Valadoc.DelegateHandler, Valadoc.EnumHandler, Valadoc.StructHandler, Valadoc.ClassHandler { + public Interface (Vala.Interface symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + public Gee.Collection get_implemented_interface_list (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + protected Valadoc.Class? base_type { get; set; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class Langlet : GLib.Object { + public Langlet (); + public abstract void write_array (Valadoc.Array param, void* ptr, Valadoc.Api.Node pos); + public abstract void write_class (Valadoc.Class cl, void* ptr); + public abstract void write_constant (Valadoc.Constant constant, Valadoc.ConstantHandler parent, void* ptr); + public abstract void write_delegate (Valadoc.Delegate del, void* ptr); + public abstract void write_enum (Valadoc.Enum en, void* ptr); + public abstract void write_enum_value (Valadoc.EnumValue enval, void* ptr); + public abstract void write_error_code (Valadoc.ErrorCode errcode, void* ptr); + public abstract void write_error_domain (Valadoc.ErrorDomain errdom, void* ptr); + public abstract void write_field (Valadoc.Field field, Valadoc.FieldHandler pos, void* ptr); + public abstract void write_file (Valadoc.Package file, void* ptr); + public abstract void write_formal_parameter (Valadoc.FormalParameter param, void* ptr); + public abstract void write_inheritance_list (Valadoc.Api.Node dtype, void* ptr); + public abstract void write_interface (Valadoc.Interface iface, void* ptr); + public abstract void write_method (void* ptr, Valadoc.Method m, Valadoc.MethodHandler pos); + public abstract void write_namespace (Valadoc.Namespace ns, void* ptr); + public abstract void write_parameter_list (Valadoc.ParameterListHandler thandler, void* ptr); + public abstract void write_pointer (Valadoc.Pointer param, void* ptr, Valadoc.Api.Node pos); + public abstract void write_property (Valadoc.Property prop, void* ptr); + public abstract void write_property_accessor (Valadoc.PropertyAccessor propac, void* ptr); + public abstract void write_signal (Valadoc.Signal sig, void* ptr); + public abstract void write_struct (Valadoc.Struct stru, void* ptr); + public abstract void write_template_parameters (Valadoc.TemplateParameterListHandler thandler, void* ptr); + public abstract void write_type_parameter (Valadoc.TypeParameter param, void* ptr); + public abstract void write_type_reference (Valadoc.TypeReference tref, void* ptr); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Method : Valadoc.Api.MemberNode, Valadoc.ParameterListHandler, Valadoc.ExceptionHandler, Valadoc.TemplateParameterListHandler, Valadoc.ReturnTypeHandler { + public Method (Vala.Method symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet, Valadoc.MethodHandler in_type); + public void write (Valadoc.Langlet langlet, void* ptr, Valadoc.MethodHandler parent); + public Valadoc.Method? base_method { get; set; } + public bool is_abstract { get; } + public bool is_constructor { get; } + public bool is_inline { get; } + public bool is_override { get; } + public bool is_static { get; } + public bool is_virtual { get; } + public bool is_yields { get; } + public override string? name { owned get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ModuleLoader : GLib.Object { + public Valadoc.Doclet doclet; + public Gee.HashMap taglets; + public ModuleLoader (); + public Valadoc.Content.Taglet create_taglet (string keyword); + public bool load (string path); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Namespace : Valadoc.Api.SymbolNode, Valadoc.MethodHandler, Valadoc.FieldHandler, Valadoc.NamespaceHandler, Valadoc.ErrorDomainHandler, Valadoc.EnumHandler, Valadoc.ClassHandler, Valadoc.StructHandler, Valadoc.InterfaceHandler, Valadoc.DelegateHandler, Valadoc.ConstantHandler { + public Namespace (Vala.Namespace symbol, Valadoc.NamespaceHandler parent); + public override void accept (Valadoc.Doclet doclet); + protected override void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + public Vala.Namespace vnspace { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Package : Valadoc.Api.Node, Valadoc.NamespaceHandler { + public Package (Vala.SourceFile vfile, string name, bool is_package = false); + public override void accept (Valadoc.Doclet doclet); + public Gee.Collection get_dependency_list (); + public Gee.Collection get_full_dependency_list (); + public override bool is_visitor_accessible (Valadoc.Settings settings); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public bool is_package { get; set; } + public override string? name { owned get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (ref_function = "valadoc_parser_ref", unref_function = "valadoc_parser_unref", cheader_filename = "valadoc-1.0.h")] + public class Parser : Valadoc.ParserCallback { + public Parser (Valadoc.Settings settings, Valadoc.Scanner scanner, Valadoc.ErrorReporter reporter); + public void accept_token (Valadoc.Token token) throws Valadoc.ParserError; + public void parse (string content, string filename, int first_line, int first_column) throws Valadoc.ParserError; + public void set_root_rule (Valadoc.Rule root_rule); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Pointer : Valadoc.Api.Item { + public Pointer (Vala.PointerType vtyperef, Valadoc.Api.Item parent); + protected override void resolve_type_references (Valadoc.Tree root); + public void write (Valadoc.Langlet langlet, void* ptr, Valadoc.Api.Node parent); + public Valadoc.Api.Item data_type { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Property : Valadoc.Api.MemberNode, Valadoc.ReturnTypeHandler { + public Property (Vala.Property symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public bool equals (Valadoc.Property p); + public string? get_cname (); + public bool is_vproperty (Vala.Property vprop); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public Valadoc.Property base_property { get; set; } + public Valadoc.PropertyAccessor getter { get; set; } + public bool is_abstract { get; } + public bool is_override { get; } + public bool is_virtual { get; } + public override Valadoc.Api.NodeType node_type { get; } + public Valadoc.PropertyAccessor setter { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class PropertyAccessor : Valadoc.Api.SymbolNode { + public PropertyAccessor (Vala.PropertyAccessor symbol, Valadoc.Property parent); + public override void accept (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public bool is_construct { get; } + public bool is_get { get; } + public bool is_owned { get; } + public bool is_set { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class Rule : GLib.Object { + [CCode (cprefix = "VALADOC_RULE_FORWARD_", cheader_filename = "valadoc-1.0.h")] + public enum Forward { + NONE, + PARENT, + CHILD + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public delegate void Action (); + protected Rule (); + public abstract bool accept_token (Valadoc.Token token, Valadoc.ParserCallback parser, Valadoc.Rule.Forward forward) throws Valadoc.ParserError; + protected void do_reduce (Valadoc.ParserCallback parser) throws Valadoc.ParserError; + protected void do_start (Valadoc.ParserCallback parser) throws Valadoc.ParserError; + protected bool has_start_token (GLib.Object? scheme_element, Valadoc.Token token); + public abstract bool is_optional (); + protected bool is_optional_rule (GLib.Object? scheme_element); + public static Valadoc.Rule many (GLib.Object?[] scheme); + public static Valadoc.Rule one_of (GLib.Object?[] scheme); + public static Valadoc.Rule option (GLib.Object?[] scheme); + public static Valadoc.Rule seq (GLib.Object?[] scheme); + public Valadoc.Rule set_name (string name); + public Valadoc.Rule set_reduce (Valadoc.Rule.Action action); + public Valadoc.Rule set_start (Valadoc.Rule.Action action); + public abstract bool starts_with_token (Valadoc.Token token); + public abstract string to_string (GLib.Object? state); + protected bool try_to_apply (GLib.Object? scheme_element, Valadoc.Token token, Valadoc.ParserCallback parser, out bool handled) throws Valadoc.ParserError; + public abstract bool would_accept_token (Valadoc.Token token, GLib.Object? state); + public abstract bool would_reduce (Valadoc.Token token, GLib.Object? state); + public string name { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Settings : GLib.Object { + public bool _internal; + public bool _private; + public bool _protected; + public bool add_inherited; + public string? basedir; + public string[] defines; + public bool deprecated; + public string? directory; + public bool disable_dbus_transformation; + public bool enable_checking; + public bool experimental; + public bool non_null_experimental; + public string path; + public string pkg_name; + public string pkg_version; + public string? profile; + public string[] vapi_directories; + public bool verbose; + public string wiki_directory; + public bool with_deps; + public Settings (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Signal : Valadoc.Api.MemberNode, Valadoc.ParameterListHandler, Valadoc.ReturnTypeHandler { + public Signal (Vala.Signal symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public bool is_virtual { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Struct : Valadoc.Api.TypeSymbolNode, Valadoc.MethodHandler, Valadoc.ConstructionMethodHandler, Valadoc.FieldHandler, Valadoc.ConstantHandler, Valadoc.TemplateParameterListHandler { + public Struct (Vala.Struct symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + protected Valadoc.Struct? base_type { get; set; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class StubRule : Valadoc.Rule { + public StubRule (); + public override bool accept_token (Valadoc.Token token, Valadoc.ParserCallback parser, Valadoc.Rule.Forward forward) throws Valadoc.ParserError; + public override bool is_optional (); + public Valadoc.Rule set_rule (Valadoc.Rule rule); + public override bool starts_with_token (Valadoc.Token token); + public override string to_string (GLib.Object? state); + public override bool would_accept_token (Valadoc.Token token, GLib.Object? state); + public override bool would_reduce (Valadoc.Token token, GLib.Object? state); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Token : GLib.Object { + public Token (); + public Token.from_type (Valadoc.TokenType type, Valadoc.SourceLocation begin, Valadoc.SourceLocation end); + public Token.from_word (string word, Valadoc.SourceLocation begin, Valadoc.SourceLocation end); + public int to_int (); + public string to_pretty_string (); + public string to_string (); + public Valadoc.SourceLocation begin { get; } + public Valadoc.SourceLocation end { get; } + public bool is_number { get; } + public bool is_word { get; } + public Valadoc.TokenType? token_type { get; } + public string? word { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class TokenType : GLib.Object { + [CCode (cheader_filename = "valadoc-1.0.h")] + public delegate void Action (Valadoc.Token token); + public static Valadoc.TokenType ALIGN_BOTTOM; + public static Valadoc.TokenType ALIGN_CENTER; + public static Valadoc.TokenType ALIGN_RIGHT; + public static Valadoc.TokenType ALIGN_TOP; + public static Valadoc.TokenType ANY; + public static Valadoc.TokenType ANY_NUMBER; + public static Valadoc.TokenType ANY_WORD; + public static Valadoc.TokenType AROBASE; + public static Valadoc.TokenType BACK_QUOTE; + public static Valadoc.TokenType CLOSED_BRACE; + public static Valadoc.TokenType DOUBLE_CLOSED_BRACE; + public static Valadoc.TokenType DOUBLE_CLOSED_BRACKET; + public static Valadoc.TokenType DOUBLE_OPEN_BRACE; + public static Valadoc.TokenType DOUBLE_OPEN_BRACKET; + public static Valadoc.TokenType DOUBLE_PIPE; + public static Valadoc.TokenType EOF; + public static Valadoc.TokenType EOL; + public static Valadoc.TokenType EQUAL_1; + public static Valadoc.TokenType EQUAL_2; + public static Valadoc.TokenType EQUAL_3; + public static Valadoc.TokenType EQUAL_4; + public static Valadoc.TokenType EQUAL_5; + public static Valadoc.TokenType GREATER_THAN; + public static Valadoc.TokenType LESS_THAN; + public static Valadoc.TokenType MINUS; + public static Valadoc.TokenType OPEN_BRACE; + public static Valadoc.TokenType PIPE; + public static Valadoc.TokenType SHARP; + public static Valadoc.TokenType SINGLE_QUOTE_2; + public static Valadoc.TokenType SLASH_2; + public static Valadoc.TokenType SPACE; + public static Valadoc.TokenType STAR; + public static Valadoc.TokenType TAB; + public static Valadoc.TokenType TRIPLE_CLOSED_BRACE; + public static Valadoc.TokenType TRIPLE_OPEN_BRACE; + public static Valadoc.TokenType UNDERSCORE_2; + public Valadoc.TokenType action (Valadoc.TokenType.Action action); + public static Valadoc.TokenType any (); + public static Valadoc.TokenType any_number (); + public static Valadoc.TokenType any_word (); + public void do_action (Valadoc.Token matched_token) throws Valadoc.ParserError; + public bool matches (Valadoc.Token token); + public static Valadoc.TokenType str (string str); + public string to_pretty_string (); + public string to_string (); + } + [CCode (ref_function = "valadoc_tree_ref", unref_function = "valadoc_tree_unref", cheader_filename = "valadoc-1.0.h")] + public class Tree { + public Tree (Valadoc.ErrorReporter reporter, Valadoc.Settings settings); + public void add_depencies (string[] packages); + public void add_documented_file (string[] sources); + public bool create_tree (); + public Gee.Collection get_package_list (); + public void parse_comments (Valadoc.DocumentationParser docparser); + public Valadoc.Api.Node? search_symbol_str (Valadoc.Api.Node? element, string symname); + public void visit (Valadoc.Doclet doclet); + public Valadoc.WikiPageTree? wikitree { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class TypeParameter : Valadoc.Api.SymbolNode, Valadoc.ReturnTypeHandler { + public TypeParameter (Vala.TypeParameter symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class TypeReference : Valadoc.Api.Item { + public TypeReference (Vala.DataType? vtyperef, Valadoc.Api.Item parent); + public Gee.Collection get_type_arguments (); + protected override void resolve_type_references (Valadoc.Tree root); + public void write (Valadoc.Langlet langlet, void* ptr); + public Valadoc.Api.Item? data_type { get; set; } + public bool is_dynamic { get; } + public bool is_nullable { get; } + public bool is_owned { get; } + public bool is_unowned { get; } + public bool is_weak { get; } + public bool pass_ownership { get; } + public string type_name { owned get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class WikiPage : GLib.Object, Valadoc.Documentation { + public WikiPage (string name, string path); + public bool parse (Valadoc.DocumentationParser docparser); + public void read () throws GLib.FileError; + public Valadoc.Content.Page documentation { get; set; } + public string documentation_str { get; set; } + public string name { get; set; } + public string path { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class WikiPageTree : GLib.Object { + public WikiPageTree (Valadoc.ErrorReporter reporter, Valadoc.Settings settings); + public void create_tree (Valadoc.DocumentationParser docparser) throws GLib.FileError; + public Gee.Collection get_pages (); + public Valadoc.WikiPage? search (string name); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class WikiScanner : GLib.Object, Valadoc.Scanner { + public WikiScanner (Valadoc.Settings settings); + protected virtual void accept (unichar c) throws Valadoc.ParserError; + public int get_line (); + public virtual string get_line_content (); + public virtual int get_line_start_column (); + protected unichar get_next_char (int offset = 1); + public virtual void reset (); + public void set_code_escape_mode (bool escape_mode); + public void set_url_escape_mode (bool escape_mode); + public virtual void stop (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ClassHandler : Valadoc.Api.Node { + protected Valadoc.Class? find_vclass (Vala.Class vcl); + public Gee.Collection get_class_list (); + public void visit_classes (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ConstantHandler : Valadoc.Api.Node { + public Gee.Collection get_constant_list (); + public void visit_constants (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ConstructionMethodHandler : Valadoc.Api.Node { + public Gee.Collection get_construction_method_list (); + public void visit_construction_methods (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface DelegateHandler : Valadoc.Api.Node { + public Gee.Collection get_delegate_list (); + public void visit_delegates (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Documentation : GLib.Object { + public abstract string? get_filename (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface EnumHandler : Valadoc.Api.Node { + public Gee.Collection get_enum_list (); + public void visit_enums (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ErrorDomainHandler : Valadoc.Api.Node { + public Gee.Collection get_error_domain_list (); + public void visit_error_domains (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ExceptionHandler : Valadoc.Api.Node { + public void add_exception_list (Valadoc.Tree root, Vala.Collection vexceptions); + public Gee.Collection get_error_domains (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface FieldHandler : Valadoc.Api.Node { + public Gee.Collection get_field_list (); + public void visit_fields (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface InterfaceHandler : Valadoc.Api.Node { + public Gee.Collection get_interface_list (); + public void visit_interfaces (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface MethodHandler : Valadoc.Api.Node { + public Gee.Collection get_method_list (); + public void visit_methods (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface NamespaceHandler : Valadoc.Api.Node { + protected Valadoc.Namespace get_namespace (Vala.Symbol node); + public Gee.Collection get_namespace_list (bool filtered = true); + public void visit_namespaces (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ParameterListHandler : Valadoc.Api.Node { + public Gee.List get_parameter_list (); + public Gee.List param_list { owned get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ParserCallback { + public abstract void error (string message, Valadoc.Token? token = null) throws Valadoc.ParserError; + public abstract GLib.Object? get_rule_state (); + public abstract void push_rule (Valadoc.Rule rule); + public abstract void reduce (); + public abstract void set_rule_state (GLib.Object state); + public abstract void warning (string message, Valadoc.Token? token = null); + public abstract bool would_parent_accept_token (Valadoc.Token token); + public abstract bool would_parent_reduce_to_rule (Valadoc.Token token, Valadoc.Rule rule); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface PropertyHandler : Valadoc.Api.Node { + public Gee.Collection get_property_list (); + protected bool is_overwritten_property (Valadoc.Property prop); + public void visit_properties (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ResourceLocator : GLib.Object { + public abstract string resolve (string path); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ReturnTypeHandler : Valadoc.Api.Item { + public abstract Valadoc.TypeReference? type_reference { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Scanner : GLib.Object { + public abstract void end () throws Valadoc.ParserError; + public abstract string get_line_content (); + public abstract void reset (); + public abstract void scan (string content) throws Valadoc.ParserError; + public abstract void set_parser (Valadoc.Parser parser); + public abstract void stop (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface SignalHandler : Valadoc.Api.Node { + public Gee.Collection get_signal_list (); + public void visit_signals (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface StructHandler : Valadoc.Api.Node { + public Gee.Collection get_struct_list (); + public void visit_structs (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface SymbolAccessibility { + public abstract bool is_internal { get; } + public abstract bool is_private { get; } + public abstract bool is_protected { get; } + public abstract bool is_public { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface TemplateParameterListHandler : Valadoc.Api.Node { + public Gee.Collection get_template_param_list (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Visitable : Valadoc.Api.Item { + public abstract bool is_visitor_accessible (Valadoc.Settings settings); + } + [CCode (type_id = "VALADOC_TYPE_SOURCE_LOCATION", cheader_filename = "valadoc-1.0.h")] + public struct SourceLocation { + public int line; + public int column; + public SourceLocation (int _line, int _column); + } + [CCode (cprefix = "VALADOC_ERROR_LEVEL_", cheader_filename = "valadoc-1.0.h")] + public enum ErrorLevel { + ASSUMPTION, + WARNING, + ERROR + } + [CCode (cprefix = "VALADOC_PARSER_ERROR_", cheader_filename = "valadoc-1.0.h")] + public errordomain ParserError { + INTERNAL_ERROR, + UNEXPECTED_TOKEN, + } + [CCode (cheader_filename = "valadoc-1.0.h", has_target = false)] + public delegate GLib.Type DocletRegisterFunction (); + [CCode (cheader_filename = "valadoc-1.0.h", has_target = false)] + public delegate void TagletRegisterFunction (Valadoc.ModuleLoader loader); + [CCode (cheader_filename = "valadoc-1.0.h")] + public static bool copy_directory (string src, string dest); + [CCode (cheader_filename = "valadoc-1.0.h")] + public static bool copy_file (string src, string dest); + [CCode (cheader_filename = "valadoc-1.0.h")] + public static string realpath (string name); +} +[CCode (cheader_filename = "valadoc-1.0.h")] +public static Valadoc.Class glib_error; diff --git a/src/valadoc/Makefile.am b/src/valadoc/Makefile.am index 1405bb88b..49778e2c7 100644 --- a/src/valadoc/Makefile.am +++ b/src/valadoc/Makefile.am @@ -6,6 +6,7 @@ AM_CFLAGS = \ -DPACKAGE_VERSION=\"$(VERSION)\" \ -I ../libvaladoc/ \ $(GLIB_CFLAGS) \ + $(LIBGEE_CFLAGS) \ $(LIBVALA_CFLAGS) \ $(GMODULE_CFLAGS) \ $(LIBGVC_CFLAGS) \ @@ -35,11 +36,12 @@ valadoc_LDADD = \ $(LIBVALA_LIBS) \ $(GMODULE_LIBS) \ $(LIBGVC_LIBS) \ + $(LIBGEE_LIBS) \ $(NULL) valadoc.vala.stamp: $(libvaladoc_VALASOURCES) - $(VALAC) -C -H valadoc.h --pkg gmodule-2.0 --pkg config --vapidir ../vapi --pkg valadoc-1.0 --basedir $(top_srcdir)/src/valadoc/ valadoc.vala --save-temps $^ + $(VALAC) -C -H valadoc.h --pkg gee-1.0 --pkg gmodule-2.0 --pkg config --vapidir ../vapi --pkg valadoc-1.0 --basedir $(top_srcdir)/src/valadoc/ valadoc.vala --save-temps $^ touch $@ diff --git a/src/valadoc/valadoc b/src/valadoc/valadoc new file mode 100755 index 000000000..9e660a3d8 --- /dev/null +++ b/src/valadoc/valadoc @@ -0,0 +1,148 @@ +#! /bin/bash + +# valadoc - temporary wrapper script for .libs/valadoc +# Generated by ltmain.sh (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1 +# +# The valadoc program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='/bin/sed -e 1s/^X//' +sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command="(cd /home/mog/Desktop/valadoc/src/valadoc; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games; export PATH; gcc -DPACKAGE_DATADIR=\\\"/usr/local/lib/valadoc/plugins\\\" -DPACKAGE_VERSION=\\\"0.2\\\" -I ../libvaladoc/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/local/include/gee-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/local/include/vala-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/graphviz -g -O2 -o \$progdir/\$file valadoc.o -Wl,--export-dynamic ../libvaladoc/.libs/libvaladoc.so -L/usr/local/lib /usr/lib/libxml2.so /usr/local/lib/libvala.so /usr/lib/libgmodule-2.0.so -lgvc -lgraph -lcdt /usr/local/lib/libgee.so /usr/lib/libgobject-2.0.so /usr/lib/libglib-2.0.so -Wl,-rpath -Wl,/home/mog/Desktop/valadoc/src/libvaladoc/.libs -Wl,-rpath -Wl,/usr/local/lib/valadoc/)" + +# This environment variable determines our operation mode. +if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then + # install mode needs the following variables: + generated_by_libtool_version='2.2.6' + notinst_deplibs=' ../libvaladoc/libvaladoc.la' +else + # When we are sourced in execute mode, $file and $ECHO are already set. + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + ECHO="echo" + file="$0" + # Make sure echo works. + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then + # Yippee, $ECHO works! + : + else + # Restart under the correct shell, and then maybe $ECHO will work. + exec /bin/bash "$0" --no-reexec ${1+"$@"} + fi + fi + + # Find the directory that this script lives in. + thisdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'` + test "x$thisdir" = "x$file" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'` + while test -n "$file"; do + destdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'` + + # If there was a directory component, then change thisdir. + if test "x$destdir" != "x$file"; then + case "$destdir" in + [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; + *) thisdir="$thisdir/$destdir" ;; + esac + fi + + file=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'` + file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'` + done + + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no + if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then + # special case for '.' + if test "$thisdir" = "."; then + thisdir=`pwd` + fi + # remove .libs from thisdir + case "$thisdir" in + *[\\/].libs ) thisdir=`$ECHO "X$thisdir" | $Xsed -e 's%[\\/][^\\/]*$%%'` ;; + .libs ) thisdir=. ;; + esac + fi + + # Try to get the absolute directory name. + absdir=`cd "$thisdir" && pwd` + test -n "$absdir" && thisdir="$absdir" + + program=lt-'valadoc' + progdir="$thisdir/.libs" + + if test ! -f "$progdir/$program" || + { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \ + test "X$file" != "X$progdir/$program"; }; then + + file="$$-$program" + + if test ! -d "$progdir"; then + mkdir "$progdir" + else + rm -f "$progdir/$file" + fi + + # relink executable if necessary + if test -n "$relink_command"; then + if relink_command_output=`eval $relink_command 2>&1`; then : + else + echo "$relink_command_output" >&2 + rm -f "$progdir/$file" + exit 1 + fi + fi + + mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null || + { rm -f "$progdir/$program"; + mv -f "$progdir/$file" "$progdir/$program"; } + rm -f "$progdir/$file" + fi + + if test -f "$progdir/$program"; then + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + # Run the actual program with our arguments. + + exec "$progdir/$program" ${1+"$@"} + + $ECHO "$0: cannot exec $program $*" 1>&2 + exit 1 + fi + else + # The program doesn't exist. + $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2 + $ECHO "This script is just a wrapper for $program." 1>&2 + echo "See the libtool documentation for more information." 1>&2 + exit 1 + fi +fi diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala index 26ae78be5..17dcaa6ba 100755 --- a/src/valadoc/valadoc.vala +++ b/src/valadoc/valadoc.vala @@ -20,7 +20,6 @@ using GLib.Path; using Valadoc; using Config; -using GLib; using Gee; diff --git a/src/vapi/valadoc-1.0.vapi b/src/vapi/valadoc-1.0.vapi new file mode 100644 index 000000000..919b82fdf --- /dev/null +++ b/src/vapi/valadoc-1.0.vapi @@ -0,0 +1,1043 @@ +/* valadoc-1.0.vapi generated by valac, do not modify. */ + +[CCode (cprefix = "Valadoc", lower_case_cprefix = "valadoc_")] +namespace Valadoc { + [CCode (cprefix = "ValadocApi", lower_case_cprefix = "valadoc_api_")] + namespace Api { + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class Item : GLib.Object { + public Item (); + protected virtual void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + protected virtual void resolve_type_references (Valadoc.Tree root); + public Valadoc.Api.Item parent { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class MemberNode : Valadoc.Api.SymbolNode { + public MemberNode (Vala.Member symbol, Valadoc.Api.Node parent); + protected override void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class Node : Valadoc.Api.Item, Valadoc.Visitable, Valadoc.Documentation { + public Node (Valadoc.Api.Node? parent); + public abstract void accept (Valadoc.Doclet doclet); + public void accept_children (Valadoc.Api.NodeType[] types, Valadoc.Doclet doclet); + public void accept_children_by_type (Valadoc.Api.NodeType type, Valadoc.Doclet doclet); + protected void add_child (Valadoc.Api.SymbolNode child); + public Valadoc.Api.Node? find_by_name (string name); + public Valadoc.Api.Node? find_by_symbol (Vala.Symbol symbol); + public string? full_name (); + public Gee.List get_children_by_type (Valadoc.Api.NodeType type, bool filtered = true); + public virtual string? get_filename (); + public abstract bool is_visitor_accessible (Valadoc.Settings settings); + protected override void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + protected override void resolve_type_references (Valadoc.Tree root); + public Valadoc.Content.Comment? documentation { get; set; } + public abstract string? name { owned get; } + public abstract Valadoc.Api.NodeType node_type { get; } + public Valadoc.Namespace? nspace { get; } + public Valadoc.Package? package { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class SymbolNode : Valadoc.Api.Node, Valadoc.SymbolAccessibility { + public SymbolNode (Vala.Symbol symbol, Valadoc.Api.Node parent); + public override string? get_filename (); + public override bool is_visitor_accessible (Valadoc.Settings settings); + public override string? name { owned get; } + protected Vala.Symbol symbol { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class TypeSymbolNode : Valadoc.Api.SymbolNode { + public TypeSymbolNode (Vala.TypeSymbol symbol, Valadoc.Api.Node parent); + protected override void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + } + [CCode (cprefix = "VALADOC_API_NODE_TYPE_", cheader_filename = "valadoc-1.0.h")] + public enum NodeType { + CLASS, + CONSTANT, + CREATION_METHOD, + DELEGATE, + ENUM, + ENUM_VALUE, + ERROR_CODE, + ERROR_DOMAIN, + FIELD, + FORMAL_PARAMETER, + INTERFACE, + METHOD, + NAMESPACE, + PACKAGE, + PROPERTY, + PROPERTY_ACCESSOR, + SIGNAL, + STRUCT, + TYPE_PARAMETER + } + } + [CCode (cprefix = "ValadocContent", lower_case_cprefix = "valadoc_content_")] + namespace Content { + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class BlockContent : Valadoc.Content.ContentElement { + public override void accept_children (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public Gee.List content { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Comment : Valadoc.Content.BlockContent { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void accept_children (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public Gee.List find_taglets (Valadoc.Api.Node? container, GLib.Type taglet_type); + public Gee.List taglets { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class ContentElement : GLib.Object { + public ContentElement (); + public abstract void accept (Valadoc.Content.ContentVisitor visitor); + public virtual void accept_children (Valadoc.Content.ContentVisitor visitor); + public abstract void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public virtual void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ContentFactory : GLib.Object { + public ContentFactory (Valadoc.Settings settings, Valadoc.ResourceLocator locator, Valadoc.ModuleLoader modules); + public Valadoc.Content.Comment create_comment (); + public Valadoc.Content.Embedded create_embedded (); + public Valadoc.Content.Headline create_headline (); + public Valadoc.Content.Link create_link (); + public Valadoc.Content.List create_list (); + public Valadoc.Content.ListItem create_list_item (); + public Valadoc.Content.Page create_page (); + public Valadoc.Content.Paragraph create_paragraph (); + public Valadoc.Content.Run create_run (Valadoc.Content.Run.Style style); + public Valadoc.Content.SourceCode create_source_code (); + public Valadoc.Content.Table create_table (); + public Valadoc.Content.TableCell create_table_cell (); + public Valadoc.Content.TableRow create_table_row (); + public Valadoc.Content.Taglet create_taglet (string name); + public Valadoc.Content.Text create_text (string? text = null); + public Valadoc.Content.ContentElement set_style_attributes (Valadoc.Content.StyleAttributes element, Valadoc.Content.VerticalAlign? valign, Valadoc.Content.HorizontalAlign? halign, string? style); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class ContentRenderer : Valadoc.Content.ContentVisitor { + public ContentRenderer (); + public abstract void render (Valadoc.Content.ContentElement element); + public abstract void render_children (Valadoc.Content.ContentElement element); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class ContentVisitor : GLib.Object { + public ContentVisitor (); + public virtual void visit_comment (Valadoc.Content.Comment element); + public virtual void visit_embedded (Valadoc.Content.Embedded element); + public virtual void visit_headline (Valadoc.Content.Headline element); + public virtual void visit_link (Valadoc.Content.Link element); + public virtual void visit_list (Valadoc.Content.List element); + public virtual void visit_list_item (Valadoc.Content.ListItem element); + public virtual void visit_page (Valadoc.Content.Page element); + public virtual void visit_paragraph (Valadoc.Content.Paragraph element); + public virtual void visit_run (Valadoc.Content.Run element); + public virtual void visit_source_code (Valadoc.Content.SourceCode element); + public virtual void visit_symbol_link (Valadoc.Content.SymbolLink element); + public virtual void visit_table (Valadoc.Content.Table element); + public virtual void visit_table_cell (Valadoc.Content.TableCell element); + public virtual void visit_table_row (Valadoc.Content.TableRow element); + public virtual void visit_taglet (Valadoc.Content.Taglet element); + public virtual void visit_text (Valadoc.Content.Text element); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Embedded : Valadoc.Content.ContentElement, Valadoc.Content.Inline, Valadoc.Content.StyleAttributes { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public string caption { get; set; } + public string url { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Headline : Valadoc.Content.Block, Valadoc.Content.InlineContent { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public int level { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class InlineContent : Valadoc.Content.ContentElement { + public override void accept_children (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Gee.List content { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class InlineTaglet : Valadoc.Content.ContentElement, Valadoc.Content.Taglet, Valadoc.Content.Inline { + protected Valadoc.ResourceLocator locator; + protected Valadoc.Settings settings; + public InlineTaglet (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public abstract Valadoc.Rule? get_parser_rule (Valadoc.Rule run_rule); + public abstract Valadoc.Content.ContentElement produce_content (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Link : Valadoc.Content.ContentElement, Valadoc.Content.Inline { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public string label { get; set; } + public string url { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class List : Valadoc.Content.ContentElement, Valadoc.Content.Block { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Gee.List items { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ListItem : Valadoc.Content.InlineContent { + [CCode (cprefix = "VALADOC_CONTENT_LIST_ITEM_BULLET_", cheader_filename = "valadoc-1.0.h")] + public enum Bullet { + NONE, + UNORDERED, + ORDERED, + ORDERED_LATIN, + ORDERED_CAPITAL, + ORDERED_NUMBER, + ORDERED_LOWER_CASE + } + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Valadoc.Content.ListItem.Bullet bullet { get; set; } + public int level { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Page : Valadoc.Content.BlockContent { + public override void accept (Valadoc.Content.ContentVisitor visitor); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Paragraph : Valadoc.Content.InlineContent, Valadoc.Content.Block, Valadoc.Content.StyleAttributes { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Run : Valadoc.Content.InlineContent, Valadoc.Content.Inline { + [CCode (cprefix = "VALADOC_CONTENT_RUN_STYLE_", cheader_filename = "valadoc-1.0.h")] + public enum Style { + NONE, + BOLD, + ITALIC, + UNDERLINED, + MONOSPACED, + STROKE, + LANG_KEYWORD, + LANG_LITERAL, + LANG_TYPE + } + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Valadoc.Content.Run.Style style { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class SourceCode : Valadoc.Content.ContentElement, Valadoc.Content.Block { + [CCode (cprefix = "VALADOC_CONTENT_SOURCE_CODE_LANGUAGE_", cheader_filename = "valadoc-1.0.h")] + public enum Language { + GENIE, + VALA, + C + } + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public string code { get; set; } + public Valadoc.Content.SourceCode.Language language { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class SymbolLink : Valadoc.Content.ContentElement, Valadoc.Content.Inline { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override void configure (Valadoc.Settings settings, Valadoc.ResourceLocator locator); + public string label { get; set; } + public Valadoc.Api.Node symbol { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Table : Valadoc.Content.ContentElement, Valadoc.Content.Block { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void accept_children (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Gee.List rows { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class TableCell : Valadoc.Content.InlineContent, Valadoc.Content.StyleAttributes { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public int colspan { get; set; } + public int rowspan { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class TableRow : Valadoc.Content.ContentElement { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void accept_children (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Gee.List cells { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Text : Valadoc.Content.ContentElement, Valadoc.Content.Inline { + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public string content { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Block : Valadoc.Content.ContentElement { + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Inline : Valadoc.Content.ContentElement { + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface StyleAttributes : Valadoc.Content.ContentElement { + public abstract Valadoc.Content.HorizontalAlign? horizontal_align { get; set; } + public abstract string? style { get; set; } + public abstract Valadoc.Content.VerticalAlign? vertical_align { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Taglet : Valadoc.Content.ContentElement { + public abstract Valadoc.Rule? get_parser_rule (Valadoc.Rule run_rule); + } + [CCode (cprefix = "VALADOC_CONTENT_HORIZONTAL_ALIGN_", cheader_filename = "valadoc-1.0.h")] + public enum HorizontalAlign { + LEFT, + RIGHT, + CENTER + } + [CCode (cprefix = "VALADOC_CONTENT_VERTICAL_ALIGN_", cheader_filename = "valadoc-1.0.h")] + public enum VerticalAlign { + TOP, + MIDDLE, + BOTTOM + } + } + [CCode (cprefix = "ValadocDiagrams", lower_case_cprefix = "valadoc_diagrams_")] + namespace Diagrams { + [CCode (cheader_filename = "valadoc-1.0.h")] + public static void write_class_diagram (Valadoc.Class cl, string path); + [CCode (cheader_filename = "valadoc-1.0.h")] + public static void write_interface_diagram (Valadoc.Interface iface, string path); + [CCode (cheader_filename = "valadoc-1.0.h")] + public static void write_struct_diagram (Valadoc.Struct stru, string path); + } + [CCode (cprefix = "ValadocTaglets", lower_case_cprefix = "valadoc_taglets_")] + namespace Taglets { + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Deprecated : Valadoc.Content.InlineContent, Valadoc.Content.Taglet, Valadoc.Content.Block { + public Deprecated (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class InheritDoc : Valadoc.Content.InlineTaglet { + public InheritDoc (); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override Valadoc.Rule? get_parser_rule (Valadoc.Rule run_rule); + public override Valadoc.Content.ContentElement produce_content (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Link : Valadoc.Content.InlineTaglet { + public Link (); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public override Valadoc.Rule? get_parser_rule (Valadoc.Rule run_rule); + public override Valadoc.Content.ContentElement produce_content (); + public string symbol_name { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Param : Valadoc.Content.InlineContent, Valadoc.Content.Taglet, Valadoc.Content.Block { + public Param (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public string parameter_name { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Return : Valadoc.Content.InlineContent, Valadoc.Content.Taglet, Valadoc.Content.Block { + public Return (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class See : Valadoc.Content.ContentElement, Valadoc.Content.Taglet, Valadoc.Content.Block { + public See (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Valadoc.Api.Node symbol { get; set; } + public string symbol_name { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Since : Valadoc.Content.ContentElement, Valadoc.Content.Taglet, Valadoc.Content.Block { + public string version; + public Since (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Throws : Valadoc.Content.InlineContent, Valadoc.Content.Taglet, Valadoc.Content.Block { + public Throws (); + public override void accept (Valadoc.Content.ContentVisitor visitor); + public override void check (Valadoc.Tree api_root, Valadoc.Api.Node? container, Valadoc.ErrorReporter reporter); + public Valadoc.Api.Node error_domain { get; set; } + public string error_domain_name { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public static void init (Valadoc.ModuleLoader loader); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Array : Valadoc.Api.Item { + public Array (Vala.ArrayType vtyperef, Valadoc.Api.Item parent); + protected override void resolve_type_references (Valadoc.Tree root); + public void write (Valadoc.Langlet langlet, void* ptr, Valadoc.Api.Node parent); + public Valadoc.Api.Item data_type { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Class : Valadoc.Api.TypeSymbolNode, Valadoc.ClassHandler, Valadoc.StructHandler, Valadoc.SignalHandler, Valadoc.MethodHandler, Valadoc.EnumHandler, Valadoc.PropertyHandler, Valadoc.ConstructionMethodHandler, Valadoc.FieldHandler, Valadoc.DelegateHandler, Valadoc.ConstantHandler, Valadoc.TemplateParameterListHandler { + public Class (Vala.Class symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + public Gee.Collection get_implemented_interface_list (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + protected Valadoc.Class? base_type { get; set; } + public bool is_abstract { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class CommentScanner : Valadoc.WikiScanner { + public CommentScanner (Valadoc.Settings settings); + protected override void accept (unichar c) throws Valadoc.ParserError; + public override int get_line_start_column (); + public override void reset (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Constant : Valadoc.Api.MemberNode, Valadoc.ReturnTypeHandler { + public Constant (Vala.Constant symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string get_cname (); + public bool is_vconstant (Vala.Constant vconst); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet, Valadoc.ConstantHandler? parent); + public void write (Valadoc.Langlet langlet, void* ptr, Valadoc.ConstantHandler parent); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Delegate : Valadoc.Api.TypeSymbolNode, Valadoc.ParameterListHandler, Valadoc.ReturnTypeHandler, Valadoc.TemplateParameterListHandler, Valadoc.ExceptionHandler { + public Delegate (Vala.Delegate symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public bool is_static { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class Doclet : GLib.Object { + public Doclet (); + public abstract void initialisation (Valadoc.Settings settings, Valadoc.Tree tree); + public abstract void visit_class (Valadoc.Class cl); + public abstract void visit_constant (Valadoc.Constant constant, Valadoc.ConstantHandler parent); + public abstract void visit_delegate (Valadoc.Delegate del); + public abstract void visit_enum (Valadoc.Enum en); + public abstract void visit_enum_value (Valadoc.EnumValue enval); + public abstract void visit_error_code (Valadoc.ErrorCode errcode); + public abstract void visit_error_domain (Valadoc.ErrorDomain errdom); + public abstract void visit_field (Valadoc.Field field, Valadoc.FieldHandler parent); + public abstract void visit_interface (Valadoc.Interface iface); + public abstract void visit_method (Valadoc.Method m, Valadoc.MethodHandler parent); + public abstract void visit_namespace (Valadoc.Namespace ns); + public abstract void visit_package (Valadoc.Package pkg); + public abstract void visit_property (Valadoc.Property prop); + public abstract void visit_signal (Valadoc.Signal sig); + public abstract void visit_struct (Valadoc.Struct stru); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class DocumentationParser : GLib.Object, Valadoc.ResourceLocator { + public DocumentationParser (Valadoc.Settings settings, Valadoc.ErrorReporter reporter, Valadoc.Tree tree, Valadoc.ModuleLoader modules); + public Valadoc.Content.Comment? parse (Valadoc.Api.Node element, Vala.Comment source_comment); + public Valadoc.Content.Page? parse_wikipage (Valadoc.WikiPage page); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Enum : Valadoc.Api.TypeSymbolNode, Valadoc.MethodHandler { + public Enum (Vala.Enum symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + public Gee.Collection get_enum_values (); + public void visit (Valadoc.Doclet doclet); + public void visit_enum_values (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class EnumValue : Valadoc.Api.SymbolNode { + public EnumValue (Vala.EnumValue symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string get_cname (); + public bool is_venumvalue (Vala.EnumValue venval); + protected override void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ErrorCode : Valadoc.Api.TypeSymbolNode { + public ErrorCode (Vala.ErrorCode symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string get_cname (); + public bool is_verrorcode (Vala.ErrorCode verrcode); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ErrorDomain : Valadoc.Api.TypeSymbolNode, Valadoc.MethodHandler { + public ErrorDomain (Vala.ErrorDomain symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + public Gee.Collection get_error_code_list (); + public void visit (Valadoc.Doclet doclet); + public void visit_error_codes (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ErrorReporter : GLib.Object { + public ErrorReporter (); + public void error (string file, long line, long startpos, long endpos, string errline, string msg); + public void simple_error (string msg); + public void simple_warning (string msg); + public void warning (string file, long line, long startpos, long endpos, string errline, string msg); + public int errors { get; } + public GLib.FileStream stream { get; set; } + public Vala.Report? vreporter { get; set; } + public int warnings { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Field : Valadoc.Api.MemberNode, Valadoc.ReturnTypeHandler { + public Field (Vala.Field symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet, Valadoc.FieldHandler? parent); + public void write (Valadoc.Langlet langlet, void* ptr, Valadoc.FieldHandler parent); + public bool is_static { get; } + public bool is_volatile { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class FormalParameter : Valadoc.Api.SymbolNode, Valadoc.ReturnTypeHandler { + public FormalParameter (Vala.FormalParameter symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + protected override void resolve_type_references (Valadoc.Tree root); + public void write (Valadoc.Langlet langlet, void* ptr); + public bool ellipsis { get; } + public bool has_default_value { get; } + public bool is_out { get; } + public bool is_ref { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Interface : Valadoc.Api.TypeSymbolNode, Valadoc.SignalHandler, Valadoc.PropertyHandler, Valadoc.FieldHandler, Valadoc.ConstantHandler, Valadoc.TemplateParameterListHandler, Valadoc.MethodHandler, Valadoc.DelegateHandler, Valadoc.EnumHandler, Valadoc.StructHandler, Valadoc.ClassHandler { + public Interface (Vala.Interface symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + public Gee.Collection get_implemented_interface_list (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + protected Valadoc.Class? base_type { get; set; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class Langlet : GLib.Object { + public Langlet (); + public abstract void write_array (Valadoc.Array param, void* ptr, Valadoc.Api.Node pos); + public abstract void write_class (Valadoc.Class cl, void* ptr); + public abstract void write_constant (Valadoc.Constant constant, Valadoc.ConstantHandler parent, void* ptr); + public abstract void write_delegate (Valadoc.Delegate del, void* ptr); + public abstract void write_enum (Valadoc.Enum en, void* ptr); + public abstract void write_enum_value (Valadoc.EnumValue enval, void* ptr); + public abstract void write_error_code (Valadoc.ErrorCode errcode, void* ptr); + public abstract void write_error_domain (Valadoc.ErrorDomain errdom, void* ptr); + public abstract void write_field (Valadoc.Field field, Valadoc.FieldHandler pos, void* ptr); + public abstract void write_file (Valadoc.Package file, void* ptr); + public abstract void write_formal_parameter (Valadoc.FormalParameter param, void* ptr); + public abstract void write_inheritance_list (Valadoc.Api.Node dtype, void* ptr); + public abstract void write_interface (Valadoc.Interface iface, void* ptr); + public abstract void write_method (void* ptr, Valadoc.Method m, Valadoc.MethodHandler pos); + public abstract void write_namespace (Valadoc.Namespace ns, void* ptr); + public abstract void write_parameter_list (Valadoc.ParameterListHandler thandler, void* ptr); + public abstract void write_pointer (Valadoc.Pointer param, void* ptr, Valadoc.Api.Node pos); + public abstract void write_property (Valadoc.Property prop, void* ptr); + public abstract void write_property_accessor (Valadoc.PropertyAccessor propac, void* ptr); + public abstract void write_signal (Valadoc.Signal sig, void* ptr); + public abstract void write_struct (Valadoc.Struct stru, void* ptr); + public abstract void write_template_parameters (Valadoc.TemplateParameterListHandler thandler, void* ptr); + public abstract void write_type_parameter (Valadoc.TypeParameter param, void* ptr); + public abstract void write_type_reference (Valadoc.TypeReference tref, void* ptr); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Method : Valadoc.Api.MemberNode, Valadoc.ParameterListHandler, Valadoc.ExceptionHandler, Valadoc.TemplateParameterListHandler, Valadoc.ReturnTypeHandler { + public Method (Vala.Method symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet, Valadoc.MethodHandler in_type); + public void write (Valadoc.Langlet langlet, void* ptr, Valadoc.MethodHandler parent); + public Valadoc.Method? base_method { get; set; } + public bool is_abstract { get; } + public bool is_constructor { get; } + public bool is_inline { get; } + public bool is_override { get; } + public bool is_static { get; } + public bool is_virtual { get; } + public bool is_yields { get; } + public override string? name { owned get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class ModuleLoader : GLib.Object { + public Valadoc.Doclet doclet; + public Gee.HashMap taglets; + public ModuleLoader (); + public Valadoc.Content.Taglet create_taglet (string keyword); + public bool load (string path); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Namespace : Valadoc.Api.SymbolNode, Valadoc.MethodHandler, Valadoc.FieldHandler, Valadoc.NamespaceHandler, Valadoc.ErrorDomainHandler, Valadoc.EnumHandler, Valadoc.ClassHandler, Valadoc.StructHandler, Valadoc.InterfaceHandler, Valadoc.DelegateHandler, Valadoc.ConstantHandler { + public Namespace (Vala.Namespace symbol, Valadoc.NamespaceHandler parent); + public override void accept (Valadoc.Doclet doclet); + protected override void process_comments (Valadoc.Settings settings, Valadoc.DocumentationParser parser); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + public Vala.Namespace vnspace { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Package : Valadoc.Api.Node, Valadoc.NamespaceHandler { + public Package (Vala.SourceFile vfile, string name, bool is_package = false); + public override void accept (Valadoc.Doclet doclet); + public Gee.Collection get_dependency_list (); + public Gee.Collection get_full_dependency_list (); + public override bool is_visitor_accessible (Valadoc.Settings settings); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public bool is_package { get; set; } + public override string? name { owned get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (ref_function = "valadoc_parser_ref", unref_function = "valadoc_parser_unref", cheader_filename = "valadoc-1.0.h")] + public class Parser : Valadoc.ParserCallback { + public Parser (Valadoc.Settings settings, Valadoc.Scanner scanner, Valadoc.ErrorReporter reporter); + public void accept_token (Valadoc.Token token) throws Valadoc.ParserError; + public void parse (string content, string filename, int first_line, int first_column) throws Valadoc.ParserError; + public void set_root_rule (Valadoc.Rule root_rule); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Pointer : Valadoc.Api.Item { + public Pointer (Vala.PointerType vtyperef, Valadoc.Api.Item parent); + protected override void resolve_type_references (Valadoc.Tree root); + public void write (Valadoc.Langlet langlet, void* ptr, Valadoc.Api.Node parent); + public Valadoc.Api.Item data_type { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Property : Valadoc.Api.MemberNode, Valadoc.ReturnTypeHandler { + public Property (Vala.Property symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public bool equals (Valadoc.Property p); + public string? get_cname (); + public bool is_vproperty (Vala.Property vprop); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public Valadoc.Property base_property { get; set; } + public Valadoc.PropertyAccessor getter { get; set; } + public bool is_abstract { get; } + public bool is_override { get; } + public bool is_virtual { get; } + public override Valadoc.Api.NodeType node_type { get; } + public Valadoc.PropertyAccessor setter { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class PropertyAccessor : Valadoc.Api.SymbolNode { + public PropertyAccessor (Vala.PropertyAccessor symbol, Valadoc.Property parent); + public override void accept (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public bool is_construct { get; } + public bool is_get { get; } + public bool is_owned { get; } + public bool is_set { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public abstract class Rule : GLib.Object { + [CCode (cprefix = "VALADOC_RULE_FORWARD_", cheader_filename = "valadoc-1.0.h")] + public enum Forward { + NONE, + PARENT, + CHILD + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public delegate void Action (); + protected Rule (); + public abstract bool accept_token (Valadoc.Token token, Valadoc.ParserCallback parser, Valadoc.Rule.Forward forward) throws Valadoc.ParserError; + protected void do_reduce (Valadoc.ParserCallback parser) throws Valadoc.ParserError; + protected void do_start (Valadoc.ParserCallback parser) throws Valadoc.ParserError; + protected bool has_start_token (GLib.Object? scheme_element, Valadoc.Token token); + public abstract bool is_optional (); + protected bool is_optional_rule (GLib.Object? scheme_element); + public static Valadoc.Rule many (GLib.Object?[] scheme); + public static Valadoc.Rule one_of (GLib.Object?[] scheme); + public static Valadoc.Rule option (GLib.Object?[] scheme); + public static Valadoc.Rule seq (GLib.Object?[] scheme); + public Valadoc.Rule set_name (string name); + public Valadoc.Rule set_reduce (Valadoc.Rule.Action action); + public Valadoc.Rule set_start (Valadoc.Rule.Action action); + public abstract bool starts_with_token (Valadoc.Token token); + public abstract string to_string (GLib.Object? state); + protected bool try_to_apply (GLib.Object? scheme_element, Valadoc.Token token, Valadoc.ParserCallback parser, out bool handled) throws Valadoc.ParserError; + public abstract bool would_accept_token (Valadoc.Token token, GLib.Object? state); + public abstract bool would_reduce (Valadoc.Token token, GLib.Object? state); + public string name { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Settings : GLib.Object { + public bool _internal; + public bool _private; + public bool _protected; + public bool add_inherited; + public string? basedir; + public string[] defines; + public bool deprecated; + public string? directory; + public bool disable_dbus_transformation; + public bool enable_checking; + public bool experimental; + public bool non_null_experimental; + public string path; + public string pkg_name; + public string pkg_version; + public string? profile; + public string[] vapi_directories; + public bool verbose; + public string wiki_directory; + public bool with_deps; + public Settings (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Signal : Valadoc.Api.MemberNode, Valadoc.ParameterListHandler, Valadoc.ReturnTypeHandler { + public Signal (Vala.Signal symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public bool is_virtual { get; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Struct : Valadoc.Api.TypeSymbolNode, Valadoc.MethodHandler, Valadoc.ConstructionMethodHandler, Valadoc.FieldHandler, Valadoc.ConstantHandler, Valadoc.TemplateParameterListHandler { + public Struct (Vala.Struct symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public string? get_cname (); + protected override void resolve_type_references (Valadoc.Tree root); + public void visit (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + protected Valadoc.Struct? base_type { get; set; } + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class StubRule : Valadoc.Rule { + public StubRule (); + public override bool accept_token (Valadoc.Token token, Valadoc.ParserCallback parser, Valadoc.Rule.Forward forward) throws Valadoc.ParserError; + public override bool is_optional (); + public Valadoc.Rule set_rule (Valadoc.Rule rule); + public override bool starts_with_token (Valadoc.Token token); + public override string to_string (GLib.Object? state); + public override bool would_accept_token (Valadoc.Token token, GLib.Object? state); + public override bool would_reduce (Valadoc.Token token, GLib.Object? state); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class Token : GLib.Object { + public Token (); + public Token.from_type (Valadoc.TokenType type, Valadoc.SourceLocation begin, Valadoc.SourceLocation end); + public Token.from_word (string word, Valadoc.SourceLocation begin, Valadoc.SourceLocation end); + public int to_int (); + public string to_pretty_string (); + public string to_string (); + public Valadoc.SourceLocation begin { get; } + public Valadoc.SourceLocation end { get; } + public bool is_number { get; } + public bool is_word { get; } + public Valadoc.TokenType? token_type { get; } + public string? word { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class TokenType : GLib.Object { + [CCode (cheader_filename = "valadoc-1.0.h")] + public delegate void Action (Valadoc.Token token); + public static Valadoc.TokenType ALIGN_BOTTOM; + public static Valadoc.TokenType ALIGN_CENTER; + public static Valadoc.TokenType ALIGN_RIGHT; + public static Valadoc.TokenType ALIGN_TOP; + public static Valadoc.TokenType ANY; + public static Valadoc.TokenType ANY_NUMBER; + public static Valadoc.TokenType ANY_WORD; + public static Valadoc.TokenType AROBASE; + public static Valadoc.TokenType BACK_QUOTE; + public static Valadoc.TokenType CLOSED_BRACE; + public static Valadoc.TokenType DOUBLE_CLOSED_BRACE; + public static Valadoc.TokenType DOUBLE_CLOSED_BRACKET; + public static Valadoc.TokenType DOUBLE_OPEN_BRACE; + public static Valadoc.TokenType DOUBLE_OPEN_BRACKET; + public static Valadoc.TokenType DOUBLE_PIPE; + public static Valadoc.TokenType EOF; + public static Valadoc.TokenType EOL; + public static Valadoc.TokenType EQUAL_1; + public static Valadoc.TokenType EQUAL_2; + public static Valadoc.TokenType EQUAL_3; + public static Valadoc.TokenType EQUAL_4; + public static Valadoc.TokenType EQUAL_5; + public static Valadoc.TokenType GREATER_THAN; + public static Valadoc.TokenType LESS_THAN; + public static Valadoc.TokenType MINUS; + public static Valadoc.TokenType OPEN_BRACE; + public static Valadoc.TokenType PIPE; + public static Valadoc.TokenType SHARP; + public static Valadoc.TokenType SINGLE_QUOTE_2; + public static Valadoc.TokenType SLASH_2; + public static Valadoc.TokenType SPACE; + public static Valadoc.TokenType STAR; + public static Valadoc.TokenType TAB; + public static Valadoc.TokenType TRIPLE_CLOSED_BRACE; + public static Valadoc.TokenType TRIPLE_OPEN_BRACE; + public static Valadoc.TokenType UNDERSCORE_2; + public Valadoc.TokenType action (Valadoc.TokenType.Action action); + public static Valadoc.TokenType any (); + public static Valadoc.TokenType any_number (); + public static Valadoc.TokenType any_word (); + public void do_action (Valadoc.Token matched_token) throws Valadoc.ParserError; + public bool matches (Valadoc.Token token); + public static Valadoc.TokenType str (string str); + public string to_pretty_string (); + public string to_string (); + } + [CCode (ref_function = "valadoc_tree_ref", unref_function = "valadoc_tree_unref", cheader_filename = "valadoc-1.0.h")] + public class Tree { + public Tree (Valadoc.ErrorReporter reporter, Valadoc.Settings settings); + public void add_depencies (string[] packages); + public void add_documented_file (string[] sources); + public bool create_tree (); + public Gee.Collection get_package_list (); + public void parse_comments (Valadoc.DocumentationParser docparser); + public Valadoc.Api.Node? search_symbol_str (Valadoc.Api.Node? element, string symname); + public void visit (Valadoc.Doclet doclet); + public Valadoc.WikiPageTree? wikitree { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class TypeParameter : Valadoc.Api.SymbolNode, Valadoc.ReturnTypeHandler { + public TypeParameter (Vala.TypeParameter symbol, Valadoc.Api.Node parent); + public override void accept (Valadoc.Doclet doclet); + public void write (Valadoc.Langlet langlet, void* ptr); + public override Valadoc.Api.NodeType node_type { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class TypeReference : Valadoc.Api.Item { + public TypeReference (Vala.DataType? vtyperef, Valadoc.Api.Item parent); + public Gee.Collection get_type_arguments (); + protected override void resolve_type_references (Valadoc.Tree root); + public void write (Valadoc.Langlet langlet, void* ptr); + public Valadoc.Api.Item? data_type { get; set; } + public bool is_dynamic { get; } + public bool is_nullable { get; } + public bool is_owned { get; } + public bool is_unowned { get; } + public bool is_weak { get; } + public bool pass_ownership { get; } + public string type_name { owned get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class WikiPage : GLib.Object, Valadoc.Documentation { + public WikiPage (string name, string path); + public bool parse (Valadoc.DocumentationParser docparser); + public void read () throws GLib.FileError; + public Valadoc.Content.Page documentation { get; set; } + public string documentation_str { get; set; } + public string name { get; set; } + public string path { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class WikiPageTree : GLib.Object { + public WikiPageTree (Valadoc.ErrorReporter reporter, Valadoc.Settings settings); + public void create_tree (Valadoc.DocumentationParser docparser) throws GLib.FileError; + public Gee.Collection get_pages (); + public Valadoc.WikiPage? search (string name); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public class WikiScanner : GLib.Object, Valadoc.Scanner { + public WikiScanner (Valadoc.Settings settings); + protected virtual void accept (unichar c) throws Valadoc.ParserError; + public int get_line (); + public virtual string get_line_content (); + public virtual int get_line_start_column (); + protected unichar get_next_char (int offset = 1); + public virtual void reset (); + public void set_code_escape_mode (bool escape_mode); + public void set_url_escape_mode (bool escape_mode); + public virtual void stop (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ClassHandler : Valadoc.Api.Node { + protected Valadoc.Class? find_vclass (Vala.Class vcl); + public Gee.Collection get_class_list (); + public void visit_classes (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ConstantHandler : Valadoc.Api.Node { + public Gee.Collection get_constant_list (); + public void visit_constants (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ConstructionMethodHandler : Valadoc.Api.Node { + public Gee.Collection get_construction_method_list (); + public void visit_construction_methods (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface DelegateHandler : Valadoc.Api.Node { + public Gee.Collection get_delegate_list (); + public void visit_delegates (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Documentation : GLib.Object { + public abstract string? get_filename (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface EnumHandler : Valadoc.Api.Node { + public Gee.Collection get_enum_list (); + public void visit_enums (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ErrorDomainHandler : Valadoc.Api.Node { + public Gee.Collection get_error_domain_list (); + public void visit_error_domains (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ExceptionHandler : Valadoc.Api.Node { + public void add_exception_list (Valadoc.Tree root, Vala.Collection vexceptions); + public Gee.Collection get_error_domains (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface FieldHandler : Valadoc.Api.Node { + public Gee.Collection get_field_list (); + public void visit_fields (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface InterfaceHandler : Valadoc.Api.Node { + public Gee.Collection get_interface_list (); + public void visit_interfaces (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface MethodHandler : Valadoc.Api.Node { + public Gee.Collection get_method_list (); + public void visit_methods (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface NamespaceHandler : Valadoc.Api.Node { + protected Valadoc.Namespace get_namespace (Vala.Symbol node); + public Gee.Collection get_namespace_list (bool filtered = true); + public void visit_namespaces (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ParameterListHandler : Valadoc.Api.Node { + public Gee.List get_parameter_list (); + public Gee.List param_list { owned get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ParserCallback { + public abstract void error (string message, Valadoc.Token? token = null) throws Valadoc.ParserError; + public abstract GLib.Object? get_rule_state (); + public abstract void push_rule (Valadoc.Rule rule); + public abstract void reduce (); + public abstract void set_rule_state (GLib.Object state); + public abstract void warning (string message, Valadoc.Token? token = null); + public abstract bool would_parent_accept_token (Valadoc.Token token); + public abstract bool would_parent_reduce_to_rule (Valadoc.Token token, Valadoc.Rule rule); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface PropertyHandler : Valadoc.Api.Node { + public Gee.Collection get_property_list (); + protected bool is_overwritten_property (Valadoc.Property prop); + public void visit_properties (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ResourceLocator : GLib.Object { + public abstract string resolve (string path); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface ReturnTypeHandler : Valadoc.Api.Item { + public abstract Valadoc.TypeReference? type_reference { get; set; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Scanner : GLib.Object { + public abstract void end () throws Valadoc.ParserError; + public abstract string get_line_content (); + public abstract void reset (); + public abstract void scan (string content) throws Valadoc.ParserError; + public abstract void set_parser (Valadoc.Parser parser); + public abstract void stop (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface SignalHandler : Valadoc.Api.Node { + public Gee.Collection get_signal_list (); + public void visit_signals (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface StructHandler : Valadoc.Api.Node { + public Gee.Collection get_struct_list (); + public void visit_structs (Valadoc.Doclet doclet); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface SymbolAccessibility { + public abstract bool is_internal { get; } + public abstract bool is_private { get; } + public abstract bool is_protected { get; } + public abstract bool is_public { get; } + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface TemplateParameterListHandler : Valadoc.Api.Node { + public Gee.Collection get_template_param_list (); + } + [CCode (cheader_filename = "valadoc-1.0.h")] + public interface Visitable : Valadoc.Api.Item { + public abstract bool is_visitor_accessible (Valadoc.Settings settings); + } + [CCode (type_id = "VALADOC_TYPE_SOURCE_LOCATION", cheader_filename = "valadoc-1.0.h")] + public struct SourceLocation { + public int line; + public int column; + public SourceLocation (int _line, int _column); + } + [CCode (cprefix = "VALADOC_ERROR_LEVEL_", cheader_filename = "valadoc-1.0.h")] + public enum ErrorLevel { + ASSUMPTION, + WARNING, + ERROR + } + [CCode (cprefix = "VALADOC_PARSER_ERROR_", cheader_filename = "valadoc-1.0.h")] + public errordomain ParserError { + INTERNAL_ERROR, + UNEXPECTED_TOKEN, + } + [CCode (cheader_filename = "valadoc-1.0.h", has_target = false)] + public delegate GLib.Type DocletRegisterFunction (); + [CCode (cheader_filename = "valadoc-1.0.h", has_target = false)] + public delegate void TagletRegisterFunction (Valadoc.ModuleLoader loader); + [CCode (cheader_filename = "valadoc-1.0.h")] + public static bool copy_directory (string src, string dest); + [CCode (cheader_filename = "valadoc-1.0.h")] + public static bool copy_file (string src, string dest); + [CCode (cheader_filename = "valadoc-1.0.h")] + public static string realpath (string name); +} +[CCode (cheader_filename = "valadoc-1.0.h")] +public static Valadoc.Class glib_error;