Read source text in js-eval (#42)

es-meta · Feb 22, 2022 · 0e888f5 · 0e888f5
1 parent ae8bd3e
commit 0e888f5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/main/scala/esmeta/interp/Interp.scala b/src/main/scala/esmeta/interp/Interp.scala
@@ -5,6 +5,7 @@ import esmeta.error.*
 import esmeta.interp.util.*
 import esmeta.ir.{Func => IRFunc, *}
 import esmeta.js.*
+import esmeta.js.util.{Parser => JSParser}
 import esmeta.js.builtin.TypeModel
 import esmeta.util.BaseUtils.*
 import esmeta.util.SystemUtils.*
@@ -18,6 +19,7 @@ class Interp(
   val st: State,
   val timeLimit: Option[Long] = Some(TIMEOUT),
   val typeModel: Option[TypeModel] = None, // TODO refactoring
+  val parser: Option[JSParser] = None, // TODO refactoring
 ) {
   import Interp.*
 

diff --git a/src/main/scala/esmeta/phase/JSEval.scala b/src/main/scala/esmeta/phase/JSEval.scala
@@ -3,8 +3,9 @@ package esmeta.phase
 import esmeta.*
 import esmeta.spec.Spec
 import esmeta.interp.*
+import esmeta.util.SystemUtils.*
 import esmeta.js.*
-import esmeta.js.util.*
+import esmeta.js.util.Parser
 import esmeta.js.builtin.*
 
 /** `js-eval` phase */
@@ -16,8 +17,11 @@ case object JSEval extends Phase[Spec, State] {
     globalConfig: GlobalConfig,
     config: Config,
   ): State = {
-    val (st, typeModel) = Initialize(spec, "") // XXX get source text
-    println(st)
+    // get source text
+    val filename = getSecondFilename(globalConfig, "js-eval")
+    // TODO refactoring to mechanized spec
+    val (st, typeModel) = Initialize(spec, readFile(filename))
+    val parser = Parser(spec.grammar)
     new Interp(st, typeModel = Some(typeModel)).fixpoint
     st
   }

diff --git a/src/main/scala/esmeta/util/SystemUtils.scala b/src/main/scala/esmeta/util/SystemUtils.scala
@@ -77,6 +77,10 @@ object SystemUtils {
   def getFirstFilename(globalConfig: GlobalConfig, msg: String): String =
     globalConfig.args.headOption.getOrElse(throw NoFileError(msg))
 
+  /** get second filename */
+  def getSecondFilename(globalConfig: GlobalConfig, msg: String): String =
+    globalConfig.args.tail.headOption.getOrElse(throw NoFileError(msg))
+
   /** read file */
   def readFile(filename: String): String =
     val source = Source.fromFile(filename, ENC)