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

Ruby: improve mixin detection #2483

Merged
merged 3 commits into from
Apr 3, 2020
Merged

Ruby: improve mixin detection #2483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fd929a
Ruby: accept method invocation style mixins like include (X)
masatake Apr 2, 2020
0f753a2
main: add functions for accessing NestingLevel from the bottom of levels
masatake Apr 2, 2020
ea87271
Ruby: ignore unnamed blocks when detecting the scope of mixin methods
masatake Apr 2, 2020
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
4 changes: 4 additions & 0 deletions Units/parser-ruby.r/ruby-mixin-field.d/expected.tags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ E input.rb /^class E$/;" c mixin:extend:X,extend:Y,extend:Z
hi input.rb /^ def hi$/;" f class:E
F input.rb /^class F$/;" c mixin:extend:X
prep input.rb /^ def self.prep$/;" S class:F
G input.rb /^class G$/;" c mixin:include:X,prepend:Y,extend:Z
prep input.rb /^ def self.prep$/;" S class:G
H input.rb /^class H$/;" c mixin:include:X,prepend:Y,extend:Z
prep input.rb /^ def self.prep$/;" S class:H
24 changes: 24 additions & 0 deletions Units/parser-ruby.r/ruby-mixin-field.d/input.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,27 @@ def self.prep
extend X
end
end

class G
include(X)
def self.prep
prepend (Y)
end
extend ( Z)
end

class H
if true
unless false
include(X)
end
end
def self.prep
if true
unless false
prepend (Y)
end
end
end
extend ( Z)
end
16 changes: 6 additions & 10 deletions main/nestlevel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,23 +100,19 @@ extern void nestingLevelsPop(NestingLevels *nls)
nls->n--;
}

extern NestingLevel *nestingLevelsGetCurrent(const NestingLevels *nls)
extern NestingLevel *nestingLevelsGetNthFromRoot (const NestingLevels *nls, int n)
{
Assert (nls != NULL);

if (nls->n < 1)
if (nls->n > n && n >= 0)
return NL_NTH(nls, n);
else
return NULL;

return NL_NTH(nls, (nls->n - 1));
}

extern NestingLevel *nestingLevelsGetNth(const NestingLevels *nls, int n)
extern NestingLevel *nestingLevelsGetNthParent (const NestingLevels *nls, int n)
{
Assert (nls != NULL);
if (nls->n > n && n >= 0)
return NL_NTH(nls, n);
else
return NULL;
return nestingLevelsGetNthFromRoot (nls, nls->n - 1 - n);
}

extern void *nestingLevelGetUserData (const NestingLevel *nl)
Expand Down
5 changes: 3 additions & 2 deletions main/nestlevel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ extern void nestingLevelsFree(NestingLevels *nls);
extern NestingLevel *nestingLevelsPush(NestingLevels *nls, int corkIndex);
extern NestingLevel * nestingLevelsTruncate(NestingLevels *nls, int depth, int corkIndex);
extern void nestingLevelsPop(NestingLevels *nls);
extern NestingLevel *nestingLevelsGetCurrent(const NestingLevels *nls);
extern NestingLevel *nestingLevelsGetNth(const NestingLevels *nls, int n);
#define nestingLevelsGetCurrent(NLS) nestingLevelsGetNthParent((NLS), 0)
extern NestingLevel *nestingLevelsGetNthFromRoot(const NestingLevels *nls, int n);
extern NestingLevel *nestingLevelsGetNthParent(const NestingLevels *nls, int n);

extern void *nestingLevelGetUserData (const NestingLevel *nl);

Expand Down
34 changes: 29 additions & 5 deletions parsers/ruby.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static vString* nestingLevelsToScope (const NestingLevels* nls)
vString* result = vStringNew ();
for (i = 0; i < nls->n; ++i)
{
NestingLevel *nl = nestingLevelsGetNth (nls, i);
NestingLevel *nl = nestingLevelsGetNthFromRoot (nls, i);
tagEntryInfo *e = getEntryOfNestingLevel (nl);
if (e && strlen (e->name) > 0 && (!e->placeholder))
{
Expand Down Expand Up @@ -462,22 +462,46 @@ static int readAndEmitTag (const unsigned char** cp, rubyKind expected_kind)
static void readAndStoreMixinSpec (const unsigned char** cp, const char *how_mixin)
{

NestingLevel *nl = nestingLevelsGetCurrent (nesting);
tagEntryInfo *e = getEntryOfNestingLevel (nl);
NestingLevel *nl = NULL;
tagEntryInfo *e = NULL;
int ownerLevel = 0;

for (ownerLevel = 0; ownerLevel < nesting->n; ownerLevel++)
{
nl = nestingLevelsGetNthParent (nesting, ownerLevel);
e = nl? getEntryOfNestingLevel (nl): NULL;

/* Ignore "if", "unless", "while" ... */
if ((nl && (nl->corkIndex == CORK_NIL)) || (e && e->placeholder))
continue;
break;
}

if (!e)
return;

if (e->kindIndex == K_SINGLETON)
{
nl = nestingLevelsGetNth (nesting, nesting->n - 2);
nl = nestingLevelsGetNthParent (nesting,
ownerLevel + 1);
if (nl == NULL)
return;
e = getEntryOfNestingLevel (nl);
}

if (!e)
return;

if (! (e->kindIndex == K_CLASS || e->kindIndex == K_MODULE))
return;

if (isspace (**cp))
if (isspace (**cp) || (**cp == '('))
{
if (isspace (**cp))
skipWhitespace (cp);
if (**cp == '(')
++*cp;

vString *spec = vStringNewInit (how_mixin);
vStringPut(spec, ':');

Expand Down