1 files changed, 33 insertions, 3 deletions
diff --git a/src/main/antlr4/FIRRTL.g4 b/src/main/antlr4/FIRRTL.g4
index 2faef4e0..e0e10d45 100644
--- a/src/main/antlr4/FIRRTL.g4
+++ b/src/main/antlr4/FIRRTL.g4
@@ -93,12 +93,42 @@ id
   | keyword
   ;
 
-// TODO add all keywords
 keyword
-  : dir
-  | 'inst'  
+  : 'circuit'
+  | 'module'
+  | 'input'
+  | 'output'
+  | 'UInt'
+  | 'SInt'
+  | 'UBits'
+  | 'SBits'
+  | 'Clock'
+  | 'wire'
+  | 'reg'
   | 'mem'
   | 'reset'
+  | 'data-type'
+  | 'depth'
+  | 'read-latency'
+  | 'write-latency'
+  | 'read-under-write'
+  | 'reader'
+  | 'writer'
+  | 'readwriter'
+  | 'inst'
+  | 'node'
+  | 'is'
+  | 'invalid'
+  | 'when'
+  | 'else'
+  | 'stop'
+  | 'printf'
+  | 'skip'
+  | 'old'
+  | 'new'
+  | 'undefined'
+  | 'mux'
+  | 'validif'
   ;
 
 // Parentheses are added as part of name because semantics require no space between primop and open parentheses