refactor abstract syntax trees:

*abstract sytax trees are now backed by pattern matching
*add support for comments

1 files changed, 19 insertions, 45 deletions

diff --git a/src/main/scala/scalam/m/ast/package.scala b/src/main/scala/scalam/m/ast/package.scala
index f3a3736..245c6c4 100644
--- a/src/main/scala/scalam/m/ast/package.scala
+++ b/src/main/scala/scalam/m/ast/package.scala
@@ -1,54 +1,28 @@
 package scalam.m.ast
 
-trait Mable { def m: String }
-
-//top level m constructs
-case class Identifier(name: String) extends Mable {
-  def m: String = name
+/** Trait common to all objects having a representation in the matlab programming language. */
+trait Mable {
+  def m: String
+}
 
-  def toValid = {
-    val word = name.filter(c => c.isLetterOrDigit || c == '_')
-    val id = word.headOption match {
-      case None => sys.error("")
-      case Some(c) => if (!c.isLetter) 'x' + word else word
-    }
-    Identifier(id)
+trait Root {
+  final def line: String = this match {
+    case statement: Statement => statement.m + ";"
+    case expression: Expression => expression.m + ";"
+    case comment: Comment => comment.m
   }
 }
-trait Expression extends Mable
-trait Statement extends Mable
-case class Comment(text: String) extends Mable {def m = "% " + text}
 
-//expressions
-case class IntLiteral(x: Int) extends Expression { def m = x.toString }
-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.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("(", ",", ")")
-}
-case class IndexStructure(id: Identifier, indices: Expression*) extends Expression {
-  def m = id.m + indices.map(_.m).mkString("{", ",", "}")
-}
-case class Function(function: Identifier, params: Expression*) extends Expression {
-  def m = function.m + params.map(_.m).mkString("(", ",", ")")
+trait Comment extends Mable with Root {
+  def m = this match {
+    case SimpleComment(text) => "% " + text
+    case DoubleComment(text) => "%% " + text
+    case EOLComment(root, comment) => root.line + " " + comment.m
+  }
 }
 
-//statements
-case class Assign(variable: Identifier, value: Expression) extends Statement {
-  def m = variable.m + " = " + value.m + ";"
-}
-case class AssignMatrixIndex(variable: Identifier, indices: Seq[Expression], value: Expression) extends Statement {
-  def m = variable.m + indices.map(_.m).mkString("(", ",", ")") + " = " + value.m + ";"
-}
+case class SimpleComment(text: String) extends Comment
+case class DoubleComment(text: String) extends Comment
+case class EOLComment(root: Root, comment: Comment) extends Comment
+
 
-case class Evaluate(expression: Expression) extends Statement {
-  def m = expression.m + ";"
-}
\ No newline at end of file