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

ctags: fix Ruby parsing for block assigns #1820

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

ctags: fix Ruby parsing for block assigns #1820

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89c6eb3
Fix Ruby parsing for block assigns
tambeta Apr 6, 2018
f921368
ctags Ruby parser: sync block assign to upstream
tambeta Apr 27, 2018
1ea6be0
ctags Ruby parser: block assignment test
tambeta May 7, 2018
225c4ee
ctags Ruby parser: handle assigns to sigiled vars
tambeta Jun 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 24 additions & 23 deletions ctags/parsers/ruby.c
View file
Open in desktop
Expand Up @@ -121,14 +121,19 @@ static bool notIdentChar (int c)
return ! isIdentChar (c);
}

static bool operatorChar (int c)
{
return (c == '[' || c == ']' ||
c == '=' || c == '!' || c == '~' ||
c == '+' || c == '-' ||
c == '@' || c == '*' || c == '/' || c == '%' ||
c == '<' || c == '>' ||
c == '&' || c == '^' || c == '|');
}

static bool notOperatorChar (int c)
{
return ! (c == '[' || c == ']' ||
c == '=' || c == '!' || c == '~' ||
c == '+' || c == '-' ||
c == '@' || c == '*' || c == '/' || c == '%' ||
c == '<' || c == '>' ||
c == '&' || c == '^' || c == '|');
return ! operatorChar (c);
}

static bool isWhitespace (int c)
Expand All @@ -140,25 +145,21 @@ static bool isWhitespace (int c)
* Advance 's' while the passed predicate is true. Returns true if
* advanced by at least one position.
*/
static bool advanceBy (const unsigned char** s, bool (*predicate) (int))
static bool advanceWhile (const unsigned char** s, bool (*predicate) (int))
{
const int s_length = strlen ((const char *)*s);
unsigned char this_char;
int i = 0;
const unsigned char* original_pos = *s;

for (i = 0; i < s_length; ++i)
while (**s != '\0')
{
this_char = **s;

if (! predicate (this_char))
if (! predicate (**s))
{
return i > 0;
return *s != original_pos;
}

(*s)++;
}

return i > 0;
return *s != original_pos;
}

static bool canMatchKeyword (const unsigned char** s, const char* literal)
Expand All @@ -179,21 +180,21 @@ static bool canMatchKeywordWithAssign (const unsigned char** s, const char* lite
return true;
}

if (! advanceBy (s, isIdentChar))
if (! advanceWhile (s, isIdentChar))
{
*s = original_pos;
return false;
}

advanceBy (s, isWhitespace);
advanceWhile (s, isWhitespace);

if (**s != '=') {
if (! (advanceWhile (s, operatorChar) && *(*s - 1) == '='))
{
*s = original_pos;
return false;
}

(*s)++;
advanceBy (s, isWhitespace);
advanceWhile (s, isWhitespace);

if (canMatchKeyword (s, literal))
{
Expand Down Expand Up @@ -551,11 +552,11 @@ static void findRubyTags (void)
*/
break;
}
else if (canMatchKeywordWithAssign (&cp, "begin"))
else if (canMatchKeyword (&cp, "begin"))
{
enterUnnamedScope ();
}
else if (canMatchKeywordWithAssign (&cp, "do"))
else if (canMatchKeyword (&cp, "do"))
{
if (! expect_separator)
enterUnnamedScope ();
Expand Down