You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by lt...@apache.org on 2008/08/07 23:57:46 UTC
svn commit: r683734 -
/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Author: ltheussl
Date: Thu Aug 7 14:57:46 2008
New Revision: 683734
URL: http://svn.apache.org/viewvc?rev=683734&view=rev
Log:
Fix comment parsing: didn't work when comment was indented
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java?rev=683734&r1=683733&r2=683734&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java Thu Aug 7 14:57:46 2008
@@ -1149,7 +1149,7 @@
private void nextBlock( boolean firstBlock )
throws AptParseException
{
- // Skip open and comment lines.
+ // Skip open lines.
int length, indent, i;
skipLoop: for ( ;; )
@@ -1311,9 +1311,9 @@
}
break;
case COMMENT:
- if ( indent == 0 && charAt( line, length, i + 1 ) == COMMENT )
+ if ( charAt( line, length, i + 1 ) == COMMENT )
{
- block = new Comment( line.substring( 2 ).trim() );
+ block = new Comment( line.substring( i + 2 ).trim() );
}
break;
default:
@@ -1604,11 +1604,9 @@
int i = 0;
i = skipSpace( l, length, i );
- if ( i == length
- || ( AptParser.charAt( l, length, i ) == COMMENT && AptParser.charAt( l, length, i + 1 ) == COMMENT ) )
+ if ( i == length )
{
- // Stop after open or comment line and skip it.
- // (A comment line is considered to be an open line.)
+ // Stop after open line and skip it.
AptParser.this.nextLine();
break;
}