support for note octave, duration and accidental

Author: FunkeMT

src/main/scala/de/htwg/scalala/advancedDsl/Note.scala

@@ -2,7 +2,7 @@ package de.htwg.scalala.advancedDsl
 
 import de.htwg.scalala.music.Key
 
-case class Note(name: String) extends NoteElement {
+case class Note(name: String, accidental: String = "", duration: Int = 0, octave: String = "") extends NoteElement {
   val notes = Map[String, Key](
     "c" -> Key(midiNumber = 60),
     "d" -> Key(midiNumber = 62),
@@ -17,5 +17,19 @@ case class Note(name: String) extends NoteElement {
     "HiHatOpen" -> Key(midiNumber = 46)
   )
 
-  val note: Key = notes.get(name).orNull
+  val note: Key = {
+    println(accidental)
+    var n = accidental match {
+      case "sharp" => notes.get(name).get.sharp
+      case "flat" => notes.get(name).get.flat
+      case "dot" => notes.get(name).get.dot
+      case _ => notes.get(name).orNull
+    }
+    n = octave match {
+      case "+" => n +
+      case "-" => n -
+      case _ => n
+    }
+    n.ticks(if (duration > 0) 16/duration else 16)
+  }
 }

src/main/scala/de/htwg/scalala/advancedDsl/Reader.scala

@@ -13,8 +13,12 @@ class Reader extends StandardTokenParsers {
     "play",
     "plays",
     "tempo",
-    "at")
-  lexical.delimiters += (",", "(", ")")
+    "at",
+    "c" , "d" , "e" , "f" , "g" , "a" , "h",
+    "2", "4", "8", "16",
+    "sharp", "flat", "dot"
+  )
+  lexical.delimiters += (",", "(", ")", "/", ".", "+", "-")
 
 
   def song: Parser[Song] = rep(musician | track) ^^ {
@@ -73,8 +77,8 @@ class Reader extends StandardTokenParsers {
 
 
 
-  def note: Parser[Note] = ident ^^ {
-    case i => new Note(i)
+  def note: Parser[Note] = opt(octave) ~ ("c" | "d" | "e" | "f" | "g" | "a" | "h") ~ opt("." ~> accidental) ~ opt("/" ~> duration) ^^ {
+    case o ~ n ~ a ~ d => new Note(n, a.getOrElse(""), d.getOrElse(0), o.getOrElse(""))
   }
 
   def chord: Parser[Chord] = ("chord" ~> "(") ~> repsep(note, ",") <~ ")" ^^ {
@@ -83,7 +87,21 @@ class Reader extends StandardTokenParsers {
 
 
 
-  
+  def octave: Parser[String] = ("+" | "-") ^^ {
+    o => o
+  }
+
+  def accidental: Parser[String] = ("sharp" | "flat" | "dot") ^^ {
+    a => a
+  }
+
+  def duration: Parser[Int] = numericLit ^^ {
+    d => d.toInt
+  }
+
+
+
+
   def parseAll[T](p: Parser[T], in: String): ParseResult[T] = {
     phrase(p)(new lexical.Scanner(in))
   }