Skip to content

Commit 14791ce

Browse files
committed
main,refactor: use LMAP_* enumerators when adding or removeing maps
The original code used a boolean value to toggle how filenames were mapped to the parser by glob-like pattern or by extension. To support the third way mapping a file name to a parser, by regular expression pattern, we will use an enum value instead of Boolean. Signed-off-by: Masatake YAMATO <[email protected]>
1 parent 940751c commit 14791ce

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

main/options.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,7 +1757,7 @@ static char* skipPastMap (char* p)
17571757
static char* extractMapFromParameter (const langType language,
17581758
char* parameter,
17591759
char** tail,
1760-
bool* pattern_p,
1760+
langmapType *mapType,
17611761
char* (* skip) (char *))
17621762
{
17631763
char* p = NULL;
@@ -1767,7 +1767,7 @@ static char* extractMapFromParameter (const langType language,
17671767

17681768
if (first == EXTENSION_SEPARATOR) /* extension map */
17691769
{
1770-
*pattern_p = false;
1770+
*mapType = LMAP_EXTENSION;
17711771

17721772
++parameter;
17731773
p = (* skip) (parameter);
@@ -1789,7 +1789,7 @@ static char* extractMapFromParameter (const langType language,
17891789
}
17901790
else if (first == PATTERN_START) /* pattern map */
17911791
{
1792-
*pattern_p = true;
1792+
*mapType = LMAP_PATTERN;
17931793

17941794
++parameter;
17951795
for (p = parameter ; *p != PATTERN_STOP && *p != '\0' ; ++p)
@@ -1818,13 +1818,13 @@ static char* addLanguageMap (const langType language, char* map_parameter,
18181818
bool exclusiveInAllLanguages)
18191819
{
18201820
char* p = NULL;
1821-
bool pattern_p;
1821+
langmapType map_type;
18221822
char* map;
18231823

1824-
map = extractMapFromParameter (language, map_parameter, &p, &pattern_p, skipPastMap);
1825-
if (map && pattern_p == false)
1824+
map = extractMapFromParameter (language, map_parameter, &p, &map_type, skipPastMap);
1825+
if (map && map_type == LMAP_EXTENSION)
18261826
addLanguageExtensionMap (language, map, exclusiveInAllLanguages);
1827-
else if (map && pattern_p == true)
1827+
else if (map && map_type == LMAP_PATTERN)
18281828
addLanguagePatternMap (language, map, exclusiveInAllLanguages);
18291829
else
18301830
error (FATAL, "Badly formed language map for %s language",
@@ -1838,13 +1838,13 @@ static char* addLanguageMap (const langType language, char* map_parameter,
18381838
static char* removeLanguageMap (const langType language, char* map_parameter)
18391839
{
18401840
char* p = NULL;
1841-
bool pattern_p;
1841+
langmapType map_type;
18421842
char* map;
18431843

1844-
map = extractMapFromParameter (language, map_parameter, &p, &pattern_p, skipPastMap);
1845-
if (map && pattern_p == false)
1844+
map = extractMapFromParameter (language, map_parameter, &p, &map_type, skipPastMap);
1845+
if (map && map_type == LMAP_EXTENSION)
18461846
removeLanguageExtensionMap (language, map);
1847-
else if (map && pattern_p == true)
1847+
else if (map && map_type == LMAP_PATTERN)
18481848
removeLanguagePatternMap (language, map);
18491849
else
18501850
error (FATAL, "Badly formed language map for %s language",

0 commit comments

Comments
 (0)