Skip to content

Commit 04e705c

Browse files
heinemanheineman
committed
Upgraded annotations for packages. Completed Validation code to run test cases through M7I2 for all Java-based generation. Still have problems with ExtensibleVisitor
1 parent 6c6cb51 commit 04e705c

File tree

113 files changed

+202
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+202
-210
lines changed

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/Algebra.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/BaseDataTypeAsClass.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.abstractions.{DataType, Operation}
44
import org.combinators.ep.generator.ApproachImplementationProvider

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/BaseDataTypeAsInterface.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.abstractions.{DataType, Operation}
44
import org.combinators.ep.generator.ApproachImplementationProvider

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/ExtensibleVisitor.scala

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._
@@ -13,9 +13,6 @@ import AnyParadigm.syntax._
1313
* Shriram Krishnamurthi, Matthias Felleisen, Daniel Friedman
1414
* https://dl.acm.org/citation.cfm?id=679709
1515
*
16-
* TODO: Doesn't yet work for c1 merged, since it reuses code from visitor (constructors)
17-
* that need to be modified instead
18-
*
1916
* https://stackoverflow.com/questions/55501899/exception-in-intellijs-sbt-console-not-found-value-ideaport-ideaport-in-globa
2017
* problem with sbt...
2118
*/
@@ -27,7 +24,6 @@ trait ExtensibleVisitor extends OOApproachImplementationProvider with SharedVisi
2724

2825
lazy val visitorInstanceFactoryMethodPrefix: Name = names.mangle("make")
2926

30-
3127
/**
3228
* Instantiate an implementation of the visitor.
3329
*

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/FactoryConcepts.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions.{Attribute, DataTypeCase, Operation, TypeRep}

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/FieldDefinition.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.abstractions.Attribute
44
import org.combinators.ep.generator.Command.Generator

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/FutureVisitor.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/Interpreter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/OOApproachImplementationProvider.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/OperationAsClass.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.abstractions.{DataType, DataTypeCase, Operation, Parameter}
44
import org.combinators.ep.generator.Command.Generator

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/OperationInterfaceChain.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions.{DataType, Operation, TypeRep}

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/SharedOO.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.abstractions._
44
import org.combinators.ep.generator.Command.Generator

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/SharedVisitor.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.Model
44
import org.combinators.ep.domain.abstractions.{DataType, DataTypeCase, Operation, TypeRep}

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/Traditional.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/Trivially.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/ViTA.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/Visitor.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._

Diff for: ‎core/src/main/scala/org/combinators/ep/approach/oo/VisitorSideEffect.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.approach.oo
1+
package org.combinators.ep.approach.oo /*DI:LI:AD*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._

Diff for: ‎core/src/main/scala/org/combinators/ep/domain/tree.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
package org.combinators.ep.domain
1+
package org.combinators.ep.domain /*DI:LI:AI*/
22

33
import org.combinators.ep.domain.instances.InstanceRep
44

