From 9056bc6293710cf8cc418ceb5cded8cd09ba78a4 Mon Sep 17 00:00:00 2001 From: Marshall Lochbaum Date: Wed, 26 Jan 2022 13:37:40 -0500 Subject: =?UTF-8?q?Add=20=E2=8B=88=20to=20Dyalog=20and=20J=20dictionaries?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/fromDyalog.md | 10 +++++----- doc/fromJ.md | 20 ++++++++++++-------- docs/doc/fromDyalog.html | 5 ++++- docs/doc/fromJ.html | 25 +++++++++++++++++++------ 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 ⍋ ⍋ Give up ⍒ ⍒ Give up ≢ ≠ ≢ - ⍎ •Eval + ⍎ •BQN ⍕ •Fmt ⊥ {+⟜(𝕨⊸×)´⌽𝕩} ⊤ {>𝕨|⌊∘÷`⌾⌽𝕨«˜<𝕩} 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 @@ BQN ∾ ≍ +⋈ ↑ ↓ ↕ @@ -177,6 +178,7 @@ Monad ⊃,⌿ ↑,⍥⊂ +,⍥⊂ ,⍀ ⌽,⌽⍀⌽ ⍳ @@ -187,6 +189,7 @@ Dyad ⍪ ↑,⍥⊂ +,⍥⊂ ↑ ↓ ,⌿ @@ -304,7 +307,7 @@ ⍋ ⍋ Give up ⍒ ⍒ Give up ≢ ≠ ≢ - ⍎ •Eval + ⍎ •BQN ⍕ •Fmt ⊥ {+⟜(𝕨⊸×)´⌽𝕩} ⊤ {>𝕨|⌊∘÷`⌾⌽𝕨«˜<𝕩} 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 @@ ≥ ⊣ ⊢ -⌽ -⍉ @@ -142,6 +140,24 @@ >: [ ] + + + + + + + + + + + + + + + + + + @@ -160,7 +176,6 @@ - @@ -175,7 +190,6 @@ - @@ -188,7 +202,6 @@ -
BQN≍⋈⌽⍉
J,:,&:< |. |:
≢ ⥊ ∾≍
$ , ;,:
Dyad-.@-: $ ,,:
@@ -572,7 +585,7 @@ ". -•Eval +•BQN -- cgit v1.2.3