summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-08-27 22:11:59 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-08-27 22:11:59 +0200
commit0a252ea22f7acc1a769280c421c5630c9f1d29a8 (patch)
tree49883aeb4714b7c50c6bcb89027e4e3c8892025d
parent84c040f10ddfc66d75ce7e7459f4c92e1592238b (diff)
parent712e11f17c8e7147b6fce5063f68e51315d5fc09 (diff)
Merge branch 'master' of dreamhost:~/repositories/git/tonkadur
-rw-r--r--src/core/src/tonkadur/fate/v1/parser/FateLexer.g45
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/src/tonkadur/fate/v1/parser/FateLexer.g4 b/src/core/src/tonkadur/fate/v1/parser/FateLexer.g4
index 294eac8..96856c1 100644
--- a/src/core/src/tonkadur/fate/v1/parser/FateLexer.g4
+++ b/src/core/src/tonkadur/fate/v1/parser/FateLexer.g4
@@ -26,8 +26,9 @@ CLEAR_KW: L_PAREN 'clear' SEP+;
COND_KW: L_PAREN 'cond' SEP+;
COUNT_KW: L_PAREN 'count' SEP+;
DECLARE_ALIAS_TYPE_KW:
- L_PAREN ((('declare'|'define'|'def')US('sub'US)?'type')|'typedef') SEP+;
-DECLARE_DICT_TYPE_KW: L_PAREN ('declare'|'define'|'def')US('dict'|'struct')(US'type')? SEP+;
+ L_PAREN ((('declare'|'define'|'def')US(('sub'|'alias')US)?'type')|'typedef') SEP+;
+DECLARE_DICT_TYPE_KW: L_PAREN
+('declare'|'define'|'def')US('dict'|('struct''ure'?))(US'type')? SEP+;
DECLARE_EVENT_TYPE_KW: L_PAREN ('declare'|'define'|'def')US'event'(US'type')? SEP+;
DECLARE_TEXT_EFFECT_KW: L_PAREN ('declare'|'define'|'def')US'text'US'effect' SEP+;
DECLARE_VARIABLE_KW: L_PAREN 'global' SEP+;