summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hergert <christian@hergert.me>2021-12-08 20:11:29 +0000
committerChristian Hergert <christian@hergert.me>2021-12-08 20:11:41 +0000
commit3674348443c60c24947a550ba1d2ccfaa9e804a9 (patch)
tree94c327502ed0570d653bfedda8bd5fef722827d1
parent0e79122ebcaae6ad00dd040667854855dc9a8494 (diff)
downloadgtksourceview-3674348443c60c24947a550ba1d2ccfaa9e804a9.tar.gz
Merge branch 'cpp-redundancy' into 'master'
cpp.lang: remove redundant keywords See merge request GNOME/gtksourceview!231 (cherry picked from commit 837a44e9878cdd3c04471f056797b0f9e90f13d6) 0f03a509 cpp.lang: remove redundant keywords
-rw-r--r--data/language-specs/c.lang3
-rw-r--r--data/language-specs/cpp.lang9
2 files changed, 1 insertions, 11 deletions
diff --git a/data/language-specs/c.lang b/data/language-specs/c.lang
index b9de0340..96489321 100644
--- a/data/language-specs/c.lang
+++ b/data/language-specs/c.lang
@@ -222,10 +222,9 @@
</context>
<context id="types" style-ref="type">
- <keyword>_Bool</keyword>
+ <keyword>(_B|b)ool</keyword>
<keyword>_Complex</keyword>
<keyword>_Imaginary</keyword>
- <keyword>bool</keyword>
<keyword>char</keyword>
<keyword>char(16|32)_t</keyword>
<keyword>double(_t)?</keyword>
diff --git a/data/language-specs/cpp.lang b/data/language-specs/cpp.lang
index ff63f3b8..8f350c10 100644
--- a/data/language-specs/cpp.lang
+++ b/data/language-specs/cpp.lang
@@ -48,8 +48,6 @@
</context>
<context id="keywords" style-ref="keyword">
- <keyword>alignas</keyword>
- <keyword>alignof</keyword>
<keyword>and</keyword>
<keyword>and_eq</keyword>
<keyword>bitand</keyword>
@@ -67,7 +65,6 @@
<keyword>delete</keyword>
<keyword>dynamic_cast</keyword>
<keyword>export</keyword>
- <keyword>false</keyword>
<keyword>final</keyword>
<keyword>friend</keyword>
<keyword>import</keyword>
@@ -91,7 +88,6 @@
<keyword>this</keyword>
<keyword>thread_local</keyword>
<keyword>throw</keyword>
- <keyword>true</keyword>
<keyword>try</keyword>
<keyword>typeid</keyword>
<keyword>using</keyword>
@@ -106,14 +102,9 @@
</context>
<context id="types" style-ref="type">
- <keyword>bool</keyword>
- <keyword>char16_t</keyword>
- <keyword>char32_t</keyword>
<keyword>explicit</keyword>
- <keyword>inline</keyword>
<keyword>mutable</keyword>
<keyword>nullptr_t</keyword>
- <keyword>wchar_t</keyword>
</context>
<context id="common-defines" style-ref="common-defines">