Implement where (⍸), unique mask (≠) and unique (∪)

2 files changed, 24 insertions, 3 deletions

diff --git a/apl9.h b/apl9.h
index 2846861..2a7565f 100644
--- a/apl9.h
+++ b/apl9.h
@@ -294,6 +294,7 @@ Array *fnMagnitude(Array *);
 Array *fnCeiling(Array *);
 Array *fnFloor(Array *);
 Array *fnSame(Array *);
+Array *fnUniqueMask(Array *);
 Array *fnDepth(Array *);
 Array *fnTally(Array *);
 Array *fnMix(Array *);
@@ -304,7 +305,9 @@ Array *fnNest(Array *);
 Array *fnGradeUp(Array *);
 Array *fnGradeDown(Array *);
 Array *fnIndexGenerator(Array *);
+Array *fnWhere(Array *);
 Array *fnEnlist(Array *);
+Array *fnUnique(Array *);
 Array *fnNot(Array *);
 Array *fnRavel(Array *);
 Array *fnTable(Array *);
diff --git a/functions.c b/functions.c
index ad87c11..3b32cca 100644
--- a/functions.c
+++ b/functions.c
@@ -25,7 +25,7 @@ fnmonad monadfunctiondefs[] = {
 	fnSame, /* ⊣ */
 	fnSame, /* ⊢ */
 	0, /* = */
-	0, /* ≠ */
+	fnUniqueMask, /* ≠ */
 	0, /* ≤ */
 	0, /* < */
 	0, /* > */
@@ -45,10 +45,10 @@ fnmonad monadfunctiondefs[] = {
 	fnGradeUp, /* ⍋ */
 	fnGradeDown, /* ⍒ */
 	fnIndexGenerator, /* ⍳ */
-	0, /* ⍸ */
+	fnWhere, /* ⍸ */
 	fnEnlist, /* ∊ */
 	0, /* ⍷ */
-	0, /* ∪ */
+	fnUnique, /* ∪ */
 	0, /* ∩ */
 	fnNot, /* ~ */
 	fnRavel, /* , */
@@ -367,6 +367,12 @@ fnSame(Array *right)
 }
 
 Array *
+fnUniqueMask(Array *right)
+{
+	return rundfn(L"(⍳≢⍵)≤⊃∘⍸¨↓≡⌾⍨⌷∘⍵¨⍳≢⍵", nil, nil, nil, right);
+}
+
+Array *
 fnDepth(Array *right)
 {
 	int uniform;
@@ -576,6 +582,12 @@ fnIndexGenerator(Array *right)
 }
 
 Array *
+fnWhere(Array *right)
+{
+	return rundfn(L"(,⍵)⌿,⍳⍴⍵", nil, nil, nil, right);
+}
+
+Array *
 fnEnlist(Array *right)
 {
 	if(right->size == 0)
@@ -596,6 +608,12 @@ fnEnlist(Array *right)
 }
 
 Array *
+fnUnique(Array *right)
+{
+	return rundfn(L"(≠⍵)⌿⍵", nil, nil, nil, right);
+}
+
+Array *
 fnNot(Array *right)
 {
 	if(right->type != AtypeInt)