Merge branch 'development'

inkle · Apr 12, 2016 · 12f04d3 · 12f04d3
2 parents 8e66757 + 486fef8
commit 12f04d3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/ink-engine-runtime/Story.cs b/ink-engine-runtime/Story.cs
@@ -1044,6 +1044,10 @@ internal void CallExternalFunction(string funcName, int numberOfArguments)
                 arguments.Add (valueObj);
             }
 
+            // Reverse arguments from the order they were popped,
+            // so they're the right way round again.
+            arguments.Reverse ();
+
             // Run the function!
             object funcResult = func (arguments.ToArray());
 

diff --git a/tests/Tests.cs b/tests/Tests.cs
@@ -1676,21 +1676,33 @@ public void TestExternalBinding()
             var story = CompileString (@"
 EXTERNAL message(x)
 EXTERNAL multiply(x,y)
+EXTERNAL times(i,str)
 ~ message(""hello world"")
 {multiply(5.0, 3)}
+{times(3, ""knock "")}
 ");
             string message = null;
 
             story.BindExternalFunction ("message", (string arg) => {
                 message = "MESSAGE: "+arg;
             });
 
-            story.BindExternalFunction ("multiply", (int arg1, float arg2) => {
+            story.BindExternalFunction ("multiply", (float arg1, int arg2) => {
                 return arg1 * arg2;
             });
 
+            story.BindExternalFunction ("times", (int numberOfTimes, string str) => {
+                string result = "";
+                for(int i=0; i<numberOfTimes; i++) {
+                    result += str;
+                }
+                return result;
+            });
+
 
-            Assert.AreEqual ("15\n", story.ContinueMaximally());
+            Assert.AreEqual ("15\n", story.Continue());
+
+            Assert.AreEqual ("knock knock knock \n", story.Continue());
 
             Assert.AreEqual ("MESSAGE: hello world", message);
         }