From b1e02034e24c1e9fe3c15ffc24d97c48472b29fa Mon Sep 17 00:00:00 2001 From: Alex Proudfoot Date: Sun, 25 Oct 2020 12:52:53 +0000 Subject: [PATCH 1/3] Fixed ZILF-229 --- zillib/verbs.zil | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/zillib/verbs.zil b/zillib/verbs.zil index 2aa660b..b8a0d24 100644 --- a/zillib/verbs.zil +++ b/zillib/verbs.zil @@ -902,28 +902,17 @@ Returns: ) - (ELSE - - - ) - (ELSE )> - - - - ) - (ELSE )> - )> - )>)> + (ELSE + + + ) + (ELSE )> + + + )> + )>)> > ) - ( - - - - ) - (ELSE )> - ) (ELSE @@ -1147,15 +1136,17 @@ Returns: - ) - (ELSE )> - > + > + + ) + (ELSE )>) + (ELSE )>> - > - ) - (ELSE )>> + > + + ) + (ELSE )>> ) -- GitLab From 8a5ab7180f17fdf3e310e675c996f4b2c0b102b2 Mon Sep 17 00:00:00 2001 From: Jesse McGrew Date: Tue, 8 Dec 2020 13:03:11 -0800 Subject: [PATCH 2/3] Fix Invoke-ZLR in test.ps1 to work with .NET 5 ZLR. --- zillib/tests/test.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zillib/tests/test.ps1 b/zillib/tests/test.ps1 index 2478946..c81fa9b 100644 --- a/zillib/tests/test.ps1 +++ b/zillib/tests/test.ps1 @@ -35,7 +35,7 @@ Set-Alias izapf Invoke-Zapf function Invoke-ZLR { param ([string]$StoryFile = $(throw "StoryFile parameter is required.")) - & dotnet run --project $zlrProjectPath --framework netcoreapp2.2 -- -nowait -dumb $StoryFile + & dotnet run --project $zlrProjectPath -- -nowait -dumb $StoryFile } Set-Alias izlr Invoke-ZLR -- GitLab From 0b106885f31984754bef6404717eb4938cb0f7d3 Mon Sep 17 00:00:00 2001 From: Jesse McGrew Date: Tue, 8 Dec 2020 13:11:25 -0800 Subject: [PATCH 3/3] Update 'then' and 'multiples' zillib test cases for new take/wear behavior. --- zillib/tests/test-multiples.zil | 16 ++++++++-------- zillib/tests/test-then.zil | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zillib/tests/test-multiples.zil b/zillib/tests/test-multiples.zil index 961e9a5..72c95e6 100644 --- a/zillib/tests/test-multiples.zil +++ b/zillib/tests/test-multiples.zil @@ -79,13 +79,13 @@ - > > > - >> + >>> >> >> >> @@ -93,12 +93,12 @@ apple: Taken.|"> - > > >> - >> + >>> >> >> >> @@ -106,11 +106,11 @@ apple: Taken.|"> - + > >> >> - >> + >>> >> >> >> @@ -118,9 +118,9 @@ apple: Taken.|"> - - >> + >>> > >>> diff --git a/zillib/tests/test-then.zil b/zillib/tests/test-then.zil index fd39236..f5d650f 100644 --- a/zillib/tests/test-then.zil +++ b/zillib/tests/test-then.zil @@ -81,7 +81,7 @@ | You pick up the banana.| | -You wear the hat.|">> +You pick up the hat.|">> -- GitLab