Merge pull request #2027 from masatake/update-optlib2c-based-on-dream…

…tigers-work Update optlib2c based on dreamtigers work
universal-ctags · Mar 4, 2019 · affa2f7 · affa2f7
2 parents 0f26d9a + f0cff4a
commit affa2f7
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 37 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -128,7 +128,7 @@ OPTLIB2C = $(srcdir)/misc/optlib2c
 SUFFIXES += .ctags
 .ctags.c:
 	$(optlib2c_verbose)$(OPTLIB2C) $< > $@
-$(OPTLIB2C_INPUT): $(OPTLIB2C) Makefile
+$(OPTLIB2C_SRCS): $(OPTLIB2C) Makefile
 endif
 
 packcc_verbose = $(packcc_verbose_@AM_V@)

diff --git a/misc/optlib2c b/misc/optlib2c
@@ -826,22 +826,22 @@ EOF
     }
     if (@{$opts->{'kinddefs'}}) {
 	print <<EOF;
-	def->kindTable = $opts->{'Clangdef'}KindTable;
-	def->kindCount = ARRAY_SIZE($opts->{'Clangdef'}KindTable);
+	def->kindTable     = $opts->{'Clangdef'}KindTable;
+	def->kindCount     = ARRAY_SIZE($opts->{'Clangdef'}KindTable);
 EOF
     }
 
     if (@{$opts->{'fielddefs'}}) {
 	print <<EOF;
-	def->fieldTable = $opts->{'Clangdef'}FieldTable;
-	def->fieldCount = ARRAY_SIZE($opts->{'Clangdef'}FieldTable);
+	def->fieldTable    = $opts->{'Clangdef'}FieldTable;
+	def->fieldCount    = ARRAY_SIZE($opts->{'Clangdef'}FieldTable);
 EOF
     }
 
     if (@{$opts->{'extradefs'}}) {
 	print <<EOF;
-	def->xtagTable = $opts->{'Clangdef'}XtagTable;
-	def->xtagCount = ARRAY_SIZE($opts->{'Clangdef'}XtagTable);
+	def->xtagTable     = $opts->{'Clangdef'}XtagTable;
+	def->xtagCount     = ARRAY_SIZE($opts->{'Clangdef'}XtagTable);
 EOF
     }
 
@@ -854,7 +854,7 @@ EOF
 
     if (defined $opts->{'base'}) {
 	print <<EOF;
-	def->dependencies = $opts->{'Clangdef'}Dependencies;
+	def->dependencies    = $opts->{'Clangdef'}Dependencies;
 	def->dependencyCount = ARRAY_SIZE($opts->{'Clangdef'}Dependencies);
 EOF
     }

diff --git a/optlib/RSpec.c b/optlib/RSpec.c
@@ -66,11 +66,11 @@ extern parserDefinition* RSpecParser (void)
 	def->patterns      = patterns;
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
-	def->kindTable = RSpecKindTable;
-	def->kindCount = ARRAY_SIZE(RSpecKindTable);
+	def->kindTable     = RSpecKindTable;
+	def->kindCount     = ARRAY_SIZE(RSpecKindTable);
 	def->tagRegexTable = RSpecTagRegexTable;
 	def->tagRegexCount = ARRAY_SIZE(RSpecTagRegexTable);
-	def->dependencies = RSpecDependencies;
+	def->dependencies    = RSpecDependencies;
 	def->dependencyCount = ARRAY_SIZE(RSpecDependencies);
 	def->initialize    = initializeRSpecParser;
 

diff --git a/optlib/cmake.c b/optlib/cmake.c
@@ -246,8 +246,8 @@ extern parserDefinition* CMakeParser (void)
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
 	def->useCork       = 1;
-	def->kindTable = CMakeKindTable;
-	def->kindCount = ARRAY_SIZE(CMakeKindTable);
+	def->kindTable     = CMakeKindTable;
+	def->kindCount     = ARRAY_SIZE(CMakeKindTable);
 	def->initialize    = initializeCMakeParser;
 
 	return def;

diff --git a/optlib/ctags-optlib.c b/optlib/ctags-optlib.c
@@ -53,8 +53,8 @@ extern parserDefinition* CtagsParser (void)
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
 	def->useCork       = 1;
-	def->kindTable = CtagsKindTable;
-	def->kindCount = ARRAY_SIZE(CtagsKindTable);
+	def->kindTable     = CtagsKindTable;
+	def->kindCount     = ARRAY_SIZE(CtagsKindTable);
 	def->tagRegexTable = CtagsTagRegexTable;
 	def->tagRegexCount = ARRAY_SIZE(CtagsTagRegexTable);
 	def->initialize    = initializeCtagsParser;

diff --git a/optlib/elm.c b/optlib/elm.c
@@ -86,8 +86,8 @@ extern parserDefinition* ElmParser (void)
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
 	def->useCork       = 1;
-	def->kindTable = ElmKindTable;
-	def->kindCount = ARRAY_SIZE(ElmKindTable);
+	def->kindTable     = ElmKindTable;
+	def->kindCount     = ARRAY_SIZE(ElmKindTable);
 	def->tagRegexTable = ElmTagRegexTable;
 	def->tagRegexCount = ARRAY_SIZE(ElmTagRegexTable);
 	def->initialize    = initializeElmParser;

