summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2018-02-10 13:26:08 (GMT)
committerGitHub <noreply@github.com>2018-02-10 13:26:08 (GMT)
commit68ff251935d595d7e643c170dd5d8b43794b3297 (patch)
treefeaf784b5d12e94e7bf346ee7b29f3a610233102 /src
parent370e9cce8576ed607be8ed78412ca93dc2f96ee0 (diff)
parent98eb981dba723ed1d71fdcbcd7ca2de0e086b1e0 (diff)
downloadDoxygen-68ff251935d595d7e643c170dd5d8b43794b3297.zip
Doxygen-68ff251935d595d7e643c170dd5d8b43794b3297.tar.gz
Doxygen-68ff251935d595d7e643c170dd5d8b43794b3297.tar.bz2
Merge pull request #645 from albert-github/feature/bug_638606
Bug 638606 - Support for C# nullable type
Diffstat (limited to 'src')
-rw-r--r--src/scanner.l16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 90e710b..08a5e52 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -6618,6 +6618,22 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
BEGIN(SkipString);
}
}
+<*>\? {
+ if (insideCS)
+ {
+ if (current->type.isEmpty())
+ {
+ if (current->name.isEmpty())
+ current->name="?";
+ else
+ current->name+="?";
+ }
+ else
+ {
+ current->type+="?";
+ }
+ }
+ }
<*>.
<SkipComment>"//"|"/*"
<*>"/*" { lastCContext = YY_START ;