Merge branch 'new-low-firrtl' of github.com:ucb-bar/firrtl into new-low-firrtl

1 files changed, 5 insertions, 2 deletions

diff --git a/src/main/stanza/ir-parser.stanza b/src/main/stanza/ir-parser.stanza
index 96c50c3c..7e07eb8b 100644
--- a/src/main/stanza/ir-parser.stanza
+++ b/src/main/stanza/ir-parser.stanza
@@ -167,7 +167,7 @@ defsyntax firrtl :
          if not empty?(rest) :
             FPE(rest, "Expected a statement here.")
          InModule(first-info(form),name, ps, Begin(cs))
-      module = (exmodule ?name:#id! #:! (?ps:#port ... ?rest ...)) :
+      module = (extmodule ?name:#id! #:! (?ps:#port ... ?rest ...)) :
          if not empty?(rest) :
             FPE(rest, "Expected a port here.")
          ExModule(first-info(form),name, ps)
@@ -210,7 +210,10 @@ defsyntax firrtl :
       accdir = (rdwr) : RDWR
 
    defrule width :
-      width = (?x:#int) : IntWidth(x)
+      width = (?x:#intorlong) : 
+         match(x) : 
+            (x:Int) : IntWidth(x)
+            (x:Long) : LongWidth(x)
       width = (?) : UnknownWidth()
 
    ;Main Statement Productions