looking for bugs

scalacenter · May 22, 2023 · e3c93a6 · e3c93a6
1 parent 2b9c984
commit e3c93a6
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/.../core/src/main/scala/ch/epfl/scala/debugadapter/internal/evaluator/RuntimeEvaluator.scala b/.../core/src/main/scala/ch/epfl/scala/debugadapter/internal/evaluator/RuntimeEvaluator.scala
@@ -30,7 +30,9 @@ class RuntimeEvaluation private (
     parse(expression).flatMap {
       validator.validate(_) match {
         case Unrecoverable(e) => Recoverable(s"Can't validate at runtime, recovering with compiler: $e")
-        case validated => validated
+        case validated =>
+          println(s"\u001b[32m[DEBUG] validated: $validated\u001b[0m")
+          validated
       }
     }
 
@@ -152,10 +154,12 @@ class RuntimeEvaluator(frame: JdiFrame, logger: Logger) {
           ofValue <- evaluate(of)
           loader <- frame.classLoader()
           initMethodName <- Safe(getLastInnerType(tree.`type`.name()).get)
+          _ = println(s"initMethodName: $initMethodName")
           instance <- ofValue.value.`type` match {
             case tree.`type` => Safe(ofValue)
             case _ => ofValue.asObject.invoke(initMethodName, Seq.empty)
           }
+          _ = println(s"instance of $tree is $instance")
         } yield instance
     }
 
@@ -181,15 +185,19 @@ class RuntimeValidator(frame: JdiFrame, logger: Logger) {
         .map { ths => ThisTree(ths.reference.referenceType().asInstanceOf[ClassType]) }
     }
 
-  def validate(expression: Stat): Validation[RuntimeEvaluationTree] = expression match {
-    case value: Term.Name => validateName(value, thisTree)
-    case _: Term.This => thisTree
-    case sup: Term.Super => Recoverable("Super not (yet) supported at runtime")
-    case _: Term.Apply | _: Term.ApplyInfix | _: Term.ApplyUnary => validateMethod(extractCall(expression))
-    case select: Term.Select => validateSelect(select)
-    case lit: Lit => validateLiteral(lit)
-    case instance: Term.New => validateNew(instance)
-    case _ => Recoverable("Expression not supported at runtime")
+  def validate(expression: Stat): Validation[RuntimeEvaluationTree] = {
+    val res = expression match {
+      case value: Term.Name => validateName(value, thisTree)
+      case _: Term.This => thisTree
+      case sup: Term.Super => Recoverable("Super not (yet) supported at runtime")
+      case _: Term.Apply | _: Term.ApplyInfix | _: Term.ApplyUnary => validateMethod(extractCall(expression))
+      case select: Term.Select => validateSelect(select)
+      case lit: Lit => validateLiteral(lit)
+      case instance: Term.New => validateNew(instance)
+      case _ => Recoverable("Expression not supported at runtime")
+    }
+    println(s"Validating $expression to $res")
+    res
   }
 
   /**