fixed new flags support: all and none must not interpreted as l…

…anguage keywords. (#16)
cross-language-cpp · Nov 16, 2020 · 6f95332 · 6f95332
1 parent 3bef22b
commit 6f95332
Show file tree

Hide file tree

Showing 9 changed files with 136 additions and 173 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 # djinni-intellij-plugin Changelog
 
 ## [Unreleased]
+### Fixed
+- problem with new `flags` support: `all` and `none` must not interpreted as language keywords.
+
+## [0.10.0]
 ### Added
 - support for the `flags` data structure
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 
 pluginGroup = com.github.cross_language_cpp.djinni_intellij_plugin
 pluginName_ = djinni-intellij-plugin
-pluginVersion = 0.10.0
+pluginVersion = 0.10.1
 pluginSinceBuild = 193
 pluginUntilBuild = 202.*
 

diff --git a/...in/gen/java/com/github/cross_language_cpp/djinni_intellij_plugin/parser/DjinniParser.java b/...in/gen/java/com/github/cross_language_cpp/djinni_intellij_plugin/parser/DjinniParser.java
diff --git a/.../gen/java/com/github/cross_language_cpp/djinni_intellij_plugin/psi/DjinniFlagsMember.java b/.../gen/java/com/github/cross_language_cpp/djinni_intellij_plugin/psi/DjinniFlagsMember.java
diff --git a/src/main/gen/java/com/github/cross_language_cpp/djinni_intellij_plugin/psi/DjinniTypes.java b/src/main/gen/java/com/github/cross_language_cpp/djinni_intellij_plugin/psi/DjinniTypes.java
diff --git a/.../com/github/cross_language_cpp/djinni_intellij_plugin/psi/impl/DjinniFlagsMemberImpl.java b/.../com/github/cross_language_cpp/djinni_intellij_plugin/psi/impl/DjinniFlagsMemberImpl.java
diff --git a/src/main/java/com/github/cross_language_cpp/djinni_intellij_plugin/Djinni.bnf b/src/main/java/com/github/cross_language_cpp/djinni_intellij_plugin/Djinni.bnf
@@ -49,8 +49,6 @@
     comment="regexp:#.*"
     enum="enum"
     flags="flags"
-    all="all"
-    none="none"
     record="record"
     eq_keyword="eq"
     ord="ord"
@@ -101,7 +99,7 @@ private flagsDescription ::= flagsTypeVariant LEFT_BLOCK_BRACE flagsMember* RIGH
 
 flagsTypeVariant ::= flags
 
-flagsMember ::= flagsValue [ EQ ( all | none ) ] SEMICOLON
+flagsMember ::= flagsValue [ EQ ( 'all' | 'none' ) ] SEMICOLON
 
 flagsValue ::= identifier {
   mixin="com.github.cross_language_cpp.djinni_intellij_plugin.psi.impl.DjinniReferenceImpl"

diff --git a/src/main/java/com/github/cross_language_cpp/djinni_intellij_plugin/_DjinniLexer.flex b/src/main/java/com/github/cross_language_cpp/djinni_intellij_plugin/_DjinniLexer.flex
@@ -50,8 +50,6 @@ TEXT=[a-zA-Z_0-9]+
   "@"                   { return AT; }
   "enum"                { return ENUM; }
   "flags"               { return FLAGS; }
-  "all"                 { return ALL; }
-  "none"                { return NONE; }
   "record"              { return RECORD; }
   "eq"                  { return EQ_KEYWORD; }
   "ord"                 { return ORD; }