Swapped out Scala parser combinators library for FastParse

narrativeandplay · Mar 10, 2016 · 2c4baa9 · 2c4baa9
1 parent 51fb52a
commit 2c4baa9
Show file tree

Hide file tree

Showing 10 changed files with 602 additions and 403 deletions.
diff --git a/hypedyn-api/src/main/scala/org/narrativeandplay/hypedyn/events/Event.scala b/hypedyn-api/src/main/scala/org/narrativeandplay/hypedyn/events/Event.scala
@@ -142,7 +142,6 @@ sealed case class RedoResponse(src: String) extends Response
 sealed trait Action extends Event
 sealed case class CreateNode(node: Nodal, src: String) extends Action
 sealed case class UpdateNode(node: Nodal, updatedNode: Nodal, src: String) extends Action
-sealed case class MoveNode(node: Nodal, x:Double, y:Double, src: String) extends Action
 sealed case class DestroyNode(node: Nodal, src: String) extends Action
 
 sealed case class CreateFact(fact: Fact, src: String) extends Action

diff --git a/hypedyn-api/src/main/scala/org/narrativeandplay/hypedyn/events/EventBus.scala b/hypedyn-api/src/main/scala/org/narrativeandplay/hypedyn/events/EventBus.scala
@@ -118,8 +118,6 @@ object EventBus {
   val CreateStoryEvents = eventBus collect { case e: CreateStory => e }
   val UpdateStoryPropertiesEvents = eventBus collect { case e: UpdateStoryProperties => e }
 
-  val MoveNodeEvents = eventBus collect { case e: MoveNode => e }
-
   /**
    * Event stream of all `Completion`s
    */

diff --git a/...src/main/scala/org/narrativeandplay/hypedyn/plugins/narrativeviewer/NarrativeViewer.scala b/...src/main/scala/org/narrativeandplay/hypedyn/plugins/narrativeviewer/NarrativeViewer.scala
@@ -19,7 +19,6 @@ trait NarrativeViewer {
    * The plugin is automatically hooked into the appropriate event streams
    */
   EventBus.NodeCreatedEvents foreach { n => onNodeCreated(n.node) }
-  EventBus.MoveNodeEvents foreach { n => onMoveNode(n.node, n.x, n.y) }
   EventBus.NodeUpdatedEvents foreach { n => onNodeUpdated(n.node, n.updatedNode) }
   EventBus.NodeDestroyedEvents foreach { n => onNodeDestroyed(n.node) }
 
@@ -31,22 +30,13 @@ trait NarrativeViewer {
   def onNodeCreated(node: Nodal): Unit
 
   /**
-    * Defines what to do when a node is updated
-    *
-    * @param node The node to be updated
-    * @param updatedNode The same node with the updates already applied
-    */
+   * Defines what to do when a node is updated
+   *
+   * @param node The node to be updated
+   * @param updatedNode The same node with the updates already applied
+   */
   def onNodeUpdated(node: Nodal, updatedNode: Nodal): Unit
 
-  /**
-    * Defines what to do when a node should move
-    *
-    * @param node The node to be moved
-    * @param x The x coordinate
-    * @param y The y coordinate
-    */
-  def onMoveNode(node: Nodal, x:Double, y:Double): Unit
-
   /**
    * Defines what to do when a node is destroyed
    *

diff --git a/hypedyn-core/build.gradle b/hypedyn-core/build.gradle
@@ -5,6 +5,8 @@ dependencies {
     // For serialisation to JSON (save/load/export)
     compile "org.json4s:json4s-native_${rootProject.majorScalaVersion}:3.3.0"
 
+    compile "com.lihaoyi:fastparse_2.11:0.3.6"
+
     compile "commons-io:commons-io:2.4"
 
     compile "org.fxmisc.easybind:easybind:1.0.3"

diff --git a/hypedyn-core/src/main/scala/org/narrativeandplay/hypedyn/events/CoreEventDispatcher.scala b/hypedyn-core/src/main/scala/org/narrativeandplay/hypedyn/events/CoreEventDispatcher.scala
@@ -12,7 +12,6 @@ import org.narrativeandplay.hypedyn.story.internal.Story
 import org.narrativeandplay.hypedyn.story.rules.{ActionDefinitions, ConditionDefinitions, Fact}
 import org.narrativeandplay.hypedyn.undo._
 import org.narrativeandplay.hypedyn.utils.parsing.SchemeParser
-
 /**
  * Main event dispatcher for the core
  */
@@ -189,7 +188,11 @@ object CoreEventDispatcher {
 
   EventBus.ImportFromFileEvents foreach { evt =>
     val dataToImport = IoController read evt.file
-    val story:Story = SchemeParser.parse(dataToImport)
+    val parseResult = SchemeParser.parse(dataToImport)
+    val story = parseResult("story").asInstanceOf[Story]
+    val pluginData = parseResult("plugins").asInstanceOf[AstMap]
+
+    Console.println(pluginData.toString)
 
     StoryController.load(story)
 
@@ -199,6 +202,7 @@ object CoreEventDispatcher {
     UndoController.markCurrentPosition()
 
     EventBus.send(StoryLoaded(StoryController.story, CoreEventSourceIdentity))
+    EventBus.send(DataLoaded(pluginData.toMap, CoreEventSourceIdentity))
     EventBus.send(FileLoaded(loadedFile, CoreEventSourceIdentity))
   }