HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@320 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2006-05-10 22:35:55 +00:00
parent be14d24272
commit 5c4ea3eede
2 changed files with 81 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
tagmanager/perl.c
View File

@ -24,18 +24,25 @@
*/
typedef enum {
K_SUBROUTINE,
K_PACKAGE
K_PACKAGE,
K_LOCAL,
K_MY,
K_OUR
} perlKind;
static kindOption PerlKinds [] = {
{ TRUE, 'f', "function", "functions" },
{ TRUE, 'c', "class", "packages" }
{ TRUE, 'c', "class", "packages" },
{ TRUE, 'l', "macro", "local variables" },
{ TRUE, 'm', "member", "my variables" },
{ TRUE, 'v', "variable", "our variables" }
};
/*
* FUNCTION DEFINITIONS
*/
/* Algorithm adapted from from GNU etags.
* Perl support by Bart Robinson <lomew@cs.utah.edu>
* Perl sub names: look for /^ [ \t\n]sub [ \t\n]+ [^ \t\n{ (]+/
@ -73,8 +80,74 @@ static void findPerlTags (void)
while (isspace (*cp))
cp++;
if (strncmp((const char*) cp, "sub", (size_t) 3) == 0 ||
strncmp((const char*) cp, "package", (size_t) 7) == 0)
if (strncmp((const char*) cp, "my", (size_t) 2) == 0)
{
cp += 2;
while (isspace (*cp)) cp++;
// skip something like my($bla)
if (*(const char*) cp != '$' && ! isalpha(*(const char*) cp)) continue;
cp++; // to skip the $ sign
if (! isalpha(*(const char*) cp)) continue;
while (! isspace ((int) *cp) && *cp != '\0' && *cp != '=' && *cp != ';')
{
vStringPut (name, (int) *cp);
cp++;
}
vStringTerminate (name);
if (vStringLength (name) > 0)
makeSimpleTag (name, PerlKinds, K_MY);
vStringClear (name);
}
if (strncmp((const char*) cp, "our", (size_t) 3) == 0)
{
cp += 3;
// skip something like my ($bla)
if (*(const char*) cp != '$' && ! isalpha(*(const char*) cp)) continue;
cp++; // to skip the $ sign
if (! isalpha(*(const char*) cp)) continue;
while (! isspace ((int) *cp) && *cp != '\0' && *cp != '=' && *cp != ';')
{
vStringPut (name, (int) *cp);
cp++;
}
vStringTerminate (name);
if (vStringLength (name) > 0)
makeSimpleTag (name, PerlKinds, K_OUR);
vStringClear (name);
}
if (strncmp((const char*) cp, "local", (size_t) 5) == 0)
{
cp += 5;
// skip something like my($bla)
if (*(const char*) cp != '$' && ! isalpha(*(const char*) cp)) continue;
cp++; // to skip the $ sign
if (! isalpha(*(const char*) cp)) continue;
while (! isspace ((int) *cp) && *cp != '\0' && *cp != '=' && *cp != ';')
{
vStringPut (name, (int) *cp);
cp++;
}
vStringTerminate (name);
if (vStringLength (name) > 0)
makeSimpleTag (name, PerlKinds, K_LOCAL);
vStringClear (name);
}
else if (strncmp((const char*) cp, "sub", (size_t) 3) == 0 ||
strncmp((const char*) cp, "package", (size_t) 7) == 0)
{
if (strncmp((const char*) cp, "sub", (size_t) 3) == 0)
{
@ -89,7 +162,7 @@ static void findPerlTags (void)
while (isspace (*cp))
cp++;
while (! isspace ((int) *cp) && *cp != '\0' && *cp != '{' && *cp != '(')
while (! isspace ((int) *cp) && *cp != '\0' && *cp != '{' && *cp != '(' && *cp != ';')
{
vStringPut (name, (int) *cp);
cp++;

6
tagmanager/ruby.c
View File

@ -79,7 +79,7 @@ static void findRubyTags (void)
{
while (isspace ((int) *cp))
++cp;
while (isalnum ((int) *cp) || *cp == '_')
while (isalnum ((int) *cp) || *cp == '_' || *cp == ':')
{
vStringPut (name, (int) *cp);
++cp;
@ -94,7 +94,7 @@ static void findRubyTags (void)
cp += 3;
if (isspace ((int) *cp))
{
while (isspace ((int) *cp))
while (isalnum ((int) *cp) || *cp == ':')
++cp;
/* Put the valid characters allowed in a variable name
@ -134,5 +134,5 @@ extern parserDefinition* RubyParser (void)
def->kindCount = KIND_COUNT (RubyKinds);
def->extensions = extensions;
def->parser = findRubyTags;
return def;
return def;
}