From 5fcdd12fe92bd22f9cdfb8f5e39e510684b709bf Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Mon, 29 Aug 2016 09:33:51 -0700
Subject: Rename individual compile options. Stricter values are "true".
 Current default (not strict) values are "false".

---
 .../src/main/scala/chisel3/core/BiConnect.scala    | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'chiselFrontend/src/main/scala/chisel3/core/BiConnect.scala')

diff --git a/chiselFrontend/src/main/scala/chisel3/core/BiConnect.scala b/chiselFrontend/src/main/scala/chisel3/core/BiConnect.scala
index c40b85ad..857b25aa 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/BiConnect.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/BiConnect.scala
@@ -167,32 +167,34 @@ object BiConnect {
         case (None,         Some(Input))  => issueConnectR2L(left, right)
 
         case (Some(Input),  Some(Input))  => {
-          if (compileOptions.portDeterminesDirection)
-          (left.binding, right.binding) match {
-            case (PortBinding(_, _), PortBinding(_, _)) => throw BothDriversException
-            case (PortBinding(_, _), _) => issueConnectL2R(left, right)
-            case (_, PortBinding(_, _)) => issueConnectR2L(left, right)
-            case _ => throw BothDriversException
-          } else {
+          if (compileOptions.dontAssumeDirectionality) {
             throw BothDriversException
+          } else {
+            (left.binding, right.binding) match {
+              case (PortBinding(_, _), PortBinding(_, _)) => throw BothDriversException
+              case (PortBinding(_, _), _) => issueConnectL2R(left, right)
+              case (_, PortBinding(_, _)) => issueConnectR2L(left, right)
+              case _ => throw BothDriversException
+            }
           }
         }
         case (Some(Output), Some(Output)) => {
-          if (compileOptions.portDeterminesDirection)
+          if (compileOptions.dontAssumeDirectionality) {
+            throw BothDriversException
+          } else {
             (left.binding, right.binding) match {
               case (PortBinding(_, _), PortBinding(_, _)) => throw BothDriversException
               case (PortBinding(_, _), _) => issueConnectR2L(left, right)
               case (_, PortBinding(_, _)) => issueConnectL2R(left, right)
               case _ => throw BothDriversException
-            } else {
-            throw BothDriversException
+            }
           }
         }
         case (None,         None)         => {
-          if (compileOptions.assumeLHSIsOutput) {
-            issueConnectR2L(left, right)
-          } else {
+          if (compileOptions.dontAssumeDirectionality) {
             throw UnknownDriverException
+          } else {
+            issueConnectR2L(left, right)
           }
         }
       }
-- 
cgit v1.2.3