summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2018-05-21 11:09:27 (GMT)
committeralbert-github <albert.tests@gmail.com>2018-05-21 11:09:27 (GMT)
commit50019481eb64142248d74bb89ad2c6e2b50e69f2 (patch)
tree58209c33cc7525ca7b5960b0b4f8f97e597b965a /src
parentdf0d9c3df44dbce633c38e99d33be4de06706f7b (diff)
downloadDoxygen-50019481eb64142248d74bb89ad2c6e2b50e69f2.zip
Doxygen-50019481eb64142248d74bb89ad2c6e2b50e69f2.tar.gz
Doxygen-50019481eb64142248d74bb89ad2c6e2b50e69f2.tar.bz2
Consistency between preprocessor and handling of \cond and \if
Not all read characters in the preprocessor for the \con or \if were handled properly in de cond parser (most notably '-').
Diffstat (limited to 'src')
-rw-r--r--src/condparser.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/condparser.cpp b/src/condparser.cpp
index ab33ae3..44fada9 100644
--- a/src/condparser.cpp
+++ b/src/condparser.cpp
@@ -100,9 +100,9 @@ static bool isAlpha(const char c)
return (c>='A' && c<='Z') || (c>='a' && c<='z') || c=='_';
}
-static bool isAlphaNum(const char c)
+static bool isAlphaNumSpec(const char c)
{
- return isAlpha(c) || (c>='0' && c<='9');
+ return isAlpha(c) || (c>='0' && c<='9') || c=='-' || c=='.' || (c>=0x80 && c<=0xFF);
}
/**
@@ -170,7 +170,7 @@ void CondParser::getToken()
if (isAlpha(*m_e))
{
m_tokenType = VARIABLE;
- while (isAlphaNum(*m_e))
+ while (isAlphaNumSpec(*m_e))
{
m_token += *m_e++;
}