*refactor tree

*refactor colorSchemes

1 files changed, 5 insertions, 3 deletions

diff --git a/src/main/scala/scalam/m/ast/tree.scala b/src/main/scala/scalam/m/ast/tree.scala
index cad1859..a99b50c 100644
--- a/src/main/scala/scalam/m/ast/tree.scala
+++ b/src/main/scala/scalam/m/ast/tree.scala
@@ -13,9 +13,11 @@ case class DoubleLiteral(x: Double) extends Expression { def m = x.toString }
 case class StringLiteral(x: String) extends Expression { def m = "'" + x.toString + "'" }
 case object SliceLiteral extends Expression { def m = ":" }
 case class ArrayLiteral(elements: Expression*) extends Expression {
-  def m = elements.mkString("[", ",", "]")
+  def m = elements.map(_.m).mkString("[", ",", "]")
+}
+case class MatrixLiteral(rows: Expression*) extends Expression {
+  def m = rows.map(_.m).mkString("[", ";", "]")
 }
-
 case class Variable(id: Identifier) extends Expression { def m = id.m }
 case class IndexMatrix(id: Identifier, indices: Expression*) extends Expression {
   def m = id.m + indices.map(_.m).mkString("(", ",", ")")
@@ -23,7 +25,7 @@ case class IndexMatrix(id: Identifier, indices: Expression*) extends Expression
 case class IndexStructure(id: Identifier, indices: Expression*) extends Expression {
   def m = id.m + indices.map(_.m).mkString("{", ",", "}")
 }
-case class Call(function: Identifier, params: Expression*) extends Expression {
+case class Function(function: Identifier, params: Expression*) extends Expression {
   def m = function.m + params.map(_.m).mkString("(", ",", ")")
 }