[#328] [stbx-proto] Don't depend on halogen-petrinet-editor for type …

…Marking.
statebox · Feb 26, 2020 · f66e25b · f66e25b
1 parent 1018e92
commit f66e25b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/stbx-protocol/spago.dhall b/stbx-protocol/spago.dhall
@@ -3,11 +3,7 @@
 , name =
     "stbx-protocol"
 , dependencies =
-    [ "halogen-petrinet-editor"
-    , "stbx-core"
-    , "stbx-tx-store"
-    , "studio-common"
-    ]
+    [ "stbx-core", "studio-common", "stbx-tx-store" ]
 , packages =
     ./../packages.dhall
 }
diff --git a/stbx-protocol/src/Statebox/Protocol/ExecutionState.purs b/stbx-protocol/src/Statebox/Protocol/ExecutionState.purs
@@ -1,10 +1,15 @@
 module Statebox.Protocol.ExecutionState where
 
 import Statebox.Core.Transaction (TxId)
-import View.Petrinet.Model (Marking)
+import Statebox.Core.Types (PID)
+import Data.Petrinet.Representation.Marking (MarkingF)
 
 type ExecutionState =
   { lastFiring :: TxId
   , wiring     :: TxId
   , marking    :: Marking
   }
+
+-- TODO dedupe
+type Marking = MarkingF PID Tokens
+type Tokens = Int
diff --git a/stbx-protocol/src/Statebox/Protocol/Fire.purs b/stbx-protocol/src/Statebox/Protocol/Fire.purs
@@ -8,10 +8,10 @@ import Data.Maybe (maybe)
 import Data.NonEmpty (head)
 
 import Data.Petrinet.Representation.Dict (fireAtMarking)
+import Data.Petrinet.Representation.Marking (MarkingF)
 import Statebox.Core.Transition (gluedTokens)
-import Statebox.Core.Types (Firing, Wiring)
+import Statebox.Core.Types (Firing, Wiring, PID)
 import Statebox.Core.WiringTree (LinearizationError, fromWiring, linearize)
-import View.Petrinet.Model (Marking)
 
 data FiringError
 
@@ -42,3 +42,7 @@ fire wiring firing marking = maybe
           (index gluedTransitions transitionIndex))
       (linearize wiringTree))
   (fromWiring wiring)
+
+-- TODO dedupe
+type Marking = MarkingF PID Tokens
+type Tokens = Int