Fixed but with diverting to nested labels

astrochili · Oct 17, 2021 · 4d93449 · 4d93449
1 parent 3006e46
commit 4d93449
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 7 deletions.
diff --git a/narrator/story.lua b/narrator/story.lua
@@ -260,12 +260,13 @@ function Story:pathChainForLabel(path)
   local function findLabelChainInItems(items)
     for index, item in ipairs(items) do
 
-      if item.label == label then return { index }
+      if item.label == label then
+        return { index }
 
       elseif item.node ~= nil then
         local result = findLabelChainInItems(item.node)
         if result ~= nil then
-          table.insert(result, 0, index)
+          table.insert(result, 1, index)
           return result
         end
 
@@ -276,8 +277,8 @@ function Story:pathChainForLabel(path)
           for caseIndex, case in ipairs(cases) do
             local result = findLabelChainInItems(case)
             if result ~= nil then
-              table.insert(result, 0, 't' .. caseIndex)
-              table.insert(result, 0, index)
+              table.insert(result, 1, 't' .. caseIndex)
+              table.insert(result, 1, index)
               return result
             end
           end
@@ -286,8 +287,8 @@ function Story:pathChainForLabel(path)
         if type(item.failure) == 'table' then
           local result = findLabelChainInItems(item.failure)
           if result ~= nil then
-            table.insert(result, 0, 'f')
-            table.insert(result, 0, index)
+            table.insert(result, 1, 'f')
+            table.insert(result, 1, index)
             return result
           end
         end

diff --git a/test/cases.lua b/test/cases.lua
@@ -29,9 +29,11 @@ local units = {
   'choices-sticky',
   'choices-fallback',  
 
+  'labels-choices',
+  'labels-nested',
+
   'branching',
   'nesting',
-  'labels',
   'loop',
   'vars',
   'constants',

diff --git a/test/units/labels.ink → test/units/labels-choices.ink b/test/units/labels.ink → test/units/labels-choices.ink
diff --git a/test/units/labels/1-1.txt → test/units/labels-choices/1-1.txt b/test/units/labels/1-1.txt → test/units/labels-choices/1-1.txt
diff --git a/test/units/labels/1-2.txt → test/units/labels-choices/1-2.txt b/test/units/labels/1-2.txt → test/units/labels-choices/1-2.txt
diff --git a/test/units/labels/2-1.txt → test/units/labels-choices/2-1.txt b/test/units/labels/2-1.txt → test/units/labels-choices/2-1.txt
diff --git a/test/units/labels/2-2-1.txt → test/units/labels-choices/2-2-1.txt b/test/units/labels/2-2-1.txt → test/units/labels-choices/2-2-1.txt
diff --git a/test/units/labels/2-2-2.txt → test/units/labels-choices/2-2-2.txt b/test/units/labels/2-2-2.txt → test/units/labels-choices/2-2-2.txt
diff --git a/test/units/labels-nested.ink b/test/units/labels-nested.ink
@@ -0,0 +1,22 @@
+-> dialog_start
+==dialog_start==
+
+* [Tell me about the mister]
+- - (dima)
+- - His name is Dima.
+* * {not vika} [Tell me about Vika]
+      -> vika
+* * [Finish conversation]
+      -> stop_dialog
+
+* [Tell me about the missis]
+- - (vika)
+  Her name is Vika.
+* * {not dima} [Tell me about Dima]
+      -> dima
+* * [Finish conversation]
+      -> stop_dialog
+
+==stop_dialog==
+That's all.
+-> END
diff --git a/test/units/labels-nested/1-1-1.txt b/test/units/labels-nested/1-1-1.txt
@@ -0,0 +1,14 @@
+
+>) Tell me about the mister
+2) Tell me about the missis
+
+His name is Dima.
+
+>) Tell me about Vika
+2) Finish conversation
+
+Her name is Vika.
+
+>) Finish conversation
+
+That's all.
diff --git a/test/units/labels-nested/1-2.txt b/test/units/labels-nested/1-2.txt
@@ -0,0 +1,10 @@
+
+>) Tell me about the mister
+2) Tell me about the missis
+
+His name is Dima.
+
+1) Tell me about Vika
+>) Finish conversation
+
+That's all.
diff --git a/test/units/labels-nested/2-1-1.txt b/test/units/labels-nested/2-1-1.txt
@@ -0,0 +1,14 @@
+
+1) Tell me about the mister
+>) Tell me about the missis
+
+Her name is Vika.
+
+>) Tell me about Dima
+2) Finish conversation
+
+His name is Dima.
+
+>) Finish conversation
+
+That's all.
diff --git a/test/units/labels-nested/2-2.txt b/test/units/labels-nested/2-2.txt
@@ -0,0 +1,10 @@
+
+1) Tell me about the mister
+>) Tell me about the missis
+
+Her name is Vika.
+
+1) Tell me about Dima
+>) Finish conversation
+
+That's all.