riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

config: support p.lift(key) to optionally return a value

Browse Source
This commit is contained in:
Wesley W. Terpstra
2017-09-06 15:04:46 -07:00
parent 2d93262f71
commit 6bfea86dbf
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/config/Config.scala
View File

@@ -6,9 +6,14 @@ class Field[T]
abstract class View { abstract class View {
final def apply[T](pname: Field[T]): T = apply(pname, this) final def apply[T](pname: Field[T]): T = apply(pname, this)
final def apply[T](pname: Field[T], site: View): T = find(pname, site).asInstanceOf[T] final def apply[T](pname: Field[T], site: View): T = find(pname, site) match {
case Some(x) => x.asInstanceOf[T]
}
protected[config] def find(pname: Any, site: View): Any final def lift[T](pname: Field[T]): Option[T] = lift(pname, this)
final def lift[T](pname: Field[T], site: View): Option[T] = find(pname, site).map(_.asInstanceOf[T])
protected[config] def find(pname: Any, site: View): Option[Any]
} }
abstract class Parameters extends View { abstract class Parameters extends View {
@@ -16,7 +21,7 @@ abstract class Parameters extends View {
final def alter(f: (View, View, View) => PartialFunction[Any,Any]): Parameters = Parameters(f) ++ this final def alter(f: (View, View, View) => PartialFunction[Any,Any]): Parameters = Parameters(f) ++ this
final def alterPartial(f: PartialFunction[Any,Any]): Parameters = Parameters((_,_,_) => f) ++ this final def alterPartial(f: PartialFunction[Any,Any]): Parameters = Parameters((_,_,_) => f) ++ this
protected[config] def chain(site: View, tail: View, pname: Any): Any protected[config] def chain(site: View, tail: View, pname: Any): Option[Any]
protected[config] def find(pname: Any, site: View) = chain(site, new TerminalView, pname) protected[config] def find(pname: Any, site: View) = chain(site, new TerminalView, pname)
} }
@@ -37,8 +42,7 @@ class Config(p: Parameters) extends Parameters {
// Internal implementation: // Internal implementation:
private class TerminalView extends View { private class TerminalView extends View {
private class Unusable def find(pname: Any, site: View): Option[Any] = None
def find(pname: Any, site: View): Any = pname match { case x: Unusable => () }
} }
private class ChainView(head: Parameters, tail: View) extends View { private class ChainView(head: Parameters, tail: View) extends View {
@@ -56,6 +60,6 @@ private class EmptyParameters extends Parameters {
private class PartialParameters(f: (View, View, View) => PartialFunction[Any,Any]) extends Parameters { private class PartialParameters(f: (View, View, View) => PartialFunction[Any,Any]) extends Parameters {
protected[config] def chain(site: View, tail: View, pname: Any) = { protected[config] def chain(site: View, tail: View, pname: Any) = {
val g = f(site, this, tail) val g = f(site, this, tail)
if (g.isDefinedAt(pname)) g.apply(pname) else tail.find(pname, site) if (g.isDefinedAt(pname)) Some(g.apply(pname)) else tail.find(pname, site)
} }
} }