Disable settings screen, fix more parsing issues

DanielSchiavini · Jul 15, 2024 · 63d99cd · 63d99cd
1 parent d20c7ea
commit 63d99cd
Show file tree

Hide file tree

Showing 20 changed files with 1,104 additions and 678 deletions.
diff --git a/src/main/gen/org/vyperlang/plugin/grammar/_BaseVyperLexer.flex b/src/main/gen/org/vyperlang/plugin/grammar/_BaseVyperLexer.flex
@@ -60,6 +60,7 @@ IDENTIFIER=([A-Za-z_][a-zA-Z_0-9]*)
   "("                          { return LPAREN; }
   ")"                          { return RPAREN; }
   "..."                        { return ELLIPSIS; }
+  ":="                         { return WALRUS; }
   "+"                          { return PLUS; }
   "-"                          { return MINUS; }
   "*"                          { return MULT; }
@@ -89,17 +90,21 @@ IDENTIFIER=([A-Za-z_][a-zA-Z_0-9]*)
   "&"                          { return AMPERSAND; }
   "|"                          { return PIPE; }
   "^"                          { return CARET; }
+  "bound"                      { return BOUND; }
   "String"                     { return STRING; }
   "Bytes"                      { return BYTES; }
   "DynArray"                   { return DYNARRAY; }
   "HashMap"                    { return HASHMAP; }
   "constant"                   { return CONSTANT; }
   "public"                     { return PUBLIC; }
   "immutable"                  { return IMMUTABLE; }
+  "from"                       { return FROM; }
   "import"                     { return IMPORT; }
   "as"                         { return AS; }
-  "from"                       { return FROM; }
   "implements"                 { return IMPLEMENTS; }
+  "uses"                       { return USES; }
+  "exports"                    { return EXPORTS; }
+  "initializes"                { return INITIALIZES; }
   "interface"                  { return INTERFACE; }
   "def"                        { return DEF; }
   "pure"                       { return PURE; }
@@ -124,7 +129,7 @@ IDENTIFIER=([A-Za-z_][a-zA-Z_0-9]*)
   "break"                      { return BREAK; }
   "return"                     { return RETURN; }
   "raise"                      { return RAISE; }
-  "PASS"                       { return PASS; }
+  "pass"                       { return PASS; }
   "log"                        { return LOG; }
   "extcall"                    { return EXTCALL; }
   "staticcall"                 { return STATICCALL; }

diff --git a/src/main/gen/org/vyperlang/plugin/grammar/_BaseVyperLexer.java b/src/main/gen/org/vyperlang/plugin/grammar/_BaseVyperLexer.java