Added Presentation.cc map.

Author: robby-phd

library/shared/src/main/scala/org/sireum/presentasi/JSON.scala

@@ -79,7 +79,8 @@ object JSON {
         ("textVolume", printF64(o.textVolume)),
         ("trailing", printZ(o.trailing)),
         ("granularity", printZ(o.granularity)),
-        ("entries", printISZ(F, o.entries, printPresentationEntry _))
+        ("entries", printISZ(F, o.entries, printPresentationEntry _)),
+        ("cc", printHashSMap(T, o.cc, printString _, printString _))
       ))
     }
 
@@ -194,7 +195,10 @@ object JSON {
       parser.parseObjectKey("entries")
       val entries = parser.parseISZ(parsePresentationEntry _)
       parser.parseObjectNext()
-      return Presentation(name, args, delay, textDelay, vseekDelay, textVolume, trailing, granularity, entries)
+      parser.parseObjectKey("cc")
+      val cc = parser.parseHashSMap(parser.parseString _, parser.parseString _)
+      parser.parseObjectNext()
+      return Presentation(name, args, delay, textDelay, vseekDelay, textVolume, trailing, granularity, entries, cc)
     }
 
     def eof(): B = {

library/shared/src/main/scala/org/sireum/presentasi/Presentation.scala

@@ -50,7 +50,7 @@ object Presentation {
   type Slide = SlideEntry
   type Video = VideoEntry
 
-  val empty: Presentation = Presentation("Presentasi", ISZ(), 2000, 2000, 250, 1.0, 2000, 1, ISZ())
+  val empty: Presentation = Presentation("Presentasi", ISZ(), 2000, 2000, 250, 1.0, 2000, 1, ISZ(), HashSMap.empty)
 
   val Slide: Slide = SlideEntry("", 0, "")
 
@@ -66,17 +66,18 @@ object Presentation {
                              val textVolume: F64,
                              val trailing: Z,
                              val granularity: Z,
-                             val entries: ISZ[Presentation.Entry]) {
+                             val entries: ISZ[Presentation.Entry],
+                             val cc: HashSMap[String, String]) {
 
   @strictpure def +(entry: Presentation.Entry): Presentation =
-    Presentation(name, args, delay, textDelay, vseekDelay, textVolume, trailing, granularity, entries :+ entry)
+    this(entries = entries :+ entry)
 
   @strictpure def ++(es: ISZ[Presentation.Entry]): Presentation =
-    Presentation(name, args, delay, textDelay, vseekDelay, textVolume, trailing, granularity, entries ++ es)
+    this(entries = entries ++ es)
 
   def cli(args: ISZ[String]): Unit = {
     val thisL = this
     println(JSON.fromPresentation(thisL(args = args), T))
   }
 
-}
+}