move interpreters to seperate package

5 files changed, 27 insertions, 8 deletions

diff --git a/src/main/scala/scalam/m/Interpreter.scala b/src/main/scala/scalam/m/interpretation/Interpreter.scala
index b4be651..93411c3 100644
--- a/src/main/scala/scalam/m/Interpreter.scala
+++ b/src/main/scala/scalam/m/interpretation/Interpreter.scala
@@ -1,4 +1,4 @@
-package scalam.m
+package scalam.m.interpretation
 
 import scalax.file.Path
 import scala.sys.process._
diff --git a/src/main/scala/scalam/m/MatlabInterpreter.scala b/src/main/scala/scalam/m/interpretation/MInterpreter.scala
index 2b055e2..b154cd7 100644
--- a/src/main/scala/scalam/m/MatlabInterpreter.scala
+++ b/src/main/scala/scalam/m/interpretation/MInterpreter.scala
@@ -1,18 +1,18 @@
-package scalam.m
+package scalam
+package m
+package interpretation
 
 import ast._
 import scalax.file.Path
 
-class MatlabInterpreter(pwd: Path) extends Interpreter("matlab -nosplash -nodesktop", pwd) {
+class MInterpreter(command: String, pwd: Path) extends Interpreter(command, pwd){
+  
   def evaluate(root: ast.Root) = write(root.line + "\n")
+  
   def exit() = {
     val cmd = Function(Identifier("exit"))
     evaluate(cmd)
     super.close()
   }
-  
-}
 
-object MatlabInterpreter {
-  final val command = "matlab -nosplash -nodesktop"
 }
\ No newline at end of file
diff --git a/src/main/scala/scalam/m/interpretation/MatlabInterpreter.scala b/src/main/scala/scalam/m/interpretation/MatlabInterpreter.scala
new file mode 100644
index 0000000..34534e6
--- /dev/null
+++ b/src/main/scala/scalam/m/interpretation/MatlabInterpreter.scala
@@ -0,0 +1,8 @@
+package scalam
+package m
+package interpretation
+
+import ast._
+import scalax.file.Path
+
+class MatlabInterpreter(pwd: Path) extends MInterpreter("matlab -nosplash -nodesktop", pwd)
\ No newline at end of file
diff --git a/src/main/scala/scalam/m/interpretation/OctaveInterpreter.scala b/src/main/scala/scalam/m/interpretation/OctaveInterpreter.scala
new file mode 100644
index 0000000..c55166b
--- /dev/null
+++ b/src/main/scala/scalam/m/interpretation/OctaveInterpreter.scala
@@ -0,0 +1,9 @@
+package scalam
+package m
+package interpretation
+
+import ast._
+import scalax.file.Path
+
+
+class OctaveInterpreter(pwd: Path) extends MInterpreter("octave", pwd)
\ No newline at end of file
diff --git a/src/main/scala/scalam/plotting/Plotter.scala b/src/main/scala/scalam/plotting/Plotter.scala
index 46e579f..341b976 100644
--- a/src/main/scala/scalam/plotting/Plotter.scala
+++ b/src/main/scala/scalam/plotting/Plotter.scala
@@ -3,13 +3,15 @@ package scalam.plotting
 import scalam.m._
 import scalam.m.ast._
 import scalam.plotting.styles._
+import scalam.m.interpretation.MInterpreter
+import scalam.m.interpretation.MatlabInterpreter
 
 trait Plotter {
   import Plotter._
   
   val pwd: scalax.file.Path
   
-  lazy val interpreter = new MatlabInterpreter(pwd)
+  lazy val interpreter: MInterpreter = new MatlabInterpreter(pwd)
   
   def plot(dataSets: Seq[DataSet], title: String, x: String, y: String, grid: Boolean = true, legend: Boolean = true)(implicit styles: Seq[Style[_]] = defaultStyles, fontSize: FontSize =  defaultFontSize) = {
     val p = new Plot(dataSets, title, x, y, grid, legend, styles = styles, fontSize = fontSize.fontSize)