Add ⋈ to Dyalog and J dictionaries

4 files changed, 40 insertions, 20 deletions

diff --git a/doc/fromDyalog.md b/doc/fromDyalog.md
index 712e5e56..6bdb99e6 100644
--- a/doc/fromDyalog.md
+++ b/doc/fromDyalog.md
@@ -62,10 +62,10 @@ Here are some closest equivalents in Dyalog APL for the BQN functions that don't
 | Monad | `*` | `*∘(÷2)` | `[⍋]` | `[⍒]` | `~`   | `≢⍤⍴` | `≢` | `⊂` | `↑` | `⍴` | `,` |
 | Dyad  | `*` | `*∘÷⍨`   | `∧`   | `∨`   | `1+-` | `=`   | `≠` | `<` | `>` | `≢` | `⍴` |
 
-| BQN   | `∾`   | `≍`    | `↑`  | `↓`     | `↕`  | `»`          | `«`           |
-|:-----:|:-----:|:------:|:----:|:-------:|:----:|:------------:|:-------------:|
-| Monad | `⊃,⌿` | `↑,⍥⊂` | `,⍀` | `⌽,⌽⍀⌽` | `⍳`  | `≢↑(¯1-≢)↑⊢` | `-⍤≢↑(1+≢)↑⊢` |
-| Dyad  | `⍪`   | `↑,⍥⊂` | `↑`  | `↓`     | `,⌿` | `≢⍤⊢↑⍪`      | `-⍤≢⍤⊢↑⍪⍨`    |
+| BQN   | `∾`   | `≍`    | `⋈`   | `↑`  | `↓`     | `↕`  | `»`          | `«`           |
+|:-----:|:-----:|:------:|:-----:|:----:|:-------:|:----:|:------------:|:-------------:|
+| Monad | `⊃,⌿` | `↑,⍥⊂` | `,⍥⊂` | `,⍀` | `⌽,⌽⍀⌽` | `⍳`  | `≢↑(¯1-≢)↑⊢` | `-⍤≢↑(1+≢)↑⊢` |
+| Dyad  | `⍪`   | `↑,⍥⊂` | `,⍥⊂` | `↑`  | `↓`     | `,⌿` | `≢⍤⊢↑⍪`      | `-⍤≢⍤⊢↑⍪⍨`    |
 
 | BQN   | `/` | `⍋` | `⍒`   | `⊏`  | `⊑` | `⊐`   | `⊒` | `∊` | `⍷` | `⊔`        |
 |:-----:|:---:|:---:|:-----:|:----:|:---:|:-----:|:---:|:---:|:---:|:----------:|
@@ -115,7 +115,7 @@ The form `F⍣G` (Power with a function right operand; Power limit) must be impl
 <tr><td> <code>⍋</code> </td><td> <code>⍋</code>               </td><td> Give up </td>              </tr>
 <tr><td> <code>⍒</code> </td><td> <code>⍒</code>               </td><td> Give up </td>              </tr>
 <tr><td> <code>≢</code> </td><td> <code>≠</code>               </td><td> <code>≢</code></td>        </tr>
