ctags.rb 1.1.3 → 1.1.4

data/ext/vendor/ctags/main/writer-xref.c

@@ -16,7 +16,8 @@
 #include "writer.h"
 
 
-static int writeXrefEntry  (MIO * mio, const tagEntryInfo *const tag, void *data CTAGS_ATTR_UNUSED);
+static int writeXrefEntry  (tagWriter *writer CTAGS_ATTR_UNUSED,
+							MIO * mio, const tagEntryInfo *const tag);
 
 tagWriter xrefWriter = {
 	.writeEntry = writeXrefEntry,
@@ -26,7 +27,8 @@ tagWriter xrefWriter = {
 	.useStdoutByDefault = true,
 };
 
-static int writeXrefEntry (MIO * mio, const tagEntryInfo *const tag, void *data CTAGS_ATTR_UNUSED)
+static int writeXrefEntry (tagWriter *writer CTAGS_ATTR_UNUSED,
+						   MIO * mio, const tagEntryInfo *const tag)
 {
 	int length;
 	static fmtElement *fmt1;

data/ext/vendor/ctags/main/writer.c

@@ -8,21 +8,23 @@
 */
 
 #include "general.h"
+#include "entry.h"
 #include "writer.h"
 
-extern tagWriter ctagsWriter;
+extern tagWriter uCtagsWriter;
+extern tagWriter eCtagsWriter;
 extern tagWriter etagsWriter;
 extern tagWriter xrefWriter;
 extern tagWriter jsonWriter;
 
 static tagWriter *writerTable [WRITER_COUNT] = {
-	[WRITER_CTAGS] = &ctagsWriter,
+	[WRITER_U_CTAGS] = &uCtagsWriter,
+	[WRITER_E_CTAGS] = &eCtagsWriter,
 	[WRITER_ETAGS] = &etagsWriter,
 	[WRITER_XREF]  = &xrefWriter,
 	[WRITER_JSON]  = &jsonWriter,
 };
 
-static void *writerData;
 static tagWriter *writer;
 
 extern void setTagWriter (writerType wtype)
@@ -39,23 +41,26 @@ extern bool outputFormatUsedStdoutByDefault (void)
 extern void writerSetup (MIO *mio)
 {
 	if (writer->preWriteEntry)
-		writerData = writer->preWriteEntry (mio);
+		writer->private = writer->preWriteEntry (writer, mio);
 	else
-		writerData = NULL;
+		writer->private = NULL;
 }
 
-extern void writerTeardown (MIO *mio, const char *filename)
+extern bool writerTeardown (MIO *mio, const char *filename)
 {
 	if (writer->postWriteEntry)
 	{
-		writer->postWriteEntry (mio, filename, writerData);
-		writerData = NULL;
+		bool r;
+		r = writer->postWriteEntry (writer, mio, filename);
+		writer->private = NULL;
+		return r;
 	}
+	return false;
 }
 
 extern int writerWriteTag (MIO * mio, const tagEntryInfo *const tag)
 {
-	return writer->writeEntry (mio, tag, writerData);
+	return writer->writeEntry (writer, mio, tag);
 }
 
 extern int writerWritePtag (MIO * mio,
@@ -67,7 +72,29 @@ extern int writerWritePtag (MIO * mio,
 	if (writer->writePtagEntry == NULL)
 		return -1;
 
-	return writer->writePtagEntry (mio, desc, fileName,
-								   pattern, parserName, writerData);
+	return writer->writePtagEntry (writer, mio, desc, fileName,
+								   pattern, parserName);
 
 }
+
+extern void writerBuildFqTagCache (tagEntryInfo *const tag)
+{
+	if (writer->buildFqTagCache)
+		writer->buildFqTagCache (writer, tag);
+}
+
+
+extern bool ptagMakeCtagsOutputMode (ptagDesc *desc, void *data CTAGS_ATTR_UNUSED)
+{
+	const char *mode ="";
+
+	if (&uCtagsWriter == writer)
+		mode = "u-ctags";
+	else if (&eCtagsWriter == writer)
+		mode = "e-ctags";
+
+	return writePseudoTag (desc,
+						   mode,
+						   "u-ctags or e-ctags",
+						   NULL);
+}

data/ext/vendor/ctags/main/writer.h

@@ -20,7 +20,8 @@
 
 typedef enum eWriterType {
 	WRITER_DEFAULT,
-	WRITER_CTAGS = WRITER_DEFAULT,
+	WRITER_U_CTAGS = WRITER_DEFAULT,
+	WRITER_E_CTAGS,
 	WRITER_ETAGS,
 	WRITER_XREF,
 	WRITER_JSON,
@@ -30,21 +31,29 @@ typedef enum eWriterType {
 struct sTagWriter;
 typedef struct sTagWriter tagWriter;
 struct sTagWriter {
-	int (* writeEntry) (MIO * mio, const tagEntryInfo *const tag, void *data);
-	int (* writePtagEntry) (MIO * mio, const ptagDesc *desc,
+	int (* writeEntry) (tagWriter *writer, MIO * mio, const tagEntryInfo *const tag);
+	int (* writePtagEntry) (tagWriter *writer, MIO * mio, const ptagDesc *desc,
 							const char *const fileName,
 							const char *const pattern,
-							const char *const parserName, void *data);
-	void * (* preWriteEntry) (MIO * mio);
-	void (* postWriteEntry)  (MIO * mio, const char* filename, void *data);
+							const char *const parserName);
+	void * (* preWriteEntry) (tagWriter *writer, MIO * mio);
+
+	/* Returning TRUE means the output file may be shrunk.
+	   In such case the callee may do truncate output file. */
+	bool (* postWriteEntry)  (tagWriter *writer, MIO * mio, const char* filename);
+	void (* buildFqTagCache) (tagWriter *writer, tagEntryInfo *const tag);
 	bool useStdoutByDefault;
 
+	/* The value returned from preWriteEntry is stored `private' field.
+	   The value must be released in postWriteEntry. */
+	void *private;
 	writerType type;
+
 };
 
 extern void setTagWriter (writerType otype);
 extern void writerSetup  (MIO *mio);
-extern void writerTeardown (MIO *mio, const char *filename);
+extern bool writerTeardown (MIO *mio, const char *filename);
 
 int writerWriteTag (MIO * mio, const tagEntryInfo *const tag);
 int writerWritePtag (MIO * mio,
@@ -53,6 +62,8 @@ int writerWritePtag (MIO * mio,
 					 const char *const pattern,
 					 const char *const parserName);
 
+extern void writerBuildFqTagCache (tagEntryInfo *const tag);
+
 extern bool outputFormatUsedStdoutByDefault (void);
 
 extern int makePatternStringCommon (const tagEntryInfo *const tag,
@@ -64,5 +75,6 @@ extern void truncateTagLine (char *const line, const char *const token,
 extern void abort_if_ferror(MIO *const fp);
 
 extern bool ptagMakeJsonOutputVersion (ptagDesc *desc, void *data CTAGS_ATTR_UNUSED);
+extern bool ptagMakeCtagsOutputMode (ptagDesc *desc, void *data CTAGS_ATTR_UNUSED);
 
 #endif

data/lib/ctags/universal.rb

@@ -14,7 +14,7 @@ module Ctags
       args = [
         '--options=NONE',
         "--options=#{CONFIG}",
-        '--fields=+KlnzsStimfa',
+        '--fields=*',
         '--interactive'
       ]
 

data/lib/ctags/version.rb

@@ -1,3 +1,3 @@
 module Ctags
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ctags.rb
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -175,6 +175,7 @@ files:
 - ext/vendor/ctags/Tmain/invalid-encoding-option.d/stderr-expected.txt
 - ext/vendor/ctags/Tmain/invalid-encoding-option.d/stdout-expected.txt
 - ext/vendor/ctags/Tmain/json-output-format.d/input.c
+- ext/vendor/ctags/Tmain/json-output-format.d/input.go
 - ext/vendor/ctags/Tmain/json-output-format.d/input.py
 - ext/vendor/ctags/Tmain/json-output-format.d/run.sh
 - ext/vendor/ctags/Tmain/json-output-format.d/stdout-expected.txt
@@ -372,6 +373,8 @@ files:
 - ext/vendor/ctags/Tmain/output-format-option.d/input.c
 - ext/vendor/ctags/Tmain/output-format-option.d/run.sh
 - ext/vendor/ctags/Tmain/output-format-option.d/stdout-expected.txt
+- ext/vendor/ctags/Tmain/output-input-field-with-no-escape.d/run.sh
+- ext/vendor/ctags/Tmain/output-input-field-with-no-escape.d/stdout-expected.txt
 - ext/vendor/ctags/Tmain/pattern-length-limit.d/input.java
 - ext/vendor/ctags/Tmain/pattern-length-limit.d/run.sh
 - ext/vendor/ctags/Tmain/pattern-length-limit.d/stdout-expected.txt
@@ -1486,6 +1489,9 @@ files:
 - ext/vendor/ctags/Units/parser-php.r/php-classes.d/args.ctags
 - ext/vendor/ctags/Units/parser-php.r/php-classes.d/expected.tags
 - ext/vendor/ctags/Units/parser-php.r/php-classes.d/input.php
+- ext/vendor/ctags/Units/parser-php.r/php-full-qualified-tags-no-esc.d/args.ctags
+- ext/vendor/ctags/Units/parser-php.r/php-full-qualified-tags-no-esc.d/expected.tags
+- ext/vendor/ctags/Units/parser-php.r/php-full-qualified-tags-no-esc.d/input.php
 - ext/vendor/ctags/Units/parser-php.r/php-full-qualified-tags.d/args.ctags
 - ext/vendor/ctags/Units/parser-php.r/php-full-qualified-tags.d/expected.tags
 - ext/vendor/ctags/Units/parser-php.r/php-full-qualified-tags.d/input.php
@@ -2224,6 +2230,7 @@ files:
 - ext/vendor/ctags/docs/guessing.rst
 - ext/vendor/ctags/docs/index.rst
 - ext/vendor/ctags/docs/input-text-stream.svg
+- ext/vendor/ctags/docs/interactive-mode.rst
 - ext/vendor/ctags/docs/internal.rst
 - ext/vendor/ctags/docs/news.rst
 - ext/vendor/ctags/docs/noise.rst
@@ -2233,6 +2240,7 @@ files:
 - ext/vendor/ctags/docs/output-format.rst
 - ext/vendor/ctags/docs/output-json.rst
 - ext/vendor/ctags/docs/output-tag-stream.svg
+- ext/vendor/ctags/docs/output-xref.rst
 - ext/vendor/ctags/docs/parser-asm.rst
 - ext/vendor/ctags/docs/parser-cxx.rst
 - ext/vendor/ctags/docs/parser-html.rst