Handle types that appear in effpi

liufengyun · liufengyun · commit 5c9c017c681b · 2021-03-12T18:54:04.000+01:00
We get types like the following in effpi:

 effpi.examples.demo.audit.types.Pay#replyTo
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Summarization.scala b/compiler/src/dotty/tools/dotc/transform/init/Summarization.scala
@@ -206,7 +206,7 @@ object Summarization{
 val tp = tdef.symbol.info
 val traverser = new TypeTraverser{
 def traverse(tp: Type): Unit = tp match{
- case tp: TermRef =>
+ case TermRef(_: SingletonType, _) =>
 summary = summary + analyze(tp, tdef.rhs)
 case _ =>
 traverseChildren(tp)
@@ -219,6 +219,10 @@ object Summarization{
 case _: Import | _: Export =>
 Summary.empty
 
+ case _: TermParamRef =>
+ // possible from type definitions
+ Summary.empty
+
 case _ =>
 throw new Exception("unexpected tree: " + expr.show)
 }
@@ -258,7 +262,7 @@ object Summarization{
 Summary(pots2, effs)
 
 case _ =>
- throw new Exception("unexpected type: " + tp.show)
+ throw new Exception("unexpected type: " + tp)
 }
 
 if (env.isAlwaysInitialized(tp)) Summary(Potentials.empty, summary.effs)

-Original file line number
+Diff line change
 valtp= tdef.symbol.info
 valtraverser=newTypeTraverser{
 deftraverse(tp: Type):Unit= tp match{
 -casetp: TermRef=>
 +caseTermRef(_: SingletonType, _)=>
  summary = summary + analyze(tp, tdef.rhs)
 case _ =>
  traverseChildren(tp)
 case_: Import|_: Export=>
 Summary.empty
 +case_: TermParamRef=>
 +// possible from type definitions
 +Summary.empty
++
 case _ =>
 thrownewException("unexpected tree: "+ expr.show)
+ }
 Summary(pots2, effs)
 case _ =>
 -thrownewException("unexpected type: "+ tp.show)
 +thrownewException("unexpected type: "+ tp)
+ }
 if (env.isAlwaysInitialized(tp)) Summary(Potentials.empty, summary.effs)