5-
/*DI:LI:AI*/
6-
75
/** Provides models of generic trees. */
86
package object tree {
97
/** Models a generic int-labeled tree with data of any type stored in its leaves. */

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/AbstractSyntax.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator
1+
package org.combinators.ep.generator /*DI:LI:AI*/
22

33
/** Provides type definitions for abstract syntax tree components. */
44
trait AbstractSyntax {

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/ApproachImplementationProvider.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import cats.data._
99
import cats.syntax._
1010
import cats.implicits._
1111
import org.combinators.ep.generator.Command._
12-
import org.combinators.ep.generator.paradigm.{AddImport, AnyParadigm, FindClass, Reify, ResolveImport, ToTargetLanguageType}
12+
import org.combinators.ep.generator.paradigm.{AddImport, AnyParadigm, ResolveImport}
1313
import AnyParadigm.syntax._
1414

1515
/** Provides implementations for language and approach specific code generation tasks which do not depend on a specific

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/Command.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator
1+
package org.combinators.ep.generator /*DI:LI:AI*/
22

33
import cats.data.State
44
import cats._

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/EvolutionImplementationProvider.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator
1+
package org.combinators.ep.generator /*DI:LI:AI*/
22

33
import cats.free.Free
44
import cats.kernel.Monoid

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/FreshNameProvider.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator
1+
package org.combinators.ep.generator /*DI:LI:AI*/
22

33
case class FreshNameProvider[Name](
44
pushName: (Name, Int) => Name,

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/NameProvider.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator
1+
package org.combinators.ep.generator /*DI:LI:AI*/
22

33
import org.combinators.ep.domain.{GenericModel, Model}
44
import org.combinators.ep.domain.abstractions._

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/TestImplementationProvider.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator
1+
package org.combinators.ep.generator /*DI:LI:AI*/
22

33
import cats.kernel.Monoid
44
import org.combinators.ep.domain.abstractions.{DataType, EqualsCompositeTestCase, EqualsTestCase, NotEqualsTestCase, Operation, TestCase, TypeRep}

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/Understands.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator
1+
package org.combinators.ep.generator /*DI:LI:AI*/
22

33
@scala.annotation.implicitNotFound(msg = "Context ${Context} does not understand ${Cmd}")
44
trait Understands[Context, Cmd <: Command] {

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/communication.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator
1+
package org.combinators.ep.generator /*DI:LI:AI*/
22

33
import org.combinators.ep.domain.abstractions.{Attribute, DataType, DataTypeCase, Operation, Parameter}
44

@@ -14,7 +14,6 @@ package object communication {
1414
)
1515
}
1616

17-
1817
/** Models a received request to perform an operation on a data type.
1918
*
2019
* At the time of delivery, the approach and language specific dispatch mechanism has filled in the data type case.

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/AnyParadigm.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package org.combinators.ep.generator.paradigm
1+
package org.combinators.ep.generator.paradigm /*DI:LI:AI*/
22

3-
import org.combinators.ep.domain.abstractions.{DataType, DataTypeCase, TypeRep}
4-
import org.combinators.ep.domain.instances.{DataTypeInstance, InstanceRep}
3+
import org.combinators.ep.domain.abstractions.TypeRep
54
import org.combinators.ep.generator.{AbstractSyntax, Command, FileWithPath, Understands}
65
import Command._
76
import cats.implicits._

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/Functional.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.combinators.ep.generator.paradigm
1+
package org.combinators.ep.generator.paradigm /*DI:LI:AI*/
22

3-
import org.combinators.ep.domain.abstractions.{DataType, TypeRep}
4-
import org.combinators.ep.generator.{AbstractSyntax, Command, Understands}
3+
import org.combinators.ep.domain.abstractions.TypeRep
4+
import org.combinators.ep.generator.{Command, Understands}
55
import org.combinators.ep.generator.Command.Generator
66

77
case class AddType[Name, TypeContext](name: Name, tpeGen: Generator[TypeContext, Unit]) extends Command {

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/Generics.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.combinators.ep.generator.paradigm
1+
package org.combinators.ep.generator.paradigm /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
4-
import org.combinators.ep.generator.{AbstractSyntax, Command, Understands}
4+
import org.combinators.ep.generator.{Command, Understands}
55

66
case class AddLowerBound[Type](bound: Type) extends Command {
77
type Result = Unit

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ObjectOriented.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm
1+
package org.combinators.ep.generator.paradigm /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.{AbstractSyntax, Command, Understands}
44
import Command.Generator

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ParametricPolymorphism.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.combinators.ep.generator.paradigm
1+
package org.combinators.ep.generator.paradigm /*DI:LI:AI*/
22

3-
import org.combinators.ep.generator.{AbstractSyntax, Command, Understands}
3+
import org.combinators.ep.generator.{Command, Understands}
44
import org.combinators.ep.generator.Command.Generator
55

66
case class AddTypeParameter[Name, TypeParameterContext](

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/control/Functional.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.control
1+
package org.combinators.ep.generator.paradigm.control /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
44
import org.combinators.ep.generator.{Command, Understands}

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/control/Imperative.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.control
1+
package org.combinators.ep.generator.paradigm.control /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
44
import org.combinators.ep.generator.{Command, Understands}

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ffi/Arithmetic.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.ffi
1+
package org.combinators.ep.generator.paradigm.ffi /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
44
import org.combinators.ep.generator.Understands

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ffi/Assertions.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.ffi
1+
package org.combinators.ep.generator.paradigm.ffi /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
44
import org.combinators.ep.generator.Understands

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ffi/Booleans.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.ffi
1+
package org.combinators.ep.generator.paradigm.ffi /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
44
import org.combinators.ep.generator.paradigm.{AnyParadigm, Apply}

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ffi/Equality.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.ffi
1+
package org.combinators.ep.generator.paradigm.ffi /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
44
import org.combinators.ep.generator.Understands

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ffi/FFI.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.ffi
1+
package org.combinators.ep.generator.paradigm.ffi /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
44
import org.combinators.ep.generator.paradigm.AnyParadigm

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ffi/Lists.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.ffi
1+
package org.combinators.ep.generator.paradigm.ffi /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
44
import org.combinators.ep.generator.Understands

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ffi/RealArithmetic.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.ffi
1+
package org.combinators.ep.generator.paradigm.ffi /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
44
import org.combinators.ep.generator.{Command, Understands}

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ffi/Strings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.ffi
1+
package org.combinators.ep.generator.paradigm.ffi /*DI:LI:AI*/
22

33
import org.combinators.ep.domain.abstractions.TypeRep
44
import org.combinators.ep.generator.Command.Generator

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ffi/Time.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.generator.paradigm.ffi
1+
package org.combinators.ep.generator.paradigm.ffi /*DI:LI:AI*/
22

33
import org.combinators.ep.generator.Command.Generator
44
import org.combinators.ep.generator.Understands

Diff for: ‎core/src/main/scala/org/combinators/ep/generator/paradigm/ffi/Trees.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package org.combinators.ep.generator.paradigm.ffi
1+
package org.combinators.ep.generator.paradigm.ffi /*DI:LI:AI*/
22

3-
import org.combinators.ep.domain.tree.Tree
43
import org.combinators.ep.generator.Command.Generator
54
import org.combinators.ep.generator.Understands
65
import org.combinators.ep.generator.paradigm.{AnyParadigm, Apply}

Diff for: ‎domain/math/src/main/scala/org/combinators/ep/domain/math/A1.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.domain.math
1+
package org.combinators.ep.domain.math /*DD:LI:AI*/
22

33
import org.combinators.ep.domain.{Evolution, GenericModel}
44
import org.combinators.ep.domain.abstractions.{DataTypeCase, EqualsTestCase, TestCase}

Diff for: ‎domain/math/src/main/scala/org/combinators/ep/domain/math/A1M3.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.domain.math
1+
package org.combinators.ep.domain.math /*DD:LI:AI*/
22

33
import org.combinators.ep.domain.{Evolution, GenericModel}
44
import org.combinators.ep.domain.abstractions.TestCase

Diff for: ‎domain/math/src/main/scala/org/combinators/ep/domain/math/A1M3I2.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.domain.math
1+
package org.combinators.ep.domain.math /*DD:LI:AI*/
22

33
import org.combinators.ep.domain.{Evolution, GenericModel}
44
import org.combinators.ep.domain.abstractions.TestCase

Diff for: ‎domain/math/src/main/scala/org/combinators/ep/domain/math/A3.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.combinators.ep.domain.math
1+
package org.combinators.ep.domain.math /*DD:LI:AI*/
22

33
import org.combinators.ep.domain.{Evolution, GenericModel}
44
import org.combinators.ep.domain.abstractions.{DataTypeCase, EqualsTestCase, TestCase}

Diff for: ‎domain/math/src/main/scala/org/combinators/ep/domain/math/M2.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.combinators.ep.domain.math
1+
package org.combinators.ep.domain.math /*DD:LI:AI*/
22

33
import org.combinators.ep.domain._
44
import org.combinators.ep.domain.abstractions._
5-
import org.combinators.ep.domain.instances.{DataTypeInstance, InstanceRep}
6-
import org.combinators.ep.domain.math.M0.{AddInst, Eval, LitInst}
7-
import org.combinators.ep.domain.math.M1.{Sub, SubInst}
5+
import org.combinators.ep.domain.instances.InstanceRep
6+
import org.combinators.ep.domain.math.M0.{AddInst, LitInst}
7+
import org.combinators.ep.domain.math.M1.SubInst
88

99
//class M2(val m1:M1) extends Evolution {
1010
object M2 extends Evolution {

Diff for: ‎domain/math/src/main/scala/org/combinators/ep/domain/math/M4.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.combinators.ep.domain._
44
import org.combinators.ep.domain.abstractions.{EqualsCompositeTestCase, EqualsTestCase, Operation, TestCase, TypeRep}
55
import org.combinators.ep.domain.instances.InstanceRep
66
import org.combinators.ep.domain.math.M0.{AddInst, Eval, LitInst}
7-
import org.combinators.ep.domain.math.M1.{Sub, SubInst}
7+
import org.combinators.ep.domain.math.M1.SubInst
88
import org.combinators.ep.domain.math.M2.{PrettyP, StringInst}
99
import org.combinators.ep.domain.math.M3.{DivdInst, MultInst, NegInst}
1010

Diff for: ‎domain/math/src/main/scala/org/combinators/ep/domain/math/M5.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.combinators.ep.domain.math.M0.{Lit, Add, AddInst, LitInst, DoubleInst
88
import org.combinators.ep.domain.math.M1.{Sub, SubInst}
99
import org.combinators.ep.domain.math.M2.{PrettyP, StringInst}
1010
import org.combinators.ep.domain.math.M3.{Divd, DivdInst, Mult, MultInst, Neg, NegInst}
11-
import org.combinators.ep.domain.math.M4.{Simplify}
11+
import org.combinators.ep.domain.math.M4.Simplify
1212

1313
object M5 extends Evolution {
1414
override implicit def getModel:GenericModel = M4.getModel.evolve("m5", Seq.empty, Seq(Operation.asTree, Identifier))

Diff for: ‎domain/math/src/main/scala/org/combinators/ep/domain/math/M6.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.combinators.ep.domain.math /*DD:LI:AI*/
22

3-
import org.combinators.ep.domain.{Evolution, GenericModel, Model}
4-
import org.combinators.ep.domain.abstractions.{DataType, EqualsTestCase, Operation, Parameter, PerformanceTestCase, TestCase, TypeRep}
3+
import org.combinators.ep.domain.{Evolution, GenericModel}
4+
import org.combinators.ep.domain.abstractions.{EqualsTestCase, Operation, Parameter, PerformanceTestCase, TestCase, TypeRep}
55
import org.combinators.ep.domain.instances.{DataTypeInstance, InstanceRep}
66
import org.combinators.ep.domain.math.M0.{Add, AddInst, LitInst}
7-
import org.combinators.ep.domain.math.M1.{Sub, SubInst}
8-
import org.combinators.ep.domain.math.M3.{Divd, DivdInst, Mult, MultInst, Neg, NegInst}
7+
import org.combinators.ep.domain.math.M1.SubInst
8+
import org.combinators.ep.domain.math.M3.{DivdInst, MultInst, NegInst}
99

1010
object M6 extends Evolution {
1111
override implicit def getModel:GenericModel = M5.getModel.evolve("m6", Seq.empty, Seq(Equals))

0 commit comments

Comments
 (0)