From 3ae577bc710b3767f47403a3d055e84815a30043 Mon Sep 17 00:00:00 2001 From: Donggyu Kim Date: Tue, 10 May 2016 17:06:10 -0700 Subject: Some -> Option Option(null) returns None, but Some(null) returns Some(null) --- chiselFrontend/src/main/scala/Chisel/Module.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chiselFrontend/src/main') diff --git a/chiselFrontend/src/main/scala/Chisel/Module.scala b/chiselFrontend/src/main/scala/Chisel/Module.scala index 3e839cac..62e907b6 100644 --- a/chiselFrontend/src/main/scala/Chisel/Module.scala +++ b/chiselFrontend/src/main/scala/Chisel/Module.scala @@ -40,9 +40,9 @@ abstract class Module( extends HasId { // _clock and _reset can be clock and reset in these 2ary constructors // once chisel2 compatibility issues are resolved - def this(_clock: Clock) = this(Some(_clock), None) - def this(_reset: Bool) = this(None, Some(_reset)) - def this(_clock: Clock, _reset: Bool) = this(Some(_clock), Some(_reset)) + def this(_clock: Clock) = this(Option(_clock), None) + def this(_reset: Bool) = this(None, Option(_reset)) + def this(_clock: Clock, _reset: Bool) = this(Option(_clock), Option(_reset)) private[Chisel] val _namespace = Builder.globalNamespace.child private[Chisel] val _commands = ArrayBuffer[Command]() -- cgit v1.2.3