kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix failure to handle otherwise blocks with multiple expressions

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-10-13 11:30:34 -06:00
parent 47215b0934
commit 314edc61ef
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kiss/src/kiss/SpecialForms.hx
View File

@@ -273,10 +273,11 @@ class SpecialForms {
// Therefore only one case is required in a case statement, because one case could be enough // Therefore only one case is required in a case statement, because one case could be enough
// to cover all patterns. // to cover all patterns.
wholeExp.checkNumArgs(2, null, '(case [expression] [cases...] [optional: (otherwise [default])])'); wholeExp.checkNumArgs(2, null, '(case [expression] [cases...] [optional: (otherwise [default])])');
var b = wholeExp.expBuilder();
var defaultExpr = switch (args[-1].def) { var defaultExpr = switch (args[-1].def) {
case CallExp({pos: _, def: Symbol("otherwise")}, [otherwiseExp]): case CallExp({pos: _, def: Symbol("otherwise")}, otherwiseExps):
args.pop(); args.pop();
k.convert(otherwiseExp); k.convert(b.begin(otherwiseExps));
default: default:
null; null;
}; };

7
kiss/src/test/cases/BasicTestCase.kiss
View File

@@ -378,7 +378,12 @@
((Some (as inner (Some v))) ((Some (as inner (Some v)))
(Assert.equals 5 v) (Assert.equals 5 v)
(Assert.isTrue (Type.enumEq (Some 5) inner))) (Assert.isTrue (Type.enumEq (Some 5) inner)))
(otherwise (Assert.fail)))) (otherwise (Assert.fail)))
// Otherwise blocks should allow multiple expressions, too:
(case 5
(otherwise
6 5)))
(function _testMaps [] (function _testMaps []
(localVar :Map<String,String> myMap [=>"hey" "you" (localVar :Map<String,String> myMap [=>"hey" "you"