From: Florian Brosch Date: Thu, 17 Sep 2009 17:12:15 +0000 (+0200) Subject: - a few renamings X-Git-Tag: 0.37.1~3^2~585 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a8ff81dc20267ba9183741b379a8792a7e529fa;p=thirdparty%2Fvala.git - a few renamings --- diff --git a/src/doclets/devhelp/doclet/doclet.vala b/src/doclets/devhelp/doclet/doclet.vala index 8a4a593cd..21e6da0bc 100755 --- a/src/doclets/devhelp/doclet/doclet.vala +++ b/src/doclets/devhelp/doclet/doclet.vala @@ -25,7 +25,7 @@ using Gee; namespace Valadoc.Devhelp { - public string? get_html_link ( Settings settings, Documented element, Documented? pos ) { + public string? get_html_link ( Settings settings, Documentation element, Documentation? pos ) { if ( element is Visitable ) { if ( ((Visitable)element).is_visitor_accessible () == false ) { return null; diff --git a/src/doclets/htm/doclet/doclet.vala b/src/doclets/htm/doclet/doclet.vala index 83dea1a1a..98e817683 100755 --- a/src/doclets/htm/doclet/doclet.vala +++ b/src/doclets/htm/doclet/doclet.vala @@ -24,7 +24,7 @@ using Gee; namespace Valadoc { - public string? get_html_link ( Settings settings, Documented element, Documented? pos ) { + public string? get_html_link ( Settings settings, Documentation element, Documentation? pos ) { if ( element is Visitable ) { if ( ((Visitable)element).is_visitor_accessible () == false ) { return null; diff --git a/src/doclets/htmlhelpers/doclet/globals.vala b/src/doclets/htmlhelpers/doclet/globals.vala index e930b0793..834b9544a 100755 --- a/src/doclets/htmlhelpers/doclet/globals.vala +++ b/src/doclets/htmlhelpers/doclet/globals.vala @@ -135,17 +135,17 @@ namespace Valadoc.Html { public const string css_content_literal = "css_content_literal"; - public delegate string? HtmlLink (Settings settings, Documented element, Documented? pos); + public delegate string? HtmlLink (Settings settings, Documentation element, Documentation? pos); public HtmlLink get_html_link_imp; - public string? get_html_link ( Settings settings, Documented element, Documented? pos ) { + public string? get_html_link ( Settings settings, Documentation element, Documentation? pos ) { if (get_html_link_imp == null) { return null; } return get_html_link_imp(settings, element, pos); } - public string get_html_type_link (Settings settings, Documented element, Documented? pos) { + public string get_html_type_link (Settings settings, Documentation element, Documentation? pos) { string prefix = ""; string tmp = ""; diff --git a/src/doclets/htmlhelpers/taglets/image/taglet.vala b/src/doclets/htmlhelpers/taglets/image/taglet.vala index 319076131..189e0d608 100755 --- a/src/doclets/htmlhelpers/taglets/image/taglet.vala +++ b/src/doclets/htmlhelpers/taglets/image/taglet.vala @@ -32,7 +32,7 @@ namespace Valadoc.Html { private string path; private string alt; - public override bool parse ( Settings settings, Documented pos, owned string path, owned string alt ) { + public override bool parse ( Settings settings, Documentation pos, owned string path, owned string alt ) { if ( GLib.FileUtils.test ( path, GLib.FileTest.EXISTS | GLib.FileTest.IS_REGULAR ) == false ) { return false; } diff --git a/src/doclets/htmlhelpers/taglets/link/taglet.vala b/src/doclets/htmlhelpers/taglets/link/taglet.vala index 35d6ad161..fc692587c 100755 --- a/src/doclets/htmlhelpers/taglets/link/taglet.vala +++ b/src/doclets/htmlhelpers/taglets/link/taglet.vala @@ -27,7 +27,7 @@ namespace Valadoc.Html { protected string desc; protected string path; - public override bool parse ( Settings settings, Tree tree, Documented pos, owned string path, owned string desc ) { + public override bool parse ( Settings settings, Tree tree, Documentation pos, owned string path, owned string desc ) { if ( path.has_suffix(".valadoc")&&path.has_prefix("/") ) { if ( tree.wikitree == null ) { return false; diff --git a/src/doclets/htmlhelpers/taglets/typelink/taglet.vala b/src/doclets/htmlhelpers/taglets/typelink/taglet.vala index f9ea3fe6c..0e24c679d 100755 --- a/src/doclets/htmlhelpers/taglets/typelink/taglet.vala +++ b/src/doclets/htmlhelpers/taglets/typelink/taglet.vala @@ -43,7 +43,7 @@ namespace Valadoc.Html { return true; } - protected override bool parse ( Settings settings, Tree tree, Documented self, string content, ref ErrorLevel errlvl, out string? errmsg ) { + protected override bool parse ( Settings settings, Tree tree, Documentation self, string content, ref ErrorLevel errlvl, out string? errmsg ) { Valadoc.DocumentedElement? element = tree.search_symbol_str ( (self is DocumentedElement)? (DocumentedElement)self : null, content.strip() ); if ( element == null ) { errmsg = "Linked type is not available"; diff --git a/src/doclets/valadoc.org/taglets/image/taglet.vala b/src/doclets/valadoc.org/taglets/image/taglet.vala index 1e9a939e9..7a62eab29 100755 --- a/src/doclets/valadoc.org/taglets/image/taglet.vala +++ b/src/doclets/valadoc.org/taglets/image/taglet.vala @@ -28,7 +28,7 @@ public class Valadoc.ValdocOrg.ImageDocElement : Valadoc.ImageDocElement { private string path; private string alt; - public override bool parse (Settings settings, Documented pos, owned string path, owned string alt) { + public override bool parse (Settings settings, Documentation pos, owned string path, owned string alt) { if ( GLib.FileUtils.test (path, GLib.FileTest.EXISTS | GLib.FileTest.IS_REGULAR ) == false) { return false; } diff --git a/src/doclets/valadoc.org/taglets/link/taglet.vala b/src/doclets/valadoc.org/taglets/link/taglet.vala index fc6c38f43..bd975d4a0 100755 --- a/src/doclets/valadoc.org/taglets/link/taglet.vala +++ b/src/doclets/valadoc.org/taglets/link/taglet.vala @@ -26,7 +26,7 @@ public class Valadoc.ValdocOrg.LinkDocElement : Valadoc.LinkDocElement { private string desc; private string path; - public override bool parse (Settings settings, Tree tree, Documented pos, owned string path, owned string desc) { + public override bool parse (Settings settings, Tree tree, Documentation pos, owned string path, owned string desc) { if ( path.has_suffix(".valadoc")&&path.has_prefix("/") ) { if ( tree.wikitree == null ) { return false; diff --git a/src/doclets/valadoc.org/taglets/typelink/taglet.vala b/src/doclets/valadoc.org/taglets/typelink/taglet.vala index eff4913f6..0d9620f13 100755 --- a/src/doclets/valadoc.org/taglets/typelink/taglet.vala +++ b/src/doclets/valadoc.org/taglets/typelink/taglet.vala @@ -35,7 +35,7 @@ public class Valadoc.ValdocOrg.TypeLinkInlineTaglet : Valadoc.InlineTaglet { return true; } - protected override bool parse (Settings settings, Tree tree, Documented self, string content, ref ErrorLevel errlvl, out string? errmsg) { + protected override bool parse (Settings settings, Tree tree, Documentation self, string content, ref ErrorLevel errlvl, out string? errmsg) { Valadoc.DocumentedElement? element = tree.search_symbol_str ( (self is DocumentedElement)? (DocumentedElement)self : null, content.strip() ); if (element == null) { errmsg = "Linked type is not available"; diff --git a/src/libvaladoc/apitree/constant.vala b/src/libvaladoc/apitree/constant.vala index b8d1bcebd..c9f033f5b 100644 --- a/src/libvaladoc/apitree/constant.vala +++ b/src/libvaladoc/apitree/constant.vala @@ -23,7 +23,7 @@ using GLib; using Gee; -public class Valadoc.Constant : DocumentedElement, SymbolAccessibility, ReturnTypeHandler, Visitable { +public class Valadoc.Constant : DocumentedElement, SymbolAccessibility, Visitable, ReturnTypeHandler { private Vala.Constant vconst; public TypeReference? type_reference { diff --git a/src/libvaladoc/apitree/documentedelement.vala b/src/libvaladoc/apitree/documentedelement.vala index 0f0c4b7aa..ba88f56d2 100644 --- a/src/libvaladoc/apitree/documentedelement.vala +++ b/src/libvaladoc/apitree/documentedelement.vala @@ -23,7 +23,7 @@ using GLib; using Gee; -public abstract class Valadoc.DocumentedElement : Basic, Documented { +public abstract class Valadoc.DocumentedElement : Basic, Documentation { private Namespace? _nspace = null; private Package? _package = null; private string _full_name = null; diff --git a/src/libvaladoc/documentation/doctree.vala b/src/libvaladoc/documentation/doctree.vala index 55114d0b4..e4258bc61 100755 --- a/src/libvaladoc/documentation/doctree.vala +++ b/src/libvaladoc/documentation/doctree.vala @@ -54,7 +54,7 @@ public enum Valadoc.ListType { /* deprecated */ -public interface Valadoc.Documented : Object { +public interface Valadoc.Documentation : Object { public abstract string? get_filename (); } @@ -67,7 +67,7 @@ public abstract class Valadoc.Taglet : DocElement { } public abstract class Valadoc.InlineTaglet : Taglet { - public abstract bool parse (Settings settings, Tree tree, Documented self, string content, ref ErrorLevel errlvl, out string? errmsg); + public abstract bool parse (Settings settings, Tree tree, Documentation self, string content, ref ErrorLevel errlvl, out string? errmsg); public abstract string to_string (); } @@ -129,11 +129,11 @@ public abstract class Valadoc.HeadlineDocElement : DocElement { } public abstract class Valadoc.ImageDocElement : DocElement { - public abstract bool parse (Settings settings, Documented pos, owned string path, owned string alt); + public abstract bool parse (Settings settings, Documentation pos, owned string path, owned string alt); } public abstract class Valadoc.LinkDocElement : DocElement { - public abstract bool parse (Settings settings, Tree tree, Documented pos, owned string link, owned string desc); + public abstract bool parse (Settings settings, Tree tree, Documentation pos, owned string link, owned string desc); } public abstract class Valadoc.SourceCodeDocElement : DocElement { diff --git a/src/libvaladoc/documentation/moduleloader.vala b/src/libvaladoc/documentation/moduleloader.vala index 98f2c069b..8fce8e38b 100755 --- a/src/libvaladoc/documentation/moduleloader.vala +++ b/src/libvaladoc/documentation/moduleloader.vala @@ -27,25 +27,26 @@ public static delegate GLib.Type Valadoc.TagletRegisterFunction ( Gee.HashMap taglets; - public GLib.Type codeconstanttag; - public GLib.Type underlinedtag; - public GLib.Type headlinetag; - public GLib.Type notifictag; - public GLib.Type centertag; - public GLib.Type italictag; - public GLib.Type ulistetag; - public GLib.Type righttag; - public GLib.Type ulisttag; - public GLib.Type linktag; - public GLib.Type strtag; - public GLib.Type srctag; - public GLib.Type imgtag; - public GLib.Type boldtag; - public GLib.Type tabletag; - public GLib.Type celltag; - - public Doclet doclet; + public Doclet doclet; //rm + + public Gee.HashMap taglets; + public GLib.Type bold; + public GLib.Type center; + public GLib.Type headline; + public GLib.Type image; + public GLib.Type italic; + public GLib.Type link; + public GLib.Type list; + public GLib.Type list_element; + public GLib.Type notification; + public GLib.Type right; + public GLib.Type source; + public GLib.Type source_inline; + public GLib.Type @string; // + public GLib.Type table; + public GLib.Type table_cell; + public GLib.Type underline; + private Module docletmodule; private Type doclettype; @@ -111,52 +112,52 @@ public class Valadoc.ModuleLoader : Object { string soname = entry.ndup( entry.size() - modulesuffixlen ); switch ( soname ) { case "libtagletstring": - this.strtag = type; + this.string = type; break; case "libtagletimage": - this.imgtag = type; + this.image = type; break; case "libtagletcenter": - this.centertag = type; + this.center = type; break; case "libtagletright": - this.righttag = type; + this.right = type; break; case "libtagletbold": - this.boldtag = type; + this.bold = type; break; case "libtagletunderline": - this.underlinedtag = type; + this.underline = type; break; case "libtagletitalic": - this.italictag = type; + this.italic = type; break; case "libtagletsource": - this.srctag = type; + this.source = type; break; case "libtagletnotification": - this.notifictag = type; + this.notification = type; break; case "libtaglettable": - this.tabletag = type; + this.table = type; break; case "libtaglettablecell": - this.celltag = type; + this.table_cell = type; break; case "libtagletlink": - this.linktag = type; + this.link = type; break; case "libtagletlist": - this.ulisttag = type; + this.list = type; break; case "libtagletlistelement": - this.ulistetag = type; + this.list_element = type; break; case "libtagletheadline": - this.headlinetag = type; + this.headline = type; break; case "libtagletcodeconstant": - this.codeconstanttag = type; + this.source_inline = type; break; } modules.add ( module ); diff --git a/src/libvaladoc/documentation/parser.vala b/src/libvaladoc/documentation/parser.vala index d073f8ef8..290525fac 100755 --- a/src/libvaladoc/documentation/parser.vala +++ b/src/libvaladoc/documentation/parser.vala @@ -83,7 +83,7 @@ public class Valadoc.Parser : Object { /* == helpers == */ private StringTaglet create_string_taglet (string str, long strlen, ref long startpos, long pos, long lpos, StringBuilder buf ) { buf.append_len (str.offset(startpos), lpos-startpos); - StringTaglet strtag = (StringTaglet)GLib.Object.new ( this.modules.strtag ); + StringTaglet strtag = (StringTaglet)GLib.Object.new ( this.modules.string ); strtag.parse ( buf.str ); buf.erase ( 0, -1 ); startpos = pos+1; @@ -150,7 +150,7 @@ public class Valadoc.Parser : Object { return false; } - private string? parse_taglet_name (Documented? curelement, string str, long strlen, ref long pos, long line, long newlinepos, long npos, bool _inline) { + private string? parse_taglet_name (Documentation? curelement, string str, long strlen, ref long pos, long line, long newlinepos, long npos, bool _inline) { long startpos = pos; for (; str[pos]!=' '&&str[pos]!='\t'&&str[pos]!='\n'&&str[pos]!='\0'&&(_inline&&str[pos+1]!='}'); pos++); if (str[pos]=='\0'|| !str[pos].isspace()) { @@ -162,7 +162,7 @@ public class Valadoc.Parser : Object { return str.substring (startpos, pos-startpos); } - private bool parse_inline_taglet_pos ( Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode ) { + private bool parse_inline_taglet_pos ( Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode ) { if ( str[npos] != '{' ) { return false; } @@ -248,18 +248,18 @@ public class Valadoc.Parser : Object { return true; } - private bool parse_align_pos (Documented curelement, string str, long strlen, Gee.ArrayList content, ref long pos, ref long line, ref long newlinepos, ref long space, bool wikimode ) { - if ( this.parse_align_helper (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, wikimode, this.modules.righttag, "))" ) ) { + private bool parse_align_pos (Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long pos, ref long line, ref long newlinepos, ref long space, bool wikimode ) { + if ( this.parse_align_helper (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, wikimode, this.modules.right, "))" ) ) { return true; } - if ( this.parse_align_helper (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, wikimode, this.modules.centertag, ")(" ) ) { + if ( this.parse_align_helper (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, wikimode, this.modules.center, ")(" ) ) { return true; } return false; } - private bool parse_highlighting_pos (Documented curelement, string str, long strlen, Gee.ArrayList content, ref long pos, ref long line, ref long newlinepos, bool wikimode ) { + private bool parse_highlighting_pos (Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long pos, ref long line, ref long newlinepos, bool wikimode ) { if ( this.parse_bold_pos (curelement, str, strlen, content, ref pos, ref line, ref newlinepos, wikimode) ) { return true; } @@ -272,7 +272,7 @@ public class Valadoc.Parser : Object { return false; } - private bool parse_align_helper ( Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, ref long space, bool wikimode, GLib.Type tagtype, string tag ) { + private bool parse_align_helper ( Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, ref long space, bool wikimode, GLib.Type tagtype, string tag ) { long newlinepos = nnewlinepos; long line = nline; long pos = npos; @@ -333,7 +333,7 @@ public class Valadoc.Parser : Object { return true; } - private bool parse_notification_pos (Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, ref long nspace, bool wikimode ) { + private bool parse_notification_pos (Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, ref long nspace, bool wikimode ) { weak string strpos = str.offset( npos ); if ( !strpos.has_prefix( "[[warning:" ) ) { return false; @@ -382,7 +382,7 @@ public class Valadoc.Parser : Object { this.append_string_taglet ( str, strlen, subcontent, ref startpos, pos, nlpos, buf ); nnewlinepos = newlinepos; - NotificationDocElement notificationtag = (NotificationDocElement)GLib.Object.new ( this.modules.notifictag ); + NotificationDocElement notificationtag = (NotificationDocElement)GLib.Object.new ( this.modules.notification ); notificationtag.parse ( subcontent ); content.add ( notificationtag ); @@ -411,7 +411,7 @@ public class Valadoc.Parser : Object { return false; } - private bool parse_source_pos (Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, ref long space, bool wikimode ) { + private bool parse_source_pos (Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, ref long space, bool wikimode ) { weak string strpos = str.offset( npos ); if ( !strpos.has_prefix( "{{{" ) ) return false; @@ -443,7 +443,7 @@ public class Valadoc.Parser : Object { for (space=++tmppos;str[tmppos]==' '||str[tmppos]=='\t';tmppos++); space = tmppos-space; - SourceCodeDocElement srctag = (SourceCodeDocElement)GLib.Object.new ( this.modules.srctag ); + SourceCodeDocElement srctag = (SourceCodeDocElement)GLib.Object.new ( this.modules.source ); srctag.parse ( buf.str, Language.VALA ); content.add ( srctag ); @@ -459,19 +459,19 @@ public class Valadoc.Parser : Object { return false; } - private bool parse_bold_pos (Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long line, ref long newlinepos, bool wikimode ) { - return this.parse_highlighting_helper_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos, wikimode, this.modules.boldtag, "++" ); + private bool parse_bold_pos (Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long line, ref long newlinepos, bool wikimode ) { + return this.parse_highlighting_helper_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos, wikimode, this.modules.bold, "++" ); } - private bool parse_italic_pos (Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long line, ref long newlinepos, bool wikimode ) { - return this.parse_highlighting_helper_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos, wikimode, this.modules.italictag, "//" ); + private bool parse_italic_pos (Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long line, ref long newlinepos, bool wikimode ) { + return this.parse_highlighting_helper_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos, wikimode, this.modules.italic, "//" ); } - private bool parse_underline_pos (Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long line, ref long newlinepos, bool wikimode ) { - return this.parse_highlighting_helper_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos, wikimode, this.modules.underlinedtag, "__" ); + private bool parse_underline_pos (Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long line, ref long newlinepos, bool wikimode ) { + return this.parse_highlighting_helper_pos (curelement, str, strlen, content, ref npos, ref line, ref newlinepos, wikimode, this.modules.underline, "__" ); } - private bool parse_highlighting_helper_pos (Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode, GLib.Type tagtype, string markup ) { + private bool parse_highlighting_helper_pos (Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode, GLib.Type tagtype, string markup ) { weak string strpos = str.offset( npos ); if ( !strpos.has_prefix( markup ) ) { return false; @@ -564,7 +564,7 @@ public class Valadoc.Parser : Object { return url.has_prefix("http://") || url.has_prefix("http://") || (url.has_prefix("/")&&url.has_suffix(".valadoc")); } - private bool parse_url_pos ( Documented curelement, string str, long strlen, Gee.ArrayList content, ref long rpos, ref long nline, ref long newlinepos ) { + private bool parse_url_pos ( Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long rpos, ref long nline, ref long newlinepos ) { if ( !str.offset(rpos).has_prefix ("[[") ) return false; @@ -588,7 +588,7 @@ public class Valadoc.Parser : Object { } string urldesc = (urlend==-1)? url : str.substring( urlend+1, pos-urlend-1 ); - LinkDocElement linktag = (LinkDocElement)GLib.Object.new ( this.modules.linktag ); + LinkDocElement linktag = (LinkDocElement)GLib.Object.new ( this.modules.link ); linktag.parse ( this.settings, this.tree, curelement, url, urldesc ); content.add ( linktag ); @@ -606,7 +606,7 @@ public class Valadoc.Parser : Object { return false; } - private bool parse_img_pos ( Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long line, ref long newlinepos ) { + private bool parse_img_pos ( Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long line, ref long newlinepos ) { if ( str[npos]!='{'||str[npos+1]!='{' ) return false; @@ -626,7 +626,7 @@ public class Valadoc.Parser : Object { return false; } string alt = (urlend==-1)? url : str.substring( urlend+1, pos-urlend-1 ); - ImageDocElement imgtag = (ImageDocElement)GLib.Object.new ( this.modules.imgtag ); + ImageDocElement imgtag = (ImageDocElement)GLib.Object.new ( this.modules.image ); imgtag.parse ( this.settings, curelement, url, alt ); content.add ( imgtag ); @@ -782,7 +782,7 @@ public class Valadoc.Parser : Object { return long.min(long.min( long.min( cellend, lineend), endpos), strlen-startpos); } - private bool parse_table_cell_attributes (Documented curelement, string str, long strlen, ref long npos, long line, long newlinepos, out TextPosition vpos, out TextVerticalPosition hpos, out int hwidth, out int vwidth, out int color) { + private bool parse_table_cell_attributes (Documentation curelement, string str, long strlen, ref long npos, long line, long newlinepos, out TextPosition vpos, out TextVerticalPosition hpos, out int hwidth, out int vwidth, out int color) { if ( str[npos] != '<' ) { return false; } @@ -851,7 +851,7 @@ public class Valadoc.Parser : Object { return false; } - private bool parse_table_cell ( Documented curelement, string str, long strlen, Gee.ArrayList cells, ref long pos, ref long line, ref long newlinepos, bool wikimode ) { + private bool parse_table_cell ( Documentation curelement, string str, long strlen, Gee.ArrayList cells, ref long pos, ref long line, ref long newlinepos, bool wikimode ) { if ( !str.offset(pos).has_prefix("||") ) { return false; } @@ -878,7 +878,7 @@ public class Valadoc.Parser : Object { if ( str.offset(pos).has_prefix("||") ) { this.append_string_taglet ( str, strlen, content, ref startpos, pos, lpos, buf ); - TableCellDocElement celltag = (TableCellDocElement)GLib.Object.new ( this.modules.celltag ); + TableCellDocElement celltag = (TableCellDocElement)GLib.Object.new ( this.modules.table_cell ); celltag.parse ( vpos, hpos, hwidth, vwidth, content ); cells.add ( celltag ); return true; @@ -926,7 +926,7 @@ public class Valadoc.Parser : Object { return false; } - private bool parse_table_row ( Documented curelement, string str, long strlen, Gee.ArrayList> rows, ref long npos, ref long nline, ref long nnewlinepos, ref long nspace, bool wikimode ) { + private bool parse_table_row ( Documentation curelement, string str, long strlen, Gee.ArrayList> rows, ref long npos, ref long nline, ref long nnewlinepos, ref long nspace, bool wikimode ) { if ( !str.offset(npos).has_prefix("||") ) { return false; } @@ -955,7 +955,7 @@ public class Valadoc.Parser : Object { return true; } - private bool parse_table ( Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, ref long nspace, bool wikimode ) { + private bool parse_table ( Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long nline, ref long nnewlinepos, ref long nspace, bool wikimode ) { if ( !str.offset(npos).has_prefix("||") ) { return false; } @@ -970,7 +970,7 @@ public class Valadoc.Parser : Object { npos--; - TableDocElement tabletag = (TableDocElement)GLib.Object.new ( this.modules.tabletag ); + TableDocElement tabletag = (TableDocElement)GLib.Object.new ( this.modules.table ); tabletag.parse ( rows ); content.add ( tabletag ); return true; @@ -1099,7 +1099,7 @@ public class Valadoc.Parser : Object { else if (this.parse_newline_pos (str, strlen, ref rpos, ref line, ref newlinepos, wikimode)) { buf.append_len (str.offset(startpos), lpos-startpos); - HeadlineDocElement htag = (HeadlineDocElement)GLib.Object.new ( this.modules.headlinetag ); + HeadlineDocElement htag = (HeadlineDocElement)GLib.Object.new ( this.modules.headline ); htag.parse ( buf.str, lvl ); content.add ( htag ); @@ -1355,7 +1355,7 @@ public class Valadoc.Parser : Object { return cmnt[0] == '*'; } - private bool parse_list_template_pos ( Documented curelement, string str, long strlen, Gee.ArrayList content, ref long pos, ref long line, ref long newlinepos, ref long space, ref long linestart, bool wikimode, ListType listtype, unichar tag ) { + private bool parse_list_template_pos ( Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long pos, ref long line, ref long newlinepos, ref long space, ref long linestart, bool wikimode, ListType listtype, unichar tag ) { if ( str[pos]!=tag ) return false; @@ -1377,21 +1377,21 @@ public class Valadoc.Parser : Object { } while ( pos < strlen && space == lspace ); - ListDocElement listtag = (ListDocElement)GLib.Object.new ( this.modules.ulisttag ); + ListDocElement listtag = (ListDocElement)GLib.Object.new ( this.modules.list ); listtag.parse ( listtype, listelements ); content.add ( listtag ); return true; } - private bool parse_unsorted_list_pos ( Documented curelement, string str, long strlen, Gee.ArrayList content, ref long pos, ref long line, ref long newlinepos, ref long space, ref long linestart, bool wikimode ) { + private bool parse_unsorted_list_pos ( Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long pos, ref long line, ref long newlinepos, ref long space, ref long linestart, bool wikimode ) { return parse_list_template_pos ( curelement, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, ref linestart, wikimode, ListType.UNSORTED, '-' ); } - private bool parse_sorted_list_pos ( Documented curelement, string str, long strlen, Gee.ArrayList content, ref long pos, ref long line, ref long newlinepos, ref long space, ref long linestart, bool wikimode ) { + private bool parse_sorted_list_pos ( Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long pos, ref long line, ref long newlinepos, ref long space, ref long linestart, bool wikimode ) { return parse_list_template_pos ( curelement, str, strlen, content, ref pos, ref line, ref newlinepos, ref space, ref linestart, wikimode, ListType.SORTED, '#' ); } - private bool parse_list_pos ( Documented curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long line, ref long newlinepos, ref long space, ref long linestart, bool wikimode ) { + private bool parse_list_pos ( Documentation curelement, string str, long strlen, Gee.ArrayList content, ref long npos, ref long line, ref long newlinepos, ref long space, ref long linestart, bool wikimode ) { if (this.parse_unsorted_list_pos ( curelement, str, strlen, content, ref npos, ref line, ref newlinepos, ref space, ref linestart, wikimode )) { npos--; return true; @@ -1403,7 +1403,7 @@ public class Valadoc.Parser : Object { return false; } - private bool parse_list_entry_pos ( Documented curelement, string str, long strlen, Gee.ArrayList listelements, ref long npos, ref long line, ref long newlinepos, out long space, bool wikimode, ListType listtype, unichar tag ) { + private bool parse_list_entry_pos ( Documentation curelement, string str, long strlen, Gee.ArrayList listelements, ref long npos, ref long line, ref long newlinepos, out long space, bool wikimode, ListType listtype, unichar tag ) { if ( str[npos]!=tag ) return false; @@ -1441,7 +1441,7 @@ public class Valadoc.Parser : Object { this.append_string_taglet (str, strlen, content, ref startpos, pos, lpos, buf); space = pos-space; - ListEntryDocElement listeltag = (ListEntryDocElement)GLib.Object.new (this.modules.ulistetag); + ListEntryDocElement listeltag = (ListEntryDocElement)GLib.Object.new (this.modules.list_element); listeltag.parse (listtype, newlinepos, content); listelements.add (listeltag); diff --git a/src/libvaladoc/documentation/wiki.vala b/src/libvaladoc/documentation/wiki.vala index 30c66d087..b0ed31e3b 100755 --- a/src/libvaladoc/documentation/wiki.vala +++ b/src/libvaladoc/documentation/wiki.vala @@ -18,7 +18,7 @@ */ -public class Valadoc.WikiPage : Object, Documented { +public class Valadoc.WikiPage : Object, Documentation { private Gee.ArrayList content; public string documentation_str {