diff --git a/optlib/gdbinit.c b/optlib/gdbinit.c
@@ -63,8 +63,8 @@ extern parserDefinition* GdbinitParser (void)
 	def->patterns      = patterns;
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
-	def->kindTable = GdbinitKindTable;
-	def->kindCount = ARRAY_SIZE(GdbinitKindTable);
+	def->kindTable     = GdbinitKindTable;
+	def->kindCount     = ARRAY_SIZE(GdbinitKindTable);
 	def->tagRegexTable = GdbinitTagRegexTable;
 	def->tagRegexCount = ARRAY_SIZE(GdbinitTagRegexTable);
 	def->initialize    = initializeGdbinitParser;

diff --git a/optlib/man.c b/optlib/man.c
@@ -66,8 +66,8 @@ extern parserDefinition* ManParser (void)
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
 	def->useCork       = 1;
-	def->kindTable = ManKindTable;
-	def->kindCount = ARRAY_SIZE(ManKindTable);
+	def->kindTable     = ManKindTable;
+	def->kindCount     = ARRAY_SIZE(ManKindTable);
 	def->tagRegexTable = ManTagRegexTable;
 	def->tagRegexCount = ARRAY_SIZE(ManTagRegexTable);
 	def->initialize    = initializeManParser;

diff --git a/optlib/markdown.c b/optlib/markdown.c
@@ -130,10 +130,10 @@ extern parserDefinition* MarkdownParser (void)
 	def->patterns      = patterns;
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
-	def->kindTable = MarkdownKindTable;
-	def->kindCount = ARRAY_SIZE(MarkdownKindTable);
-	def->fieldTable = MarkdownFieldTable;
-	def->fieldCount = ARRAY_SIZE(MarkdownFieldTable);
+	def->kindTable     = MarkdownKindTable;
+	def->kindCount     = ARRAY_SIZE(MarkdownKindTable);
+	def->fieldTable    = MarkdownFieldTable;
+	def->fieldCount    = ARRAY_SIZE(MarkdownFieldTable);
 	def->initialize    = initializeMarkdownParser;
 
 	return def;

diff --git a/optlib/passwd.c b/optlib/passwd.c
@@ -52,8 +52,8 @@ extern parserDefinition* PasswdParser (void)
 	def->patterns      = patterns;
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
-	def->fieldTable = PasswdFieldTable;
-	def->fieldCount = ARRAY_SIZE(PasswdFieldTable);
+	def->fieldTable    = PasswdFieldTable;
+	def->fieldCount    = ARRAY_SIZE(PasswdFieldTable);
 	def->tagRegexTable = PasswdTagRegexTable;
 	def->tagRegexCount = ARRAY_SIZE(PasswdTagRegexTable);
 	def->initialize    = initializePasswdParser;

diff --git a/optlib/pod.c b/optlib/pod.c
@@ -60,8 +60,8 @@ extern parserDefinition* PodParser (void)
 	def->patterns      = patterns;
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
-	def->kindTable = PodKindTable;
-	def->kindCount = ARRAY_SIZE(PodKindTable);
+	def->kindTable     = PodKindTable;
+	def->kindCount     = ARRAY_SIZE(PodKindTable);
 	def->tagRegexTable = PodTagRegexTable;
 	def->tagRegexCount = ARRAY_SIZE(PodTagRegexTable);
 	def->initialize    = initializePodParser;

diff --git a/optlib/puppetManifest.c b/optlib/puppetManifest.c
@@ -652,8 +652,8 @@ extern parserDefinition* PuppetManifestParser (void)
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
 	def->useCork       = 1;
-	def->kindTable = PuppetManifestKindTable;
-	def->kindCount = ARRAY_SIZE(PuppetManifestKindTable);
+	def->kindTable     = PuppetManifestKindTable;
+	def->kindCount     = ARRAY_SIZE(PuppetManifestKindTable);
 	def->requestAutomaticFQTag = true;
 	def->defaultScopeSeparator = "::";
 	def->initialize    = initializePuppetManifestParser;

diff --git a/optlib/qemuhx.c b/optlib/qemuhx.c
@@ -59,10 +59,10 @@ extern parserDefinition* QemuHXParser (void)
 	def->patterns      = patterns;
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
-	def->kindTable = QemuHXKindTable;
-	def->kindCount = ARRAY_SIZE(QemuHXKindTable);
-	def->xtagTable = QemuHXXtagTable;
-	def->xtagCount = ARRAY_SIZE(QemuHXXtagTable);
+	def->kindTable     = QemuHXKindTable;
+	def->kindCount     = ARRAY_SIZE(QemuHXKindTable);
+	def->xtagTable     = QemuHXXtagTable;
+	def->xtagCount     = ARRAY_SIZE(QemuHXXtagTable);
 	def->tagRegexTable = QemuHXTagRegexTable;
 	def->tagRegexCount = ARRAY_SIZE(QemuHXTagRegexTable);
 	def->initialize    = initializeQemuHXParser;

diff --git a/optlib/systemtap.c b/optlib/systemtap.c
@@ -426,8 +426,8 @@ extern parserDefinition* SystemTapParser (void)
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
 	def->useCork       = 1;
-	def->kindTable = SystemTapKindTable;
-	def->kindCount = ARRAY_SIZE(SystemTapKindTable);
+	def->kindTable     = SystemTapKindTable;
+	def->kindCount     = ARRAY_SIZE(SystemTapKindTable);
 	def->initialize    = initializeSystemTapParser;
 
 	return def;