Merge branch 'sourceforge' into deploy

Conflicts: vim.c
kleopatra999 · Sep 22, 2014 · 73cf369 · 73cf369
2 parents 1f53d4b + 9fce9dd
commit 73cf369
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 13 deletions.
diff --git a/NEWS.exuberant b/NEWS.exuberant
@@ -1,6 +1,7 @@
 Current Version: @VERSION@
 
 ctags-@VERSION@ (@DATE@)
+* Fixed parsing of inline docs: support encoding POD word [Perl].
 * Added support for constants declared via hash reference [Perl].
 * Added support for new "attached" and "detachable" keywords [Eiffel].
 * Fixed parsing of comments after import statements and other tags, contributed by Huandari Lopez to Geany [Python].

diff --git a/Test/bug358.vim b/Test/bug358.vim
diff --git a/Test/bug359.vim b/Test/bug359.vim
@@ -0,0 +1,2 @@
+" This is an invalid Vim command, but it crashes the Vim parser
+command 'endlessloop'
diff --git a/Test/simple.pl b/Test/simple.pl
@@ -1,3 +1,13 @@
+=encoding utf-8
+
+Some more stuff to ignore
+
+  sub foo {
+      ...
+  }
+
+=cut
+
 =head1 NAME
 Some stuff to ignore
 package NotAPackage;

diff --git a/flex.c b/flex.c
@@ -1466,7 +1466,7 @@ static boolean parseStatement (tokenInfo *const token)
 	boolean is_class = FALSE;
 	boolean is_terminated = TRUE;
 	boolean is_global = FALSE;
-	boolean is_prototype = FALSE;
+	/* boolean is_prototype = FALSE; */
 	vString *	fulltag;
 
 	vStringClear(saveScope);
@@ -1614,7 +1614,7 @@ static boolean parseStatement (tokenInfo *const token)
 					 */
 					makeClassTag (name);
 					is_class = TRUE;
-					is_prototype = TRUE;
+					/* is_prototype = TRUE; */
 
 					/*
 					 * There should a ".function_name" next.

diff --git a/jscript.c b/jscript.c
@@ -1609,7 +1609,6 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class)
 static void parseUI5 (tokenInfo *const token)
 {
 	tokenInfo *const name = newToken ();
-	boolean is_inside_class = FALSE;
 	/*
 	 * SAPUI5 is built on top of jQuery.
 	 * It follows a standard format:
@@ -1651,9 +1650,8 @@ static void parseUI5 (tokenInfo *const token)
 			parseMethods (token, name);
 		} while (! isType (token, TOKEN_CLOSE_CURLY) );
 	}
-cleanUp:
-	deleteToken (name);
 
+	deleteToken (name);
 }
 
 static boolean parseLine (tokenInfo *const token, boolean is_inside_class)

diff --git a/perl.c b/perl.c
@@ -65,12 +65,12 @@ static boolean isIdentifier (int c)
 
 static boolean isPodWord (const char *word)
 {
-	/* Perl POD words are three to five characters in size.  We use this
+	/* Perl POD words are three to eight characters in size.  We use this
 	 * fact to find (or not find) the right side of the word and then
 	 * perform comparisons, if necessary, of POD words of that size.
 	 */
 	size_t len;
-	for (len = 0; len < 6; ++len)
+	for (len = 0; len < 9; ++len)
 		if ('\0' == word[len] || ' ' == word[len] || '\t' == word[len])
 			break;
 	switch (len) {
@@ -88,6 +88,8 @@ static boolean isPodWord (const char *word)
 				|| 0 == strncmp(word, "head2", 5)
 				|| 0 == strncmp(word, "head3", 5)
 				|| 0 == strncmp(word, "head4", 5);
+		case 8:
+			return 0 == strncmp(word, "encoding", 8);
 		default:
 			return FALSE;
 	}

diff --git a/sql.c b/sql.c
@@ -1233,7 +1233,7 @@ static void parseLabel (tokenInfo *const token)
 
 static void parseStatements (tokenInfo *const token, const boolean exit_on_endif )
 {
-	boolean isAnsi   = TRUE;
+	/* boolean isAnsi   = TRUE; */
 	boolean stmtTerm = FALSE;
 	do
 	{
@@ -1311,7 +1311,7 @@ static void parseStatements (tokenInfo *const token, const boolean exit_on_endif
 
 					if( isKeyword (token, KEYWORD_begin ) )
 					{
-						isAnsi = FALSE;
+						/* isAnsi = FALSE; */
 						parseBlock(token, FALSE);
 
 						/*

diff --git a/vim.c b/vim.c
@@ -419,6 +419,10 @@ static boolean parseCommand (const unsigned char *line)
 			while (*cp && !isspace ((int) *cp))
 				++cp; 
 		}
+		else
+		{
+			++cp;
+		}
 	} while ( *cp &&  !isalnum ((int) *cp) );
 
 	if ( ! *cp )
@@ -719,10 +723,10 @@ static void findVimTags (void)
 
 	line = readVimLine();
 
-	if (line == NULL)
-	{
-		return;
-	}
+    if (line == NULL)
+    {
+            return;
+    }
 
 	if ( strncmp ((const char*) line, "UseVimball", (size_t) 10) == 0 )
 	{
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		" This is an invalid Vim command, but it crashes the Vim parser
		command 'endlessloop'