summaryrefslogtreecommitdiff
path: root/src/main/scala/Chisel
diff options
context:
space:
mode:
authorAndrew Waterman2015-07-29 18:44:33 -0700
committerAndrew Waterman2015-07-29 18:44:33 -0700
commitc2116dcc45e4916a99515c99f654ce2429d0d839 (patch)
treed74cf56b72c01a15300be6962e229aa63e1a125d /src/main/scala/Chisel
parent24698c5bc1a03103b0ce0e6312c52afd6824f0eb (diff)
Remove nondeterminism in field naming
We must compensate for Class.getMethod's nondeterministic ordering.
Diffstat (limited to 'src/main/scala/Chisel')
-rw-r--r--src/main/scala/Chisel/Core.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/scala/Chisel/Core.scala b/src/main/scala/Chisel/Core.scala
index 7ba4444c..dd0799d8 100644
--- a/src/main/scala/Chisel/Core.scala
+++ b/src/main/scala/Chisel/Core.scala
@@ -963,7 +963,7 @@ class Bundle(dirArg: Direction = NO_DIR) extends Aggregate(dirArg) {
}
}
}
- elts sortWith (_._2._id > _._2._id)
+ elts sortWith {case ((an, a), (bn, b)) => (a._id > b._id) || ((a eq b) && (an > bn))}
}
override def collectElts =
sortedElts.foreach(e => setFieldForId(cid, e._2.cid, e._1))