Markus Koschany pushed to branch upstream at Debian Java Maintainers / qdox2
Commits: 908676b8 by Markus Koschany at 2019-01-19T23:36:36Z New upstream version 2.0~M10 - - - - - 3 changed files: - pom.xml - src/grammar/lexer.flex - src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java Changes: ===================================== pom.xml ===================================== @@ -10,7 +10,7 @@ <name>QDox</name> <groupId>com.thoughtworks.qdox</groupId> <artifactId>qdox</artifactId> - <version>2.0-M9</version> + <version>2.0-M10</version> <url>https://github.com/paul-hammant/qdox</url> <description> @@ -36,7 +36,7 @@ <connection>scm:git:https://github.com/paul-hammant/qdox.git</connection> <developerConnection>scm:git:ssh://[email protected]/paul-hammant/qdox.git</developerConnection> <url>https://github.com/paul-hammant/qdox</url> - <tag>qdox-2.0-M9</tag> + <tag>qdox-2.0-M10</tag> </scm> <developers> ===================================== src/grammar/lexer.flex ===================================== @@ -159,7 +159,7 @@ import java.util.*; private void resetAnnotatedElementLine() { - annotatedElementLine = 0 - annotatedElementLine; + annotatedElementLine = - Math.abs(annotatedElementLine); } public JFlexLexer( java.io.Reader reader, java.io.Writer writer ) { @@ -428,9 +428,9 @@ JavadocEnd = "*"+ "/" "default" { assignmentDepth = nestingDepth; appendingToCodeBody = true; pushState(ASSIGNMENT); } } <NAME> { - {Id} / {WhiteSpace}* "." { return Parser.IDENTIFIER; } - {Id} / {WhiteSpace}* [;{] { resetAnnotatedElementLine(); popState(); return Parser.IDENTIFIER; } - {Id} { popState(); return Parser.IDENTIFIER; } + {Id} / {WhiteSpace}* "." { return Parser.IDENTIFIER; } + {Id} / {WhiteSpace}* [;{(] { resetAnnotatedElementLine(); popState(); return Parser.IDENTIFIER; } + {Id} { popState(); return Parser.IDENTIFIER; } } <YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, MODULE, TYPE> { {Id} { return Parser.IDENTIFIER; ===================================== src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java ===================================== @@ -1342,6 +1342,21 @@ public class JavaProjectBuilderTest extends TestCase assertEquals( 9, clazz.getMethods().get(1).getLineNumber() ); } + public void testConstructorLineNumber() { + String source = "package fix.test;\r\n" + + "public class ClassWithJavadoc\r\n" + + " implements InterfaceWithJavadoc\r\n" + + "{\r\n" + + " public ClassWithJavadoc()\r\n" + + " {\r\n" + + " }" + + "}"; + + builder.addSource(new StringReader( source )); + + assertEquals( 5, builder.getClassByName( "fix.test.ClassWithJavadoc" ).getConstructors().get( 0 ).getLineNumber() ); + } + // for QDOX-209 public void testAnnotationMap() { String source = "import javax.persistence.JoinColumn;\n" + View it on GitLab: https://salsa.debian.org/java-team/qdox2/commit/908676b81568557350d34d4c51d93763a2953d77 -- View it on GitLab: https://salsa.debian.org/java-team/qdox2/commit/908676b81568557350d34d4c51d93763a2953d77 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
