Parse with indices expload#245

nevgeny · Oct 22, 2018 · 6b25a53 · 6b25a53
1 parent f2ddf49
commit 6b25a53
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/evm/src/main/scala/pravda/evm/parse/Parser.scala b/evm/src/main/scala/pravda/evm/parse/Parser.scala
@@ -60,6 +60,6 @@ object Parser {
 
   private val ops: P[Either[String, List[Op]]] = P(Start ~ op.rep ~ End).map(ops => sequence(ops.toList))
 
-  //private val opsWithIndices = P(Start  ~ (Index ~ op).rep ~ End)
+  val opsWithIndices = P(Start  ~ (Index ~ op).rep ~ End)
 
 }
diff --git a/evm/src/main/scala/pravda/evm/translate/Translator.scala b/evm/src/main/scala/pravda/evm/translate/Translator.scala
@@ -22,6 +22,7 @@ import pravda.vm.asm
 import cats.instances.list._
 import cats.instances.either._
 import cats.syntax.traverse._
+import pravda.evm.EVM.{CodeCopy, Push}
 import pravda.evm.translate.opcode.SimpleTranslation
 
 object Translator {
@@ -30,4 +31,12 @@ object Translator {
     ops.map(SimpleTranslation.evmOpToOps).sequence.map(_.flatten)
   }
 
+  def translateActualContract(ops: List[(Int,EVM.Op)]): Either[String, List[asm.Operation]] = {
+    val offset = ops.takeWhile({case (_,CodeCopy) => false case _ => true}).reverse.tail.headOption match {
+      case Some((_,Push(address))) => BigInt(1,address.toArray).intValue()
+      case _ => throw new Exception("Parse error")
+    }
+    ops.flatMap({case(ind,op) => if (ind - offset < 0) None else Some((ind - offset,op)) })
+  }
+
 }
diff --git a/evm/src/test/scala/pravda/evm/parse/EvmTests.scala b/evm/src/test/scala/pravda/evm/parse/EvmTests.scala
@@ -11,6 +11,8 @@ object EvmTests extends TestSuite {
     'SimpleStorage - {
       val bytes = evm.readSolidityBinFile("SimpleStorage.bin")
 
+      Parser.opsWithIndices.parse(bytes).get.value.foreach(println)
+
       Parser(bytes) ==>
         Right(
           List(