Merge pull request universal-ctags#1756 from masatake/booking-bugs

Booking bugs recently reported
tony534 · May 23, 2018 · 6f7654b · 6f7654b
2 parents 0b0c73f + 44176ed
commit 6f7654b
Show file tree

Hide file tree

Showing 28 changed files with 47 additions and 150 deletions.
diff --git a/Units/java-review-needed.r/bug1447756.java.t/expected.tags b/Units/java-review-needed.r/bug1447756.java.t/expected.tags
diff --git a/Units/java-review-needed.r/bug1447756.java.t/input.java b/Units/java-review-needed.r/bug1447756.java.t/input.java
diff --git a/Units/java-review-needed.r/bug1691412.java.t/expected.tags b/Units/java-review-needed.r/bug1691412.java.t/expected.tags
diff --git a/Units/java-review-needed.r/bug1691412.java.t/input.java b/Units/java-review-needed.r/bug1691412.java.t/input.java
diff --git a/Units/java-review-needed.r/bug1777340.java.t/expected.tags b/Units/java-review-needed.r/bug1777340.java.t/expected.tags
diff --git a/Units/java-review-needed.r/bug1777340.java.t/input.java b/Units/java-review-needed.r/bug1777340.java.t/input.java
diff --git a/Units/java-review-needed.r/bug1777344.java.t/expected.tags b/Units/java-review-needed.r/bug1777344.java.t/expected.tags
diff --git a/Units/java-review-needed.r/bug1777344.java.t/input.java b/Units/java-review-needed.r/bug1777344.java.t/input.java
diff --git a/Units/java-review-needed.r/bug2049723.java.t/expected.tags b/Units/java-review-needed.r/bug2049723.java.t/expected.tags
diff --git a/Units/java-review-needed.r/bug2049723.java.t/input.java b/Units/java-review-needed.r/bug2049723.java.t/input.java
diff --git a/Units/java-review-needed.r/bug2117073.java.t/expected.tags b/Units/java-review-needed.r/bug2117073.java.t/expected.tags
diff --git a/Units/java-review-needed.r/bug2117073.java.t/input.java b/Units/java-review-needed.r/bug2117073.java.t/input.java
diff --git a/Units/java-review-needed.r/bug814263.java.t/expected.tags b/Units/java-review-needed.r/bug814263.java.t/expected.tags
diff --git a/Units/java-review-needed.r/bug814263.java.t/input.java b/Units/java-review-needed.r/bug814263.java.t/input.java
diff --git a/Units/java-review-needed.r/enum.java.t/expected.tags b/Units/java-review-needed.r/enum.java.t/expected.tags
diff --git a/Units/java-review-needed.r/enum.java.t/input.java b/Units/java-review-needed.r/enum.java.t/input.java
diff --git a/Units/java-review-needed.r/infinite_loop.java.t/expected.tags b/Units/java-review-needed.r/infinite_loop.java.t/expected.tags
diff --git a/Units/java-review-needed.r/infinite_loop.java.t/input.java b/Units/java-review-needed.r/infinite_loop.java.t/input.java
diff --git a/Units/java-review-needed.r/java_enum.java.t/expected.tags b/Units/java-review-needed.r/java_enum.java.t/expected.tags
diff --git a/Units/java-review-needed.r/java_enum.java.t/input.java b/Units/java-review-needed.r/java_enum.java.t/input.java
diff --git a/Units/java-review-needed.r/unicode8.java.t/expected.tags b/Units/java-review-needed.r/unicode8.java.t/expected.tags
diff --git a/Units/java-review-needed.r/unicode8.java.t/input.java b/Units/java-review-needed.r/unicode8.java.t/input.java
diff --git a/Units/parser-cxx.r/template-nested-triangle-brackets.b/args.ctags b/Units/parser-cxx.r/template-nested-triangle-brackets.b/args.ctags
@@ -0,0 +1,2 @@
+--sort=no
+--fields-c++={template}
diff --git a/Units/parser-cxx.r/template-nested-triangle-brackets.b/expected.tags b/Units/parser-cxx.r/template-nested-triangle-brackets.b/expected.tags
@@ -0,0 +1,2 @@
+Test	input.hpp	/^class Test : public set<int> {$/;"	c	template:template:<int,class _Comp0=less<int>,class _Comp1=less<pair<int,int>>>
+xxx	input.hpp	/^  typedef int xxx;$/;"	t	class:Test	typeref:typename:int
diff --git a/Units/parser-cxx.r/template-nested-triangle-brackets.b/input.hpp b/Units/parser-cxx.r/template-nested-triangle-brackets.b/input.hpp
@@ -0,0 +1,7 @@
+template <int,
+         class _Comp0=less<int>,
+         class _Comp1=less<pair<int, int> > >
+class Test : public set<int> {
+  typedef int xxx;
+};
+// Taken from #1750 submitted by @tuarba.
diff --git a/Units/parser-java.r/anonymous-class.b/args.ctags b/Units/parser-java.r/anonymous-class.b/args.ctags
@@ -0,0 +1,3 @@
+--sort=no
+--fields=+n
+--kinds-Java=+l
diff --git a/Units/parser-java.r/anonymous-class.b/expected.tags b/Units/parser-java.r/anonymous-class.b/expected.tags
@@ -0,0 +1,11 @@
+input	input.java	/^public class input {$/;"	c	line:2
+greeting	input.java	/^    interface greeting {$/;"	i	line:3	class:input
+greet	input.java	/^	public void greet(String word);$/;"	m	line:4	interface:input.greeting
+hello	input.java	/^    public void hello () {$/;"	m	line:7	class:input
+g	input.java	/^	greeting g = new greeting() {$/;"	l	line:8	method:input.hello
+anonXXX	input.java	/^	greeting g = new greeting() {$/;"	c	line:8	method:input.hello
+greet	input.java	/^		public void greet (String word) {$/;"	m	line:9	method:input.hello.anonXXX
+bye	input.java	/^    public void bye () {$/;"	m	line:14	class:input
+h	input.java	/^	greeting h = new greeting() {$/;"	l	line:15
+anonYYY	input.java	/^	greeting g = new greeting() {$/;"	c	line:15	method:input.bye
+greet	input.java	/^		public void greet (String word) {$/;"	m	line:16	method:input.hello.anonYYY
diff --git a/Units/parser-java.r/anonymous-class.b/input.java b/Units/parser-java.r/anonymous-class.b/input.java
@@ -0,0 +1,22 @@
+// See #1739
+public class input {
+    interface greeting {
+	public void greet(String word);
+    }
+
+    public void hello () {
+	greeting g = new greeting() {
+		public void greet (String word) {
+		}
+	};
+	g.greet("hello");
+    }
+    public void bye () {
+	greeting h = new greeting() {
+		public void greet (String word) {
+		}
+	};
+	h.greet("bye");
+    }
+
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Test input.hpp /^class Test : public set<int> {$/;" c template:template:<int,class _Comp0=less<int>,class _Comp1=less<pair<int,int>>>
		xxx input.hpp /^ typedef int xxx;$/;" t class:Test typeref:typename:int