Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vim: Cleanup word matching code #146

Merged
merged 3 commits into from
Dec 11, 2014
Merged

vim: Cleanup word matching code #146

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cb0e4b
vim: Cleanup word matching code
b4n Nov 24, 2014
0b20bc2
vim: Skip matched word on the caller side rather than the callee one
b4n Dec 11, 2014
98b4255
vim: Do not reject augroups names prefixed with "end"
b4n Dec 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 35 additions & 55 deletions vim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ static const unsigned char* skipPrefix (const unsigned char* name, int *scope)
return result;
}

static boolean isWordChar(const unsigned char c)
{
return (isalnum (c) || c == '_');
}

/* checks if a word at the start of `p` matches at least `min_len` first
* characters from `word` */
static boolean wordMatchLen(const unsigned char *p, const char *const word, size_t min_len)
Expand All @@ -152,10 +157,17 @@ static boolean wordMatchLen(const unsigned char *p, const char *const word, size
n++;
}

if (*p == 0 || *p == ' ' || *p == '\t' || *p == '!')
return n >= min_len;
if (isWordChar (*p))
return FALSE;

return FALSE;
return n >= min_len;
}

static const unsigned char *skipWord(const unsigned char *p)
{
while (*p && isWordChar (*p))
p++;
return p;
}

static boolean isMap (const unsigned char* line)
Expand Down Expand Up @@ -219,13 +231,8 @@ static void parseFunction (const unsigned char *line)
vString *name = vStringNew ();
/* boolean inFunction = FALSE; */
int scope;
const unsigned char *cp = line;

const unsigned char *cp = line + 1;

if ((int) *++cp == 'n' && (int) *++cp == 'c' &&
(int) *++cp == 't' && (int) *++cp == 'i' &&
(int) *++cp == 'o' && (int) *++cp == 'n')
++cp;
if ((int) *cp == '!')
++cp;
if (isspace ((int) *cp))
Expand Down Expand Up @@ -257,12 +264,7 @@ static void parseFunction (const unsigned char *line)
/* TODO - update struct to indicate inside function */
while ((line = readVimLine ()) != NULL)
{
/*
* Vim7 added the for/endfo[r] construct, so we must first
* check for an "endfo", before a "endf"
*/
if ( (!strncmp ((const char*) line, "endfo", (size_t) 5) == 0) &&
(strncmp ((const char*) line, "endf", (size_t) 4) == 0) )
if (wordMatchLen (line, "endfunction", 4))
break;

parseVimLine(line, TRUE);
Expand All @@ -275,24 +277,20 @@ static void parseAutogroup (const unsigned char *line)
vString *name = vStringNew ();

/* Found Autocommand Group (augroup) */
const unsigned char *cp = line + 2;
if ((int) *++cp == 'r' && (int) *++cp == 'o' &&
(int) *++cp == 'u' && (int) *++cp == 'p')
++cp;
const unsigned char *cp = line;
if (isspace ((int) *cp))
{
while (*cp && isspace ((int) *cp))
++cp;

if (*cp)
{
if (strncasecmp ((const char*) cp, "end", (size_t) 3) != 0)
{
do
{
vStringPut (name, (int) *cp);
++cp;
} while (isalnum ((int) *cp) || *cp == '_');
const unsigned char *end = skipWord (cp);

/* "end" (caseless) has a special meaning and should not generate a tag */
if (end > cp && strncasecmp ((const char *) cp, "end", end - cp) != 0)
{
vStringNCatS (name, (const char *) cp, end - cp);
vStringTerminate (name);
makeSimpleTag (name, VimKinds, K_AUGROUP);
vStringClear (name);
Expand Down Expand Up @@ -339,15 +337,9 @@ static boolean parseCommand (const unsigned char *line)
while (*cp && isspace ((int) *cp))
++cp;
}
else if ( line &&
(!strncmp ((const char*) line, "comp", (size_t) 4) == 0) &&
(!strncmp ((const char*) line, "comc", (size_t) 4) == 0) &&
(strncmp ((const char*) line, "com", (size_t) 3) == 0) )
else if ( line && wordMatchLen (cp, "command", 3) )
{
cp += 2;
if ((int) *++cp == 'm' && (int) *++cp == 'a' &&
(int) *++cp == 'n' && (int) *++cp == 'd')
++cp;
cp = skipWord (cp);

if ((int) *cp == '!')
++cp;
Expand Down Expand Up @@ -438,7 +430,7 @@ static void parseLet (const unsigned char *line, int infunction)
{
vString *name = vStringNew ();

const unsigned char *cp = line + 3;
const unsigned char *cp = line;
const unsigned char *np = line;
/* get the name */
if (isspace ((int) *cp))
Expand Down Expand Up @@ -496,13 +488,8 @@ static void parseLet (const unsigned char *line, int infunction)
static boolean parseMap (const unsigned char *line)
{
vString *name = vStringNew ();

const unsigned char *cp = line;

/* Remove map */
while (*cp && isalnum ((int) *cp))
++cp;

if ((int) *cp == '!')
++cp;

Expand Down Expand Up @@ -576,41 +563,34 @@ static boolean parseMap (const unsigned char *line)
return TRUE;
}

static boolean isCommand (const unsigned char* line)
{
return ( (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) &&
(!strncmp ((const char*) line, "comc", (size_t) 4) == 0) &&
(strncmp ((const char*) line, "com", (size_t) 3) == 0) );
}

static boolean parseVimLine (const unsigned char *line, int infunction)
{
boolean readNextLine = TRUE;

if (isCommand(line))
if (wordMatchLen (line, "command", 3))
{
readNextLine = parseCommand(line);
/* TODO - Handle parseCommand returning FALSE */
}

else if (isMap(line))
{
parseMap(line);
parseMap(skipWord(line));
}

else if (strncmp ((const char*) line, "fu", (size_t) 2) == 0)
else if (wordMatchLen (line, "function", 2))
{
parseFunction(line);
parseFunction(skipWord(line));
}

else if (strncmp ((const char*) line, "aug", (size_t) 3) == 0)
else if (wordMatchLen (line, "augroup", 3))
{
parseAutogroup(line);
parseAutogroup(skipWord(line));
}

else if ( strncmp ((const char*) line, "let", (size_t) 3) == 0 )
else if (wordMatchLen (line, "let", 3))
{
parseLet(line, infunction);
parseLet(skipWord(line), infunction);
}

return readNextLine;
Expand Down