Refactoring

src/main/scala/esmeta/peval/PartialEvaluator.scala

@@ -106,8 +106,13 @@ class PartialEvaluator(
         }
         (ISeq(newInsts), newPst)
       case ISdoCall(lhs, base, method, args) =>
-        pst.define(lhs, Unknown)
-        (inst, pst)
+        val (pv, newBase) = peval(base, pst)
+        pv match
+          // TODO: local variable inline: <varname>_<fid>_<ctxtcounter>
+          // case Known(AstValue(ast)) =>
+          case _ =>
+            pst.define(lhs, Unknown)
+            (inst, pst)
       case call @ ICall(lhs, fexpr, args) =>
         pst.define(lhs, Unknown)
         (inst, pst)

src/main/scala/esmeta/peval/pstate/PContext.scala

@@ -0,0 +1,8 @@
+package esmeta.peval.pstate
+
+import esmeta.peval.*
+import esmeta.state.*
+import esmeta.ir.{Func, Local}
+import scala.collection.mutable.{Map => MMap}
+
+case class PContext(func: Func, locals: MMap[Local, Predict[Value]])

src/main/scala/esmeta/peval/pstate/PHeap.scala

@@ -17,7 +17,7 @@ import esmeta.state.*
 /** IR PHeap for partial Evaluation. similar to state/PHeap.scala */
 case class PHeap(
   val map: MMap[Addr, PObj] = MMap(),
-  var size: Int = 0,
+  var size: Int = 0, // TODO: move to PartialEvaluator
 ) extends StateElem {
 
   /** getter */
@@ -84,11 +84,3 @@ case class PHeap(
     size,
   )
 }
-
-object PHeap {
-  def fromHeap(heap: esmeta.state.Heap): PHeap = ???
-  // PHeap(
-  //   Map.from(heap.map).map((addr, obj) => (addr, PObj.from(obj))),
-  //   heap.size,
-  // )
-}

src/main/scala/esmeta/peval/pstate/PState.scala

@@ -12,24 +12,16 @@ import scala.util.{Try, Success}
 import esmeta.state.*
 import esmeta.peval.*
 
-type PContext = Map[Local, Predict[Value]]
-
 /** IR PStates */
 case class PState(
-  // var func: IRFunc,
-  // var callStack: List[PCallContext] = Nil,
-  val globals: Map[Global, Predict[Value]] = Map(),
-  var locals: PContext = Map(),
-  val heap: PHeap = PHeap(),
+  val globals: Map[Global, Predict[Value]],
+  var callStack: List[PContext],
+  val context: PContext,
+  val heap: PHeap,
 ) extends StateElem {
 
-  def setContext(func: IRFunc): PState = PState(
-    // func,
-    // callStack,
-    globals,
-    locals,
-    heap,
-  )
+  inline def func = context.func
+  inline def locals = context.locals
 
   /** getter */
   def apply(rt: Predict[RefTarget])(using CFG): Predict[Value] = rt match
@@ -65,12 +57,12 @@ case class PState(
     case _       => throw WrongStringRef(str, field)
 
   /** address getter */
-  def apply(addr: Addr): PObj = ??? // heap(addr)
+  def apply(addr: Addr): PObj = heap(addr)
 
   /** define variables */
   def define(x: Var, value: Predict[Value]): Unit = x match
-    case x: Global =>
-    case x: Local  => this.locals = locals + (x -> value)
+    case x: Global => /* do nothing */
+    case x: Local  => locals += x -> value
 
   /** setter */
   def update(rt: RefTarget, value: Predict[Value]): Unit = rt match
@@ -79,8 +71,8 @@ case class PState(
 
   /** variable setter */
   def update(x: Var, value: Predict[Value]): Unit = x match
-    case x: Global =>
-    case x: Local  => this.locals = locals + (x -> value)
+    case x: Global => /* do nothing */
+    case x: Local  => locals += x -> value
 
   /** field setter */
   def update(base: Value, field: Value, value: Predict[Value]): PState = ???
@@ -138,19 +130,3 @@ case class PState(
   // val addr -> pheap = heap.allocList(vs)
   // (addr, this.replaced(heap = pheap))
 }
-object PState {
-
-  def fromState(st: State): PState = PState(
-    // st.func.irFunc,
-    // st.callStack.map((cc) =>
-    //   PCallContext(
-    //     cc.context.func.irFunc,
-    //     Map.from(cc.context.locals).map((l, v) => (l, Known(v))),
-    //   ),
-    // ),
-    Map.from(st.globals).map((l, v) => (l, Known(v))),
-    Map.from(st.context.locals).map((l, v) => (l, Known(v))),
-    PHeap.fromHeap(st.heap),
-  )
-
-}

src/main/scala/esmeta/phase/PEval.scala

@@ -57,11 +57,16 @@ case object PEval extends Phase[CFG, Unit] {
 
     for (fd <- fds) {
 
-      val st = PState(globals = globals)
+      val func = pevalTarget.irFunc
+      val st = PState(
+        globals = globals,
+        callStack = Nil,
+        context = PContext(func = func, locals = MMap()),
+        heap = PHeap(),
+      )
       // .fromState(Initialize.fromFile(cfg, filename))
       // .setContext(pevalTarget.irFunc)
       // val (addr_empty_map, st) = st.allocMap(Nil)
-      val func = pevalTarget.irFunc
       val addr_func_obj_record = st.allocRecord(
         "ECMAScriptFunctionObject",
         List(