Upgraded to latest version of JCodeModel to avoid dependency version …

…conflicts.
mcoblenz · Jan 15, 2020 · 51aef67 · 51aef67
1 parent ad4f35e
commit 51aef67
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 70 deletions.
diff --git a/.idea/modules/Obsidian.iml b/.idea/modules/Obsidian.iml
diff --git a/.idea/sbt.xml b/.idea/sbt.xml
diff --git a/build.sbt b/build.sbt
@@ -31,7 +31,7 @@ libraryDependencies += "junit" % "junit" % "4.12" % "test"
 libraryDependencies += "com.google.protobuf" % "protobuf-java" % "3.10.0"
 libraryDependencies += "org.hyperledger.fabric-chaincode-java" % "fabric-chaincode-shim" % "1.4.4"
 libraryDependencies += "org.hyperledger.fabric-chaincode-java" % "fabric-chaincode-protos" % "1.4.4"
-libraryDependencies += "com.helger" % "jcodemodel" % "3.0.3"
+libraryDependencies += "com.helger" % "jcodemodel" % "3.3.0"
 libraryDependencies += "org.apache.commons" % "commons-io" % "1.3.2"
 
 /* settings for assembly */

diff --git a/project/assembly.sbt b/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.4
+sbt.version=1.3.6
diff --git a/src/main/scala/edu/cmu/cs/obsidian/Main.scala b/src/main/scala/edu/cmu/cs/obsidian/Main.scala
@@ -8,6 +8,7 @@ import org.apache.commons.io.FileUtils
 
 import scala.collection.mutable.HashSet
 import com.helger.jcodemodel.JCodeModel
+import com.helger.jcodemodel.writer.JCMWriter
 import edu.cmu.cs.obsidian.codegen._
 import edu.cmu.cs.obsidian.parser._
 import edu.cmu.cs.obsidian.protobuf._
@@ -321,7 +322,8 @@ object Main {
                     return false
                 }
                 case Right(javaModel) =>
-                    javaModel.build(srcDir.toFile, srcDir.toFile, null)
+                    val writer = new JCMWriter(javaModel)
+                    writer.build(srcDir.toFile)
             }
 
 

diff --git a/src/main/scala/edu/cmu/cs/obsidian/codegen/CodeGen.scala b/src/main/scala/edu/cmu/cs/obsidian/codegen/CodeGen.scala
diff --git a/src/main/scala/edu/cmu/cs/obsidian/codegen/TranslationContext.scala b/src/main/scala/edu/cmu/cs/obsidian/codegen/TranslationContext.scala
@@ -79,7 +79,9 @@ case class TranslationContext(
              * this makes shadowing of this variable impossible */
                 case (None, GlobalFieldInfo(_)) => body.assign(JExpr._this().ref(name), assignExpr)
                 case (Some(_), GlobalFieldInfo(_)) => body.assign(contractClass.staticRef("this").ref(name), assignExpr)
-                case (_, StateSpecificFieldInfo(_, _, setFunc)) => body.invoke(setFunc).arg(assignExpr)
+                case (_, StateSpecificFieldInfo(_, _, setFunc)) =>
+                    val setFuncInvocation = JExpr.invoke(setFunc).arg(assignExpr)
+                    body.add(setFuncInvocation)
             }
         }
     }