manual merge with clean-scala-code

polystat · Sep 13, 2022 · 99ec19f · 99ec19f
1 parent 2545d13
commit 99ec19f
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/transpiler/src/main/scala/org/polystat/py2eo/transpiler/Transpile.scala b/transpiler/src/main/scala/org/polystat/py2eo/transpiler/Transpile.scala
@@ -56,8 +56,6 @@ object Transpile {
           debugPrinter(rmWith._1, "afterRmWith")
           val rmAssert = GenericStatementPasses.procStatement(SimplifyAssert.apply)(rmWith._1, rmWith._2)
           debugPrinter(rmAssert._1, "afterRmAssert")
-          val preRmExcepts = GenericStatementPasses.procStatement(SimplifyExceptions.preSimplifyExcepts)(rmAssert._1, rmAssert._2)
-          val rmAssert = GenericStatementPasses.procStatement(SimplifyAssert.simplifyAssert)(rmWith._1, rmWith._2)
           val rmAnnot = GenericStatementPasses.procStatement(SimplifyAnnotation.simplify)(rmAssert._1, rmAssert._2)
           debugPrinter(rmAnnot._1, "afterRmAssertAnnot")
           val preRmExcepts = GenericStatementPasses.procStatement(SimplifyExceptions.preSimplifyExcepts)(rmAnnot._1, rmAnnot._2)
@@ -68,10 +66,9 @@ object Transpile {
           debugPrinter(simIf._1, "afterSimplifyIf")
           val simAssList = GenericStatementPasses.procStatement(SimplifyAssignmentList.apply)(simIf._1, simIf._2)
           debugPrinter(simAssList._1, "simplifyAssList")
-          val simCompr = GenericStatementPasses.procExprInStatement((SimplifyComprehension.apply))(simAssList._1, simAssList._2)
-          val simAss2Index = GenericStatementPasses.procStatement(SimplifyAssignmentList.simplifyAssignmentList)(simAssList._1, simAssList._2)
+          val simAss2Index = GenericStatementPasses.procStatement(SimplifyAssignmentList.apply)(simAssList._1, simAssList._2)
           debugPrinter(simAssList._1, "simplifyAss2Index")
-          val simCompr = GenericStatementPasses.procExprInStatement((SimplifyComprehension.simplifyComprehension))(simAss2Index._1, simAss2Index._2)
+          val simCompr = GenericStatementPasses.procExprInStatement((SimplifyComprehension.apply))(simAss2Index._1, simAss2Index._2)
           debugPrinter(simCompr._1, "afterSimplifyCollectionComprehension")
           val simForAgain = GenericStatementPasses.procStatement(SimplifyFor.apply)(simCompr._1, simCompr._2)
           debugPrinter(simForAgain._1, "afterSimForAgain")