diff options
| author | azidar | 2016-01-30 13:45:43 -0800 |
|---|---|---|
| committer | azidar | 2016-02-09 18:55:26 -0800 |
| commit | f1b5193353b6e021a0f5e5f33d5ac265f7bc686e (patch) | |
| tree | db8ac0992c95f106dd2553083d01500cd8b80c0f /src/main/scala/firrtl/Visitor.scala | |
| parent | 9e26d71f1131cb086c4ac5cfa05369e40dfb3f1a (diff) | |
Added expand connect. Resolve now includes to working ir
Diffstat (limited to 'src/main/scala/firrtl/Visitor.scala')
| -rw-r--r-- | src/main/scala/firrtl/Visitor.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/firrtl/Visitor.scala b/src/main/scala/firrtl/Visitor.scala index ccdb2e22..e9bc633c 100644 --- a/src/main/scala/firrtl/Visitor.scala +++ b/src/main/scala/firrtl/Visitor.scala @@ -53,8 +53,8 @@ class Visitor(val fullFilename: String) extends FIRRTLBaseVisitor[AST] private def visitDir[AST](ctx: FIRRTLParser.DirContext): Direction = ctx.getText match { - case "input" => Input - case "output" => Output + case "input" => INPUT + case "output" => OUTPUT } // Match on a type instead of on strings? @@ -66,7 +66,7 @@ class Visitor(val fullFilename: String) extends FIRRTLBaseVisitor[AST] else SIntType( UnknownWidth() ) case "Clock" => ClockType() case "{" => BundleType(ctx.field.map(visitField)) - case _ => new VectorType( visitType(ctx.`type`), string2BigInt(ctx.IntLit.getText) ) + case _ => new VectorType( visitType(ctx.`type`), string2Int(ctx.IntLit.getText) ) } } @@ -180,7 +180,7 @@ class Visitor(val fullFilename: String) extends FIRRTLBaseVisitor[AST] ctx.getChild(1).getText match { case "." => new SubField(visitExp(ctx.exp(0)), (ctx.id.getText), UnknownType()) case "[" => if (ctx.exp(1) == null) - new SubIndex(visitExp(ctx.exp(0)), string2BigInt(ctx.IntLit(0).getText), UnknownType()) + new SubIndex(visitExp(ctx.exp(0)), string2Int(ctx.IntLit(0).getText), UnknownType()) else new SubAccess(visitExp(ctx.exp(0)), visitExp(ctx.exp(1)), UnknownType()) // Assume primop case _ => DoPrim(visitPrimop(ctx.primop), ctx.exp.map(visitExp), |