X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/CommentRecorderParser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/CommentRecorderParser.java index a3bee75..8ec7bd3 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/CommentRecorderParser.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/CommentRecorderParser.java @@ -170,68 +170,68 @@ public class CommentRecorderParser extends UnitParser { * * @see net.sourceforge.phpdt.internal.compiler.parser.Parser#flushCommentsDefinedPriorTo(int) */ - public int flushCommentsDefinedPriorTo(int position) { - - int lastCommentIndex = this.scanner.commentPtr; - if (lastCommentIndex < 0) - return position; // no comment - - // compute the index of the first obsolete comment - int index = lastCommentIndex; - int validCount = 0; - while (index >= 0) { - int commentEnd = this.scanner.commentStops[index]; - if (commentEnd < 0) - commentEnd = -commentEnd; // negative end position for - // non-javadoc comments - if (commentEnd <= position) { - break; - } - index--; - validCount++; - } - // if the source at is immediately followed by a line - // comment, then - // flush this comment and shift to the comment end. - if (validCount > 0) { - int immediateCommentEnd = 0; - while (index < lastCommentIndex - && (immediateCommentEnd = -this.scanner.commentStops[index + 1]) > 0) { // only - // tolerating - // non-javadoc - // comments - // (non-javadoc - // comment - // end - // positions - // are - // negative) - // is there any line break until the end of the immediate - // comment ? (thus only tolerating line comment) - immediateCommentEnd--; // comment end in one char too far - if (this.scanner.getLineNumber(position) != this.scanner - .getLineNumber(immediateCommentEnd)) - break; - position = immediateCommentEnd; - validCount--; // flush this comment - index++; - } - } - - if (index < 0) - return position; // no obsolete comment - pushOnCommentsStack(0, index); // store comment before flushing them - - if (validCount > 0) { // move valid comment infos, overriding obsolete - // comment infos - System.arraycopy(this.scanner.commentStarts, index + 1, - this.scanner.commentStarts, 0, validCount); - System.arraycopy(this.scanner.commentStops, index + 1, - this.scanner.commentStops, 0, validCount); - } - this.scanner.commentPtr = validCount - 1; - return position; - } +// public int flushCommentsDefinedPriorTo(int position) { +// +// int lastCommentIndex = this.scanner.commentPtr; +// if (lastCommentIndex < 0) +// return position; // no comment +// +// // compute the index of the first obsolete comment +// int index = lastCommentIndex; +// int validCount = 0; +// while (index >= 0) { +// int commentEnd = this.scanner.commentStops[index]; +// if (commentEnd < 0) +// commentEnd = -commentEnd; // negative end position for +// // non-javadoc comments +// if (commentEnd <= position) { +// break; +// } +// index--; +// validCount++; +// } +// // if the source at is immediately followed by a line +// // comment, then +// // flush this comment and shift to the comment end. +// if (validCount > 0) { +// int immediateCommentEnd = 0; +// while (index < lastCommentIndex +// && (immediateCommentEnd = -this.scanner.commentStops[index + 1]) > 0) { // only +// // tolerating +// // non-javadoc +// // comments +// // (non-javadoc +// // comment +// // end +// // positions +// // are +// // negative) +// // is there any line break until the end of the immediate +// // comment ? (thus only tolerating line comment) +// immediateCommentEnd--; // comment end in one char too far +// if (this.scanner.getLineNumber(position) != this.scanner +// .getLineNumber(immediateCommentEnd)) +// break; +// position = immediateCommentEnd; +// validCount--; // flush this comment +// index++; +// } +// } +// +// if (index < 0) +// return position; // no obsolete comment +// pushOnCommentsStack(0, index); // store comment before flushing them +// +// if (validCount > 0) { // move valid comment infos, overriding obsolete +// // comment infos +// System.arraycopy(this.scanner.commentStarts, index + 1, +// this.scanner.commentStarts, 0, validCount); +// System.arraycopy(this.scanner.commentStops, index + 1, +// this.scanner.commentStops, 0, validCount); +// } +// this.scanner.commentPtr = validCount - 1; +// return position; +// } /* * Build a n*2 matrix of comments positions. For each position, 0 is for