BROKEN partial redo of room tree composition

src/Dodge/Tree/Compose/Data.hs

@@ -10,9 +10,9 @@ data ComposingNode a
     | UseSome   {_composeIndices :: [Int], _unCompose :: a}
     | UseNone   {_unCompose :: a}
     | UseLabel  {_composeIndex :: Int, _unCompose :: a} -- defaults to using no children
-type SubCompTree a = Tree (ComposingNode a)
-type CompTree a = Tree (SubCompTree a)
-type LabSubCompTree a = (Tree (ComposingNode a),TreeSubLabelling)
+type SubCompTree a = Tree a
+type CompTree a = Tree (Tree a)
+type LabSubCompTree a = (a -> Maybe ([String],a),Tree a)
 type LabCompTree a = Tree (LabSubCompTree a)
 data TreeSubLabelling = TreeSubLabelling
     { _topLabel :: String
@@ -20,3 +20,4 @@ data TreeSubLabelling = TreeSubLabelling
     }
 makeLenses ''ComposingNode
 makeLenses ''TreeSubLabelling
+