[valadoc] { inheritDoc} bug
- From: Florian Brosch <flobrosch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [valadoc] { inheritDoc} bug
- Date: Sun, 6 Sep 2009 18:14:20 +0000 (UTC)
commit e9e8ec19cb1df4bd92a0bb9828f9c153e502abdf
Author: Florian Brosch <flo brosch gmail com>
Date: Sun Sep 6 20:13:51 2009 +0200
{ inheritDoc} bug
src/libvaladoc/parser.vala | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/libvaladoc/parser.vala b/src/libvaladoc/parser.vala
index f363f8e..d073f8e 100755
--- a/src/libvaladoc/parser.vala
+++ b/src/libvaladoc/parser.vala
@@ -150,16 +150,16 @@ 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 ) {
+ private string? parse_taglet_name (Documented? 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'; pos++ );
- if ( str[pos]=='\0'|| !str[pos].isspace() ) {
+ for (; str[pos]!=' '&&str[pos]!='\t'&&str[pos]!='\n'&&str[pos]!='\0'&&(_inline&&str[pos+1]!='}'); pos++);
+ if (str[pos]=='\0'|| !str[pos].isspace()) {
if (curelement != null) {
- this.printr ( ErrorNumber.OPEN_TAG, curelement.get_filename(), str, strlen, line, newlinepos, npos, -1 );
+ this.printr (ErrorNumber.OPEN_TAG, curelement.get_filename(), str, strlen, line, newlinepos, npos, -1);
}
return null;
}
- return str.substring ( startpos, pos-startpos );
+ return str.substring (startpos, pos-startpos);
}
private bool parse_inline_taglet_pos ( Documented curelement, string str, long strlen, Gee.ArrayList<DocElement> content, ref long npos, ref long nline, ref long nnewlinepos, bool wikimode ) {
@@ -193,7 +193,7 @@ public class Valadoc.Parser : Object {
long keywordline = line;
pos++;
- string keyword = this.parse_taglet_name ( curelement, str, strlen, ref pos, line, newlinepos, npos );
+ string keyword = this.parse_taglet_name (curelement, str, strlen, ref pos, line, newlinepos, npos, true);
if ( keyword == null ) {
return false;
}
@@ -661,7 +661,7 @@ public class Valadoc.Parser : Object {
long keywordline = nline;
- string keyword = this.parse_taglet_name ( curelement, str, strlen, ref pos, line, newlinepos, npos );
+ string keyword = this.parse_taglet_name (curelement, str, strlen, ref pos, line, newlinepos, npos, false);
if ( keyword == null ) {
return false;
}
@@ -1002,7 +1002,7 @@ public class Valadoc.Parser : Object {
pos++;
- string keyword = this.parse_taglet_name ( null, str, strlen, ref pos, line, newlinepos, npos );
+ string keyword = this.parse_taglet_name (null, str, strlen, ref pos, line, newlinepos, npos, true);
if ( keyword != "inheritDoc" ) {
return false;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]