-<tr><td> <code>⍎</code> </td><td colspan=2><code>•Eval</code></td>                                  </tr>
+<tr><td> <code>⍎</code> </td><td colspan=2><code>•BQN</code></td>                                   </tr>
 <tr><td> <code>⍕</code> </td><td colspan=2><code>•Fmt</code></td>                                   </tr>
 <tr><td> <code>⊥</code> </td><td>                              </td><td> <code>{+⟜(𝕨⊸×)´⌽𝕩}</code>    </td></tr>
 <tr><td> <code>⊤</code> </td><td>                              </td><td> <code>{>𝕨|⌊∘÷`⌾⌽𝕨«˜<𝕩}</code></td></tr>
diff --git a/doc/fromJ.md b/doc/fromJ.md
index 73a79f9c..ecca06f3 100644
--- a/doc/fromJ.md
+++ b/doc/fromJ.md
@@ -53,14 +53,18 @@ J analogues of BQN primitive functions are given below. They are not always the
 
 Functions `+` `-` `|` `<` `>` are the same in both languages.
 
-| BQN | `×` | `÷` | `⋆` | `√`  | `⌊`  | `⌈`  | `≤`  | `≥`  | `⊣` | `⊢` | `⌽`   | `⍉`   |
-|:---:|:---:|:---:|:---:|:----:|:----:|:----:|:----:|:----:|:---:|:---:|:-----:|:-----:|
-| J   | `*` | `%` | `^` | `%:` | `<.` | `>.` | `<:` | `>:` | `[` | `]` | `\|.` | `\|:` |
+| BQN | `×` | `÷` | `⋆` | `√`  | `⌊`  | `⌈`  | `≤`  | `≥`  | `⊣` | `⊢` |
+|:---:|:---:|:---:|:---:|:----:|:----:|:----:|:----:|:----:|:---:|:---:|
+| J   | `*` | `%` | `^` | `%:` | `<.` | `>.` | `<:` | `>:` | `[` | `]` |
 
-| BQN   | `∧`   | `∨`   | `¬`   | `=`   | `≠`  | `≡`  | `≢`     | `⥊` | `∾` | `≍`  |
-|:-----:|:-----:|:-----:|:-----:|:-----:|:----:|:----:|:-------:|:---:|:---:|:----:|
-| Monad | `/:~` | `\:~` | `-.`  | `#@$` | `#`  | `L.` | `$`     | `,` | `;` | `,:` |
-| Dyad  | `*.`  | `+.`  | `+-.` | `=`   | `~:` | `-:` | `-.@-:` | `$` | `,` | `,:` |
+| BQN | `≍`  | `⋈`    | `⌽`   | `⍉`   |
+|:---:|:----:|:------:|:-----:|:-----:|
+| J   | `,:` | `,&:<` | `\|.` | `\|:` |
+
+| BQN   | `∧`   | `∨`   | `¬`   | `=`   | `≠`  | `≡`  | `≢`     | `⥊` | `∾` |
+|:-----:|:-----:|:-----:|:-----:|:-----:|:----:|:----:|:-------:|:---:|:---:|
+| Monad | `/:~` | `\:~` | `-.`  | `#@$` | `#`  | `L.` | `$`     | `,` | `;` |
+| Dyad  | `*.`  | `+.`  | `+-.` | `=`   | `~:` | `-:` | `-.@-:` | `$` | `,` |
 
 | BQN   | `↑`  | `↓`   | `↕`  | `»`            | `«`             | `/`  |
 |:-----:|:----:|:-----:|:----:|:--------------:|:---------------:|:----:|
@@ -138,7 +142,7 @@ The tables below give approximate implementations of J primitives. J has a whole
 | `{::`|                         | `⊑`
 | `}.` | `1⊸↓`                   | `↓`
 | `}:` | `¯1⊸↓`                  |
-| `".` | `•Eval`                 |
+| `".` | `•BQN`                  |
 | `":` | `•Fmt`                  |
 | `?`  | `•rand.Range⚇0`         | `•rand.Deal`
 | `e.` | `><∘∾∊¨⊢`               | `∊`
diff --git a/docs/doc/fromDyalog.html b/docs/doc/fromDyalog.html
index 0f6a727a..ac3d4974 100644
--- a/docs/doc/fromDyalog.html
+++ b/docs/doc/fromDyalog.html
@@ -165,6 +165,7 @@
 <th align="center">BQN</th>
 <th align="center"><code><span class='Function'>∾</span></code></th>
 <th align="center"><code><span class='Function'>≍</span></code></th>
+<th align="center"><code><span class='Function'>⋈</span></code></th>
 <th align="center"><code><span class='Function'>↑</span></code></th>
 <th align="center"><code><span class='Function'>↓</span></code></th>
 <th align="center"><code><span class='Function'>↕</span></code></th>
@@ -177,6 +178,7 @@
 <td align="center">Monad</td>
 <td align="center"><code><span class='Value'>⊃</span><span class='Separator'>,</span><span class='Value'>⌿</span></code></td>
 <td align="center"><code><span class='Function'>↑</span><span class='Separator'>,</span><span class='Value'>⍥⊂</span></code></td>
+<td align="center"><code><span class='Separator'>,</span><span class='Value'>⍥⊂</span></code></td>
 <td align="center"><code><span class='Separator'>,</span><span class='Value'>⍀</span></code></td>
 <td align="center"><code><span class='Function'>⌽</span><span class='Separator'>,</span><span class='Function'>⌽</span><span class='Value'>⍀</span><span class='Function'>⌽</span></code></td>
 <td align="center"><code><span class='Value'>⍳</span></code></td>
@@ -187,6 +189,7 @@
 <td align="center">Dyad</td>
 <td align="center"><code><span class='Value'>⍪</span></code></td>
 <td align="center"><code><span class='Function'>↑</span><span class='Separator'>,</span><span class='Value'>⍥⊂</span></code></td>
+<td align="center"><code><span class='Separator'>,</span><span class='Value'>⍥⊂</span></code></td>
 <td align="center"><code><span class='Function'>↑</span></code></td>
 <td align="center"><code><span class='Function'>↓</span></code></td>
 <td align="center"><code><span class='Separator'>,</span><span class='Value'>⌿</span></code></td>
@@ -304,7 +307,7 @@
 <tr><td> <code><span class='Function'>⍋</span></code> </td><td> <code><span class='Function'>⍋</span></code>               </td><td> Give up </td>              </tr>
 <tr><td> <code><span class='Function'>⍒</span></code> </td><td> <code><span class='Function'>⍒</span></code>               </td><td> Give up </td>              </tr>
 <tr><td> <code><span class='Function'>≢</span></code> </td><td> <code><span class='Function'>≠</span></code>               </td><td> <code><span class='Function'>≢</span></code></td>        </tr>
-<tr><td> <code><span class='Value'>⍎</span></code> </td><td colspan=2><code><span class='Function'>•Eval</span></code></td>                                  </tr>
+<tr><td> <code><span class='Value'>⍎</span></code> </td><td colspan=2><code><span class='Function'>•BQN</span></code></td>                                   </tr>
 <tr><td> <code><span class='Value'>⍕</span></code> </td><td colspan=2><code><span class='Function'>•Fmt</span></code></td>                                   </tr>
 <tr><td> <code><span class='Value'>⊥</span></code> </td><td>                              </td><td> <code><span class='Brace'>{</span><span class='Function'>+</span><span class='Modifier2'>⟜</span><span class='Paren'>(</span><span class='Value'>𝕨</span><span class='Modifier2'>⊸</span><span class='Function'>×</span><span class='Paren'>)</span><span class='Modifier'>´</span><span class='Function'>⌽</span><span class='Value'>𝕩</span><span class='Brace'>}</span></code>    </td></tr>
 <tr><td> <code><span class='Value'>⊤</span></code> </td><td>                              </td><td> <code><span class='Brace'>{</span><span class='Function'>></span><span class='Value'>𝕨</span><span class='Function'>|⌊</span><span class='Modifier2'>∘</span><span class='Function'>÷</span><span class='Modifier'>`</span><span class='Modifier2'>⌾</span><span class='Function'>⌽</span><span class='Value'>𝕨</span><span class='Function'>«</span><span class='Modifier'>˜</span><span class='Function'><</span><span class='Value'>𝕩</span><span class='Brace'>}</span></code></td></tr>
diff --git a/docs/doc/fromJ.html b/docs/doc/fromJ.html
index 9b053151..a0dfde9e 100644
--- a/docs/doc/fromJ.html
+++ b/docs/doc/fromJ.html
@@ -125,8 +125,6 @@
 <th align="center"><code><span class='Function'>≥</span></code></th>
 <th align="center"><code><span class='Function'>⊣</span></code></th>
 <th align="center"><code><span class='Function'>⊢</span></code></th>
-<th align="center"><code><span class='Function'>⌽</span></code></th>
-<th align="center"><code><span class='Function'>⍉</span></code></th>
 </tr>
 </thead>
 <tbody>
@@ -142,6 +140,24 @@
 <td align="center"><code><span class='Function'>&gt;</span><span class='Value'>:</span></code></td>
 <td align="center"><code><span class='Value'>[</span></code></td>
 <td align="center"><code><span class='Value'>]</span></code></td>
+</tr>
+</tbody>
+</table>
+<table>
+<thead>
+<tr>
+<th align="center">BQN</th>
+<th align="center"><code><span class='Function'>≍</span></code></th>
+<th align="center"><code><span class='Function'>⋈</span></code></th>
+<th align="center"><code><span class='Function'>⌽</span></code></th>
+<th align="center"><code><span class='Function'>⍉</span></code></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td align="center">J</td>
+<td align="center"><code><span class='Separator'>,</span><span class='Value'>:</span></code></td>
+<td align="center"><code><span class='Separator'>,</span><span class='Value'>&amp;:</span><span class='Function'>&lt;</span></code></td>
 <td align="center"><code><span class='Function'>|</span><span class='Value'>.</span></code></td>
 <td align="center"><code><span class='Function'>|</span><span class='Value'>:</span></code></td>
 </tr>
@@ -160,7 +176,6 @@
 <th align="center"><code><span class='Function'>≢</span></code></th>
 <th align="center"><code><span class='Function'>⥊</span></code></th>
 <th align="center"><code><span class='Function'>∾</span></code></th>
-<th align="center"><code><span class='Function'>≍</span></code></th>
 </tr>
 </thead>
 <tbody>
@@ -175,7 +190,6 @@
 <td align="center"><code><span class='Value'>$</span></code></td>
 <td align="center"><code><span class='Separator'>,</span></code></td>
 <td align="center"><code><span class='Value'>;</span></code></td>
-<td align="center"><code><span class='Separator'>,</span><span class='Value'>:</span></code></td>
 </tr>
 <tr>
 <td align="center">Dyad</td>
@@ -188,7 +202,6 @@
 <td align="center"><code><span class='Function'>-</span><span class='Value'>.</span><span class='String'>@</span><span class='Function'>-</span><span class='Value'>:</span></code></td>
 <td align="center"><code><span class='Value'>$</span></code></td>
 <td align="center"><code><span class='Separator'>,</span></code></td>
-<td align="center"><code><span class='Separator'>,</span><span class='Value'>:</span></code></td>
 </tr>
 </tbody>
 </table>
@@ -572,7 +585,7 @@
 </tr>
 <tr>
 <td><code><span class='String'>&quot;</span><span class='Value'>.</span></code></td>
-<td><code><span class='Function'>•Eval</span></code></td>
+<td><code><span class='Function'>•BQN</span></code></td>
 <td></td>
 </tr>
 <tr>