From c13ad522ae226bad57f341d0f93865194fb0bf76 Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Fri, 10 Jun 2016 18:09:19 -0700
Subject: Change BoolType from method to val

---
 src/main/scala/firrtl/PrimOps.scala | 54 ++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'src/main/scala/firrtl/PrimOps.scala')

diff --git a/src/main/scala/firrtl/PrimOps.scala b/src/main/scala/firrtl/PrimOps.scala
index c90260a3..7e8d77db 100644
--- a/src/main/scala/firrtl/PrimOps.scala
+++ b/src/main/scala/firrtl/PrimOps.scala
@@ -180,60 +180,60 @@ object PrimOps extends LazyLogging {
          }
          case Lt => {
             val t = (t1(),t2()) match {
-               case (t1:UIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:UIntType, t2:SIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:SIntType) => Utils.BoolType()
+               case (t1:UIntType, t2:UIntType) => Utils.BoolType
+               case (t1:SIntType, t2:UIntType) => Utils.BoolType
+               case (t1:UIntType, t2:SIntType) => Utils.BoolType
+               case (t1:SIntType, t2:SIntType) => Utils.BoolType
                case (t1, t2) => UnknownType
             }
             DoPrim(o,a,c,t)
          }
          case Leq => {
             val t = (t1(),t2()) match {
-               case (t1:UIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:UIntType, t2:SIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:SIntType) => Utils.BoolType()
+               case (t1:UIntType, t2:UIntType) => Utils.BoolType
+               case (t1:SIntType, t2:UIntType) => Utils.BoolType
+               case (t1:UIntType, t2:SIntType) => Utils.BoolType
+               case (t1:SIntType, t2:SIntType) => Utils.BoolType
                case (t1, t2) => UnknownType
             }
             DoPrim(o,a,c,t)
          }
          case Gt => {
             val t = (t1(),t2()) match {
-               case (t1:UIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:UIntType, t2:SIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:SIntType) => Utils.BoolType()
+               case (t1:UIntType, t2:UIntType) => Utils.BoolType
+               case (t1:SIntType, t2:UIntType) => Utils.BoolType
+               case (t1:UIntType, t2:SIntType) => Utils.BoolType
+               case (t1:SIntType, t2:SIntType) => Utils.BoolType
                case (t1, t2) => UnknownType
             }
             DoPrim(o,a,c,t)
          }
          case Geq => {
             val t = (t1(),t2()) match {
-               case (t1:UIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:UIntType, t2:SIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:SIntType) => Utils.BoolType()
+               case (t1:UIntType, t2:UIntType) => Utils.BoolType
+               case (t1:SIntType, t2:UIntType) => Utils.BoolType
+               case (t1:UIntType, t2:SIntType) => Utils.BoolType
+               case (t1:SIntType, t2:SIntType) => Utils.BoolType
                case (t1, t2) => UnknownType
             }
             DoPrim(o,a,c,t)
          }
          case Eq => {
             val t = (t1(),t2()) match {
-               case (t1:UIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:UIntType, t2:SIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:SIntType) => Utils.BoolType()
+               case (t1:UIntType, t2:UIntType) => Utils.BoolType
+               case (t1:SIntType, t2:UIntType) => Utils.BoolType
+               case (t1:UIntType, t2:SIntType) => Utils.BoolType
+               case (t1:SIntType, t2:SIntType) => Utils.BoolType
                case (t1, t2) => UnknownType
             }
             DoPrim(o,a,c,t)
          }
          case Neq => {
             val t = (t1(),t2()) match {
-               case (t1:UIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:UIntType) => Utils.BoolType()
-               case (t1:UIntType, t2:SIntType) => Utils.BoolType()
-               case (t1:SIntType, t2:SIntType) => Utils.BoolType()
+               case (t1:UIntType, t2:UIntType) => Utils.BoolType
+               case (t1:SIntType, t2:UIntType) => Utils.BoolType
+               case (t1:UIntType, t2:SIntType) => Utils.BoolType
+               case (t1:SIntType, t2:SIntType) => Utils.BoolType
                case (t1, t2) => UnknownType
             }
             DoPrim(o,a,c,t)
@@ -352,21 +352,21 @@ object PrimOps extends LazyLogging {
          }
          case Andr => {
             val t = (t1()) match {
-               case (_:UIntType|_:SIntType) => Utils.BoolType()
+               case (_:UIntType|_:SIntType) => Utils.BoolType
                case (t1) => UnknownType
             }
             DoPrim(o,a,c,t)
          }
          case Orr => {
             val t = (t1()) match {
-               case (_:UIntType|_:SIntType) => Utils.BoolType()
+               case (_:UIntType|_:SIntType) => Utils.BoolType
                case (t1) => UnknownType
             }
             DoPrim(o,a,c,t)
          }
          case Xorr => {
             val t = (t1()) match {
-               case (_:UIntType|_:SIntType) => Utils.BoolType()
+               case (_:UIntType|_:SIntType) => Utils.BoolType
                case (t1) => UnknownType
             }
             DoPrim(o,a,c,t)
-- 
cgit v1.2.3