Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
1ad550a
Update dependencies (remove some breakages)
JanBessai Apr 23, 2025
82396e6
Cleanup toward Scala 3
JanBessai May 14, 2025
4453c4a
Cleanup until Java Main
JanBessai May 21, 2025
fd84c74
Most Scala 3 translation fixed up to language-java.
JanBessai May 21, 2025
b64ee69
Solve some lazy val inheritance issues in Scala3 with case classes
JanBessai May 28, 2025
decc921
Fix java code generator for Scala 3
JanBessai Jun 18, 2025
360c55b
Fix Scala 3 for the scala generator
JanBessai Jun 18, 2025
39729fa
Refactor core to extract cogen
JanBessai Jun 25, 2025
a5006c7
Factor out approaches into subproject and refactor domains
JanBessai Jul 9, 2025
5246ee0
Refactored/fixed language-java for cogen
JanBessai Jul 9, 2025
e2a2c3c
Refactored/fixed language inbetween
JanBessai Jul 9, 2025
899c9b1
Refactor/fix language newScala for cogen
JanBessai Jul 9, 2025
7347c6d
Fix coco and java lists after refactor
JanBessai Jul 16, 2025
4bb2a4c
Updated helloWorld so it compiles properly and cleaned up lots of Sca…
heineman Jul 17, 2025
36a3c2a
Continuing clean-up of code
heineman Jul 21, 2025
8bff401
Updated documentation
heineman Jul 30, 2025
b059e50
Toward moving Trees into builder:
JanBessai Aug 27, 2025
4b41711
Toward refactoring for seperate domain type extensions (e.g., here: T…
JanBessai Sep 26, 2025
531d5e4
Refactored Inbetween up to generics and ffi
JanBessai Sep 26, 2025
3b8d392
Refactor inbetween Generics
JanBessai Sep 26, 2025
3d6e0ad
inbetween FFI refactored
JanBessai Oct 15, 2025
c90bc6e
Initial refactor of newScala to improved CoCo pattern
JanBessai Oct 15, 2025
c414e49
Initial work on finalized layer for ScalaBaseAST
JanBessai Oct 22, 2025
fda705f
Initial work on FFIASTs for scala
JanBessai Oct 22, 2025
6a84b2d
Some more finalized new Scala factories, including a NameProvider
JanBessai Oct 29, 2025
4dc49b0
Completed rest, but two compilation errors remain.
heineman Oct 31, 2025
6190417
Some progress on scalaBase FinalFactories
JanBessai Nov 5, 2025
136992c
Patched up as many as I could, with a few remaining.
heineman Nov 6, 2025
d0b4873
Minor fixes
heineman Nov 6, 2025
ccb6335
Most scala FFIs in new style
JanBessai Nov 12, 2025
2046448
starting process of upgrading code
heineman Nov 13, 2025
b1b7f77
Finish scala ASTs
JanBessai Nov 19, 2025
0272eec
Scala code generator overhaul done
JanBessai Nov 19, 2025
f6100d2
Merge branch 'inbetween_cleanup' of https://github.com/combinators/ex…
heineman Nov 25, 2025
ce8a346
I was able to generate HelloWorld and Fibonacci Scala code using the …
heineman Nov 25, 2025
380f109
Got EpCoGen to run (without Trees in Scala).
heineman Nov 28, 2025
e7b6bb6
Add missing genericsFactory in newScala BaseAST
JanBessai Dec 3, 2025
05f47b0
Add missing FinalNameProviderAST in newScala
JanBessai Dec 3, 2025
989fd58
Remove treeLibrary from CodeGenerator2 in newScala
JanBessai Dec 3, 2025
23cfaf9
Some progress on Trees in builder.
JanBessai Dec 3, 2025
38825ea
Removing un-matched trailing */
heineman Dec 8, 2025
89ca200
Add capability to include custom files in Project and fix Scala build…
JanBessai Dec 10, 2025
cb198fe
Moved a fibonacci Main to the builder.
heineman Dec 11, 2025
6ba199c
Fix missing typeLookupMap copy and override vals
JanBessai Dec 17, 2025
2f5bc3f
Merge branch 'inbetween_cleanup' of github.com:combinators/expression…
JanBessai Dec 17, 2025
75e88da
Bump scala version
JanBessai Dec 17, 2025
7eb5dec
Fixup trait logic
JanBessai Dec 17, 2025
0e4cf94
Fix missing type registration in classes and constructors
JanBessai Jan 14, 2026
4a9eb77
Updated and prepared for removing 2s from classes
heineman Jan 14, 2026
df4844f
Remove old-style inbetween/newScala files
JanBessai Jan 14, 2026
14521cd
Rename XXX2 created in newstyle refactor to XXX
JanBessai Jan 14, 2026
6e79165
Fixup helloworld examples, especially fix missing FinalTypes in newScala
JanBessai Jan 14, 2026
12cda7d
Add ci-pipeline publishing for cogen
JanBessai Feb 4, 2026
8b162a4
Merge branch 'main' into inbetween_cleanup
JanBessai Feb 4, 2026
3ae1bd4
Fix sbt version and publish only for cogen
JanBessai Feb 4, 2026
14ebe5b
Merge branch 'inbetween_cleanup' of github.com:combinators/expression…
JanBessai Feb 4, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Minor fixes
  • Loading branch information
heineman committed Nov 6, 2025
commit d0b487337eaa8c9af57fe084f295c4ccc727f703
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ trait AnyAST {
def copy(
function: Expression = this.function,
arguments: Seq[Expression] = this.arguments
): ApplyExpression = applyExpression(function, arguments)
): ApplyExpression = factory.applyExpression(function, arguments)
}

trait ArgumentExpression extends Expression {
Expand Down Expand Up @@ -122,7 +122,7 @@ trait AnyAST {
): TestSuite = factory.testSuite(name, tests, methodTypeLookupMap)
}

trait CompilationUnit {
trait CompilationUnit {
def getSelfCompilationUnit: finalTypes.CompilationUnit

def name: Seq[Name] = Seq.empty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1483,7 +1483,6 @@ trait FinalBaseAST extends BaseAST {
}
ADT(name, imports, typeConstructors, typeLookupMap)
}

def typeConstructor(name: any.Name, parameters: Seq[(any.Name, any.Type)]): functional.TypeConstructor = {
case class TypeConstructor(override val name: any.Name,
override val parameters: Seq[(any.Name, any.Type)]
Expand Down Expand Up @@ -1646,7 +1645,6 @@ trait FinalBaseAST extends BaseAST {
}
AssignVariable(variable, expression)
}

// cannot find LiftExpression in scalaBase.*.LiftExpression
def liftExpression(expression: any.Expression): imperative.LiftExpression = {
case class LiftExpression(expression:any.Expression)
Expand All @@ -1655,7 +1653,6 @@ trait FinalBaseAST extends BaseAST {
}
LiftExpression(expression)
}

def ifThenElse(condition: any.Expression,
ifBranch: Seq[any.Statement],
elseIfBranches: Seq[(any.Expression, Seq[any.Statement])],
Expand Down