Fixed scala code generation for test cases.

Confirmed able to generate both Scala and Java expression problem code, validating compilation and test cases.

Author: heineman

approach/src/main/scala/org/combinators/ep/approach/oo/ExtensibleVisitor.scala

@@ -99,7 +99,7 @@ trait ExtensibleVisitor extends SharedOO with OperationAsClass {
         _ <- addTypeParameter(visitTyParam, Command.skip)
 
         // this returns mangled visitTypeParameter name and gets list of all type parameters, for which there is only one, so we get head
-        args <- getTypeArguments()
+        args <- getTypeArguments
         _ <- setReturnType(args.head)
 
         // identify Visitor<R>
@@ -428,7 +428,7 @@ trait ExtensibleVisitor extends SharedOO with OperationAsClass {
         vType = visitorInterfaceName(model) // convert Name to a class
 
         visitorClassType <- findClass(vType *)
-        tpeParam <- getTypeArguments()
+        tpeParam <- getTypeArguments
         instVisitClassType <- applyType(visitorClassType, tpeParam)
         castV <- castObject(instVisitClassType, v)
         // invoke visit method on 'v' with 'this' as argument

approach/src/main/scala/org/combinators/ep/approach/oo/RuntimeDispatch.scala

@@ -125,7 +125,7 @@ trait RuntimeDispatch extends SharedOO with OperationAsClass {
     */
   def makeDispatchingOperation(model: GenericModel, op: Operation): Generator[ClassContext, Unit] = {
     def ifStmt(): Generator[MethodBodyContext, Option[Expression]] = {
-      import exceptions.exceptisonCapabilities._
+      import exceptions.exceptionsCapabilities._
       import impParadigm.imperativeCapabilities._
       import ooParadigm.methodBodyCapabilities._
       import paradigm.methodBodyCapabilities._

approach/src/main/scala/org/combinators/ep/approach/oo/Visitor.scala

@@ -238,7 +238,7 @@ trait Visitor extends SharedOO with OperationAsClass { self =>
         _ <- addTypeParameter(visitTyParam, Command.skip)
 
         // this returns mangled visitTypeParameter name and gets list of all type parameters, for which there is only one, so we get head
-        args <- getTypeArguments()
+        args <- getTypeArguments
         _ <- setReturnType(args.head)
 
         // identify Visitor<R>

builder/src/main/scala/org/combinators/ep/builder/java/Main.scala

@@ -577,8 +577,6 @@ object GenerateAllForOneApproach extends IOApp {
 
 
 object QuickValidation extends Subselection {
-
-
   // note that visitorSideEffect and dispatch are omitted from this validation.  VISITORSIDEEFFECT has a problem
   // with the test cases in that the methods become too long for the JavaVM and attempts to subdivide them fail
   // because visitorSideEffect needs to create visitor objects, and arbitrarily splitting test cases means that
@@ -595,12 +593,9 @@ object QuickValidation extends Subselection {
 
   // latest in all system families
   val evolutions = Seq("M9", "J8", "A3", "O1OA", "OD3", "OO3", "V1", "D3", "I2M3I1N1", "O2")
-
 }
 
 object GenerateAllMain extends Subselection {
-
-
   def approaches(args: List[String]): Seq[String] = if (args.isEmpty) {
     Seq("oo", "visitor", "extensibleVisitor", "interpreter", "coco", "trivially", "algebra")
   } else {
@@ -613,12 +608,9 @@ object GenerateAllMain extends Subselection {
   }
   val evolutions = Seq("M0", "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M7I2", "M8", "M9", "I1", "A1", "A1M3", "A1M3I2", "A3", "I2",
     "O1", "O2", "OA", "O1OA", "OD1", "OD2", "OD3", "OO1", "OO2", "OO3")
-
 }
 
 object GenerateAllJ extends Subselection {
-
-
   def approaches(args: List[String]): Seq[String] = if (args.isEmpty) {
     Seq("oo", "visitor", "extensibleVisitor", "interpreter", "coco", "trivially", "algebra")
   } else {
@@ -630,11 +622,9 @@ object GenerateAllJ extends Subselection {
     args.head
   }
   val evolutions = Seq("M0", "J1", "J2", "J3", "K1", "K2", "J4", "J5", "J6", "K2J6", "J7", "J8")
-
 }
 
 object GenerateAllD1D2 extends Subselection {
-
   def approaches(args: List[String]): Seq[String] = if (args.isEmpty) {
     Seq("oo", "visitor", "extensibleVisitor", "interpreter", "coco", "trivially", "algebra")
   } else {
@@ -649,7 +639,6 @@ object GenerateAllD1D2 extends Subselection {
 }
 
 object GenerateAllMerging extends Subselection {
-
   def approaches(args: List[String]): Seq[String] = if (args.isEmpty) {
     Seq("oo", "visitor", "extensibleVisitor", "interpreter", "coco", "trivially", "algebra")
   } else {
@@ -664,8 +653,6 @@ object GenerateAllMerging extends Subselection {
 }
 
 object GenerateAllExtended extends Subselection {
-
-
   def approaches(args: List[String]): Seq[String] = if (args.isEmpty) {
     Seq("oo", "visitor", "extensibleVisitor", "interpreter", "coco", "trivially", "algebra")
   } else {
@@ -680,8 +667,6 @@ object GenerateAllExtended extends Subselection {
 }
 
 object GenerateAllThirdAlternate extends Subselection {
-
-
   def approaches(args: List[String]): Seq[String] = if (args.isEmpty) {
     Seq("oo", "visitor", "extensibleVisitor", "interpreter", "coco", "trivially", "algebra")
   } else {
@@ -696,8 +681,6 @@ object GenerateAllThirdAlternate extends Subselection {
 }
 
 object GenerateShapes extends Subselection {
-
-
   def approaches(args: List[String]): Seq[String] = if (args.isEmpty) {
     Seq("oo", "visitor", "extensibleVisitor", "interpreter", "coco", "trivially", "algebra")
   } else {

builder/src/main/scala/org/combinators/ep/builder/scala/Main.scala

@@ -69,10 +69,14 @@ class Main(choice:String, select:String) {
   val ast: FullAST & TreesAST = new FinalBaseAST
     with FinalNameProviderAST
     with FinalArithmeticAST
+    with FinalArraysAST
     with FinalAssertionsAST
     with FinalBooleanAST
+    with FinalConsoleAST
     with FinalEqualsAST
+    with FinalExceptionsAST
     with FinalListsAST
+    with FinalMapsAST 
     with FinalOperatorExpressionsAST
     with FinalRealArithmeticOpsAST
     with FinalStringAST

language/inbetween/src/main/scala/org/combinators/ep/language/inbetween/any/AnyParadigm.scala

@@ -149,12 +149,14 @@ trait AnyParadigm[A, S](val ast: AnyAST & A, val syntax: AbstractSyntax.Abstract
         // underlying methods to exceed their maximum size.
         val groups = result.sliding(25,25)
 
+        var lastFresh:Name = command.name
         val blocks = groups.map(g => {
           val emptyMethod = factory.method(
             name = sample.getFreshName(command.name),
             typeLookupMap = context.methodTypeLookupMap
           )
-          sample.addTestExpressions(g)
+          lastFresh = sample.getFreshName(lastFresh)   // prepare for next time
+          emptyMethod.addTestExpressions(g)
         })
         (context.copy(tests = context.tests ++ blocks), ())
       }

language/newScala/src/main/scala/org/combinators/ep/language/scala/ast/BaseAST.scala

@@ -287,15 +287,16 @@ trait BaseAST extends OOAST with FunctionalAST with GenericsAST with FunctionalC
             underlyingClass.addParent(classReferenceType(
               Seq("org", "scalatest", "funsuite", "AnyFunSuite").map(n => nameProvider.mangle(n)) *
             ))
-          val methodsAsTests = withFunSuiteExtension.methods.zip(this.testMarkers).filter { case (m, isTest) => isTest }.map { case (m, _) => {
+            
+          val methodsAsTests = withFunSuiteExtension.methods.zip(this.testMarkers).filter { case (m, isTest) => isTest }.map { case (m, _) => 
             liftExpression(applyExpression(
               applyExpression(
                 memberAccessExpression(selfReferenceExpression, nameProvider.mangle("test")),
                 Seq(reifiedScalaValue(TypeRep.String, m.name.component))
               ),
               Seq(blockExpression(m.statements))
             ))
-          }
+          
           }
           val withPrimaryClsConstructor = if (underlyingClass.constructors.isEmpty) {
             withFunSuiteExtension.addConstructor(constructor(statements = methodsAsTests))

scripts/README.md

@@ -29,6 +29,10 @@ For simplicity, all instructions using the 'sbt' command line.
    * ep-java-third-alternate (GenerateAllThirdAlternate)
       * Approaches: oo visitor visitorSideEffect extensibleVisitor interpreter coco trivially dispatch algebra
       * Evolutions: M0 X1 X2 X3 X2X3 X4
+   
+   * ep-java-quick (QuickValidation) -- Note that you cannot validate this generation (so skip step 2 below)
+      * Approaches: trivially oo visitor extensibleVisitor interpreter coco algebra
+      * Evolutions: A3 D3 I2M3I1N1 J8 M9 O1OA O2 OD3 OO3 V1
 
 For Scala-generated code, the above are replaced with `ep-scala-XXX` and approaches and
 evolutions remain the same.
@@ -128,6 +132,8 @@ or
    source code, executing the test cases and code coverage statistics. This script also detects
    errors in these three phases.
 
+   Make sure `scipy` is installed
+
    In the respective ep-java-XXX directories, execute the following Python script:
 
 ```c:\Python37\python.exe ..\..\scripts\process.py > STATISTICS```