From 0c288c48382f1b31fbfb1c202867fb444e46136c Mon Sep 17 00:00:00 2001
From: Jack
Date: Mon, 12 Oct 2015 16:45:21 -0700
Subject: Added support for no width to mean unknown, and print nothing instead
 of <?> for unknown width. Also added test to check this

---
 src/main/antlr4/FIRRTL.g4 | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/main/antlr4/FIRRTL.g4')

diff --git a/src/main/antlr4/FIRRTL.g4 b/src/main/antlr4/FIRRTL.g4
index 08697bb1..d9f3d18f 100644
--- a/src/main/antlr4/FIRRTL.g4
+++ b/src/main/antlr4/FIRRTL.g4
@@ -1,7 +1,3 @@
-// Jack Koenig
-// UC Berkeley ASPIRE Lab
-// July 9, 2015
-
 grammar FIRRTL;
 
 /*------------------------------------------------------------------
@@ -33,8 +29,8 @@ portKind
   ;
 
 type 
-  : 'UInt' '<' width '>'
-  | 'SInt' '<' width '>'
+  : 'UInt' ('<' width '>')?
+  | 'SInt' ('<' width '>')?
   | 'Clock'
   | '{' field* '}'        // Bundle
   | type '[' IntLit ']'   // Vector
@@ -93,8 +89,8 @@ dir
 // TODO implement
 // What is exp?
 exp
-  : 'UInt' '<' width '>' '(' (IntLit) ')' // FIXME what does "ints" mean?
-  | 'SInt' '<' width '>' '(' (IntLit) ')' // FIXME same
+  : 'UInt' ('<' width '>')? '(' (IntLit) ')' // FIXME what does "ints" mean?
+  | 'SInt' ('<' width '>')? '(' (IntLit) ')' // FIXME same
   | id    // Ref
   | exp '.' id // FIXME Does this work for no space?
   | exp '[' IntLit ']'
-- 
cgit v1.2.3