From c1bdee9b38dffafe5d1f7914ae1659dc907222ba Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 12:34:43 -0700 Subject: [PATCH 001/110] Start revising 7 --- scripts/lib/initialExpressionContainers.ts | 1 + scripts/lib/runnerConfigs.ts | 13 + src/components/Runners/Dvfg.tsx | 12 + src/components/Runners/Hkbs.tsx | 12 + src/components/Runners/index.ts | 2 + src/contents/7.jp.tsx | 1562 +++++++++++++++++++- src/lib/episodeEmojis.ts | 2 +- src/lib/runners/dvfg.json | 67 + src/lib/runners/hkbs.json | 70 + src/lib/titles.ts | 4 +- 10 files changed, 1731 insertions(+), 14 deletions(-) create mode 100644 src/components/Runners/Dvfg.tsx create mode 100644 src/components/Runners/Hkbs.tsx create mode 100644 src/lib/runners/dvfg.json create mode 100644 src/lib/runners/hkbs.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 8af9732e7..d92b3379d 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -252,6 +252,7 @@ export const mhbx = initializeExpressionContainer( numberParamsHighlightNumber('e', 'f', 1) ) +export const lyet = initializeExpressionContainer(numberParams('d', 'e', 0)) export const okmr = initializeExpressionContainer(numberParams('d', 'e', 1)) export const dqgs = initializeExpressionContainer(numberParams('f', 'g', 2)) export const zdlx = initializeExpressionContainer( diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index eaa708da5..e9ad970c7 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1150,6 +1150,19 @@ export const pbop: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const dvfg: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.lyet, + showPriorities: true +} + +export const hkbs: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.lyet, + showPriorities: true, + bottomRightBadgeOverrides: { d: '🅰️', e: '🅱️' } +} + export const fxde: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.okmr, diff --git a/src/components/Runners/Dvfg.tsx b/src/components/Runners/Dvfg.tsx new file mode 100644 index 000000000..204fe20c4 --- /dev/null +++ b/src/components/Runners/Dvfg.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/dvfg.json' + +const Dvfg = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Dvfg diff --git a/src/components/Runners/Hkbs.tsx b/src/components/Runners/Hkbs.tsx new file mode 100644 index 000000000..8de65f57d --- /dev/null +++ b/src/components/Runners/Hkbs.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/hkbs.json' + +const Hkbs = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Hkbs diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 01c3a016d..35125d7e5 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -172,6 +172,8 @@ export { default as Fljg } from 'src/components/Runners/Fljg' export { default as Ezmz } from 'src/components/Runners/Ezmz' export { default as Biit } from 'src/components/Runners/Biit' export { default as Pbop } from 'src/components/Runners/Pbop' +export { default as Dvfg } from 'src/components/Runners/Dvfg' +export { default as Hkbs } from 'src/components/Runners/Hkbs' export { default as Fxde } from 'src/components/Runners/Fxde' export { default as Rbup } from 'src/components/Runners/Rbup' export { default as Cmla } from 'src/components/Runners/Cmla' diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index d8d131232..02eed949e 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -223,24 +223,34 @@ export default () => ( わかりました。まず、 。

+ + ) + } + ]} + /> + +

- {' '} - がたくさんありますが、それぞれの{' '} - - {' '} - には何らかの料理が入ります。 - + 前回の復習ですが、この弁当箱は、ぼくが計算箱に変換すると{' '} + になります。

) } ]} /> - - それぞれの には -
- 何らかの料理が入る - + + + + + ( ]} /> ) + +// export default () => ( +// 難易度が急激に上がります, +// content: ( +// <> +//

+// +// このページから難易度が急激に上がります。 +// +// 弁当箱も、以前に比べて複雑になります。 +//

+// 難易度が上がり、弁当箱も複雑に} +// /> +//

+// ただ、 +// +// 内容を完全に理解する必要はありません。少しくらい分からなくても、雰囲気で読み進めていただいて大丈夫です。 +// +// また、先に進んでから読み返すことで理解できる場合もあるので、分からなくてもとりあえず先に進んでみてください。 +//

+// 完全に理解する必要はありません！} +// /> +// +// ) +// }, +// { +// title: <>問題の説明, +// content: ( +// <> +// +//

+// では約束通り、 +// +// これから出す問題に答えることができたら、計算箱を返してやろう！ +// +//

+// +// ) +// } +// ]} +// /> +// , +// 😈, +// +// ]} +// description={ +// <> +// これから出す難しい問題に +//
+// 答えられたら計算箱を返してやろう！ +// +// } +// /> +// +//

+// この問題は非常に難しい +// から覚悟するんだな。ミニオン、問題を説明するんだ！ +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

+// わかりました。まず、 +// 。 +//

+//

+// {' '} +// がたくさんありますが、それぞれの{' '} +// +// {' '} +// には何らかの料理が入ります。 +// +//

+// +// ) +// } +// ]} +// /> +// +// それぞれの には +//
+// 何らかの料理が入る +// +// +//

何だか複雑そうな弁当箱だなあ…

+//

+// +// {' '} +// にはそれぞれ何の料理が入るの？ +// +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

+// それが今回の問題です！ +// +// 村人のみなさんには、 +// {' '} +// には何の料理が入るかを当ててもらいます。 +// +//

+// +// ) +// } +// ]} +// /> +// +// +// に何が入るかを +//
+// 当ててもらいます！🐶 +// +// +// +//

+// でも、まだ何の情報もないから… +// {' '} +// に何が入るかなんて分かんないよ。 +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

+// その通りです。まだ説明することがありますから。では、続けますね！ +//

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// title: ( +// <> +// +// +// ), +// content: ( +// <> +// +//

+// 先ほどの弁当箱は、 +// +// それぞれの {' '} +// に、ある法則に基づいて料理を入れると… +// +//

+//

+// +// +// がある弁当箱になります。 +// +//

+// +// ) +// } +// ]} +// /> +// +// それぞれの に、 +//
+// ある法則に基づいて料理を入れると、 +//
+// +// がある弁当箱になる +// +// +//

+// 背景に {' '} +// の模様がついた！ +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

+// そうですね。背景にある{' '} +// {' '} +// の模様は単に、 +// +// があるということを表しているだけです。 +//

+// +// ) +// }, +// { +// type: 'thinking', +// children: ( +// <> +//

+// その +// +// ってどういう効果なの？ +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

では、説明しますね！

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// type: 'summary', +// title: ( +// <> +// +// の説明 +// +// ), +// content: ( +// <> +// +//

+// +// とはどういう効果を説明しますね。 +//

+//

+// まず、 +// +// ある数字 {' '} +// に変換できる弁当箱と合体させてみます。 +// +//

+// +// ) +// } +// ]} +// /> + +// +// に変換できる弁当箱と、 +//
+// +// がある弁当箱を合体 +// +// +//

この合体した弁当箱を、

+// +//

+// すると、 +// +// 結果は {' '} +// ➕ {' '} +// +// になるのです。 +//

+// +// ) +// } +// ]} +// /> +// +// +//
+// すると、結果は {' '} +// ➕ になる +// +// +//

+// これが +// +// です。 +//

+//

+// 一言で言うと、 +// に変換できる弁当箱を{' '} +// ➕{' '} +// にできるんです！ +//

+// +// ) +// } +// ]} +// /> +// , +// , +// , +// ➕, +// +// ]} +// description={ +// <> +// に変換できる弁当箱を +//
+// ➕{' '} +// にできる +// +// } +// /> +// +//

うーん、具体例で説明してくれる？

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// title: ( +// <> +// が になる +// +// ), +// content: ( +// <> +// +//

+// では、具体例で説明しましょう！ +// : +//

+// +// ) +// } +// ]} +// /> +// +// +//

+// 前回の復習ですが、この弁当箱は、ぼくが計算箱に変換すると{' '} +// になります。 +//

+// +// ) +// } +// ]} +// /> +// +// +// +// +// +// +//

+// では上の弁当箱を、先ほどの +// +// がある弁当箱と +// 合体させてみます。 +//

+// +// ) +// } +// ]} +// /> +// +// +// がある弁当箱と合体 +// +// +//

+// では、この弁当箱を「 +// +// +// +// 」するとどうなるか見てみましょう。 +//

+// +// ) +// } +// ]} +// /> +// +// +//

+// になった！ +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

そうなんです！つまり、

+//
    +// +// +// に変換できる弁当箱と、 +// +// +// +// +// 先ほどの +// +// がある弁当箱を合体させて、 +// +// +//
+// +//

+// を押すと、 +// +// 結果は になる +// +// ということです。 +//

+// +// ) +// } +// ]} +// /> +// +// に変換できる弁当箱と、 +//
+// +// がある弁当箱を合体させ… +// +// +// +// +//
+// すると、結果は になる +// +// +//

+// つまりざっくり言うと、 +// +// が{' '} +// になった +// +// というわけです。 +//

+// +// ) +// } +// ]} +// /> +// , +// , +// +// ]} +// description={ +// <> +// ざっくり言うと、 +// が {' '} +// になった +// +// } +// /> +// +// ) +// }, +// { +// title: ( +// <> +// が になる +// +// ), +// content: ( +// <> +// +//

+// 続いて、 +// 。 +//

+// +// ) +// } +// ]} +// /> +// +// +//

+// この弁当箱は、ぼくが計算箱に変換すると{' '} +// になります。 +//

+// +// ) +// } +// ]} +// /> +// +// +// +// +// +// +//

+// この弁当箱も、 +// +// 先ほどの +// +// がある弁当箱と合体させてみました。 +// +//

+// +// ) +// } +// ]} +// /> +// +// +// がある弁当箱と合体 +// +// +//

+// こちらを「 +// +// +// +// 」するとどうなるか確かめてみてください！ +//

+// +// ) +// } +// ]} +// /> +// +// +//

+// になった！ +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

そうなんです！まとめると、以下のようになります。

+// +// ) +// } +// ]} +// /> + +// +// に変換できる弁当箱と、 +//
+// +// がある弁当箱を合体させ… +// +// +// +// +//
+// すると、結果は になる +// +// +//

+// ざっくり言うと、今度は{' '} +// +// が{' '} +// になった +// +// のです。 +//

+// +// ) +// } +// ]} +// /> +// , +// , +// +// ]} +// description={ +// <> +// ざっくり言うと、 +// が {' '} +// になった +// +// } +// /> +// +// ) +// }, +// { +// type: 'summary', +// title: <>まとめ, +// content: ( +// <> +// +//

まとめると、

+//
    +// +// +// ある数字 {' '} +// に変換できる弁当箱と、 +// +// +// +// +// +// がある弁当箱を合体させ、 +// +// +//
+// +//

+// を押すと、 +// +// 結果は {' '} +// ➕ になる +// +// のです。 +//

+// +// ) +// } +// ]} +// /> +// +// に変換できる弁当箱と、 +//
+// +// がある弁当箱を合体させ… +// +// +// +// +//
+// すると、結果は {' '} +// ➕ になる +// +// +// ) +// }, +// { +// type: 'challengeProblem', +// title: <>計算箱を賭けた問題, +// content: ( +// <> +// +//

+// では、ここで問題です。 +// +// この弁当箱に、どのような法則に基づいて{' '} +// {' '} +// に料理を入れると… +// +//

+// +// ) +// } +// ]} +// /> +// +// +// どのような法則に基づいて +//
+// に料理を入れると… +// +// +// +//

+// 先ほどのような、 +// +// +// がある弁当箱になるでしょう？ +// +//

+// +// ) +// } +// ]} +// /> +// +// +// +// がある弁当箱になる？ +// +// +// +//

+// つまり、 +// +// それぞれの {' '} +// に何を入れたら、 +// +// があるか当てろってこと？ +// +//

+// +// ) +// } +// ]} +// /> +// +// それぞれの に何を入れたら +//
+// +// がある弁当箱になる？ +// +// +// +// +//

+// はい、その通りです！ +// +// ある法則に基づいて{' '} +// {' '} +// に料理を入れた時に限り +// +// 、 +// がある弁当箱になります。 +//

+//

+// +// それがどんな法則が、当ててみよう！ +// +// という問題です。 +//

+// +// ) +// }, +// { +// type: 'devil', +// children: ( +// <> +//

+// この問題こそが、以前から話していた「難しい問題」だ。 +// +// これを解けたら、約束通り計算箱を返してやろう！ +// +//

+// +// ) +// } +// ]} +// /> +// , +// 😈, +// +// ]} +// description={<>この問題が解けたら、計算箱を返してやろう！} +// /> +// +// ) +// }, +// { +// title: ( +// <> +// 試しに適当な料理を入れてみる +// +// ), +// content: ( +// <> +// +//

+// うーん… +// +// 問題を完全に理解できた自信がないし、どうやって解けばいいかさっぱり分からない！ +// +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

大丈夫、安心してください！

+//

+// +// 試しに、 +// {' '} +// に適当な料理を入れてみると、問題を理解できると思います。 +// +//

+// +// ) +// } +// ]} +// /> +// +// {' '} +// に適当な料理を入れてみて下さい！🐶 +// +// +//

+// わかった。じゃあとりあえず、 +// {' '} +// に適当な料理を入れてみよう。 +//

+//

+// +// 、 +// 、 +// +// を適当な組み合わせで{' '} +// {' '} +// に入れてみたよ。 +// +//

+// +// ) +// } +// ]} +// /> +// +// {' '} +// を適当に{' '} +// に入れてみた +// +// +//

+// この弁当箱に、 +// +// があれば +// 成功 🎉 +// 、なければ失敗{' '} +// 😭 ということかな？ +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

+// そうですね。そして、 +// +// があるかどうかを確かめるには、まず{' '} +// ➕{' '} +// {' '} +// が計算できるかを確かめてみます。 +//

+// +// ) +// } +// ]} +// /> +// , +// ➕, +// +// ]} +// description={ +// <> +// ➕{' '} +// が計算できるか確かめる +// +// } +// /> +// +//

+// つまり、以下のように {' '} +// に変換できる弁当箱と合体させたときに… +//

+//

+// 結果が {' '} +// にならないといけないのです。 +//

+// +// ) +// } +// ]} +// /> +// +// に変換できる弁当箱と、 +//
+// 先ほどの弁当箱を合体させ… +// +// +// +// +// して… +// +// +// +// +// 結果が になれば +//
+// +// があるので +// 成功 🎉 +//
+// それ以外なら失敗 😭 +// +// +// ) +// }, +// { +// title: ( +// <> +// +// があるかチェック +// +// ), +// content: ( +// <> +// +//

+// では、 +// ➕{' '} +// {' '} +// が計算できるか確かめるために、冒頭にも登場した、 +// {' '} +// に変換できる弁当箱を使って試してみましょう。 +//

+// +// ) +// } +// ]} +// /> +// +// +// +// +//

+// これを先ほどの弁当箱と組み合わせて、 +// +// し、 +// +// ➕{' '} +// を計算できればいい +// +// んだな。 +//

+//

+// すなわち、 +// +// 結果が になれば +// 成功 🎉 +// 、それ以外なら +// +// 失敗 +// 😭{' '} +// +// というわけか。 +//

+// +// ) +// } +// ]} +// /> +// +// に変換できる弁当箱と、 +//
+// 先ほどの弁当箱を合体させ… +// +// +// +// +// して… +// +// +// +// +// 結果が になれば +// 成功 🎉 +//
+// それ以外なら失敗 😭 +// +// +//

では、上の弁当箱を実行したらどうなるか見ていこう！

+// +// ) +// } +// ]} +// /> +// +// ), +// footer: { +// content: ( +// <> +// +//
+// +// +// } +// preview={{ +// text: <>初級編の内容を復習する, +// content: ( +// <> +//

+// 復習が必要ですか？: 今回の弁当箱では、 +// 初級その5で学んだ法則が登場 +// します。 +//

+//

+// 復習したい場合は、↓の「初級編の内容を復習する」を押してください。 +//

+// +// ) +// }} +// /> +// +// ) +// } +// }, +// { +// title: <>早送りしてみよう, +// content: ( +// <> +// +// +// +// +// +// +// +// +// +// +// +// +// +//

つまり、最終的に以下のようになりました！

+// +// ) +// } +// ]} +// /> +// 実行結果 +// +// ) +// }, +// { +// title: <>計算箱に変換できない, +// content: ( +// <> +// +//

+// 実行を終えたので、 +// {' '} +// したいところですが… +//

+//

+// 残念ながら、 +// +// この弁当箱はぼくが計算箱に変換することができません。 +// +//

+// +// ) +// } +// ]} +// /> +// +// ❌ 計算箱に変換できない ❌ +// +// +//

+// 理由は、 +// +// 以下の法則に沿っていないからです。 +// +//

+// +// +// +//

+// +// 右上には 🅱️{' '} +// の料理がひとつないといけませんが、ここでは{' '} +// 🅰️ になっている +// +// ので、計算箱に変換できないのです。 +//

+// +// ) +// } +// ]} +// /> +// +// 右上が 🅱️ の ではなく、 +//
+// 🅰️ の なので +//
+// 計算箱に変換できない +// +// +//

+// ダメか… +// +// もし仮に右上が +// +// ではなくて +// +// だったら、 +// に変換できていたのになあ。 +// +// あとちょっとだったのに！ +//

+// +// ) +// } +// ]} +// /> +// +// もし仮に右上が +// +//
+// だったら、 +// に変換できていた +// +// +// +// +// ) +// }, +// { +// title: ( +// <> +// +// は無い +// +// ), +// content: ( +// <> +// +//

+// つまり、実行しても{' '} +// {' '} +// に変換できる弁当箱になりませんでした。 +//

+// +// ) +// } +// ]} +// /> +// +// に変換できる弁当箱と合体させ… +// +// +// +// 実行したところ、 +//
+// +// {' '} +// に変換できる弁当箱にならなかった +// +// +// +//

+// だから、 +// +// 先ほどの弁当箱に、 +// +// は無い +// +// のです。つまり、 +// 不正解でした！ +//

+// +// ) +// } +// ]} +// /> +// +// +// は無い +// +// +//

+// 残念…やっぱり、適当に{' '} +// {' '} +// に料理を埋めても正解にはならないかあ… +//

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// type: 'challengeProblem', +// title: <>問題をもう一度, +// content: ( +// <> +// +//

+// 問題の意味が分かったでしょうか？では、もう一度聞きますね。 +//

+//

+// +// この弁当箱に、どのような法則に基づいて{' '} +// {' '} +// に料理を入れると… +// +//

+// +// ) +// } +// ]} +// /> +// +// +// どのような法則に基づいて {' '} +// に料理を入れると… +// +// +// +//

+// +// +// がある弁当箱になるでしょう？ +// +//

+// +// ) +// } +// ]} +// /> +// +// +// +// がある弁当箱になる？ +// +// +// +//

+// 繰り返しますが、先ほど適当に料理を入れた以下の弁当箱は、不正解でした！ +//

+// +// ) +// } +// ]} +// /> +// こちらは不正解だった +// +//

+// うーん…問題の意味は分かったけど、答え方が分からない！ +//

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// title: <>答えは次のページに, +// content: ( +// <> +//

+// せっかく計算箱を返してもらえるチャンスなのに、問題が難しくて村人は苦戦しているようですね。 +//

+// 難しすぎて見当もつかない！} +// /> +//

+// しかし、 +// 次のページで答えが判明します。 +// ぜひ先に進んでみてください！ +//

+// +// +// ) +// } +// ]} +// /> +// ) diff --git a/src/lib/episodeEmojis.ts b/src/lib/episodeEmojis.ts index 7446ad2d4..d3a33026d 100644 --- a/src/lib/episodeEmojis.ts +++ b/src/lib/episodeEmojis.ts @@ -8,7 +8,7 @@ const episodeEmojis: Record = { 4: ['✅', '🍱', '💥'], 5: ['3️⃣', '🍱', '3️⃣'], 6: ['🍱', '🐶', '🔲'], - 7: ['➕', '🐶', '1️⃣'], + 7: ['0️⃣', '➡️', '1️⃣'], 8: ['😮', '👧🏻', '🐶'], 9: ['❓', '👧🏻', '❓'], 10: ['➖', '😈', '1️⃣'], diff --git a/src/lib/runners/dvfg.json b/src/lib/runners/dvfg.json new file mode 100644 index 000000000..87097a1aa --- /dev/null +++ b/src/lib/runners/dvfg.json @@ -0,0 +1,67 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 1, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/hkbs.json b/src/lib/runners/hkbs.json new file mode 100644 index 000000000..42b521372 --- /dev/null +++ b/src/lib/runners/hkbs.json @@ -0,0 +1,70 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 1, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": { + "d": "🅰️", + "e": "🅱️" + }, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/titles.ts b/src/lib/titles.ts index b4bc5ec32..91eb3bfec 100644 --- a/src/lib/titles.ts +++ b/src/lib/titles.ts @@ -28,7 +28,7 @@ export const episodeTitles = { 10: 'The “Minus One” Effect', 11: 'The “Conditional” Feature', 12: 'Reproducing the “Conditional” Feature', - 13: '?', + 13: 'Replace Parts of a Lunchbox', 14: '?', 15: '?', 16: '?' @@ -40,7 +40,7 @@ export const episodeTitles = { 4: '弁当箱の法則', 5: '3段の弁当箱', 6: 'ミニオンの芸', - 7: '1を足す効果', + 7: 'ゼロからイチへ', 8: '天才サヤちゃん', 9: '1を足せない？', 10: '1を引く効果', From 955e8b1e4203f4f51fc71143e39a39f24c842eae Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 12:43:50 -0700 Subject: [PATCH 002/110] jwue and hbbv are duplicates --- scripts/lib/initialExpressionContainers.ts | 12 ---- scripts/lib/runnerConfigs.ts | 23 +++---- src/components/Runners/Jwue.tsx | 12 ---- src/components/Runners/index.ts | 1 - src/contents/5.en.tsx | 2 +- src/contents/5.jp.tsx | 2 +- src/lib/runners/jwue.json | 74 ---------------------- 7 files changed, 10 insertions(+), 116 deletions(-) delete mode 100644 src/components/Runners/Jwue.tsx delete mode 100644 src/lib/runners/jwue.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index d92b3379d..9c3b02d7d 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1089,18 +1089,6 @@ export const kipz = initializeExpressionContainer([ 'd' ]) -export const ycof = initializeExpressionContainer([ - { - arg: 'a', - body: { - arg: 'b', - body: 'a' - } - }, - 'c', - 'd' -]) - export const guql = initializeExpressionContainer( predParams( 'questionFoodGrey', diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index e9ad970c7..1e8d64f5d 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -491,13 +491,6 @@ export const kvso: ExpressionRunnerShorthandConfig = { skipToTheEnd: false } -export const jwue: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.pisd, - nextIterations: 1, - showPriorities: true -} - export const sgnp: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.pisd, @@ -1584,7 +1577,7 @@ export const kwyy: ExpressionRunnerShorthandConfig = { export const oukl: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ycof, + initialExpressionContainer: initialExpressionContainers.pisd, showPriorities: true, initialState: 'showFuncUnbound', highlightOverrides: { b: 'highlighted', c: 'highlighted' }, @@ -1602,7 +1595,7 @@ export const rypq: ExpressionRunnerShorthandConfig = { export const etae: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ycof, + initialExpressionContainer: initialExpressionContainers.pisd, showPriorities: true, initialState: 'betaReducePreviewBefore', highlightOverrideActiveAfterStart: true @@ -1619,7 +1612,7 @@ export const wqml: ExpressionRunnerShorthandConfig = { export const jwdn: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ycof, + initialExpressionContainer: initialExpressionContainers.pisd, showPriorities: true, initialState: 'betaReducePreviewAfter', skipAlphaConvert: true @@ -1635,7 +1628,7 @@ export const abnp: ExpressionRunnerShorthandConfig = { export const yabb: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ycof, + initialExpressionContainer: initialExpressionContainers.pisd, showPriorities: true, initialState: 'betaReducePreviewCrossed', skipAlphaConvert: true @@ -1651,7 +1644,7 @@ export const osff: ExpressionRunnerShorthandConfig = { export const hbbv: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ycof, + initialExpressionContainer: initialExpressionContainers.pisd, showPriorities: true, nextIterations: 1, skipAlphaConvert: true @@ -1667,7 +1660,7 @@ export const fxok: ExpressionRunnerShorthandConfig = { export const lxhc: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ycof, + initialExpressionContainer: initialExpressionContainers.pisd, showPriorities: true, nextIterations: 1, skipAlphaConvert: true, @@ -1685,7 +1678,7 @@ export const hvqy: ExpressionRunnerShorthandConfig = { export const nntn: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ycof, + initialExpressionContainer: initialExpressionContainers.pisd, showPriorities: true, nextIterations: 1, skipAlphaConvert: true, @@ -1712,7 +1705,7 @@ export const bdme: ExpressionRunnerShorthandConfig = { export const yxel: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ycof, + initialExpressionContainer: initialExpressionContainers.pisd, showPriorities: true, skipAlphaConvert: true, isDone: true diff --git a/src/components/Runners/Jwue.tsx b/src/components/Runners/Jwue.tsx deleted file mode 100644 index 4852cb61c..000000000 --- a/src/components/Runners/Jwue.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/jwue.json' - -const Jwue = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Jwue diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 35125d7e5..ed2320ae6 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -68,7 +68,6 @@ export { default as Jwzh } from 'src/components/Runners/Jwzh' export { default as Keck } from 'src/components/Runners/Keck' export { default as Knhw } from 'src/components/Runners/Knhw' export { default as Kvso } from 'src/components/Runners/Kvso' -export { default as Jwue } from 'src/components/Runners/Jwue' export { default as Sgnp } from 'src/components/Runners/Sgnp' export { default as Beiz } from 'src/components/Runners/Beiz' export { default as Laea } from 'src/components/Runners/Laea' diff --git a/src/contents/5.en.tsx b/src/contents/5.en.tsx index a98a18e1c..9291ee16a 100644 --- a/src/contents/5.en.tsx +++ b/src/contents/5.en.tsx @@ -799,7 +799,7 @@ export default () => ( } ]} /> - We now have a simpler lunchbox + We now have a simpler lunchbox ( } ]} /> - 残った弁当箱はシンプルな2段 + 残った弁当箱はシンプルな2段 Date: Thu, 17 Oct 2019 12:47:03 -0700 Subject: [PATCH 003/110] zxkq and duuk are duplicates --- scripts/lib/initialExpressionContainers.ts | 4 - scripts/lib/runnerConfigs.ts | 7 - src/components/Runners/Zxkq.tsx | 12 -- src/components/Runners/index.ts | 1 - src/contents/8.en.tsx | 4 +- src/contents/8.jp.tsx | 4 +- src/lib/runners/zxkq.json | 155 --------------------- 7 files changed, 4 insertions(+), 183 deletions(-) delete mode 100644 src/components/Runners/Zxkq.tsx delete mode 100644 src/lib/runners/zxkq.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 9c3b02d7d..a2bcba102 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1039,10 +1039,6 @@ export const mtyb = initializeExpressionContainer([ numberParams('k', 'l', 3) ]) -export const wwii = initializeExpressionContainer( - numberParamsHighlightNumber('i', 'j', 4) -) - export const orfr = initializeExpressionContainer([ succParams('a', 'b', 'c', false, true), numberParams('d', 'b', 1) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 1e8d64f5d..e4934aa5f 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1485,13 +1485,6 @@ export const oqpi: ExpressionRunnerShorthandConfig = { speed: 1.5 } -export const zxkq: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.wwii, - showPriorities: true, - bottomRightBadgeOverrides: { j: '🅱️', i: '🅰️' } -} - export const dyoq: ExpressionRunnerShorthandConfig = { runner: 'predefined', initialExpressionContainers: [ diff --git a/src/components/Runners/Zxkq.tsx b/src/components/Runners/Zxkq.tsx deleted file mode 100644 index 87bc2b23b..000000000 --- a/src/components/Runners/Zxkq.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/zxkq.json' - -const Zxkq = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Zxkq diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index ed2320ae6..539297511 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -219,7 +219,6 @@ export { default as Dvpl } from 'src/components/Runners/Dvpl' export { default as Udxn } from 'src/components/Runners/Udxn' export { default as Cjxe } from 'src/components/Runners/Cjxe' export { default as Oqpi } from 'src/components/Runners/Oqpi' -export { default as Zxkq } from 'src/components/Runners/Zxkq' export { default as Dyoq } from 'src/components/Runners/Dyoq' export { default as Xhdq } from 'src/components/Runners/Xhdq' export { default as Nhqo } from 'src/components/Runners/Nhqo' diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index fdfdd531e..a2dc49a1e 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -889,7 +889,7 @@ export default () => ( The result was a lunchbox that can be converted to{' '} !

- + ( number: 4 }} /> - +

Therefore: It calculated{' '} ➕{' '} diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 870259d19..38d95b3d9 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -852,7 +852,7 @@ export default () => ( {' '} に変換できる弁当箱が残りました！

- + ( number: 4 }} /> - +

つまり、 ➕{' '} diff --git a/src/lib/runners/zxkq.json b/src/lib/runners/zxkq.json deleted file mode 100644 index 4d5363d45..000000000 --- a/src/lib/runners/zxkq.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3, - 4 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 4 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 4, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "numLeafNodes": 5, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": { - "j": "🅱️", - "i": "🅰️" - }, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} From ec893af914a067bd900a72338267bf647dfecdad Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 12:50:31 -0700 Subject: [PATCH 004/110] Thbw and weoz --- scripts/lib/runnerConfigs.ts | 10 ++----- src/components/Runners/Thbw.tsx | 12 -------- src/components/Runners/index.ts | 1 - src/contents/3.en.tsx | 2 +- src/contents/3.jp.tsx | 2 +- src/contents/4.en.tsx | 2 +- src/contents/4.jp.tsx | 2 +- src/lib/runners/thbw.json | 52 --------------------------------- 8 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 src/components/Runners/Thbw.tsx delete mode 100644 src/lib/runners/thbw.json diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index e4934aa5f..c899df4c6 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -270,12 +270,6 @@ export const issq: ExpressionRunnerShorthandConfig = { explanationsVisibility: 'visible' } -export const thbw: ExpressionRunnerShorthandConfig = { - runner: 'simple', - isDone: true, - initialExpressionContainer: initialExpressionContainers.sisf -} - export const dtzu: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.lqti, @@ -854,8 +848,8 @@ export const ehxq: ExpressionRunnerShorthandConfig = { export const weoz: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.sisf, - isDone: true + isDone: true, + initialExpressionContainer: initialExpressionContainers.sisf } export const uwma: ExpressionRunnerShorthandConfig = { diff --git a/src/components/Runners/Thbw.tsx b/src/components/Runners/Thbw.tsx deleted file mode 100644 index 15791c12a..000000000 --- a/src/components/Runners/Thbw.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/thbw.json' - -const Thbw = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Thbw diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 539297511..7cd12b62a 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -35,7 +35,6 @@ export { default as Ycxr } from 'src/components/Runners/Ycxr' export { default as Dkdt } from 'src/components/Runners/Dkdt' export { default as Sxnt } from 'src/components/Runners/Sxnt' export { default as Issq } from 'src/components/Runners/Issq' -export { default as Thbw } from 'src/components/Runners/Thbw' export { default as Dtzu } from 'src/components/Runners/Dtzu' export { default as Vilr } from 'src/components/Runners/Vilr' export { default as Eozk } from 'src/components/Runners/Eozk' diff --git a/src/contents/3.en.tsx b/src/contents/3.en.tsx index ed30fabf9..093382971 100644 --- a/src/contents/3.en.tsx +++ b/src/contents/3.en.tsx @@ -724,7 +724,7 @@ export default () => (

- +

Example 4:

diff --git a/src/contents/3.jp.tsx b/src/contents/3.jp.tsx index 5d464b04d..41ce943c8 100644 --- a/src/contents/3.jp.tsx +++ b/src/contents/3.jp.tsx @@ -656,7 +656,7 @@ export default () => (

- +

例その4:

diff --git a/src/contents/4.en.tsx b/src/contents/4.en.tsx index 2891fa50f..b451a43a2 100644 --- a/src/contents/4.en.tsx +++ b/src/contents/4.en.tsx @@ -925,7 +925,7 @@ export default () => ( And we’re left with and{' '} .

- + ) }, diff --git a/src/contents/4.jp.tsx b/src/contents/4.jp.tsx index ff261d42e..66e3b46d9 100644 --- a/src/contents/4.jp.tsx +++ b/src/contents/4.jp.tsx @@ -881,7 +881,7 @@ export default () => ( と {' '} が残るのです。

- + ) }, diff --git a/src/lib/runners/thbw.json b/src/lib/runners/thbw.json deleted file mode 100644 index 43fee620b..000000000 --- a/src/lib/runners/thbw.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "o", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "previouslyChangedExpressionState": "default", - "activePriority": 1, - "containerState": "done", - "numLeafNodes": 1 - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": true, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} From 5986d6648cdaedd5a8e67f94f1d159e182d610bf Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 12:59:17 -0700 Subject: [PATCH 005/110] Remove vhte --- scripts/lib/initialExpressionContainers.ts | 4 - scripts/lib/runnerConfigs.ts | 7 -- src/components/Runners/Vhte.tsx | 12 --- src/components/Runners/index.ts | 1 - src/contents/13.en.tsx | 4 +- src/contents/13.jp.tsx | 4 +- src/lib/runners/vhte.json | 113 --------------------- 7 files changed, 4 insertions(+), 141 deletions(-) delete mode 100644 src/components/Runners/Vhte.tsx delete mode 100644 src/lib/runners/vhte.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index a2bcba102..6b75d7a3b 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1397,10 +1397,6 @@ export const loem = initializeExpressionContainer( numberParamsHighlightNumber('l', 'm', 3) ) -export const harq = initializeExpressionContainer( - numberParamsHighlightNumber('g', 'h', 2) -) - export const wvsk = initializeExpressionContainer([ { arg: 'f', diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index c899df4c6..2f5eb8ced 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -2037,13 +2037,6 @@ export const ayrl: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { l: '🅰️', m: '🅱️' } } -export const vhte: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.harq, - showPriorities: true, - bottomRightBadgeOverrides: { g: '🅰️', h: '🅱️' } -} - export const uwgj: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.wvsk, diff --git a/src/components/Runners/Vhte.tsx b/src/components/Runners/Vhte.tsx deleted file mode 100644 index 117bbb133..000000000 --- a/src/components/Runners/Vhte.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/vhte.json' - -const Vhte = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Vhte diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 7cd12b62a..34a1754ef 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -293,7 +293,6 @@ export { default as Bnyo } from 'src/components/Runners/Bnyo' export { default as Hkfq } from 'src/components/Runners/Hkfq' export { default as Ywpq } from 'src/components/Runners/Ywpq' export { default as Ayrl } from 'src/components/Runners/Ayrl' -export { default as Vhte } from 'src/components/Runners/Vhte' export { default as Uwgj } from 'src/components/Runners/Uwgj' export { default as Itis } from 'src/components/Runners/Itis' export { default as Wgby } from 'src/components/Runners/Wgby' diff --git a/src/contents/13.en.tsx b/src/contents/13.en.tsx index 470b96859..d801bc4f4 100644 --- a/src/contents/13.en.tsx +++ b/src/contents/13.en.tsx @@ -312,7 +312,7 @@ export default () => ( The middle-right section is actually a lunchbox that can be converted to !

- + ( number: 2 }} /> - + ) }, diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index 2f666a1db..c2c4e725b 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -299,7 +299,7 @@ export default () => ( に変換できる弁当箱だ！

- + ( number: 2 }} /> - + ) }, diff --git a/src/lib/runners/vhte.json b/src/lib/runners/vhte.json deleted file mode 100644 index 7741c3b6e..000000000 --- a/src/lib/runners/vhte.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "g", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "g", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "numLeafNodes": 3, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": { - "g": "🅰️", - "h": "🅱️" - }, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} From 9314acf5bd9d0a51422686a53c80915907f9fd32 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 13:18:59 -0700 Subject: [PATCH 006/110] Remove oclg --- scripts/lib/initialExpressionContainers.ts | 4 - scripts/lib/runnerConfigs.ts | 7 -- src/components/Runners/Oclg.tsx | 12 --- src/components/Runners/index.ts | 1 - src/contents/12.en.tsx | 4 +- src/contents/12.jp.tsx | 4 +- src/lib/runners/oclg.json | 92 ---------------------- 7 files changed, 4 insertions(+), 120 deletions(-) delete mode 100644 src/components/Runners/Oclg.tsx delete mode 100644 src/lib/runners/oclg.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 6b75d7a3b..499571f67 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1342,10 +1342,6 @@ export const zmua = initializeExpressionContainer( ) ) -export const qzuv = initializeExpressionContainer( - numberParamsHighlightNumber('f', 'g', 1) -) - export const lcce = initializeExpressionContainer( isZeroParams( 'A', diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 2f5eb8ced..cb31bbb17 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1995,13 +1995,6 @@ export const svbd: ExpressionRunnerShorthandConfig = { speed: 2 } -export const oclg: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.qzuv, - showPriorities: true, - bottomRightBadgeOverrides: { f: '🅰️', g: '🅱️' } -} - export const fton: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.lcce, diff --git a/src/components/Runners/Oclg.tsx b/src/components/Runners/Oclg.tsx deleted file mode 100644 index ef4b4df90..000000000 --- a/src/components/Runners/Oclg.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/oclg.json' - -const Oclg = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Oclg diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 34a1754ef..2e32184c6 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -287,7 +287,6 @@ export { default as Zdpf } from 'src/components/Runners/Zdpf' export { default as Jbqw } from 'src/components/Runners/Jbqw' export { default as Kfru } from 'src/components/Runners/Kfru' export { default as Svbd } from 'src/components/Runners/Svbd' -export { default as Oclg } from 'src/components/Runners/Oclg' export { default as Fton } from 'src/components/Runners/Fton' export { default as Bnyo } from 'src/components/Runners/Bnyo' export { default as Hkfq } from 'src/components/Runners/Hkfq' diff --git a/src/contents/12.en.tsx b/src/contents/12.en.tsx index 4e51a4cde..06a7b57f9 100644 --- a/src/contents/12.en.tsx +++ b/src/contents/12.en.tsx @@ -732,7 +732,7 @@ export default () => ( The result is a lunchbox that can be converted to{' '} !

- + ( number: 1 }} /> - +

Because the result is , it’s a success! 🎉 diff --git a/src/contents/12.jp.tsx b/src/contents/12.jp.tsx index 6adf1bfea..980dfd906 100644 --- a/src/contents/12.jp.tsx +++ b/src/contents/12.jp.tsx @@ -762,7 +762,7 @@ export default () => ( 最終的に残ったこちらの弁当箱は、 に変換できる弁当箱だね。

- + ( number: 1 }} /> - +

だから、 が残ったので、 diff --git a/src/lib/runners/oclg.json b/src/lib/runners/oclg.json deleted file mode 100644 index 79bc23830..000000000 --- a/src/lib/runners/oclg.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "numLeafNodes": 2, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": { - "f": "🅰️", - "g": "🅱️" - }, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} From c3294065ba565b2c946669bd18307d5ae08997d1 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 13:52:14 -0700 Subject: [PATCH 007/110] Remove Fogc --- scripts/lib/initialExpressionContainers.ts | 8 ----- scripts/lib/runnerConfigs.ts | 8 +---- src/components/Runners/Fogc.tsx | 12 -------- src/components/Runners/index.ts | 1 - src/contents/3.en.tsx | 2 +- src/contents/3.jp.tsx | 2 +- src/lib/runners/fogc.json | 36 ---------------------- 7 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 src/components/Runners/Fogc.tsx delete mode 100644 src/lib/runners/fogc.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 499571f67..ebb574c92 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -40,14 +40,6 @@ export const sisf = initializeExpressionContainer([ } ]) -export const zgxp = initializeExpressionContainer([ - { - arg: 'h', - body: 'i' - }, - 'j' -]) - export const ysyy = initializeExpressionContainer([ { arg: 'h', diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index cb31bbb17..d85bba0a3 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -160,7 +160,7 @@ export const bgfl: ExpressionRunnerShorthandConfig = { export const cpkp: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.zgxp, + initialExpressionContainer: initialExpressionContainers.ysyy, isDone: true } @@ -517,12 +517,6 @@ export const ldqk: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.ysyy } -export const fogc: ExpressionRunnerShorthandConfig = { - runner: 'simple', - isDone: true, - initialExpressionContainer: initialExpressionContainers.ysyy -} - export const loai: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.gvjy diff --git a/src/components/Runners/Fogc.tsx b/src/components/Runners/Fogc.tsx deleted file mode 100644 index 57d33506a..000000000 --- a/src/components/Runners/Fogc.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/fogc.json' - -const Fogc = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Fogc diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 2e32184c6..f5296eb98 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -72,7 +72,6 @@ export { default as Beiz } from 'src/components/Runners/Beiz' export { default as Laea } from 'src/components/Runners/Laea' export { default as Nmmz } from 'src/components/Runners/Nmmz' export { default as Ldqk } from 'src/components/Runners/Ldqk' -export { default as Fogc } from 'src/components/Runners/Fogc' export { default as Loai } from 'src/components/Runners/Loai' export { default as Mhgm } from 'src/components/Runners/Mhgm' export { default as Msiw } from 'src/components/Runners/Msiw' diff --git a/src/contents/3.en.tsx b/src/contents/3.en.tsx index 093382971..fa8bf37d2 100644 --- a/src/contents/3.en.tsx +++ b/src/contents/3.en.tsx @@ -730,7 +730,7 @@ export default () => (

- + (

- + Date: Thu, 17 Oct 2019 13:57:49 -0700 Subject: [PATCH 008/110] Remove otbe --- scripts/lib/runnerConfigs.ts | 6 ------ src/components/Runners/Otbe.tsx | 12 ----------- src/components/Runners/index.ts | 1 - src/contents/6.en.tsx | 2 +- src/contents/6.jp.tsx | 2 +- src/lib/runners/otbe.json | 36 --------------------------------- 6 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 src/components/Runners/Otbe.tsx delete mode 100644 src/lib/runners/otbe.json diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index d85bba0a3..21dbd0213 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -824,12 +824,6 @@ export const duuk: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { j: '🅱️', i: '🅰️' } } -export const otbe: ExpressionRunnerShorthandConfig = { - runner: 'simple', - showPriorities: true, - initialExpressionContainer: initialExpressionContainers.uarl -} - export const ehxq: ExpressionRunnerShorthandConfig = { runner: 'predefined', showPriorities: true, diff --git a/src/components/Runners/Otbe.tsx b/src/components/Runners/Otbe.tsx deleted file mode 100644 index 83d2a70df..000000000 --- a/src/components/Runners/Otbe.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/otbe.json' - -const Otbe = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Otbe diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index f5296eb98..eb0521f45 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -115,7 +115,6 @@ export { default as Qsnv } from 'src/components/Runners/Qsnv' export { default as Dcji } from 'src/components/Runners/Dcji' export { default as Zlrx } from 'src/components/Runners/Zlrx' export { default as Duuk } from 'src/components/Runners/Duuk' -export { default as Otbe } from 'src/components/Runners/Otbe' export { default as Ehxq } from 'src/components/Runners/Ehxq' export { default as Weoz } from 'src/components/Runners/Weoz' export { default as Uwma } from 'src/components/Runners/Uwma' diff --git a/src/contents/6.en.tsx b/src/contents/6.en.tsx index a3bfeea05..8917c6726 100644 --- a/src/contents/6.en.tsx +++ b/src/contents/6.en.tsx @@ -516,7 +516,7 @@ export default () => ( } ]} /> - + ) diff --git a/src/contents/6.jp.tsx b/src/contents/6.jp.tsx index a64ec57a1..9e9c43133 100644 --- a/src/contents/6.jp.tsx +++ b/src/contents/6.jp.tsx @@ -512,7 +512,7 @@ export default () => ( } ]} /> - + ) diff --git a/src/lib/runners/otbe.json b/src/lib/runners/otbe.json deleted file mode 100644 index 4c5f5c522..000000000 --- a/src/lib/runners/otbe.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 4, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "done", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} From 7438c3b6cda63a777296e5781ee0b855ed264ce2 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 14:01:55 -0700 Subject: [PATCH 009/110] Remove ruou --- scripts/lib/runnerConfigs.ts | 5 --- src/components/Runners/Ruou.tsx | 12 ------ src/components/Runners/index.ts | 1 - src/contents/13.en.tsx | 4 +- src/contents/13.jp.tsx | 4 +- src/lib/runners/ruou.json | 70 --------------------------------- 6 files changed, 4 insertions(+), 92 deletions(-) delete mode 100644 src/components/Runners/Ruou.tsx delete mode 100644 src/lib/runners/ruou.json diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 21dbd0213..31a8e7566 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -2088,11 +2088,6 @@ export const vlhb: ExpressionRunnerShorthandConfig = { showPriorities: true } -export const ruou: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.anme -} - export const awbq: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.exoq, diff --git a/src/components/Runners/Ruou.tsx b/src/components/Runners/Ruou.tsx deleted file mode 100644 index 1c88af9c6..000000000 --- a/src/components/Runners/Ruou.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/ruou.json' - -const Ruou = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Ruou diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index eb0521f45..e8ca2d98c 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -299,7 +299,6 @@ export { default as Cpdy } from 'src/components/Runners/Cpdy' export { default as Lxgj } from 'src/components/Runners/Lxgj' export { default as Wenx } from 'src/components/Runners/Wenx' export { default as Vlhb } from 'src/components/Runners/Vlhb' -export { default as Ruou } from 'src/components/Runners/Ruou' export { default as Awbq } from 'src/components/Runners/Awbq' export { default as Crvj } from 'src/components/Runners/Crvj' export { default as Ghwe } from 'src/components/Runners/Ghwe' diff --git a/src/contents/13.en.tsx b/src/contents/13.en.tsx index d801bc4f4..6a65c7713 100644 --- a/src/contents/13.en.tsx +++ b/src/contents/13.en.tsx @@ -479,9 +479,9 @@ export default () => ( .

- + Replace with - +

Here’s how we’re going to replace it:

Before (the bottom right section) diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index c2c4e725b..da73a7633 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -463,10 +463,10 @@ export default () => ( 」に置き換えるんだ。

- + 「 」に置き換える - +

以下のように置き換えてみるよ。

置き換え前(右下の部分のみ) diff --git a/src/lib/runners/ruou.json b/src/lib/runners/ruou.json deleted file mode 100644 index c12e96df4..000000000 --- a/src/lib/runners/ruou.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "type": "conditional", - "state": "default", - "checkType": "isZero", - "condition": { - "name": "blankNumberGreen", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "trueCase": { - "name": "blankNumberYellow", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "falseCase": { - "name": "blankNumberRed", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 3, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": true, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} From 595f97d146dc6fd64c6a5a5b39cb890f9cef2449 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 14:03:38 -0700 Subject: [PATCH 010/110] Remove sdta --- scripts/lib/runnerConfigs.ts | 6 - src/components/Runners/Sdta.tsx | 12 -- src/components/Runners/index.ts | 1 - src/contents/12.en.tsx | 16 +-- src/contents/12.jp.tsx | 16 +-- src/lib/runners/sdta.json | 203 -------------------------------- 6 files changed, 16 insertions(+), 238 deletions(-) delete mode 100644 src/components/Runners/Sdta.tsx delete mode 100644 src/lib/runners/sdta.json diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 31a8e7566..67e9c5900 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1869,12 +1869,6 @@ export const rhoa: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.anme } -export const sdta: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.cmay, - showPriorities: true -} - export const hhjq: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.rpcm, diff --git a/src/components/Runners/Sdta.tsx b/src/components/Runners/Sdta.tsx deleted file mode 100644 index d51ce17ef..000000000 --- a/src/components/Runners/Sdta.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/sdta.json' - -const Sdta = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Sdta diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index e8ca2d98c..4fd118845 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -267,7 +267,6 @@ export { default as Eweo } from 'src/components/Runners/Eweo' export { default as Bgko } from 'src/components/Runners/Bgko' export { default as Jehv } from 'src/components/Runners/Jehv' export { default as Rhoa } from 'src/components/Runners/Rhoa' -export { default as Sdta } from 'src/components/Runners/Sdta' export { default as Hhjq } from 'src/components/Runners/Hhjq' export { default as Dqwh } from 'src/components/Runners/Dqwh' export { default as Vwvb } from 'src/components/Runners/Vwvb' diff --git a/src/contents/12.en.tsx b/src/contents/12.en.tsx index 06a7b57f9..e5146cc6f 100644 --- a/src/contents/12.en.tsx +++ b/src/contents/12.en.tsx @@ -122,9 +122,9 @@ export default () => ( Reproduce … - + 👧🏻 Using a lunchbox! - + ( Reproduce … - + 👧🏻 Using a lunchbox!
Question: Is this the correct answer? - + ( } ]} /> - + 👧🏻 In Saya’s lunchbox… - + Use {' '} @@ -793,11 +793,11 @@ export default () => ( … - + …can be reproduced by
👧🏻 Saya’s lunchbox! - + ( 」を… - + 👧🏻 弁当箱で再現してみた！ - + ( 」を… - + 👧🏻 サヤちゃんが弁当箱で再現してみた！
果たして、これが正解なのか？ - + ( } ]} /> - + 👧🏻 サヤの弁当箱の… - + に{' '} @@ -825,11 +825,11 @@ export default () => ( 」は… - + 👧🏻 サヤちゃんの弁当箱で
再現できている！ - + Date: Thu, 17 Oct 2019 14:49:26 -0700 Subject: [PATCH 011/110] Continue with 7 --- src/contents/7.jp.tsx | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index 02eed949e..0c79a204a 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -246,11 +246,51 @@ export default () => ( /> + +

+ 次に、 + + 上の弁当箱と、こちらの弁当箱を合体させます。 + +

+

+ それぞれの {' '} + には何らかの料理が入るのですが、それについてはこれから説明します。 +

+ + ) + } + ]} + /> + + こちらの弁当箱と合体させる。 +
+ それぞれの には +
+ 何らかの料理が入る + + +

合体させると、次のようになります。

+ + ) + } + ]} + /> Date: Thu, 17 Oct 2019 14:49:44 -0700 Subject: [PATCH 012/110] Remove unused json --- src/lib/runners/aimm.json | 39 - src/lib/runners/orhj.json | 60 - src/lib/runners/poii.json | 2907 ------------------------------------- 3 files changed, 3006 deletions(-) delete mode 100644 src/lib/runners/aimm.json delete mode 100644 src/lib/runners/orhj.json delete mode 100644 src/lib/runners/poii.json diff --git a/src/lib/runners/aimm.json b/src/lib/runners/aimm.json deleted file mode 100644 index e397e483e..000000000 --- a/src/lib/runners/aimm.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "expressionContainers": [ - { - "containerState": "done", - "previouslyChangedExpressionState": "default", - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 3 - } - } - ], - "speed": 1, - "showOnlyFocused": false, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": true, - "variableSize": "lg", - "containerSize": "xxs", - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "argPriorityAggHighlights": [], - "funcPriorityAggHighlights": [], - "highlightFunctions": false, - "superFastForward": false -} diff --git a/src/lib/runners/orhj.json b/src/lib/runners/orhj.json deleted file mode 100644 index 8d722f5f6..000000000 --- a/src/lib/runners/orhj.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "expressionContainers": [ - { - "containerState": "ready", - "previouslyChangedExpressionState": "default", - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 2 - }, - "func": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "add" - }, - "state": "default", - "type": "call", - "priority": 1 - } - } - ], - "speed": 1, - "showOnlyFocused": false, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": true, - "variableSize": "lg", - "containerSize": "xxs", - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "argPriorityAggHighlights": [], - "funcPriorityAggHighlights": [], - "highlightFunctions": false, - "superFastForward": false -} diff --git a/src/lib/runners/poii.json b/src/lib/runners/poii.json deleted file mode 100644 index 48df85e88..000000000 --- a/src/lib/runners/poii.json +++ /dev/null @@ -1,2907 +0,0 @@ -{ - "expressionContainers": [ - { - "containerState": "ready", - "previouslyChangedExpressionState": "default", - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "type": "function" - }, - "state": "default", - "type": "call", - "priority": 1 - } - }, - { - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "func": { - "arg": { - "name": "a", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "a", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "type": "function" - }, - "state": "active", - "type": "call", - "priority": 1 - }, - "previouslyChangedExpressionState": "active", - "activePriority": 1, - "containerState": "stepped" - }, - { - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "func": { - "arg": { - "name": "a", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "a", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "type": "function" - }, - "state": "showFuncUnbound", - "type": "call", - "priority": 1 - }, - "previouslyChangedExpressionState": "showFuncUnbound", - "activePriority": 1, - "containerState": "stepped" - }, - { - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "func": { - "arg": { - "name": "a", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "a", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "type": "function" - }, - "state": "betaReducePreviewBefore", - "type": "call", - "priority": 1 - }, - "previouslyChangedExpressionState": "betaReducePreviewBefore", - "matchExists": true, - "activePriority": 1, - "containerState": "stepped" - }, - { - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "func": { - "arg": { - "name": "a", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "d", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "state": "default", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "type": "function" - }, - "state": "betaReducePreviewAfter", - "type": "call", - "priority": 1 - }, - "previouslyChangedExpressionState": "betaReducePreviewAfter", - "activePriority": 1, - "containerState": "stepped" - }, - { - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "func": { - "arg": { - "name": "a", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "state": "default", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "type": "function" - }, - "state": "betaReducePreviewCrossed", - "type": "call", - "priority": 1 - }, - "previouslyChangedExpressionState": "betaReducePreviewCrossed", - "activePriority": 1, - "containerState": "stepped" - }, - { - "containerState": "ready", - "previouslyChangedExpressionState": "default", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "state": "default", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - } - }, - { - "containerState": "stepped", - "previouslyChangedExpressionState": "active", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true - }, - "func": { - "arg": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "state": "active", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "activePriority": 2 - }, - { - "containerState": "stepped", - "previouslyChangedExpressionState": "showFuncUnbound", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true - }, - "func": { - "arg": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "state": "showFuncUnbound", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "activePriority": 2 - }, - { - "containerState": "stepped", - "previouslyChangedExpressionState": "betaReducePreviewBefore", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true - }, - "func": { - "arg": { - "name": "d", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "d", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "state": "betaReducePreviewBefore", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "matchExists": true, - "activePriority": 2 - }, - { - "containerState": "stepped", - "previouslyChangedExpressionState": "betaReducePreviewAfter", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true - }, - "func": { - "arg": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "state": "betaReducePreviewAfter", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "activePriority": 2 - }, - { - "containerState": "stepped", - "previouslyChangedExpressionState": "betaReducePreviewCrossed", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "b", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true - }, - "func": { - "arg": { - "name": "d", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "state": "betaReducePreviewCrossed", - "type": "call", - "priority": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "activePriority": 2 - }, - { - "containerState": "ready", - "previouslyChangedExpressionState": "default", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "state": "default", - "type": "call", - "priority": 2 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - } - }, - { - "containerState": "stepped", - "previouslyChangedExpressionState": "active", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true - }, - "func": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "state": "active", - "type": "call", - "priority": 2 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "activePriority": 2 - }, - { - "containerState": "stepped", - "previouslyChangedExpressionState": "showFuncBound", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true - }, - "func": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "state": "showFuncBound", - "type": "call", - "priority": 2 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "activePriority": 2 - }, - { - "containerState": "stepped", - "previouslyChangedExpressionState": "betaReducePreviewBefore", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true - }, - "func": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "state": "betaReducePreviewBefore", - "type": "call", - "priority": 2 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "matchExists": true, - "activePriority": 2 - }, - { - "containerState": "stepped", - "previouslyChangedExpressionState": "betaReducePreviewAfter", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true - }, - "func": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "state": "betaReducePreviewAfter", - "type": "call", - "priority": 2 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "activePriority": 2 - }, - { - "containerState": "stepped", - "previouslyChangedExpressionState": "betaReducePreviewCrossed", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true - }, - "func": { - "arg": { - "name": "e", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": true, - "bound": false - }, - "body": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "state": "betaReducePreviewCrossed", - "type": "call", - "priority": 2 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - }, - "activePriority": 2 - }, - { - "containerState": "done", - "previouslyChangedExpressionState": "default", - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 2 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "type": "function" - }, - "type": "function" - } - } - ], - "speed": 1, - "showOnlyFocused": false, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "variableSize": "md", - "containerSize": "xxs", - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": true, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "argPriorityAggHighlights": [], - "funcPriorityAggHighlights": [], - "highlightFunctions": false, - "superFastForward": false -} From cff41e69f1367fc667636b42a9c23ed8155b9580 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 14:59:55 -0700 Subject: [PATCH 013/110] Simplify meta --- scripts/lib/churchEncodingParams.ts | 11 ++-- scripts/lib/initialExpressionContainers.ts | 58 ++++------------------ src/types/ExpressionTypes.ts | 2 +- 3 files changed, 16 insertions(+), 55 deletions(-) diff --git a/scripts/lib/churchEncodingParams.ts b/scripts/lib/churchEncodingParams.ts index d8edfaac8..3637b674a 100644 --- a/scripts/lib/churchEncodingParams.ts +++ b/scripts/lib/churchEncodingParams.ts @@ -28,16 +28,14 @@ const nest = ( export const numberParams = ( f: VariableNames | HighlightedVariableExpressionParams, x: VariableNames | HighlightedVariableExpressionParams, - n: number, - focused?: boolean + n: number ): FunctionExpressionParams => { return { arg: f, body: { arg: x, body: nest(f, x, n) - }, - meta: focused ? 'focused' : undefined + } } } @@ -73,8 +71,7 @@ export const succParams = ( a: VariableNames | HighlightedVariableExpressionParams, b: VariableNames | HighlightedVariableExpressionParams, c: VariableNames | HighlightedVariableExpressionParams, - focused?: boolean, - specialEffect?: boolean + specialEffect?: true ): FunctionExpressionParams => { return { arg: a, @@ -85,7 +82,7 @@ export const succParams = ( body: [b, [a, b, c]] } }, - meta: specialEffect ? 'plusOneEffect' : focused ? 'focused' : undefined + meta: specialEffect ? 'plusOneEffect' : undefined } } diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index ebb574c92..2b5629630 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -786,34 +786,16 @@ export const epmt = initializeExpressionContainer( ) export const yrgv = initializeExpressionContainer( - succParams( - 'questionFoodGrey', - 'questionFoodGrey', - 'questionFoodGrey', - false, - true - ) + succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true) ) export const szos = initializeExpressionContainer([ - succParams( - 'questionFoodGrey', - 'questionFoodGrey', - 'questionFoodGrey', - false, - true - ), + succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true), numberParams('d', 'e', 1) ]) export const pxae = initializeExpressionContainer([ - succParams( - 'questionFoodGrey', - 'questionFoodGrey', - 'questionFoodGrey', - false, - true - ), + succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true), numberParams('f', 'g', 2) ]) @@ -833,13 +815,7 @@ export const vemg = initializeExpressionContainer( ) export const glmd = initializeExpressionContainer([ - succParams( - 'questionFoodGrey', - 'questionFoodGrey', - 'questionFoodGrey', - false, - true - ), + succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true), { shorthandNumber: 1, shorthandNumberAfterConvert: 'number' @@ -847,13 +823,7 @@ export const glmd = initializeExpressionContainer([ ]) export const kgoi = initializeExpressionContainer([ - succParams( - 'questionFoodGrey', - 'questionFoodGrey', - 'questionFoodGrey', - false, - true - ), + succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true), { shorthandNumber: 2, shorthandNumberAfterConvert: 'number' @@ -861,13 +831,7 @@ export const kgoi = initializeExpressionContainer([ ]) export const cyhx = initializeExpressionContainer([ - succParams( - 'questionFoodGrey', - 'questionFoodGrey', - 'questionFoodGrey', - false, - true - ), + succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true), { shorthandNumberAfterConvert: 'blank' } @@ -1010,16 +974,16 @@ export const ngth = initializeExpressionContainer([ ]) export const disc = initializeExpressionContainer( - succParams('a', 'b', 'c', false, true) + succParams('a', 'b', 'c', true) ) export const blns = initializeExpressionContainer( - succParams('A', 'B', 'C', false, true) + succParams('A', 'B', 'C', true) ) export const ojsm = initializeExpressionContainer(succParams('h', 'i', 'j')) export const zgad = initializeExpressionContainer( - succParams('h', 'i', 'j', false, true) + succParams('h', 'i', 'j', true) ) export const lidn = initializeExpressionContainer( @@ -1032,7 +996,7 @@ export const mtyb = initializeExpressionContainer([ ]) export const orfr = initializeExpressionContainer([ - succParams('a', 'b', 'c', false, true), + succParams('a', 'b', 'c', true), numberParams('d', 'b', 1) ]) @@ -1468,7 +1432,7 @@ export const snye = initializeExpressionContainer([ ]) export const aqvq = initializeExpressionContainer( - succParams('i', 'j', 'k', false, true) + succParams('i', 'j', 'k', true) ) export const abrk = initializeExpressionContainer([ diff --git a/src/types/ExpressionTypes.ts b/src/types/ExpressionTypes.ts index d29f32da3..983dfc83d 100644 --- a/src/types/ExpressionTypes.ts +++ b/src/types/ExpressionTypes.ts @@ -285,7 +285,7 @@ export interface FunctionExpression { readonly type: 'function' readonly arg: VariableExpression readonly body: Expression - readonly meta?: 'focused' | 'plusOneEffect' | 'minusOneEffect' + readonly meta?: 'plusOneEffect' | 'minusOneEffect' readonly maxNestedFunctionDepth?: number } From 616aea4d6384c3f153c2b7e5c2ea4f5af922898b Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 15:15:03 -0700 Subject: [PATCH 014/110] Continue with 7 --- scripts/lib/initialExpressionContainers.ts | 5 + scripts/lib/runnerConfigs.ts | 6 + src/components/Runners/Stda.tsx | 12 ++ src/components/Runners/index.ts | 1 + src/contents/7.jp.tsx | 57 +----- src/lib/runners/stda.json | 201 +++++++++++++++++++++ 6 files changed, 227 insertions(+), 55 deletions(-) create mode 100644 src/components/Runners/Stda.tsx create mode 100644 src/lib/runners/stda.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 2b5629630..625c130a6 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -785,6 +785,11 @@ export const epmt = initializeExpressionContainer( succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey') ) +export const ikrk = initializeExpressionContainer([ + succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey'), + numberParams('d', 'e', 0) +]) + export const yrgv = initializeExpressionContainer( succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true) ) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 67e9c5900..488ebd76d 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1091,6 +1091,12 @@ export const envj: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const stda: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.ikrk, + showPriorities: true +} + export const jguj: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.yrgv, diff --git a/src/components/Runners/Stda.tsx b/src/components/Runners/Stda.tsx new file mode 100644 index 000000000..f385cab7d --- /dev/null +++ b/src/components/Runners/Stda.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/stda.json' + +const Stda = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Stda diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 4fd118845..59297df69 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -163,6 +163,7 @@ export { default as Dogu } from 'src/components/Runners/Dogu' export { default as Cowm } from 'src/components/Runners/Cowm' export { default as Ozxi } from 'src/components/Runners/Ozxi' export { default as Envj } from 'src/components/Runners/Envj' +export { default as Stda } from 'src/components/Runners/Stda' export { default as Jguj } from 'src/components/Runners/Jguj' export { default as Fljg } from 'src/components/Runners/Fljg' export { default as Ezmz } from 'src/components/Runners/Ezmz' diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index 0c79a204a..220457d6b 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -291,67 +291,14 @@ export default () => ( } ]} /> + 合体させるとこうなる -

何だか複雑そうな弁当箱だなあ…

-

- - {' '} - にはそれぞれ何の料理が入るの？ - -

- - ) - }, { type: 'dog', children: ( <> -

- それが今回の問題です！ - - 村人のみなさんには、 - {' '} - には何の料理が入るかを当ててもらいます。 - -

- - ) - } - ]} - /> - - - に何が入るかを -
- 当ててもらいます！🐶 - - - -

- でも、まだ何の情報もないから… - {' '} - に何が入るかなんて分かんないよ。 -

- - ) - }, - { - type: 'dog', - children: ( - <> -

- その通りです。まだ説明することがありますから。では、続けますね！ -

+

それでは、ここで質問です！

) } diff --git a/src/lib/runners/stda.json b/src/lib/runners/stda.json new file mode 100644 index 000000000..4e0bb6eed --- /dev/null +++ b/src/lib/runners/stda.json @@ -0,0 +1,201 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "questionFoodGrey", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "questionFoodGrey", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "questionFoodGrey", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "questionFoodGrey", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "questionFoodGrey", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "questionFoodGrey", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "questionFoodGrey", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 5, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From c3bbfea4336c56b6baded1c5684e8b53b407deab Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 17:50:53 -0700 Subject: [PATCH 015/110] Remove ilbg and zrwn --- scripts/lib/initialExpressionContainers.ts | 8 -------- scripts/lib/runnerConfigs.ts | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 625c130a6..f716fd71d 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -2220,14 +2220,6 @@ export const nuoh = initializeExpressionContainer([ 'B' ]) -export const ilbg = initializeDoneExpressionContainer({ - shorthandNumber: 2 -}) - -export const zrwn = initializeDoneExpressionContainer({ - shorthandNumber: 1 -}) - export const ntes = initializeExpressionContainer(numberParams('c', 'd', 1)) export const tgxv = initializeExpressionContainer(numberParams('g', 'h', 3)) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 488ebd76d..c80274b5e 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -398,7 +398,7 @@ export const iatt: ExpressionRunnerShorthandConfig = { runner: 'predefined', initialExpressionContainers: [ initialExpressionContainers.ekyd, - initialExpressionContainers.zrwn + initialExpressionContainers.ntua ] } @@ -980,7 +980,7 @@ export const pgxb: ExpressionRunnerShorthandConfig = { runner: 'predefined', initialExpressionContainers: [ initialExpressionContainers.bmar, - initialExpressionContainers.ilbg + initialExpressionContainers.hdpc ] } From 453d10f56ccb852c1665d4e72635fad5fd83fe5b Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 19:00:24 -0700 Subject: [PATCH 016/110] Continue with 7 --- src/contents/7.jp.tsx | 151 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index 220457d6b..1fa1dab78 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -307,6 +307,157 @@ export default () => ( ) }, + { + type: 'challengeProblem', + title: ( + <> + を に + + ), + content: ( + <> + +

+ 先ほどの弁当箱は、 + + それぞれの {' '} + に、ある法則に基づいて料理を入れ、 + +

+ +

+ …を行うと、 + + 結果が になります。 + +

+ + ) + } + ]} + /> + + それぞれの に、 +
+ ある法則に基づいて料理を入れ、 + + + + +
+ すると、結果は になる + + +

+ もともとの弁当箱が {' '} + に変換できる弁当箱だったので、 +

+ + + +

+ 先ほどの {' '} + がたくさんある弁当箱と合体させると、 + + が{' '} + になる + + というわけですね。 +

+ + ) + } + ]} + /> + , + , + , + , + + ]} + description={ + <> + 先ほどの {' '} + がたくさんある弁当箱と +
+ 合体させると、 + が {' '} + になる + + } + /> + +

それでは、ここで問題です！

+

+ + それぞれの {' '} + にどんな料理を入れると、結果が{' '} + になるでしょう？ + +

+ + ) + } + ]} + /> + + + 問題: それぞれの に、 +
+ どんな料理を入れると、 + + + + + + +
+ したとき、結果が になる？ + + + +

+ この問題こそが、以前から話していた「難しい問題」だ。 + + これを解けたら、約束通り計算箱を返してやろう！ + +

+ + ) + } + ]} + /> + + ) + }, { title: ( <> From 33ae63e23f7365c63df81682456618155488c0d0 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 21:23:06 -0700 Subject: [PATCH 017/110] Continue with 7 --- scripts/lib/initialExpressionContainers.ts | 10 + scripts/lib/runnerConfigs.ts | 12 ++ src/components/Runners/Fzpz.tsx | 12 ++ src/components/Runners/Whrn.tsx | 12 ++ src/components/Runners/index.ts | 2 + src/contents/7.jp.tsx | 128 +++++++++++++ src/lib/runners/fzpz.json | 201 +++++++++++++++++++++ src/lib/runners/whrn.json | 201 +++++++++++++++++++++ 8 files changed, 578 insertions(+) create mode 100644 src/components/Runners/Fzpz.tsx create mode 100644 src/components/Runners/Whrn.tsx create mode 100644 src/lib/runners/fzpz.json create mode 100644 src/lib/runners/whrn.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index f716fd71d..3db22218d 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -790,6 +790,16 @@ export const ikrk = initializeExpressionContainer([ numberParams('d', 'e', 0) ]) +export const uhae = initializeExpressionContainer([ + succParams(highlighted('a'), highlighted('b'), highlighted('c')), + numberParams('d', 'e', 0) +]) + +export const pyas = initializeExpressionContainer([ + succParams('a', 'b', 'c'), + numberParams('d', 'e', 0) +]) + export const yrgv = initializeExpressionContainer( succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true) ) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index c80274b5e..71a319c30 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1097,6 +1097,18 @@ export const stda: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const fzpz: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.uhae, + showPriorities: true +} + +export const whrn: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.pyas, + showPriorities: true +} + export const jguj: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.yrgv, diff --git a/src/components/Runners/Fzpz.tsx b/src/components/Runners/Fzpz.tsx new file mode 100644 index 000000000..8f964bf0b --- /dev/null +++ b/src/components/Runners/Fzpz.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/fzpz.json' + +const Fzpz = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Fzpz diff --git a/src/components/Runners/Whrn.tsx b/src/components/Runners/Whrn.tsx new file mode 100644 index 000000000..96a05c151 --- /dev/null +++ b/src/components/Runners/Whrn.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/whrn.json' + +const Whrn = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Whrn diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 59297df69..894a40569 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -164,6 +164,8 @@ export { default as Cowm } from 'src/components/Runners/Cowm' export { default as Ozxi } from 'src/components/Runners/Ozxi' export { default as Envj } from 'src/components/Runners/Envj' export { default as Stda } from 'src/components/Runners/Stda' +export { default as Fzpz } from 'src/components/Runners/Fzpz' +export { default as Whrn } from 'src/components/Runners/Whrn' export { default as Jguj } from 'src/components/Runners/Jguj' export { default as Fljg } from 'src/components/Runners/Fljg' export { default as Ezmz } from 'src/components/Runners/Ezmz' diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index 1fa1dab78..51c63a2a2 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -458,6 +458,134 @@ export default () => ( ) }, + { + title: <>試しに適当な料理を入れてみる, + content: ( + <> + +

+ うーん… + + 問題を完全に理解できた自信がないし、どうやって解けばいいかさっぱり分からない！ + +

+ + ) + }, + { + type: 'dog', + children: ( + <> +

大丈夫、安心してください！

+

+ + 試しに、 + {' '} + に適当な料理を入れてみると、問題を理解できると思います。 + +

+ + ) + } + ]} + /> + + {' '} + に適当な料理を入れてみて下さい！🐶 + + +

+ わかった。じゃあとりあえず、 + {' '} + に適当な料理を入れてみよう。 +

+

+ + 、 + 、 + + を適当な組み合わせで{' '} + {' '} + に入れてみたよ。 + +

+ + ) + } + ]} + /> + + {' '} + を適当に{' '} + に入れてみた + + +

では、問題を復習しましょう。上の弁当箱を、

+ +

したときに、結果が…

+
    + + になれば + 成功 🎉 + + + それ以外なら失敗{' '} + 😭 + +
+

というわけです。

+ + ) + } + ]} + /> + こちらの弁当箱を… + + + + して… + + + + + 結果が になれば + 成功 🎉 +
+ それ以外なら失敗 😭 + + +

+ では、 + してみましょう！ +

+ + ) + } + ]} + /> + + ) + }, { title: ( <> diff --git a/src/lib/runners/fzpz.json b/src/lib/runners/fzpz.json new file mode 100644 index 000000000..9ec709e0e --- /dev/null +++ b/src/lib/runners/fzpz.json @@ -0,0 +1,201 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 5, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/whrn.json b/src/lib/runners/whrn.json new file mode 100644 index 000000000..973194900 --- /dev/null +++ b/src/lib/runners/whrn.json @@ -0,0 +1,201 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 5, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From c66f561b78bf281c8836c1471bc5cd3a77eadca4 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 21:56:49 -0700 Subject: [PATCH 018/110] Continue with 7 --- scripts/lib/initialExpressionContainers.ts | 41 ++++++++++---- scripts/lib/runnerConfigs.ts | 4 +- src/contents/7.jp.tsx | 64 +++++++++++++++++++++- src/lib/runners/fzpz.json | 2 +- src/lib/runners/whrn.json | 2 +- 5 files changed, 97 insertions(+), 16 deletions(-) diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 3db22218d..b8e93ca26 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -790,16 +790,6 @@ export const ikrk = initializeExpressionContainer([ numberParams('d', 'e', 0) ]) -export const uhae = initializeExpressionContainer([ - succParams(highlighted('a'), highlighted('b'), highlighted('c')), - numberParams('d', 'e', 0) -]) - -export const pyas = initializeExpressionContainer([ - succParams('a', 'b', 'c'), - numberParams('d', 'e', 0) -]) - export const yrgv = initializeExpressionContainer( succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true) ) @@ -863,6 +853,37 @@ export const hswh = initializeExpressionContainer({ shorthandNumberPlusOrMinusOne: 'plus' }) +export const mzms = initializeExpressionContainer([ + { + arg: highlighted('a'), + body: { + arg: highlighted('b'), + body: { + arg: highlighted('c'), + body: [ + highlighted('b'), + [highlighted('a'), highlighted('b'), highlighted('b')] + ] + } + } + }, + numberParams('d', 'e', 0) +]) + +export const ipgy = initializeExpressionContainer([ + { + arg: 'a', + body: { + arg: 'b', + body: { + arg: 'c', + body: ['b', ['a', 'b', 'b']] + } + } + }, + numberParams('d', 'e', 0) +]) + export const ktus = initializeExpressionContainer({ arg: 'a', body: { diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 71a319c30..f420ae13d 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1099,13 +1099,13 @@ export const stda: ExpressionRunnerShorthandConfig = { export const fzpz: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.uhae, + initialExpressionContainer: initialExpressionContainers.mzms, showPriorities: true } export const whrn: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.pyas, + initialExpressionContainer: initialExpressionContainers.ipgy, showPriorities: true } diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index 51c63a2a2..0da88cbcf 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -575,8 +575,7 @@ export default () => ( children: ( <>

- では、 - してみましょう！ + では、上の弁当箱を実行したらどうなるか見てみましょう！

) @@ -584,6 +583,67 @@ export default () => ( ]} /> + ), + footer: { + content: ( + <> + +
+ + + } + preview={{ + text: <>初級編の内容を復習する, + content: ( + <> +

+ 復習が必要ですか？: 今回の弁当箱では、 + 初級その5で学んだ法則が登場 + します。 +

+

+ 復習したい場合は、↓の「初級編の内容を復習する」を押してください。 +

+ + ) + }} + /> + + ) + } + }, + { + title: <>早送りしてみよう, + content: ( + <> + + + + + + + + + + + + + +

つまり、最終的に以下のようになりました！

+ + ) + } + ]} + /> + 実行結果 + ) }, { diff --git a/src/lib/runners/fzpz.json b/src/lib/runners/fzpz.json index 9ec709e0e..0fe5f4d94 100644 --- a/src/lib/runners/fzpz.json +++ b/src/lib/runners/fzpz.json @@ -92,7 +92,7 @@ "body": { "arg": { "arg": { - "name": "c", + "name": "b", "highlightType": "initialHighlighted", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", diff --git a/src/lib/runners/whrn.json b/src/lib/runners/whrn.json index 973194900..e501baa4c 100644 --- a/src/lib/runners/whrn.json +++ b/src/lib/runners/whrn.json @@ -92,7 +92,7 @@ "body": { "arg": { "arg": { - "name": "c", + "name": "b", "highlightType": "default", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", From da2321b48428be8458753640dae9550b30652402 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 22:24:15 -0700 Subject: [PATCH 019/110] Continue with 7 --- scripts/lib/initialExpressionContainers.ts | 6 +- src/contents/7.jp.tsx | 1143 +------------------- src/lib/runners/akjy.json | 372 +------ src/lib/runners/bgxi.json | 45 +- src/lib/runners/bwff.json | 45 +- src/lib/runners/dhiu.json | 332 ++---- src/lib/runners/fhrd.json | 45 +- src/lib/runners/hnyn.json | 255 ++--- src/lib/runners/nuco.json | 42 +- src/lib/runners/ufjx.json | 42 +- src/lib/runners/xwzc.json | 45 +- 11 files changed, 289 insertions(+), 2083 deletions(-) diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index b8e93ca26..7f85cca88 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -906,14 +906,14 @@ export const kwqc = initializeExpressionContainer([ } } }, - numberParams('d', 'e', 1) + numberParams('d', 'e', 0) ]) export const iqbf = initializeExpressionContainer({ arg: 'b', body: { arg: 'c', - body: ['b', ['b', { name: 'b', highlighted: true }]] + body: ['b', { name: 'b', highlighted: true }] } }) @@ -986,7 +986,7 @@ export const utur = initializeExpressionContainer([ ]) export const abbh = initializeExpressionContainer( - numberParamsHighlightNonNumber('b', 'c', 2) + numberParamsHighlightNonNumber('b', 'c', 1) ) export const uzzl = initializeExpressionContainer(succParams('a', 'b', 'c')) diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index 0da88cbcf..e0b829456 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -646,1070 +646,6 @@ export default () => ( ) }, - { - title: ( - <> - - - ), - content: ( - <> - -

- 先ほどの弁当箱は、 - - それぞれの {' '} - に、ある法則に基づいて料理を入れると… - -

-

- - - がある弁当箱になります。 - -

- - ) - } - ]} - /> - - それぞれの に、 -
- ある法則に基づいて料理を入れると、 -
- - がある弁当箱になる - - -

- 背景に {' '} - の模様がついた！ -

- - ) - }, - { - type: 'dog', - children: ( - <> -

- そうですね。背景にある{' '} - {' '} - の模様は単に、 - - があるということを表しているだけです。 -

- - ) - }, - { - type: 'thinking', - children: ( - <> -

- その - - ってどういう効果なの？ -

- - ) - }, - { - type: 'dog', - children: ( - <> -

では、説明しますね！

- - ) - } - ]} - /> - - ) - }, - { - type: 'summary', - title: ( - <> - - の説明 - - ), - content: ( - <> - -

- - とはどういう効果を説明しますね。 -

-

- まず、 - - ある数字 {' '} - に変換できる弁当箱と合体させてみます。 - -

- - ) - } - ]} - /> - - - に変換できる弁当箱と、 -
- - がある弁当箱を合体 - - -

この合体した弁当箱を、

- -

- すると、 - - 結果は {' '} - ➕ {' '} - - になるのです。 -

- - ) - } - ]} - /> - - -
- すると、結果は {' '} - ➕ になる - - -

- これが - - です。 -

-

- 一言で言うと、 - に変換できる弁当箱を{' '} - ➕{' '} - にできるんです！ -

- - ) - } - ]} - /> - , - , - , - ➕, - - ]} - description={ - <> - に変換できる弁当箱を -
- ➕{' '} - にできる - - } - /> - -

うーん、具体例で説明してくれる？

- - ) - } - ]} - /> - - ) - }, - { - title: ( - <> - が になる - - ), - content: ( - <> - -

- では、具体例で説明しましょう！ - : -

- - ) - } - ]} - /> - - -

- 前回の復習ですが、この弁当箱は、ぼくが計算箱に変換すると{' '} - になります。 -

- - ) - } - ]} - /> - - - - - - -

- では上の弁当箱を、先ほどの - - がある弁当箱と - 合体させてみます。 -

- - ) - } - ]} - /> - - - がある弁当箱と合体 - - -

- では、この弁当箱を「 - - - - 」するとどうなるか見てみましょう。 -

- - ) - } - ]} - /> - - -

- になった！ -

- - ) - }, - { - type: 'dog', - children: ( - <> -

そうなんです！つまり、

-
    - - - に変換できる弁当箱と、 - - - - - 先ほどの - - がある弁当箱を合体させて、 - - -
- -

- を押すと、 - - 結果は になる - - ということです。 -

- - ) - } - ]} - /> - - に変換できる弁当箱と、 -
- - がある弁当箱を合体させ… - - - - -
- すると、結果は になる - - -

- つまりざっくり言うと、 - - が{' '} - になった - - というわけです。 -

- - ) - } - ]} - /> - , - , - - ]} - description={ - <> - ざっくり言うと、 - が {' '} - になった - - } - /> - - ) - }, - { - title: ( - <> - が になる - - ), - content: ( - <> - -

- 続いて、 - 。 -

- - ) - } - ]} - /> - - -

- この弁当箱は、ぼくが計算箱に変換すると{' '} - になります。 -

- - ) - } - ]} - /> - - - - - - -

- この弁当箱も、 - - 先ほどの - - がある弁当箱と合体させてみました。 - -

- - ) - } - ]} - /> - - - がある弁当箱と合体 - - -

- こちらを「 - - - - 」するとどうなるか確かめてみてください！ -

- - ) - } - ]} - /> - - -

- になった！ -

- - ) - }, - { - type: 'dog', - children: ( - <> -

そうなんです！まとめると、以下のようになります。

- - ) - } - ]} - /> - - - に変換できる弁当箱と、 -
- - がある弁当箱を合体させ… - - - - -
- すると、結果は になる - - -

- ざっくり言うと、今度は{' '} - - が{' '} - になった - - のです。 -

- - ) - } - ]} - /> - , - , - - ]} - description={ - <> - ざっくり言うと、 - が {' '} - になった - - } - /> - - ) - }, - { - type: 'summary', - title: <>まとめ, - content: ( - <> - -

まとめると、

-
    - - - ある数字 {' '} - に変換できる弁当箱と、 - - - - - - がある弁当箱を合体させ、 - - -
- -

- を押すと、 - - 結果は {' '} - ➕ になる - - のです。 -

- - ) - } - ]} - /> - - に変換できる弁当箱と、 -
- - がある弁当箱を合体させ… - - - - -
- すると、結果は {' '} - ➕ になる - - - ) - }, - { - type: 'challengeProblem', - title: <>計算箱を賭けた問題, - content: ( - <> - -

- では、ここで問題です。 - - この弁当箱に、どのような法則に基づいて{' '} - {' '} - に料理を入れると… - -

- - ) - } - ]} - /> - - - どのような法則に基づいて -
- に料理を入れると… - - - -

- 先ほどのような、 - - - がある弁当箱になるでしょう？ - -

- - ) - } - ]} - /> - - - - がある弁当箱になる？ - - - -

- つまり、 - - それぞれの {' '} - に何を入れたら、 - - があるか当てろってこと？ - -

- - ) - } - ]} - /> - - それぞれの に何を入れたら -
- - がある弁当箱になる？ - - - - -

- はい、その通りです！ - - ある法則に基づいて{' '} - {' '} - に料理を入れた時に限り - - 、 - がある弁当箱になります。 -

-

- - それがどんな法則が、当ててみよう！ - - という問題です。 -

- - ) - }, - { - type: 'devil', - children: ( - <> -

- この問題こそが、以前から話していた「難しい問題」だ。 - - これを解けたら、約束通り計算箱を返してやろう！ - -

- - ) - } - ]} - /> - , - 😈, - - ]} - description={<>この問題が解けたら、計算箱を返してやろう！} - /> - - ) - }, - { - title: ( - <> - 試しに適当な料理を入れてみる - - ), - content: ( - <> - -

- うーん… - - 問題を完全に理解できた自信がないし、どうやって解けばいいかさっぱり分からない！ - -

- - ) - }, - { - type: 'dog', - children: ( - <> -

大丈夫、安心してください！

-

- - 試しに、 - {' '} - に適当な料理を入れてみると、問題を理解できると思います。 - -

- - ) - } - ]} - /> - - {' '} - に適当な料理を入れてみて下さい！🐶 - - -

- わかった。じゃあとりあえず、 - {' '} - に適当な料理を入れてみよう。 -

-

- - 、 - 、 - - を適当な組み合わせで{' '} - {' '} - に入れてみたよ。 - -

- - ) - } - ]} - /> - - {' '} - を適当に{' '} - に入れてみた - - -

- この弁当箱に、 - - があれば - 成功 🎉 - 、なければ失敗{' '} - 😭 ということかな？ -

- - ) - }, - { - type: 'dog', - children: ( - <> -

- そうですね。そして、 - - があるかどうかを確かめるには、まず{' '} - ➕{' '} - {' '} - が計算できるかを確かめてみます。 -

- - ) - } - ]} - /> - , - ➕, - - ]} - description={ - <> - ➕{' '} - が計算できるか確かめる - - } - /> - -

- つまり、以下のように {' '} - に変換できる弁当箱と合体させたときに… -

-

- 結果が {' '} - にならないといけないのです。 -

- - ) - } - ]} - /> - - に変換できる弁当箱と、 -
- 先ほどの弁当箱を合体させ… - - - - - して… - - - - - 結果が になれば -
- - があるので - 成功 🎉 -
- それ以外なら失敗 😭 - - - ) - }, - { - title: ( - <> - - があるかチェック - - ), - content: ( - <> - -

- では、 - ➕{' '} - {' '} - が計算できるか確かめるために、冒頭にも登場した、 - {' '} - に変換できる弁当箱を使って試してみましょう。 -

- - ) - } - ]} - /> - - - - -

- これを先ほどの弁当箱と組み合わせて、 - - し、 - - ➕{' '} - を計算できればいい - - んだな。 -

-

- すなわち、 - - 結果が になれば - 成功 🎉 - 、それ以外なら - - 失敗 - 😭{' '} - - というわけか。 -

- - ) - } - ]} - /> - - に変換できる弁当箱と、 -
- 先ほどの弁当箱を合体させ… - - - - - して… - - - - - 結果が になれば - 成功 🎉 -
- それ以外なら失敗 😭 - - -

では、上の弁当箱を実行したらどうなるか見ていこう！

- - ) - } - ]} - /> - - ), - footer: { - content: ( - <> - -
- - - } - preview={{ - text: <>初級編の内容を復習する, - content: ( - <> -

- 復習が必要ですか？: 今回の弁当箱では、 - 初級その5で学んだ法則が登場 - します。 -

-

- 復習したい場合は、↓の「初級編の内容を復習する」を押してください。 -

- - ) - }} - /> - - ) - } - }, - { - title: <>早送りしてみよう, - content: ( - <> - - - - - - - - - - - - - -

つまり、最終的に以下のようになりました！

- - ) - } - ]} - /> - 実行結果 - - ) - }, { title: <>計算箱に変換できない, content: ( @@ -1802,18 +738,17 @@ export default () => (
だったら、 - に変換できていた + に変換できていた - + ) }, { title: ( <> - - は無い + 失敗 😭 ), content: ( @@ -1826,8 +761,8 @@ export default () => ( <>

つまり、実行しても{' '} - {' '} - に変換できる弁当箱になりませんでした。 + {' '} + に変換できる弁当箱にならなかったので…

) @@ -1835,14 +770,14 @@ export default () => ( ]} /> - に変換できる弁当箱と合体させ… + に変換できる弁当箱と合体させ… 実行したところ、
- {' '} + {' '} に変換できる弁当箱にならなかった @@ -1853,13 +788,7 @@ export default () => ( children: ( <>

- だから、 - - 先ほどの弁当箱に、 - - は無い - - のです。つまり、 + つまり、 不正解でした！

@@ -1867,9 +796,14 @@ export default () => ( } ]} /> + + それぞれの に… + + - - は無い + 先ほどのように料理を +
+ 当てはめるのは間違い 😭 ( type: 'dog', children: ( <> -

- 問題の意味が分かったでしょうか？では、もう一度聞きますね。 -

+

それでは、もう一度聞きますね！

- この弁当箱に、どのような法則に基づいて{' '} - {' '} - に料理を入れると… + それぞれの {' '} + にどんな料理を入れると、結果が{' '} + になるでしょう？

@@ -1916,35 +848,22 @@ export default () => ( } ]} /> - + - どのような法則に基づいて {' '} - に料理を入れると… + 問題: それぞれの に、 +
+ どんな料理を入れると、 - - -

- - - がある弁当箱になるでしょう？ - -

- - ) - } - ]} - /> - + + + - - がある弁当箱になる？ + +
+ したとき、結果が になる？ - + + Date: Thu, 17 Oct 2019 22:44:18 -0700 Subject: [PATCH 020/110] Simplify 7 --- src/contents/7.jp.tsx | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index e0b829456..a2100b81a 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -236,8 +236,11 @@ export default () => ( children: ( <>

- 前回の復習ですが、この弁当箱は、ぼくが計算箱に変換すると{' '} - になります。 + 前回の復習ですが、この弁当箱は、 + + ぼくが計算箱に変換すると {' '} + になります。 +

) @@ -264,8 +267,9 @@ export default () => (

- それぞれの {' '} - には何らかの料理が入るのですが、それについてはこれから説明します。 + それぞれの には + 何らかの料理が入る + のですが、それについてはこれから説明します。

) @@ -372,8 +376,7 @@ export default () => ( />

- 先ほどの {' '} - がたくさんある弁当箱と合体させると、 + 端的に言うと、 が{' '} になる @@ -389,16 +392,10 @@ export default () => ( nodes={[ , , - , - , ]} description={ <> - 先ほどの {' '} - がたくさんある弁当箱と -
- 合体させると、 が {' '} になる @@ -724,7 +721,7 @@ export default () => ( ではなくて だったら、 - に変換できていたのになあ。 + に変換できていたのになあ。 あとちょっとだったのに！

@@ -769,13 +766,9 @@ export default () => ( } ]} /> - - に変換できる弁当箱と合体させ… - + 実行しても… - 実行したところ、 -
{' '} に変換できる弁当箱にならなかった @@ -803,7 +796,8 @@ export default () => ( 先ほどのように料理を
- 当てはめるのは間違い 😭 + 当てはめるのは不正解{' '} + 😭 Date: Thu, 17 Oct 2019 22:56:57 -0700 Subject: [PATCH 021/110] Clarify 6 --- src/contents/6.en.tsx | 20 ++++++++++++++++++-- src/contents/6.jp.tsx | 9 +++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/contents/6.en.tsx b/src/contents/6.en.tsx index 8917c6726..13dcd8a86 100644 --- a/src/contents/6.en.tsx +++ b/src/contents/6.en.tsx @@ -1280,6 +1280,8 @@ export default () => ( + After +
@@ -1330,8 +1332,13 @@ export default () => ( <>

Suppose that you{' '} - the - lunchbox below: + {' '} + the lunchbox below:

) @@ -1497,6 +1504,15 @@ export default () => ( } ]} /> + + + + After +
+ + + + ) }, diff --git a/src/contents/6.jp.tsx b/src/contents/6.jp.tsx index 9e9c43133..7089f572d 100644 --- a/src/contents/6.jp.tsx +++ b/src/contents/6.jp.tsx @@ -1484,6 +1484,15 @@ export default () => ( } ]} /> + もともとの弁当箱を… + + + + + +
+ すると になる + ) }, From e2f0e41bcd47b533a7938d19c11774b7931b6430 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Thu, 17 Oct 2019 23:01:54 -0700 Subject: [PATCH 022/110] Continue with 8 --- src/contents/7.en.tsx | 4 ++-- src/contents/7.jp.tsx | 56 +++++++++++++++++++------------------------ src/contents/8.jp.tsx | 21 +++------------- 3 files changed, 29 insertions(+), 52 deletions(-) diff --git a/src/contents/7.en.tsx b/src/contents/7.en.tsx index 0d33d798a..d9d321fca 100644 --- a/src/contents/7.en.tsx +++ b/src/contents/7.en.tsx @@ -1013,8 +1013,8 @@ export default () => ( children: ( <>

- This is the very difficult question I’ve been talking - about. + This is the “very difficult question” I’ve + been talking about.

diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index a2100b81a..f6976180c 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -26,6 +26,26 @@ import NextLessonButton from 'src/components/NextLessonButton' import { Beginner5Rules } from 'src/contents/5.jp' import CardContent from 'src/components/CardContent' +export const Problem = () => ( + <> + + + 問題: それぞれの に、 +
+ どんな料理を入れると、 + + + + + + +
+ したとき、結果が になる？ + + + +) + export const StepOne = () => ( <> ( } ]} /> - - - 問題: それぞれの に、 -
- どんな料理を入れると、 - - - - - - -
- したとき、結果が になる？ - - + ( children: ( <>

- この問題こそが、以前から話していた「難しい問題」だ。 + この問題こそが、以前から話していた「 + 難しい問題」だ。 これを解けたら、約束通り計算箱を返してやろう！ @@ -842,22 +849,7 @@ export default () => ( } ]} /> - - - 問題: それぞれの に、 -
- どんな料理を入れると、 - - - - - - -
- したとき、結果が になる？ - - - + ( content: ( <> 😭, - , - 😭 - ]} + nodes={[😭, ❓, 😭]} />

ラムダ村の村人たちは、前回の問題に四苦八苦していました。

- - - どのような法則に基づいて {' '} - に料理を入れると… - - - - - - がある弁当箱になる？ - - + Date: Fri, 18 Oct 2019 00:03:50 -0700 Subject: [PATCH 023/110] Simplify 6 --- scripts/lib/initialExpressionContainers.ts | 19 - scripts/lib/runnerConfigs.ts | 61 --- src/components/Runners/Csqj.tsx | 12 - src/components/Runners/Dcji.tsx | 12 - src/components/Runners/Hhdu.tsx | 12 - src/components/Runners/Igpn.tsx | 12 - src/components/Runners/Qsnv.tsx | 12 - src/components/Runners/Rlrs.tsx | 12 - src/components/Runners/Zahd.tsx | 12 - src/components/Runners/Zlrx.tsx | 12 - src/components/Runners/index.ts | 8 - src/contents/6.en.tsx | 421 ---------------- src/contents/6.jp.tsx | 407 ---------------- src/lib/runners/csqj.json | 531 --------------------- src/lib/runners/dcji.json | 124 ----- src/lib/runners/hhdu.json | 92 ---- src/lib/runners/igpn.json | 89 ---- src/lib/runners/qsnv.json | 105 ---- src/lib/runners/rlrs.json | 127 ----- src/lib/runners/zahd.json | 146 ------ src/lib/runners/zlrx.json | 421 ---------------- 21 files changed, 2647 deletions(-) delete mode 100644 src/components/Runners/Csqj.tsx delete mode 100644 src/components/Runners/Dcji.tsx delete mode 100644 src/components/Runners/Hhdu.tsx delete mode 100644 src/components/Runners/Igpn.tsx delete mode 100644 src/components/Runners/Qsnv.tsx delete mode 100644 src/components/Runners/Rlrs.tsx delete mode 100644 src/components/Runners/Zahd.tsx delete mode 100644 src/components/Runners/Zlrx.tsx delete mode 100644 src/lib/runners/csqj.json delete mode 100644 src/lib/runners/dcji.json delete mode 100644 src/lib/runners/hhdu.json delete mode 100644 src/lib/runners/igpn.json delete mode 100644 src/lib/runners/qsnv.json delete mode 100644 src/lib/runners/rlrs.json delete mode 100644 src/lib/runners/zahd.json delete mode 100644 src/lib/runners/zlrx.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 7f85cca88..815882dfb 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -240,9 +240,6 @@ export const uarl = initializeDoneExpressionContainer({ shorthandNumber: 4 }) export const mxkk = initializeDoneExpressionContainer({ shorthandNumber: 5 }) export const sfvk = initializeExpressionContainer(numberParams('e', 'f', 1)) -export const mhbx = initializeExpressionContainer( - numberParamsHighlightNumber('e', 'f', 1) -) export const lyet = initializeExpressionContainer(numberParams('d', 'e', 0)) export const okmr = initializeExpressionContainer(numberParams('d', 'e', 1)) @@ -257,22 +254,6 @@ export const entt = initializeExpressionContainer( numberParamsHighlightNumber('f', 'g', 2) ) -export const wowr = initializeExpressionContainer([ - { - arg: 'g', - body: numberParams('e', 'f', 1) - }, - 'h' -]) - -export const elax = initializeExpressionContainer([ - { - arg: 'c', - body: numberParams('a', 'b', 0) - }, - 'd' -]) - export const dupe = initializeExpressionContainer({ arg: 'A', body: { diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index f420ae13d..3888366b5 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -750,73 +750,12 @@ export const dubm: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.wcdn } -export const rlrs: ExpressionRunnerShorthandConfig = { - runner: 'simple', - showPriorities: true, - initialExpressionContainer: initialExpressionContainers.wowr -} - -export const csqj: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', - showPriorities: true, - initialExpressionContainer: initialExpressionContainers.wowr, - initialState: 'active', - skipToTheEnd: false -} - -export const igpn: ExpressionRunnerShorthandConfig = { - runner: 'simple', - showPriorities: true, - initialExpressionContainer: initialExpressionContainers.sfvk -} - -export const hhdu: ExpressionRunnerShorthandConfig = { - runner: 'simple', - showPriorities: true, - initialExpressionContainer: initialExpressionContainers.mhbx, - bottomRightBadgeOverrides: { f: '🅱️', e: '🅰️' } -} - export const rnug: ExpressionRunnerShorthandConfig = { runner: 'simple', showPriorities: true, initialExpressionContainer: initialExpressionContainers.ntua } -export const zahd: ExpressionRunnerShorthandConfig = { - runner: 'predefined', - showPriorities: true, - initialExpressionContainers: [ - initialExpressionContainers.wowr, - initialExpressionContainers.ntua - ], - convert: 'toMathBoxPlay' -} - -export const qsnv: ExpressionRunnerShorthandConfig = { - runner: 'simple', - showPriorities: true, - initialExpressionContainer: initialExpressionContainers.elax -} - -export const dcji: ExpressionRunnerShorthandConfig = { - runner: 'predefined', - showPriorities: true, - initialExpressionContainers: [ - initialExpressionContainers.elax, - initialExpressionContainers.irhr - ], - convert: 'toMathBoxPlay' -} - -export const zlrx: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', - showPriorities: true, - initialExpressionContainer: initialExpressionContainers.elax, - skipToTheEnd: false, - initialState: 'active' -} - export const duuk: ExpressionRunnerShorthandConfig = { runner: 'simple', showPriorities: true, diff --git a/src/components/Runners/Csqj.tsx b/src/components/Runners/Csqj.tsx deleted file mode 100644 index 6fc911e88..000000000 --- a/src/components/Runners/Csqj.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/csqj.json' - -const Csqj = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Csqj diff --git a/src/components/Runners/Dcji.tsx b/src/components/Runners/Dcji.tsx deleted file mode 100644 index aadbed631..000000000 --- a/src/components/Runners/Dcji.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/dcji.json' - -const Dcji = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Dcji diff --git a/src/components/Runners/Hhdu.tsx b/src/components/Runners/Hhdu.tsx deleted file mode 100644 index 3c88086ac..000000000 --- a/src/components/Runners/Hhdu.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/hhdu.json' - -const Hhdu = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Hhdu diff --git a/src/components/Runners/Igpn.tsx b/src/components/Runners/Igpn.tsx deleted file mode 100644 index cd555c0bf..000000000 --- a/src/components/Runners/Igpn.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/igpn.json' - -const Igpn = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Igpn diff --git a/src/components/Runners/Qsnv.tsx b/src/components/Runners/Qsnv.tsx deleted file mode 100644 index c241b62d7..000000000 --- a/src/components/Runners/Qsnv.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/qsnv.json' - -const Qsnv = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Qsnv diff --git a/src/components/Runners/Rlrs.tsx b/src/components/Runners/Rlrs.tsx deleted file mode 100644 index 9891435c9..000000000 --- a/src/components/Runners/Rlrs.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/rlrs.json' - -const Rlrs = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Rlrs diff --git a/src/components/Runners/Zahd.tsx b/src/components/Runners/Zahd.tsx deleted file mode 100644 index 7377f4e23..000000000 --- a/src/components/Runners/Zahd.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/zahd.json' - -const Zahd = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Zahd diff --git a/src/components/Runners/Zlrx.tsx b/src/components/Runners/Zlrx.tsx deleted file mode 100644 index deb55c47f..000000000 --- a/src/components/Runners/Zlrx.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/zlrx.json' - -const Zlrx = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Zlrx diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 894a40569..8a2d7bc3a 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -105,15 +105,7 @@ export { default as Kizi } from 'src/components/Runners/Kizi' export { default as Jwah } from 'src/components/Runners/Jwah' export { default as Vlob } from 'src/components/Runners/Vlob' export { default as Dubm } from 'src/components/Runners/Dubm' -export { default as Rlrs } from 'src/components/Runners/Rlrs' -export { default as Csqj } from 'src/components/Runners/Csqj' -export { default as Igpn } from 'src/components/Runners/Igpn' -export { default as Hhdu } from 'src/components/Runners/Hhdu' export { default as Rnug } from 'src/components/Runners/Rnug' -export { default as Zahd } from 'src/components/Runners/Zahd' -export { default as Qsnv } from 'src/components/Runners/Qsnv' -export { default as Dcji } from 'src/components/Runners/Dcji' -export { default as Zlrx } from 'src/components/Runners/Zlrx' export { default as Duuk } from 'src/components/Runners/Duuk' export { default as Ehxq } from 'src/components/Runners/Ehxq' export { default as Weoz } from 'src/components/Runners/Weoz' diff --git a/src/contents/6.en.tsx b/src/contents/6.en.tsx index 13dcd8a86..98f1ce24e 100644 --- a/src/contents/6.en.tsx +++ b/src/contents/6.en.tsx @@ -4,8 +4,6 @@ import { P, Highlight, HighlightBold, - Ol, - OlLi, Bold, Italic, Hr @@ -18,7 +16,6 @@ import EmojiNumber from 'src/components/EmojiNumber' import Emoji from 'src/components/Emoji' import H from 'src/components/H' import YesNoButtons from 'src/components/YesNoButtons' -import InlineRunAndConvertToMathboxButton from 'src/components/InlineRunAndConvertToMathboxButton' import * as R from 'src/components/Runners' import EmojiWithText from 'src/components/EmojiWithText' import EmojiForLetter from 'src/components/EmojiForLetter' @@ -1098,424 +1095,6 @@ export default () => ( ) }, - { - title: <>Run and Convert, - content: ( - <> - -

Also, there’s one more thing I can do.

-

- I can{' '} - - and - convert - {' '} - a lunchbox into mathbox. -

- - ) - }, - { - type: 'thinking', - children: ( - <> -

- - and convert? - {' '} - What does that mean? -

- - ) - } - ]} - /> - 🍱, - ▶️, - , - - ]} - description={ - <> - and convert - - } - /> - -

- Here’s an example: Try pressing the{' '} - - button - {' '} - below. -

- - ) - } - ]} - /> - - -

- It became ! -

- - ) - }, - { - type: 'dog', - children: ( - <> -

- Let me explain what happened: First, let’s - just see what happens if you run the original lunchbox. -

-

- -

- - ) - } - ]} - /> - - -

- So: Here’s what happens when you{' '} - the - original lunchbox: -

- - ) - } - ]} - /> - - When you this… - - - It becomes this: - -

- As we saw earlier: This lunchbox can be - converted to . -

- - ) - } - ]} - /> - - - - - - -

- I see, that’s why it became . -

- - ) - }, - { - type: 'dog', - children: ( - <> -

Yes. By pressing this button:

- -

You can do the following steps at once:

-
    - - - the lunchbox, - {' '} - and - - - - Convert 🐶 the result to - a mathbox - - -
- - ) - } - ]} - /> - - - - After -
- - - - - -

- I see. So you can do two steps (run and{' '} - convert) at once! -

- - ) - }, - { - type: 'dog', - children: ( - <> -

- Yes. Let’s do a to - make sure you understood this! -

- - ) - } - ]} - /> - - ) - }, - { - type: 'yesNoQuiz', - title: ( - <> - - - ), - content: ( - <> - -

- Suppose that you{' '} - {' '} - the lunchbox below: -

- - ) - } - ]} - /> - - -

- Question: Will it become like this? -

- - ) - } - ]} - /> - - - - ) - }, - { - title: ( - <> - - - ), - content: ( - <> - -

- - . It should become after - conversion, instead of . -

- - ) - }, - { - type: 'dog', - children: ( - <> -

- Let’s{' '} - {' '} - to check! -

- - ) - } - ]} - /> - - -

- We’re left with instead of{' '} - . So{' '} - - ! -

- - ) - }, - { - type: 'dog', - children: ( - <> -

Good job!

-

- Just in double-check: Let’s{' '} - {' '} - the original lunchbox.{' '} - -

- - ) - } - ]} - /> - - -

- So, if you{' '} - the - original lunchbox, it becomes this: -

- - ) - } - ]} - /> - The result - -

- This can be converted to . -

- - ) - } - ]} - /> - - - - - - -

- That’s why it becomes after - doing . -

- - ) - } - ]} - /> - - - - After -
- - - - - - ) - }, { title: <>Next up: The Difficult Question, content: ( diff --git a/src/contents/6.jp.tsx b/src/contents/6.jp.tsx index 7089f572d..e0b664957 100644 --- a/src/contents/6.jp.tsx +++ b/src/contents/6.jp.tsx @@ -4,8 +4,6 @@ import { P, Highlight, HighlightBold, - Ol, - OlLi, Bold, Hr } from 'src/components/ContentTags' @@ -17,7 +15,6 @@ import EmojiNumber from 'src/components/EmojiNumber' import Emoji from 'src/components/Emoji' import H from 'src/components/H' import YesNoButtons from 'src/components/YesNoButtons' -import InlineRunAndConvertToMathboxButton from 'src/components/InlineRunAndConvertToMathboxButton' import * as R from 'src/components/Runners' import EmojiWithText from 'src/components/EmojiWithText' import EmojiForLetter from 'src/components/EmojiForLetter' @@ -1092,410 +1089,6 @@ export default () => ( ) }, - { - title: <>実行してから変換, - content: ( - <> - -

- さらにぼくは、 - - 弁当箱を - してから計算箱に変換する - - こともできます。 -

- - ) - }, - { - type: 'thinking', - children: ( - <> -

- {' '} - してから計算箱に変換？どういうこと？ -

- - ) - } - ]} - /> - 🍱, - ▶️, - , - - ]} - description={ - <> - してから -
- 計算箱に変換する - - } - /> - -

- ためしに、 - - 次の弁当箱の下にある、「 - - 」ボタンを押してみてください。 - -

- - ) - } - ]} - /> - - -

- になった！ -

- - ) - }, - { - type: 'dog', - children: ( - <> -

- では、理由を説明しますね。まず、もともとの弁当箱を実行するとどうなるか、 - で見てみましょう。 - -

- - ) - } - ]} - /> - - -

- つまり、もともとの弁当箱を - {' '} - すると、次のような弁当箱になります。 -

- - ) - } - ]} - /> - - した結果はこうなる - - -

- - これは先ほど説明した通り、計算箱に変換すると{' '} - になります。 - -

- - ) - } - ]} - /> - - - - - - -

このような、

-
    - - - まず弁当箱を - - し、 - - - - - 実行し終えたら、続いて{' '} - する - - -
-

というふたつのステップを、

- -

…を押すことで、一度に行うことができるのです。

- - ) - } - ]} - /> - - - - - - - - -

- なるほど、「実行」と「 - 計算箱に変換」を - 一括で行う - こともできる、ということだな。 -

- - ) - } - ]} - /> - - まず弁当箱を - し… - - } - /> - 🍱, - , - - ]} - noTopMargin - description={<>計算箱に変換するのを一括で行える} - /> - - ) - }, - { - type: 'yesNoQuiz', - title: ( - <> - - - ), - content: ( - <> - -

- では、ここで最後に - をやってみましょう。 -

-

こちらの弁当箱を…

- - ) - } - ]} - /> - - -

- 「 - - 」すると、下のようになるでしょうか？ -

- - ) - } - ]} - /> - - - - ) - }, - { - title: ( - <> - - - ), - content: ( - <> - -

- - {' '} - だと思う！ - - 変換すると ではなく、 - になるはずだ。 -

- - ) - }, - { - type: 'dog', - children: ( - <> -

- では、 - - を押してみてくだださい！ -

- - ) - } - ]} - /> - - -

- やった！ になったので、 - ❌ が正解だ！ -

- - ) - }, - { - type: 'dog', - children: ( - <> -

その通りです！

-

- 確認のために、もともとの弁当箱を - - してみましょう。 - -

- - ) - } - ]} - /> - - -

- つまり、もともとの弁当箱を - - すると、次のような弁当箱になります。 -

- - ) - } - ]} - /> - - した結果はこうなる - - -

- - これは、計算箱に変換すると {' '} - になります。 - -

- - ) - } - ]} - /> - - - - - - -

- というわけで、もともとの弁当箱を - すると になるのです！ -

- - ) - } - ]} - /> - もともとの弁当箱を… - - - - - -
- すると になる - - - ) - }, { title: <>次のページで、難しい問題を出します, content: ( diff --git a/src/lib/runners/csqj.json b/src/lib/runners/csqj.json deleted file mode 100644 index b7721fb23..000000000 --- a/src/lib/runners/csqj.json +++ /dev/null @@ -1,531 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "h", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "active", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "active", - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 3 - }, - { - "expression": { - "arg": { - "name": "h", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "showFuncUnbound", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "showFuncUnbound", - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 3 - }, - { - "expression": { - "arg": { - "name": "h", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "g", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "betaReducePreviewBefore", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "betaReducePreviewBefore", - "matchExists": false, - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 3 - }, - { - "expression": { - "arg": { - "name": "h", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "g", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "betaReducePreviewCrossed", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "betaReducePreviewCrossed", - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 3 - }, - { - "expression": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "previouslyChangedExpressionState": "default", - "activePriority": 1, - "containerState": "done", - "numLeafNodes": 2 - } - ], - "speed": 1, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": true, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/dcji.json b/src/lib/runners/dcji.json deleted file mode 100644 index a3082542c..000000000 --- a/src/lib/runners/dcji.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 2, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - }, - { - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 0, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "done", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": true, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "convert": "toMathBoxPlay", - "showBottomProgressBar": false -} diff --git a/src/lib/runners/hhdu.json b/src/lib/runners/hhdu.json deleted file mode 100644 index a59382325..000000000 --- a/src/lib/runners/hhdu.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "numLeafNodes": 2, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": { - "f": "🅱️", - "e": "🅰️" - }, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/igpn.json b/src/lib/runners/igpn.json deleted file mode 100644 index 7d6037eca..000000000 --- a/src/lib/runners/igpn.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "numLeafNodes": 2, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/qsnv.json b/src/lib/runners/qsnv.json deleted file mode 100644 index 052866b10..000000000 --- a/src/lib/runners/qsnv.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 2, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/rlrs.json b/src/lib/runners/rlrs.json deleted file mode 100644 index c079977b2..000000000 --- a/src/lib/runners/rlrs.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 3, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/zahd.json b/src/lib/runners/zahd.json deleted file mode 100644 index ef5d18e74..000000000 --- a/src/lib/runners/zahd.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 3, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - }, - { - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 1, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "done", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": true, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "convert": "toMathBoxPlay", - "showBottomProgressBar": false -} diff --git a/src/lib/runners/zlrx.json b/src/lib/runners/zlrx.json deleted file mode 100644 index e99988c5f..000000000 --- a/src/lib/runners/zlrx.json +++ /dev/null @@ -1,421 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "c", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "a", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "active", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "active", - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 2 - }, - { - "expression": { - "arg": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "c", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "a", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "showFuncUnbound", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "showFuncUnbound", - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 2 - }, - { - "expression": { - "arg": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "c", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "a", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "betaReducePreviewBefore", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "betaReducePreviewBefore", - "matchExists": false, - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 2 - }, - { - "expression": { - "arg": { - "name": "d", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "c", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "a", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "betaReducePreviewCrossed", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "betaReducePreviewCrossed", - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 2 - }, - { - "expression": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "previouslyChangedExpressionState": "default", - "activePriority": 1, - "containerState": "done", - "numLeafNodes": 1 - } - ], - "speed": 1, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": true, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} From 1a7f349657f1f23dc66185a3aace67ad2b28f671 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 18 Oct 2019 01:32:10 -0700 Subject: [PATCH 024/110] Clean up 7 --- scripts/lib/initialExpressionContainers.ts | 4 + scripts/lib/runnerConfigs.ts | 6 ++ src/components/Runners/Jzwg.tsx | 12 +++ src/components/Runners/index.ts | 1 + src/contents/7.jp.tsx | 110 +++++++++++---------- src/lib/runners/jzwg.json | 37 +++++++ 6 files changed, 119 insertions(+), 51 deletions(-) create mode 100644 src/components/Runners/Jzwg.tsx create mode 100644 src/lib/runners/jzwg.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 815882dfb..c5060fbe4 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -222,6 +222,10 @@ export const rlzd = initializeExpressionContainer([ export const mzxw = initializeExpressionContainer(numberParams('a', 'b', 0)) export const irhr = initializeDoneExpressionContainer({ shorthandNumber: 0 }) export const ntua = initializeDoneExpressionContainer({ shorthandNumber: 1 }) +export const dpvy = initializeDoneExpressionContainer({ + shorthandNumber: 1, + shorthandNumberAfterConvert: 'number' +}) export const nskn = initializeExpressionContainer(numberParams('e', 'f', 2)) export const qbnd = initializeExpressionContainer(numberParams('k', 'l', 2)) export const tnyj = initializeExpressionContainer( diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 3888366b5..63235c735 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -756,6 +756,12 @@ export const rnug: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.ntua } +export const jzwg: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.dpvy +} + export const duuk: ExpressionRunnerShorthandConfig = { runner: 'simple', showPriorities: true, diff --git a/src/components/Runners/Jzwg.tsx b/src/components/Runners/Jzwg.tsx new file mode 100644 index 000000000..ad8060edf --- /dev/null +++ b/src/components/Runners/Jzwg.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/jzwg.json' + +const Jzwg = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Jzwg diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 8a2d7bc3a..11f6cc1aa 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -106,6 +106,7 @@ export { default as Jwah } from 'src/components/Runners/Jwah' export { default as Vlob } from 'src/components/Runners/Vlob' export { default as Dubm } from 'src/components/Runners/Dubm' export { default as Rnug } from 'src/components/Runners/Rnug' +export { default as Jzwg } from 'src/components/Runners/Jzwg' export { default as Duuk } from 'src/components/Runners/Duuk' export { default as Ehxq } from 'src/components/Runners/Ehxq' export { default as Weoz } from 'src/components/Runners/Weoz' diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index f6976180c..6e62ec287 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -15,7 +15,6 @@ import EmojiNumber from 'src/components/EmojiNumber' import Emoji from 'src/components/Emoji' import EmojiForLetter from 'src/components/EmojiForLetter' import H from 'src/components/H' -import InlineRunAndConvertToMathboxButton from 'src/components/InlineRunAndConvertToMathboxButton' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' import ExpressionRunnerCaptionOnly from 'src/components/ExpressionRunnerCaptionOnly' import EmojiSeparator from 'src/components/EmojiSeparator' @@ -36,13 +35,13 @@ export const Problem = () => ( - + - + 実行後に
- したとき、結果が になる？ + に変換できる弁当箱になる？ - + ) @@ -346,20 +345,20 @@ export default () => ( type: 'dog', children: ( <> -

- 先ほどの弁当箱は、 - - それぞれの {' '} - に、ある法則に基づいて料理を入れ、 - -

- -

- …を行うと、 - - 結果が になります。 - -

+

実は、先ほどの弁当箱は、

+
    + + + それぞれの {' '} + に、ある法則に基づいて料理を入れて + すると、 + + + + {' '} + に変換できる弁当箱になります。 + +
) } @@ -372,9 +371,9 @@ export default () => ( - + すると、
- すると、結果は になる + に変換できる弁当箱になる ( }} /> -

- 端的に言うと、 - - が{' '} - になる - - というわけですね。 -

+

実行することで、

+
    + + + に変換できる弁当箱が、 + + + + + に変換できる弁当箱になる + + +
+

というわけですね。

) } @@ -416,8 +421,9 @@ export default () => ( ]} description={ <> - が {' '} - になる + に変換できる弁当箱が、 +
+ に変換できる弁当箱になる } /> @@ -431,8 +437,9 @@ export default () => (

それぞれの {' '} - にどんな料理を入れると、結果が{' '} - になるでしょう？ + にどんな料理を入れると、実行後に{' '} + {' '} + に変換できる弁当箱になるでしょう？

@@ -539,17 +546,21 @@ export default () => ( type: 'dog', children: ( <> -

では、問題を復習しましょう。上の弁当箱を、

- -

したときに、結果が…

+

+ では、問題を復習しましょう。上の弁当箱を実行したときに、結果が… +

    - になれば - 成功 🎉 + + {' '} + に変換できる弁当箱になれば + 成功 🎉 + - それ以外なら失敗{' '} - 😭 + + それ以外なら失敗 😭 +

というわけです。

@@ -558,17 +569,13 @@ export default () => ( } ]} /> - こちらの弁当箱を… - - - - して… - - + こちらの弁当箱を実行して… - 結果が になれば - 成功 🎉 + に変換できる +
+ 弁当箱になれば 成功{' '} + 🎉
それ以外なら失敗 😭 @@ -840,8 +847,9 @@ export default () => (

それぞれの {' '} - にどんな料理を入れると、結果が{' '} - になるでしょう？ + にどんな料理を入れると、実行後に{' '} + {' '} + に変換できる弁当箱になるでしょう？

diff --git a/src/lib/runners/jzwg.json b/src/lib/runners/jzwg.json new file mode 100644 index 000000000..4f6857d0f --- /dev/null +++ b/src/lib/runners/jzwg.json @@ -0,0 +1,37 @@ +{ + "expressionContainers": [ + { + "expression": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 1, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 2, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From 3972d65383b0f9f426a83799fdd062bbea999cd0 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 18 Oct 2019 01:42:59 -0700 Subject: [PATCH 025/110] Simplify 7 and 10 --- src/contents/10.jp.tsx | 30 ++++++++++++------------------ src/contents/7.jp.tsx | 2 +- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index 256e679d1..edda8fdb2 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -421,32 +421,26 @@ export default () => ( type: 'dog', children: ( <> -

- その通りです。上の - - がある弁当箱を、 -

+

その通りです。

    + + 上の + + がある弁当箱を、 + ある数字 {' '} - に変換できる弁当箱と合体させ、 + に変換できる弁当箱と合体させて実行すると、 - - すると、 + ➖{' '} + に変換できる弁当箱になる
-

- - 結果は {' '} - ➖ になる - - のです。 -

) } @@ -460,10 +454,10 @@ export default () => ( - + すると、
- すると、結果は {' '} - ➖ になる + ➖{' '} + に変換できる弁当箱になる ( - 実行後に + した後に
に変換できる弁当箱になる？ From 961c5c5980c6cbc47371ee44db75f86f664a854a Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 18 Oct 2019 02:01:18 -0700 Subject: [PATCH 026/110] Remove shorthandNumberPlusOrMinusOne --- scripts/lib/buildExpressionFromParams.ts | 8 -------- scripts/lib/expressionParamGuards.ts | 10 ---------- scripts/lib/initialExpressionContainers.ts | 4 ++-- src/components/VariableExpressionBox.tsx | 23 ++++++++++------------ src/lib/runners/gvxz.json | 4 ++-- src/lib/runners/jxvy.json | 4 ++-- src/types/ExpressionParamTypes.ts | 7 ------- src/types/ExpressionTypes.ts | 4 ++-- 8 files changed, 18 insertions(+), 46 deletions(-) diff --git a/scripts/lib/buildExpressionFromParams.ts b/scripts/lib/buildExpressionFromParams.ts index 848762ccb..04679c60e 100644 --- a/scripts/lib/buildExpressionFromParams.ts +++ b/scripts/lib/buildExpressionFromParams.ts @@ -6,7 +6,6 @@ import { isVariableShorthandNumberParams, isConditionalParams, isVariableShorthandFuncParams, - isQuestionPlusOrMinusOneParams, isQuestionShorthandNumberAfterConvertParams, isRepeatExpressionParams } from 'scripts/lib/expressionParamGuards' @@ -19,7 +18,6 @@ import { VariableShorthandNumberParams, ConditionalExpressionParams, RepeatExpressionParams, - QuestionPlusOrMinusOneParams, QuestionShorthandNumberAfterConvertParams, VariableShorthandFuncParams, BinaryExpressionParams @@ -183,12 +181,6 @@ export default function buildExpressionFromParams( ), shorthandFunc: expressionParams.shorthandFunc } - } else if (isQuestionPlusOrMinusOneParams(expressionParams)) { - return { - ...buildVariableExpression('blankNumber', true, 'default'), - shorthandNumberPlusOrMinusOne: - expressionParams.shorthandNumberPlusOrMinusOne - } } else if (isQuestionShorthandNumberAfterConvertParams(expressionParams)) { return { ...buildVariableExpression( diff --git a/scripts/lib/expressionParamGuards.ts b/scripts/lib/expressionParamGuards.ts index e88af07d7..34d87395c 100644 --- a/scripts/lib/expressionParamGuards.ts +++ b/scripts/lib/expressionParamGuards.ts @@ -7,7 +7,6 @@ import { HighlightedVariableExpressionParams, ConditionalExpressionParams, VariableShorthandFuncParams, - QuestionPlusOrMinusOneParams, QuestionShorthandNumberAfterConvertParams, RepeatExpressionParams } from 'src/types/ExpressionParamTypes' @@ -71,15 +70,6 @@ export function isConditionalParams( ) } -export function isQuestionPlusOrMinusOneParams( - expressionParams: ExpressionParams -): expressionParams is QuestionPlusOrMinusOneParams { - return ( - (expressionParams as QuestionPlusOrMinusOneParams) - .shorthandNumberPlusOrMinusOne !== undefined - ) -} - export function isQuestionShorthandNumberAfterConvertParams( expressionParams: ExpressionParams ): expressionParams is QuestionShorthandNumberAfterConvertParams { diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index c5060fbe4..3e8445427 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -835,7 +835,7 @@ export const drbs = initializeExpressionContainer([ ]) export const hswh = initializeExpressionContainer({ - shorthandNumberPlusOrMinusOne: 'plus' + shorthandNumberAfterConvert: 'blankPlusOne' }) export const mzms = initializeExpressionContainer([ @@ -1075,7 +1075,7 @@ export const guql = initializeExpressionContainer( ) export const jskq = initializeExpressionContainer({ - shorthandNumberPlusOrMinusOne: 'minus' + shorthandNumberAfterConvert: 'blankMinusOne' }) export const xwlj = initializeExpressionContainer([ diff --git a/src/components/VariableExpressionBox.tsx b/src/components/VariableExpressionBox.tsx index 7f1fe75b2..791fb0697 100644 --- a/src/components/VariableExpressionBox.tsx +++ b/src/components/VariableExpressionBox.tsx @@ -93,6 +93,16 @@ const VariableEmoji = ({ expression }: VariableExpressionBoxProps) => { ) : expression.shorthandNumberAfterConvert === 'blank' ? ( + ) : expression.shorthandNumberAfterConvert === 'blankPlusOne' ? ( + <> + ➕{' '} + + + ) : expression.shorthandNumberAfterConvert === 'blankMinusOne' ? ( + <> + ➖{' '} + + ) : expression.shorthandNumberAfterConvert === 'trueCase' ? ( ) : expression.shorthandNumberAfterConvert === 'falseCase' ? ( @@ -155,19 +165,6 @@ const VariableEmoji = ({ expression }: VariableExpressionBoxProps) => { )} ) - } else if ( - expression.name === 'blankNumber' && - expression.shorthandNumberPlusOrMinusOne - ) { - return ( -
- {' '} - - {expression.shorthandNumberPlusOrMinusOne === 'plus' ? '➕' : '➖'} - {' '} - -
- ) } else if (expression.name === 'Amult') { return (
diff --git a/src/lib/runners/gvxz.json b/src/lib/runners/gvxz.json index b384959a2..bfcc65e16 100644 --- a/src/lib/runners/gvxz.json +++ b/src/lib/runners/gvxz.json @@ -11,10 +11,10 @@ "funcPriorityAgg": [], "emphasizePriority": false, "bound": true, - "shorthandNumberPlusOrMinusOne": "minus", + "shorthandNumberAfterConvert": "blankMinusOne", "maxNestedFunctionDepth": 0 }, - "numLeafNodes": 1, + "numLeafNodes": 2, "containerState": "ready", "previouslyChangedExpressionState": "default" } diff --git a/src/lib/runners/jxvy.json b/src/lib/runners/jxvy.json index e4b470854..5f91fe38c 100644 --- a/src/lib/runners/jxvy.json +++ b/src/lib/runners/jxvy.json @@ -11,10 +11,10 @@ "funcPriorityAgg": [], "emphasizePriority": false, "bound": true, - "shorthandNumberPlusOrMinusOne": "plus", + "shorthandNumberAfterConvert": "blankPlusOne", "maxNestedFunctionDepth": 0 }, - "numLeafNodes": 1, + "numLeafNodes": 2, "containerState": "ready", "previouslyChangedExpressionState": "default" } diff --git a/src/types/ExpressionParamTypes.ts b/src/types/ExpressionParamTypes.ts index f9b893357..62ea89c78 100644 --- a/src/types/ExpressionParamTypes.ts +++ b/src/types/ExpressionParamTypes.ts @@ -12,12 +12,6 @@ export interface HighlightedVariableExpressionParams { readonly highlighted: true } -export interface QuestionPlusOrMinusOneParams { - readonly shorthandNumberPlusOrMinusOne: NonNullable< - VariableShorthandNumber['shorthandNumberPlusOrMinusOne'] - > -} - export interface QuestionShorthandNumberAfterConvertParams { readonly shorthandNumberAfterConvert: NonNullable< VariableShorthandNumber['shorthandNumberAfterConvert'] @@ -74,6 +68,5 @@ export type ExpressionParams = | ConditionalExpressionParams | RepeatExpressionParams | VariableShorthandFuncParams - | QuestionPlusOrMinusOneParams | QuestionShorthandNumberAfterConvertParams | BinaryExpressionParams diff --git a/src/types/ExpressionTypes.ts b/src/types/ExpressionTypes.ts index 983dfc83d..5c552fcbc 100644 --- a/src/types/ExpressionTypes.ts +++ b/src/types/ExpressionTypes.ts @@ -20,14 +20,14 @@ export interface VariableExpression { | 'condition' | 'binaryFirst' | 'binarySecond' - readonly shorthandNumberPlusOrMinusOne?: 'plus' | 'minus' + | 'blankPlusOne' + | 'blankMinusOne' readonly maxNestedFunctionDepth?: number } export interface VariableShorthandNumber extends VariableExpression { readonly shorthandNumber: NonNullable readonly shorthandNumberAfterConvert?: VariableExpression['shorthandNumberAfterConvert'] - readonly shorthandNumberPlusOrMinusOne?: VariableExpression['shorthandNumberPlusOrMinusOne'] } export interface VariableShorthandFunc extends VariableExpression { From 88157ad5cea2c60a97706cbb766f46ff33ecfe50 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 18 Oct 2019 02:04:50 -0700 Subject: [PATCH 027/110] Remove unused declaration --- scripts/lib/buildExpressionFromParams.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/lib/buildExpressionFromParams.ts b/scripts/lib/buildExpressionFromParams.ts index 04679c60e..d9cbdb1ab 100644 --- a/scripts/lib/buildExpressionFromParams.ts +++ b/scripts/lib/buildExpressionFromParams.ts @@ -96,9 +96,6 @@ export default function buildExpressionFromParams( export default function buildExpressionFromParams( expressionParams: RepeatExpressionParams ): RepeatExpression -export default function buildExpressionFromParams( - expressionParams: QuestionPlusOrMinusOneParams -): StepVariable export default function buildExpressionFromParams( expressionParams: QuestionShorthandNumberAfterConvertParams ): StepVariable From 8647f6314117ccde95a82ef7f40bf6b0299e8e7e Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 18 Oct 2019 12:14:52 -0700 Subject: [PATCH 028/110] Simplify 13 --- src/contents/13.jp.tsx | 286 ++++++++++------------------------------- 1 file changed, 69 insertions(+), 217 deletions(-) diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index da73a7633..92e5084d6 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -992,22 +992,13 @@ export default () => ( ) }, { - title: <>先ほどの弁当箱にいろいろ追加してみる, + title: ( + <> + を3回繰り返す + + ), content: ( <> - -

こちらが、先ほどの弁当箱だけど…

- - ) - } - ]} - /> - 先ほどの弁当箱 ( children: ( <>

- この弁当箱に、以下のように - いろいろ追加してみたの。 - 黄色の部分が追加した部分だよ。 + まず、この「 + + 」がある計算箱を見てみて！

) } ]} /> - - 黄色が追加した部分 - - -

ふむふむ…何やら複雑になったなあ。

-

で、これがどうしたっていうの？

- - ) - } - ]} - /> - - ) - }, - { - title: <>実行してみると, - content: ( - <> + + 「 + + 」がある計算箱 + ( children: ( <>

- では、この弁当箱を - してみて！ -

-

- ( - - 次のページで早送りして詳細に解説するけど、今回は早送りは省略します！ - - ) + この弁当箱は、以下のように{' '} + を3回繰り返すことにより、 + ➕{' '} + を計算できるわけだよね。

) } ]} /> -

- -

- + + + + を3回繰り返す + + + -

- 結果は になったよ。 -

-

- 早送りしてないから、なぜ {' '} - になったかは分からないけど… -

- - ) - }, { type: 'saya', children: ( <> -

- うん、早送りは次のページでやるから、今はとりあえず「 - - なるほど、結果は になるんだ - - 」と受け入れてほしい！ -

+

これを弁当箱で再現する方法が分かったんだ！

) }, { - type: 'thinking', + type: 'surprised', children: ( <> -

- そうか、次のページでまた詳しく説明してくれるんだね。了解だよ。 -

+

なんと！ぜひ教えてくれ！

) } @@ -1119,7 +1068,7 @@ export default () => ( ) }, { - title: <>ふたつの数字の足し算ができる？, + title: <>先ほどの弁当箱にいろいろ追加してみる, content: ( <> ( children: ( <>

- それよりも重要なのは、 - - この って、 - - 実行前の弁当箱に入っていた、 - と{' '} - を足した数 - - だよね？ - + 先ほど登場した、複雑な部分を計算箱に置き換えた弁当箱に注目してみて！

) } ]} /> - - 実行前の弁当箱に入っていた、 -
- と を足すと… - - - - になる - + 先ほど登場した弁当箱 -

確かにそうだな…

- - ) - }, { type: 'saya', children: ( <>

- ということは、この弁当箱は {' '} - ➕ {' '} - を計算しているんじゃないかな？ + この弁当箱に、以下のように + いろいろ追加してみたの。 + 黄色の部分が追加した部分だよ。

) } ]} /> - - ➕{' '} - を計算している？ - + + 黄色が追加した部分 + -

- つまり… - - ふたつの数字の足し算ができる - - ってこと？ -

+

ふむふむ…何やら複雑になったなあ。

+

で、これがどうしたっていうの？

) - } - ]} - /> - - ), - footer: { - content: ( - <> -

- 補足: 「 - - この弁当箱、本当に実行すると {' '} - になるの？ - - 」と疑われているかもしれませんが、ご安心ください！ - - 次のページでなぜ実行すると {' '} - になるのかを詳細に説明します - - ので、とりあえず読み進めてみてください！ -

- - ) - } - }, - { - title: <>繰り返しを再現できた？, - content: ( - <> - -

待てよ、そういえば…

- 以下のように計算箱の「 - - 」を使っても、 - - ➕{' '} - を計算できる - - よね。 + 実は、 + + 上の弁当箱を実行すると、先ほどの「 + + 」がある計算箱と全く同じように変化する + + んだ。

+

つまり、以下のようになるんだよ。

) } ]} /> - - 計算箱の「 + この弁当箱を実行すると… + + + 「 - 」を使うと + 」と同じく、
- ➕{' '} - を計算できる - - - + を3回繰り返す + +

えー、まさか！本当なのかい？

- ということは…サヤちゃんの弁当箱は、上の「 + もし本当だとしたら…これで「 - 」を再現できているのか…？ + 」を再現できるということになるけど…

) @@ -1282,51 +1169,29 @@ export default () => ( 」を使った計算箱は… - + 以下の弁当箱で再現できている？🤔 - +

- もしそうなら…「 - - 」を弁当箱で再現できた、ということになるぞ！ + + でも、サヤちゃんが言っていることは正しいのだろうか？ +

+

実行して確かめてみないと分からないなあ…

) - } - ]} - /> - , - 🔁, - , - 🍱, - 🔁 - ]} - description={ - <> - 「 - 」を -
- 弁当箱で再現できたかも？ - - } - /> - -

- では、本当に再現できたのかどうか、次のページで確かめてみるね！先に進むよ！ -

+

うん、では次のページで実行して確かめてみよう！

) } @@ -1334,20 +1199,7 @@ export default () => ( /> - ), - footer: { - content: ( - <> -

- 補足:{' '} - - もし上に書いてあることが腑に落ちなくてもご心配なく！ - - 次のページで詳細に解説します。 -

- - ) - } + ) } ]} /> From ee42fb63df2795e9ad3ff73010c5eadc6ad08f37 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 18 Oct 2019 12:22:05 -0700 Subject: [PATCH 029/110] Tweak 14 --- src/contents/13.jp.tsx | 3 ++- src/contents/14.jp.tsx | 52 +++++++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index 92e5084d6..411f274af 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -1142,7 +1142,8 @@ export default () => ( 」と同じく、
- を3回繰り返す + に対して {' '} + を3回繰り返す diff --git a/src/contents/14.jp.tsx b/src/contents/14.jp.tsx index 853ab8d67..de85a4ba0 100644 --- a/src/contents/14.jp.tsx +++ b/src/contents/14.jp.tsx @@ -72,30 +72,31 @@ export default () => ( 」を使った計算箱は… - + 以下の弁当箱で再現できている？🤔 - +

- サヤちゃんの弁当箱は、前回 + サヤちゃんが言うには、上の弁当箱は、「 + + 」を使った場合と同じく、 - してみると{' '} - になりました。 + に対して{' '} + を3回繰り返す + ように変化すると言うのです。

-

- つまり、「 + この弁当箱を実行すると… + + + 「 - 」を使った場合と同じように、 - ➕{' '} - を計算できているかのように見えます。 -

- 実行すると… + 」と同じく、 +
+ に対して {' '} + を3回繰り返す + - - になる。ということは -
➕{' '} - を計算できている？ - +

今回は、本当にこの弁当箱が「 @@ -105,7 +106,7 @@ export default () => ( ) }, { - title: <>途中で何が起きているのか？, + title: <>途中、何が起きているのか？, content: ( <> (

そうすることで、 - どいうった経緯で最終的に {' '} - になるのか + どいうった経緯で最終的に「 + + 」と同じになるのか を知ることができるからね。

@@ -149,9 +151,13 @@ export default () => ( } /> - - 最終的に になるのか？ - + + 「 + + 」と同じになるのか？ + + + Date: Fri, 18 Oct 2019 12:22:22 -0700 Subject: [PATCH 030/110] Remove bold --- src/contents/13.jp.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index 411f274af..76668b1eb 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -5,8 +5,7 @@ import { HighlightBold, Highlight, Ul, - UlLi, - Bold + UlLi } from 'src/components/ContentTags' import H from 'src/components/H' import BubbleQuotes from 'src/components/BubbleQuotes' From d9c3cb5d0b408404be616dfc564e585f412d6114 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 18 Oct 2019 19:51:57 -0700 Subject: [PATCH 031/110] Update packages --- package.json | 2 +- yarn.lock | 328 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 207 insertions(+), 123 deletions(-) diff --git a/package.json b/package.json index b1efac6e3..5f4e6a4d1 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@types/jest": "^24.0.18", "@types/luxon": "^1.15.2", "@types/material-ui": "^0.21.7", - "@types/node": "^12.7.12", + "@types/node": "^10.14.22", "@types/nprogress": "^0.2.0", "@types/prettier": "^1.18.3", "@types/react": "^16.9.5", diff --git a/yarn.lock b/yarn.lock index 1f4629c97..44f0e3970 100644 --- a/yarn.lock +++ b/yarn.lock @@ -55,14 +55,14 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.4.5": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.3.tgz#44de824e89eaa089bb12da7337bc9bdff2ab68f9" - integrity sha512-QfQ5jTBgXLzJuo7Mo8bZK/ePywmgNRgk/UQykiKwEtZPiFIn8ZqE6jB+AnD1hbB1S2xQyL4//it5vuAUOVAMTw== + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff" + integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.6.3" + "@babel/generator" "^7.6.4" "@babel/helpers" "^7.6.2" - "@babel/parser" "^7.6.3" + "@babel/parser" "^7.6.4" "@babel/template" "^7.6.0" "@babel/traverse" "^7.6.3" "@babel/types" "^7.6.3" @@ -72,17 +72,17 @@ lodash "^4.17.13" resolve "^1.3.2" semver "^5.4.1" - source-map "^0.6.1" + source-map "^0.5.0" -"@babel/generator@^7.4.0", "@babel/generator@^7.4.4", "@babel/generator@^7.6.3": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.3.tgz#71d5375264f93ec7bac7d9f35a67067733f5578e" - integrity sha512-hLhYbAb3pHwxjlijC4AQ7mqZdcoujiNaW7izCT04CIowHK8psN0IN8QjDv0iyFtycF5FowUOTwDloIheI25aMw== +"@babel/generator@^7.4.0", "@babel/generator@^7.4.4", "@babel/generator@^7.6.3", "@babel/generator@^7.6.4": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671" + integrity sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w== dependencies: "@babel/types" "^7.6.3" jsesc "^2.5.1" lodash "^4.17.13" - source-map "^0.6.1" + source-map "^0.5.0" "@babel/helper-annotate-as-pure@^7.0.0": version "7.0.0" @@ -277,10 +277,10 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.5", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.3.tgz#9eff8b9c3eeae16a74d8d4ff30da2bd0d6f0487e" - integrity sha512-sUZdXlva1dt2Vw2RqbMkmfoImubO0D0gaCrNngV6Hi0DA4x3o4mlrq0tbfY0dZEUIccH8I6wQ4qgEtwcpOR6Qg== +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.5", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81" + integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A== "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.2.0" @@ -783,7 +783,7 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/runtime@^7.3.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2": +"@babel/runtime@^7.3.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3": version "7.6.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f" integrity sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA== @@ -1087,9 +1087,9 @@ "@types/yargs" "^13.0.0" "@material-ui/core@^4.5.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.5.0.tgz#7e57cc40988c71b6340e3b2569b47dbac1820351" - integrity sha512-UHVAjU+1uDtA+OMBNBHb4RlCZOu514XeYPafNJv+GTdXBDr1SCPK7yqRE6TV1/bulxlDusTgu5Q6BAUgpmO4MA== + version "4.5.1" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.5.1.tgz#6f1bbb298cc2893b29169ab9398a00ca5a6ac971" + integrity sha512-6pyk7diT7bflf4qUpqgPCpKYqjhRHPFwsgEV2Gv71lMqwxuRygFGHE2TdZ+l5T249H66Doj2P/j6fW7yzgxTWw== dependencies: "@babel/runtime" "^7.4.4" "@material-ui/styles" "^4.5.0" @@ -1131,9 +1131,9 @@ prop-types "^15.7.2" "@material-ui/system@^4.5.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.5.0.tgz#3235f5d7da8b8af4df425e4f065990c16dee8097" - integrity sha512-vR0PbMTzLnuuVCoYNQ13zyhLa/4s/UA9P9JbNuHBOOkfrHn53ShINiG0v05EgfwizfULLtc7mNvsGAgIyyp/hQ== + version "4.5.1" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.5.1.tgz#d2d249667ca7ee8ff9f93517c06ee41eb89729de" + integrity sha512-M72CGz3MYxXTFLet2qWmQDBXZdtF7JKGqYaf7t9MPDYD6WYG6wKM2hUbgUtRKOwls8ZBXQGKsiAX8K4v5pXSPw== dependencies: "@babel/runtime" "^7.4.4" deepmerge "^4.0.0" @@ -1332,9 +1332,9 @@ integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== "@types/fs-extra@^8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.0.0.tgz#d3e2c313ca29f95059f198dd60d1f774642d4b25" - integrity sha512-bCtL5v9zdbQW86yexOlXWTEGvLNqWxMFyi7gQA7Gcthbezr2cPSOb8SkESVKA937QD5cIwOFLDFt0MQoXOEr9Q== + version "8.0.1" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.0.1.tgz#a2378d6e7e8afea1564e44aafa2e207dadf77686" + integrity sha512-J00cVDALmi/hJOYsunyT52Hva5TnJeKP5yd1r+mH/ZU0mbYZflR0Z5kw5kITtKTRYMhm1JMClOFYdHnQszEvqw== dependencies: "@types/node" "*" @@ -1373,9 +1373,9 @@ integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA== "@types/jest@^24.0.18": - version "24.0.18" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.18.tgz#9c7858d450c59e2164a8a9df0905fc5091944498" - integrity sha512-jcDDXdjTcrQzdN06+TSVsPPqxvsZA/5QkYfIZlq1JMw7FdP5AZylbOc+6B/cuDurctRe+MziUMtQ3xQdrbjqyQ== + version "24.0.19" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.19.tgz#f7036058d2a5844fe922609187c0ad8be430aff5" + integrity sha512-YYiqfSjocv7lk5H/T+v5MjATYjaTMsUkbDnjGqSMoO88jWdtJXJV4ST/7DKZcoMHMBvB2SeSfyOzZfkxXHR5xg== dependencies: "@types/jest-diff" "*" @@ -1402,10 +1402,15 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*", "@types/node@^12.7.12": - version "12.7.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.12.tgz#7c6c571cc2f3f3ac4a59a5f2bd48f5bdbc8653cc" - integrity sha512-KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ== +"@types/node@*": + version "12.11.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.1.tgz#1fd7b821f798b7fa29f667a1be8f3442bb8922a3" + integrity sha512-TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A== + +"@types/node@^10.14.22": + version "10.14.22" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.22.tgz#34bcdf6b6cb5fc0db33d24816ad9d3ece22feea4" + integrity sha512-9taxKC944BqoTVjE+UT3pQH0nHZlTvITwfsOZqyc+R3sfJuxaTtxWjfn1K2UlxyPcKHf0rnaXcVFrS9F9vf0bw== "@types/nprogress@^0.2.0": version "0.2.0" @@ -1435,9 +1440,9 @@ "@types/react" "*" "@types/react-dom@^16.9.1": - version "16.9.1" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.1.tgz#79206237cba9532a9f870b1cd5428bef6b66378c" - integrity sha512-1S/akvkKr63qIUWVu5IKYou2P9fHLb/P2VAwyxVV85JGaGZTcUniMiTuIqM3lXFB25ej6h+CYEQ27ERVwi6eGA== + version "16.9.2" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.2.tgz#90f9e6c161850be1feb31d2f448121be2a4f3b47" + integrity sha512-hgPbBoI1aTSTvZwo8HYw35UaTldW6n2ETLvHAcfcg1FaOuBV3olmyCe5eMpx2WybWMBPv0MdU2t5GOcQhP+3zA== dependencies: "@types/react" "*" @@ -1449,9 +1454,9 @@ "@types/react" "*" "@types/react@*", "@types/react@^16.9.5": - version "16.9.5" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.5.tgz#079dabd918b19b32118c25fd00a786bb6d0d5e51" - integrity sha512-jQ12VMiFOWYlp+j66dghOWcmDDwhca0bnlcTxS4Qz/fh5gi6wpaZDthPEu/Gc/YlAuO87vbiUXL8qKstFvuOaA== + version "16.9.9" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.9.tgz#a62c6f40f04bc7681be5e20975503a64fe783c3a" + integrity sha512-L+AudFJkDukk+ukInYvpoAPyJK5q1GanFOINOJnM0w6tUgITuWvJ4jyoBPFL7z4/L8hGLd+K/6xR5uUjXu0vVg== dependencies: "@types/prop-types" "*" csstype "^2.2.0" @@ -1479,40 +1484,41 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.3.3.tgz#71e06c6887650301e02105c99b4c8f67454157e3" - integrity sha512-12cCbwu5PbQudkq2xCIS/QhB7hCMrsNPXK+vJtqy/zFqtzVkPRGy12O5Yy0gUK086f3VHV/P4a4R4CjMW853pA== + version "2.4.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.4.0.tgz#aaf6b542ff75b78f4191a8bf1c519184817caa24" + integrity sha512-se/YCk7PUoyMwSm/u3Ii9E+BgDUc736uw/lXCDpXEqRgPGsoBTtS8Mntue/vZX8EGyzGplYuePBuVyhZDM9EpQ== dependencies: - "@typescript-eslint/experimental-utils" "2.3.3" + "@typescript-eslint/experimental-utils" "2.4.0" eslint-utils "^1.4.2" functional-red-black-tree "^1.0.1" regexpp "^2.0.1" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.3.3.tgz#0685613063ff397cfa9209be2e6e81c0382a9b11" - integrity sha512-MQ4jKPMTU1ty4TigJCRKFPye2qyQdH8jzIIkceaHgecKFmkNS1hXPqKiZ+mOehkz6+HcN5Nuvwm+frmWZR9tdg== +"@typescript-eslint/experimental-utils@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.4.0.tgz#dd8f3f466be25c3610a06fed22cfb6e6aa17f6d9" + integrity sha512-2cvhNaJoWavgTtnC7e1jUSPZQ7e4U2X9Yoy5sQmkS7lTESuyuZrlRcaoNuFfYEd6hgrmMU7+QoSp8Ad+kT1nfA== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.3.3" + "@typescript-eslint/typescript-estree" "2.4.0" eslint-scope "^5.0.0" "@typescript-eslint/parser@^2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.3.3.tgz#af519d6572bdee3e9610e21c8362766858976bc1" - integrity sha512-+cV53HuYFeeyrNW8x/rgPmbVrzzp/rpRmwbJnNtwn4K8mroL1BdjxwQh7X9cUHp9rm4BBiEWmD3cSBjKG7d5mw== + version "2.4.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.4.0.tgz#fe43ed5fec14af03d3594fce2c3b7ec4c8df0243" + integrity sha512-IouAKi/grJ4MFrwdXIJ1GHAwbPWYgkT3b/x8Q49F378c9nwgxVkO76e0rZeUVpwHMaUuoKG2sUeK0XGkwdlwkw== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.3.3" - "@typescript-eslint/typescript-estree" "2.3.3" + "@typescript-eslint/experimental-utils" "2.4.0" + "@typescript-eslint/typescript-estree" "2.4.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.3.3.tgz#be802220876bedfb80384cde1d46fe57ae7abf71" - integrity sha512-GkACs12Xp8d/STunNv/iSMYJFQrkrax9vuPZySlgSzoJJtw1cp6tbEw4qsLskQv6vloLrkFJHcTJ0a/yCB5cIA== +"@typescript-eslint/typescript-estree@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.4.0.tgz#722c95493e1b7682893edaaaec0e69f36917feef" + integrity sha512-/DzDAtMqF5d9IlXrrvu/Id/uoKjnSxf/3FbtKK679a/T7lbDM8qQuirtGvFy6Uh+x0hALuCMwnMfUf0P24/+Iw== dependencies: + chokidar "^3.0.2" glob "^7.1.4" is-glob "^4.0.1" lodash.unescape "4.0.1" @@ -1701,9 +1707,9 @@ acorn-globals@^4.1.0: acorn-walk "^6.0.1" acorn-jsx@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f" - integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw== + version "5.1.0" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" + integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== acorn-walk@^6.0.1: version "6.2.0" @@ -1804,6 +1810,14 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +anymatch@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -1975,12 +1989,12 @@ autodll-webpack-plugin@0.4.2: webpack-sources "^1.0.1" autoprefixer@^9.6.1: - version "9.6.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.4.tgz#e6453be47af316b2923eaeaed87860f52ad4b7eb" - integrity sha512-Koz2cJU9dKOxG8P1f8uVaBntOv9lP4yz9ffWvWaicv9gHBPhpQB22nGijwd8gqW9CNT+UdkbQOQNLVI8jN1ZfQ== + version "9.6.5" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.5.tgz#98f4afe7e93cccf323287515d426019619775e5e" + integrity sha512-rGd50YV8LgwFQ2WQp4XzOTG69u1qQsXn0amww7tjqV5jJuNazgFKYEVItEBngyyvVITKOg20zr2V+9VsrXJQ2g== dependencies: browserslist "^4.7.0" - caniuse-lite "^1.0.30000998" + caniuse-lite "^1.0.30000999" chalk "^2.4.2" normalize-range "^0.1.2" num2fraction "^1.2.2" @@ -2186,10 +2200,15 @@ binary-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== +binary-extensions@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c" + integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow== + bluebird@^3.5.0, bluebird@^3.5.5: - version "3.7.0" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.0.tgz#56a6a886e03f6ae577cffedeb524f8f2450293cf" - integrity sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg== + version "3.7.1" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de" + integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" @@ -2225,6 +2244,13 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" +braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" @@ -2301,14 +2327,14 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.6.6, browserslist@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17" - integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA== +browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.7.0: + version "4.7.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.1.tgz#bd400d1aea56538580e8c4d5f1c54ac11b5ab468" + integrity sha512-QtULFqKIAtiyNx7NhZ/p4rB8m3xDozVo/pi5VgTlADLF2tNigz/QH+v0m5qhn7XfHT7u+607NcCNOnC0HZAlMg== dependencies: - caniuse-lite "^1.0.30000989" - electron-to-chromium "^1.3.247" - node-releases "^1.1.29" + caniuse-lite "^1.0.30000999" + electron-to-chromium "^1.3.284" + node-releases "^1.1.36" bs-logger@0.x: version "0.2.6" @@ -2428,7 +2454,7 @@ camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30000998: +caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000999: version "1.0.30000999" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz#427253a69ad7bea4aa8d8345687b8eec51ca0e43" integrity sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg== @@ -2489,6 +2515,21 @@ chokidar@^2.0.2, chokidar@^2.0.4: optionalDependencies: fsevents "^1.2.7" +chokidar@^3.0.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.2.tgz#a433973350021e09f2b853a2287781022c0dc935" + integrity sha512-bw3pm7kZ2Wa6+jQWYP/c7bAZy3i4GwiIiMO2EeRjrE48l8vBqC/WvFhSF0xyM8fQiPEGvwMY/5bqDG7sSEOuhg== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.2.0" + optionalDependencies: + fsevents "~2.1.1" + chownr@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" @@ -2665,9 +2706,9 @@ commander@2.9.0: graceful-readlink ">= 1.0.0" commander@^2.11.0, commander@^2.19.0, commander@^2.20.0: - version "2.20.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.1.tgz#3863ce3ca92d0831dcf2a102f5fb4b5926afd0f9" - integrity sha512-cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg== + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== commondir@^1.0.1: version "1.0.1" @@ -2809,17 +2850,17 @@ copy-descriptor@^0.1.0: integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= core-js-compat@^3.1.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.2.1.tgz#0cbdbc2e386e8e00d3b85dc81c848effec5b8150" - integrity sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A== + version "3.3.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.3.2.tgz#1096c989c1b929ede06b5b6b4768dc4439078c03" + integrity sha512-gfiK4QnNXhnnHVOIZst2XHdFfdMTPxtR0EGs0TdILMlGIft+087oH6/Sw2xTTIjpWXC9vEwsJA8VG3XTGcmO5g== dependencies: - browserslist "^4.6.6" + browserslist "^4.7.0" semver "^6.3.0" core-js@^2.4.0, core-js@^2.6.5: - version "2.6.9" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" - integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== + version "2.6.10" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f" + integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -3038,7 +3079,7 @@ cssstyle@^1.0.0: dependencies: cssom "0.3.x" -csstype@^2.2.0, csstype@^2.5.2, csstype@^2.5.7, csstype@^2.6.5, csstype@^2.6.6: +csstype@^2.2.0, csstype@^2.5.2, csstype@^2.5.7, csstype@^2.6.5, csstype@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.7.tgz#20b0024c20b6718f4eda3853a1f5a1cce7f5e4a5" integrity sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ== @@ -3075,9 +3116,9 @@ data-urls@^1.0.0: whatwg-url "^7.0.0" date-fns@^2.0.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.4.1.tgz#b53f9bb65ae6bd9239437035710e01cf383b625e" - integrity sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw== + version "2.5.1" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.5.1.tgz#6bd76f01d3a438e9c481d4c18512ddac37585b4c" + integrity sha512-ZBrQmuaqH9YqIejbgu8f09ki7wdD2JxWsRTZ/+HnnLNmkI56ty0evnWzKY+ihLT0xX5VdUX0vDNZCxJJGKX2+Q== date-now@^0.1.4: version "0.1.4" @@ -3258,12 +3299,12 @@ doctrine@^3.0.0: esutils "^2.0.2" dom-helpers@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.0.tgz#57a726de04abcc2a8bbfe664b3e21c584bde514e" - integrity sha512-zRRYDhpiKuAJHasOqCm7lBnsd22nrM4+OYI4ASWCxen+ocTMl7BIAKgGag97TlLiTl6rrau5aPe1VGUm9jQBng== + version "5.1.2" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.2.tgz#217f2e0040697d3309d45d761a337f1d3fa5d1c6" + integrity sha512-VrfjMjIzNgn2oB49wKl85fgs12ELjK0npu5Oryaiazyc6WuekO1go0E//0RJ8JvsBlfaAwq+IgX9M0XhwlEENA== dependencies: - "@babel/runtime" "^7.5.5" - csstype "^2.6.6" + "@babel/runtime" "^7.6.3" + csstype "^2.6.7" dom-serializer@0: version "0.2.1" @@ -3333,10 +3374,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.247: - version "1.3.280" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.280.tgz#5f8950c8329e3e11b59c705fd59b4b8d9b3de5b9" - integrity sha512-qYWNMjKLEfQAWZF2Sarvo+ahigu0EArnpCFSoUuZJS3W5wIeVfeEvsgmT2mgIrieQkeQ0+xFmykK3nx2ezekPQ== +electron-to-chromium@^1.3.284: + version "1.3.285" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.285.tgz#909576db2ee4dfec74a87aa30c92f66ebfc78748" + integrity sha512-DYR9KW723sUbGK++DCmCmM95AbNXT4Q0tlCFMcYijFjayhuDqlGYR68OemlP8MJj0gjkwdeItIUfd0oLCgw+4A== elliptic@^6.0.0: version "6.5.1" @@ -3846,6 +3887,13 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + find-cache-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" @@ -4021,6 +4069,11 @@ fsevents@^1.2.7: nan "^2.12.1" node-pre-gyp "^0.12.0" +fsevents@~2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.1.tgz#74c64e21df71721845d0c44fe54b7f56b82995a9" + integrity sha512-4FRPXWETxtigtJW/gxzEDsX1LVbPAM93VleB83kZB+ellqbHMkyt2aJfuzNLRvFPnGi6bcE5SvfxgbXPeKteJw== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -4087,7 +4140,7 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.0.0: +glob-parent@^5.0.0, glob-parent@~5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== @@ -4505,6 +4558,13 @@ is-binary-path@^1.0.0: dependencies: binary-extensions "^1.0.0" +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + is-buffer@^1.0.2, is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -4610,7 +4670,7 @@ is-glob@^3.1.0: dependencies: is-extglob "^2.1.0" -is-glob@^4.0.0, is-glob@^4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== @@ -4629,6 +4689,11 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + is-obj@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" @@ -6076,10 +6141,10 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.29: - version "1.1.35" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.35.tgz#32a74a3cd497aa77f23d509f483475fd160e4c48" - integrity sha512-JGcM/wndCN/2elJlU0IGdVEJQQnJwsLbgPCFd2pY7V0mxf17bZ0Gb/lgOtL29ZQhvEX5shnVhxQyZz3ex94N8w== +node-releases@^1.1.36: + version "1.1.36" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.36.tgz#44b7cb8254138e87bdbfa47761d0f825e20900b4" + integrity sha512-ggXhX6QGyJSjj3r+6ml2LqqC28XOWmKtpb+a15/Zpr9V3yoNazxJNlcQDS9bYaid5FReEWHEgToH1mwoUceWwg== dependencies: semver "^6.3.0" @@ -6108,7 +6173,7 @@ normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" -normalize-path@^3.0.0: +normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== @@ -6592,6 +6657,11 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +picomatch@^2.0.4: + version "2.0.7" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6" + integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA== + pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -6660,9 +6730,9 @@ pnp-webpack-plugin@1.5.0: ts-pnp "^1.1.2" popper.js@^1.14.1: - version "1.15.0" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2" - integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA== + version "1.16.0" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.0.tgz#2e1816bcbbaa518ea6c2e15a466f4cb9c6e2fbb3" + integrity sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw== posix-character-classes@^0.1.0: version "0.1.1" @@ -7372,6 +7442,13 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" +readdirp@~3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839" + integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ== + dependencies: + picomatch "^2.0.4" + realpath-native@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c" @@ -7689,9 +7766,9 @@ schema-utils@^1.0.0: ajv-keywords "^3.1.0" schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.4.1.tgz#e89ade5d056dc8bcaca377574bb4a9c4e1b8be56" - integrity sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w== + version "2.5.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f" + integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ== dependencies: ajv "^6.10.2" ajv-keywords "^3.4.1" @@ -8292,9 +8369,9 @@ terser@4.0.0: source-map-support "~0.5.10" terser@^4.1.2: - version "4.3.8" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.8.tgz#707f05f3f4c1c70c840e626addfdb1c158a17136" - integrity sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ== + version "4.3.9" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz#e4be37f80553d02645668727777687dad26bbca8" + integrity sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA== dependencies: commander "^2.20.0" source-map "~0.6.1" @@ -8387,6 +8464,13 @@ to-regex-range@^2.1.0: is-number "^3.0.0" repeat-string "^1.6.1" +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + to-regex@^3.0.1, to-regex@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" @@ -8520,14 +8604,14 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= typescript@^3.7.0-beta: - version "3.7.0-dev.20191009" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-dev.20191009.tgz#852e49dca797bb35acf930583ef65e7b3b23fc01" - integrity sha512-Vk/wZedTpVd3QAhr3mG1+sbUHcpJ1wfw49Wo1NCQvzMa0vHCJeocEwWzaV2yWprsuuFv4+e8tjCj1Vnme2CMHg== + version "3.7.0-dev.20191018" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-dev.20191018.tgz#6b98a655b124ca697364e2d7977c469a2bfede3d" + integrity sha512-Z8KpsytbY5lBMp5cc08VFoO8CgHC6IcbgyiA5vjh7fitkoG0qcem9C354YuiWV4O2+i2gdC7vF8tNUYqO/vUkQ== uglify-js@^3.1.4: - version "3.6.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.1.tgz#ae7688c50e1bdcf2f70a0e162410003cf9798311" - integrity sha512-+dSJLJpXBb6oMHP+Yvw8hUgElz4gLTh82XuX68QiJVTXaE5ibl6buzhNkQdYhBlIhozWOC9ge16wyRmjG4TwVQ== + version "3.6.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.2.tgz#fd8048c86d990ddd29fe99d3300e0cb329103f4d" + integrity sha512-+gh/xFte41GPrgSMJ/oJVq15zYmqr74pY9VoM69UzMzq9NFk4YDylclb1/bhEzZSaUQjbW5RvniHeq1cdtRYjw== dependencies: commander "2.20.0" source-map "~0.6.1" @@ -8936,9 +9020,9 @@ write-file-atomic@2.4.1: signal-exit "^3.0.2" write-file-atomic@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.0.tgz#1b64dbbf77cb58fd09056963d63e62667ab4fb21" - integrity sha512-EIgkf60l2oWsffja2Sf2AL384dx328c0B+cIYPTQq5q2rOYuDV00/iPFBOUiDKKwKMOhkymH8AidPaRvzfxY+Q== + version "3.0.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz#558328352e673b5bb192cf86500d60b230667d4b" + integrity sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw== dependencies: imurmurhash "^0.1.4" is-typedarray "^1.0.0" From ec03455dc5bf1dbf3ed3e0149ac7a2e407aa264c Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 18 Oct 2019 21:34:43 -0700 Subject: [PATCH 032/110] Revise 10 --- scripts/lib/initialExpressionContainers.ts | 15 +- scripts/lib/runnerConfigs.ts | 22 ++- src/components/Runners/Cawl.tsx | 12 ++ src/components/Runners/Nbck.tsx | 12 ++ src/components/Runners/index.ts | 2 + src/contents/10.en.tsx | 111 +++++++-------- src/contents/10.jp.tsx | 69 +++++----- src/lib/runners/cawl.json | 37 +++++ src/lib/runners/fhkl.json | 152 +++------------------ src/lib/runners/nbck.json | 37 +++++ 10 files changed, 234 insertions(+), 235 deletions(-) create mode 100644 src/components/Runners/Cawl.tsx create mode 100644 src/components/Runners/Nbck.tsx create mode 100644 src/lib/runners/cawl.json create mode 100644 src/lib/runners/nbck.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 3e8445427..256750050 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -221,7 +221,15 @@ export const rlzd = initializeExpressionContainer([ export const mzxw = initializeExpressionContainer(numberParams('a', 'b', 0)) export const irhr = initializeDoneExpressionContainer({ shorthandNumber: 0 }) +export const haeo = initializeDoneExpressionContainer({ + shorthandNumber: 0, + shorthandNumberAfterConvert: 'number' +}) export const ntua = initializeDoneExpressionContainer({ shorthandNumber: 1 }) +export const yljj = initializeDoneExpressionContainer({ + shorthandNumber: 2, + shorthandNumberAfterConvert: 'number' +}) export const dpvy = initializeDoneExpressionContainer({ shorthandNumber: 1, shorthandNumberAfterConvert: 'number' @@ -2250,8 +2258,11 @@ export const rjyq = initializeDoneExpressionContainer({ }) export const iius = initializeExpressionContainer([ - predParams('a', 'b', 'c', 'd', 'e', 'f'), - numberParams('g', 'h', 3) + predParams('a', 'b', 'c', 'd', 'e', 'f', true), + { + shorthandNumber: 3, + shorthandNumberAfterConvert: 'number' + } ]) export const ptsa = initializeExpressionContainer([ diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 63235c735..4f9682b50 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -734,6 +734,18 @@ export const jwah: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.irhr } +export const nbck: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.haeo +} + +export const cawl: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.yljj +} + export const vlob: ExpressionRunnerShorthandConfig = { runner: 'predefined', initialExpressionContainers: [ @@ -1798,13 +1810,9 @@ export const cbmn: ExpressionRunnerShorthandConfig = { } export const fhkl: ExpressionRunnerShorthandConfig = { - runner: 'predefined', - initialExpressionContainers: [ - initialExpressionContainers.iius, - initialExpressionContainers.hdpc - ], - showPriorities: true, - convert: 'toMathBoxPlay' + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.iius, + showPriorities: true } export const eweo: ExpressionRunnerShorthandConfig = { diff --git a/src/components/Runners/Cawl.tsx b/src/components/Runners/Cawl.tsx new file mode 100644 index 000000000..7a5276d0c --- /dev/null +++ b/src/components/Runners/Cawl.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/cawl.json' + +const Cawl = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Cawl diff --git a/src/components/Runners/Nbck.tsx b/src/components/Runners/Nbck.tsx new file mode 100644 index 000000000..de458e6e8 --- /dev/null +++ b/src/components/Runners/Nbck.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/nbck.json' + +const Nbck = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Nbck diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 11f6cc1aa..f24a24ffc 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -103,6 +103,8 @@ export { default as Wopl } from 'src/components/Runners/Wopl' export { default as Pmdm } from 'src/components/Runners/Pmdm' export { default as Kizi } from 'src/components/Runners/Kizi' export { default as Jwah } from 'src/components/Runners/Jwah' +export { default as Nbck } from 'src/components/Runners/Nbck' +export { default as Cawl } from 'src/components/Runners/Cawl' export { default as Vlob } from 'src/components/Runners/Vlob' export { default as Dubm } from 'src/components/Runners/Dubm' export { default as Rnug } from 'src/components/Runners/Rnug' diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index 2a8935e9e..6c1406e4a 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -17,7 +17,6 @@ import BottomRightBadge from 'src/components/BottomRightBadge' import EmojiSeparator from 'src/components/EmojiSeparator' import CustomEmoji from 'src/components/CustomEmoji' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' -import InlineRunAndConvertToMathboxButton from 'src/components/InlineRunAndConvertToMathboxButton' import EmojiWithText from 'src/components/EmojiWithText' import Emoji from 'src/components/Emoji' import ExpressionRunnerCaptionOnly from 'src/components/ExpressionRunnerCaptionOnly' @@ -453,21 +452,23 @@ export default () => ( type: 'dog', children: ( <> -

- Yes!{' '} - - If you combine the above lunchbox with a lunchbox that - can be converted to - , and do: - -

- -

- - The result will be {' '} - ➖ . - -

+

Yes!

+
    + + + If you combine the above lunchbox with a lunchbox + that can be converted to{' '} + , + + + + + The result would be a lunchbox that can be converted + to {' '} + ➖ . + + +
) } @@ -481,13 +482,11 @@ export default () => ( - If you{' '} - - - -
- it will become {' '} - ➖ + If you it, the + result would be +
a lunchbox that can be converted to{' '} + ➖{' '} + ( ]} />

- That means: We want the final result to be{' '} + That means: We want the final result to be + a lunchbox that can be converted to{' '} .

@@ -625,13 +625,9 @@ export default () => ( - - - - - - - If it becomes ,{' '} + If it becomes a lunchbox that can be +
+ converted to ,{' '} success. 🎉
Otherwise, failure 😭 @@ -793,21 +789,22 @@ export default () => ( children: ( <>

- That means:{' '} - - If you combine Saya’s lunchbox with a lunchbox that - can be converted to , and - do: - -

- -

- - The result will be , which - is ➖{' '} - . - + That means: and do:

+
    + + + If you combine Saya’s lunchbox with a lunchbox that + can be converted to , + + + + + The final result is a lunchbox that can be converted + to . + + +
) } @@ -819,14 +816,10 @@ export default () => ( a lunchbox that can be converted to … - - - - - - - The result is + The result is a lunchbox that can be +
+ converted to ( - - - - - - - If it becomes ,{' '} + If it becomes a lunchbox that can be +
+ converted to ,{' '} success. 🎉
Otherwise, failure 😭 @@ -1234,9 +1223,9 @@ export default () => ( How to reproduce {' '}
using a lunchbox. -
- The final result will be . + +

Summary:{' '} diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index edda8fdb2..013c5713b 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -589,11 +589,12 @@ export default () => ( ]} />

- つまり、 - - した時に、 + つまり、実行した時に、 - 結果が {' '} + 結果が{' '} + + に変換できる弁当箱 + になれば成功というわけだ。

@@ -609,10 +610,11 @@ export default () => ( - + 実行したときに、 + に変換できる
- して、結果が になれば - 成功 🎉 + 弁当箱になれば成功{' '} + 🎉
それ以外なら失敗 😭 @@ -777,15 +779,20 @@ export default () => ( children: ( <>

ということは、サヤちゃんの弁当箱は…

-

- - {' '} - に変換できる弁当箱と合体させ、 - - すると、結果が になる - - ということですね。 -

+
    + + + {' '} + に変換できる弁当箱と合体させて実行すると、{' '} + + + + + に変換できる弁当箱になる + + +
+

ということですね。

) } @@ -797,11 +804,11 @@ export default () => ( 👧🏻 サヤちゃんの弁当箱を合体させ… - - + + 実行すると、
- すると、結果が になる - + に変換できる弁当箱になる + ( />

- 合体したものを - - して、 + 合体したものを実行して、 - 結果が になればいい + {' '} + に変換できる弁当箱になればいい んだよね。

@@ -929,10 +935,11 @@ export default () => ( - + 実行したときに、 + に変換できる
- して、結果が になれば - 成功 🎉 + 弁当箱になれば成功{' '} + 🎉
それ以外なら失敗 😭 @@ -1194,12 +1201,8 @@ export default () => ( {' '} の計算箱を再現できる -

- 上の - - ボタンを押すと、答えが {' '} - になるのを確認できます。 -

+ +

まとめると、 diff --git a/src/lib/runners/cawl.json b/src/lib/runners/cawl.json new file mode 100644 index 000000000..14d139fe0 --- /dev/null +++ b/src/lib/runners/cawl.json @@ -0,0 +1,37 @@ +{ + "expressionContainers": [ + { + "expression": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 2, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 2, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/fhkl.json b/src/lib/runners/fhkl.json index 08817cfad..dd39bd903 100644 --- a/src/lib/runners/fhkl.json +++ b/src/lib/runners/fhkl.json @@ -3,114 +3,20 @@ { "expression": { "arg": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 3, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 }, "func": { "arg": { @@ -343,6 +249,7 @@ "maxNestedFunctionDepth": 4 }, "type": "function", + "meta": "minusOneEffect", "maxNestedFunctionDepth": 5 }, "state": "default", @@ -350,42 +257,23 @@ "priority": 1, "maxNestedFunctionDepth": 5 }, - "numLeafNodes": 10, + "numLeafNodes": 8, "containerState": "ready", "previouslyChangedExpressionState": "default" - }, - { - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 2, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "done", - "previouslyChangedExpressionState": "default" } ], "speed": 1, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", + "hideControls": true, + "explanationsVisibility": "hidden", "hidePriorities": false, "hidePlayButton": false, "hideBottomRightBadges": false, - "skipToTheEnd": true, + "skipToTheEnd": false, "hideFuncUnboundBadgeOnExplanation": false, "highlightOverridesCallArgAndFuncUnboundOnly": false, "bottomRightBadgeOverrides": {}, "highlightOverrides": {}, "highlightOverrideActiveAfterStart": false, "highlightFunctions": false, - "convert": "toMathBoxPlay", - "showBottomProgressBar": true + "showBottomProgressBar": false } diff --git a/src/lib/runners/nbck.json b/src/lib/runners/nbck.json new file mode 100644 index 000000000..7bad4411e --- /dev/null +++ b/src/lib/runners/nbck.json @@ -0,0 +1,37 @@ +{ + "expressionContainers": [ + { + "expression": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 0, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 2, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From 6d34044302ebf0270ff5738e8d2ab0fdf56dab0c Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 18 Oct 2019 22:29:33 -0700 Subject: [PATCH 033/110] Rewrite 13 --- scripts/lib/initialExpressionContainers.ts | 4 +++ scripts/lib/runnerConfigs.ts | 6 ++++ src/components/Runners/Ldcq.tsx | 12 +++++++ src/components/Runners/index.ts | 1 + src/contents/13.en.tsx | 17 +++++----- src/contents/13.jp.tsx | 21 ++++++------ src/lib/runners/ldcq.json | 37 ++++++++++++++++++++++ 7 files changed, 78 insertions(+), 20 deletions(-) create mode 100644 src/components/Runners/Ldcq.tsx create mode 100644 src/lib/runners/ldcq.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 256750050..97d68d9c2 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -249,6 +249,10 @@ export const hzkx = initializeExpressionContainer( numberParamsHighlightNumber('i', 'j', 4) ) export const uarl = initializeDoneExpressionContainer({ shorthandNumber: 4 }) +export const kaaf = initializeDoneExpressionContainer({ + shorthandNumber: 4, + shorthandNumberAfterConvert: 'number' +}) export const mxkk = initializeDoneExpressionContainer({ shorthandNumber: 5 }) export const sfvk = initializeExpressionContainer(numberParams('e', 'f', 1)) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 4f9682b50..434de8ade 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -728,6 +728,12 @@ export const kizi: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.uarl } +export const ldcq: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.kaaf +} + export const jwah: ExpressionRunnerShorthandConfig = { runner: 'simple', showPriorities: true, diff --git a/src/components/Runners/Ldcq.tsx b/src/components/Runners/Ldcq.tsx new file mode 100644 index 000000000..e71b474c9 --- /dev/null +++ b/src/components/Runners/Ldcq.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/ldcq.json' + +const Ldcq = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Ldcq diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index f24a24ffc..caf752c0b 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -102,6 +102,7 @@ export { default as Alca } from 'src/components/Runners/Alca' export { default as Wopl } from 'src/components/Runners/Wopl' export { default as Pmdm } from 'src/components/Runners/Pmdm' export { default as Kizi } from 'src/components/Runners/Kizi' +export { default as Ldcq } from 'src/components/Runners/Ldcq' export { default as Jwah } from 'src/components/Runners/Jwah' export { default as Nbck } from 'src/components/Runners/Nbck' export { default as Cawl } from 'src/components/Runners/Cawl' diff --git a/src/contents/13.en.tsx b/src/contents/13.en.tsx index 6a65c7713..3330996bf 100644 --- a/src/contents/13.en.tsx +++ b/src/contents/13.en.tsx @@ -18,7 +18,6 @@ import CustomEmoji from 'src/components/CustomEmoji' import EmojiSeparator from 'src/components/EmojiSeparator' import TwoColGrid from 'src/components/TwoColGrid' import InlineBorder from 'src/components/InlineBorder' -import InlineRunAndConvertToMathboxButton from 'src/components/InlineRunAndConvertToMathboxButton' import * as R from 'src/components/Runners' import ExpressionRunnerCaptionOnly from 'src/components/ExpressionRunnerCaptionOnly' import NextLessonButton from 'src/components/NextLessonButton' @@ -148,10 +147,8 @@ export default () => ( <>

Now, here’s a question: What happens when - you do this: + you it?

- -

…on the above lunchbox?

) }, @@ -172,12 +169,14 @@ export default () => ( <>

I figured it out! I think the result will - be . + be a lunchbox that can be converted to{' '} + .

- - 👧🏻 I think the result will be{' '} - - + + 👧🏻 I think the result will be
a + lunchbox that can be converted to{' '} + ! + ) }, diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index 76668b1eb..c063f36d1 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -18,7 +18,6 @@ import TwoColGrid from 'src/components/TwoColGrid' import InlineBorder from 'src/components/InlineBorder' import * as R from 'src/components/Runners' import ExpressionRunnerCaptionOnly from 'src/components/ExpressionRunnerCaptionOnly' -import InlineRunAndConvertToMathboxButton from 'src/components/InlineRunAndConvertToMathboxButton' import NextLessonButton from 'src/components/NextLessonButton' export default () => ( @@ -124,10 +123,9 @@ export default () => ( type: 'dog', children: ( <> -

ここで質問です。上の弁当箱を、

-

- すると、 + ここで質問です。上の弁当箱を + すると、 どんな結果になるでしょう？ @@ -143,8 +141,7 @@ export default () => ( そんなの、すぐ答えられるわけないだろう！ - こんな複雑な弁当箱、 - するのもひと苦労だよ！ + こんな複雑な弁当箱の実行結果なんて、見当がつかないよ！

) @@ -156,14 +153,16 @@ export default () => (

サヤはすぐ分かったよ！ - 結果は になる + に変換できる弁当箱になる んじゃない？

- - 👧🏻 結果は {' '} - になると思う！ - + + 👧🏻 結果は +
+ {' '} + に変換できる弁当箱になると思う！ + ) }, diff --git a/src/lib/runners/ldcq.json b/src/lib/runners/ldcq.json new file mode 100644 index 000000000..0fb34de05 --- /dev/null +++ b/src/lib/runners/ldcq.json @@ -0,0 +1,37 @@ +{ + "expressionContainers": [ + { + "expression": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 4, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 2, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From 43ac88433c3e781ce9528918eb056e1cfc249d13 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sat, 19 Oct 2019 00:26:34 -0700 Subject: [PATCH 034/110] Remove runandconvert... from 15 --- scripts/lib/initialExpressionContainers.ts | 8 +++ scripts/lib/runnerConfigs.ts | 12 ++++ src/components/Runners/Aflw.tsx | 12 ++++ src/components/Runners/Nxjv.tsx | 12 ++++ src/components/Runners/index.ts | 2 + src/components/VariableExpressionBox.tsx | 10 +++ src/contents/15.jp.tsx | 72 +++++++--------------- src/lib/runners/aflw.json | 36 +++++++++++ src/lib/runners/nxjv.json | 36 +++++++++++ src/types/ExpressionTypes.ts | 2 + 10 files changed, 152 insertions(+), 50 deletions(-) create mode 100644 src/components/Runners/Aflw.tsx create mode 100644 src/components/Runners/Nxjv.tsx create mode 100644 src/lib/runners/aflw.json create mode 100644 src/lib/runners/nxjv.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 97d68d9c2..debe77c93 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -2454,3 +2454,11 @@ export const abhd = initializeExpressionContainer([ }, { name: 'blankNumber', highlighted: true } ]) + +export const avsj = initializeExpressionContainer({ + shorthandNumberAfterConvert: 'binaryMultiply' +}) + +export const yudv = initializeExpressionContainer({ + shorthandNumberAfterConvert: 'binaryAdd' +}) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 434de8ade..74c9238a8 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -734,6 +734,18 @@ export const ldcq: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.kaaf } +export const aflw: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.avsj +} + +export const nxjv: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.yudv +} + export const jwah: ExpressionRunnerShorthandConfig = { runner: 'simple', showPriorities: true, diff --git a/src/components/Runners/Aflw.tsx b/src/components/Runners/Aflw.tsx new file mode 100644 index 000000000..9c2eb50ae --- /dev/null +++ b/src/components/Runners/Aflw.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/aflw.json' + +const Aflw = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Aflw diff --git a/src/components/Runners/Nxjv.tsx b/src/components/Runners/Nxjv.tsx new file mode 100644 index 000000000..b62bf965c --- /dev/null +++ b/src/components/Runners/Nxjv.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/nxjv.json' + +const Nxjv = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Nxjv diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index caf752c0b..460903c90 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -103,6 +103,8 @@ export { default as Wopl } from 'src/components/Runners/Wopl' export { default as Pmdm } from 'src/components/Runners/Pmdm' export { default as Kizi } from 'src/components/Runners/Kizi' export { default as Ldcq } from 'src/components/Runners/Ldcq' +export { default as Aflw } from 'src/components/Runners/Aflw' +export { default as Nxjv } from 'src/components/Runners/Nxjv' export { default as Jwah } from 'src/components/Runners/Jwah' export { default as Nbck } from 'src/components/Runners/Nbck' export { default as Cawl } from 'src/components/Runners/Cawl' diff --git a/src/components/VariableExpressionBox.tsx b/src/components/VariableExpressionBox.tsx index 791fb0697..00ff96769 100644 --- a/src/components/VariableExpressionBox.tsx +++ b/src/components/VariableExpressionBox.tsx @@ -113,6 +113,16 @@ const VariableEmoji = ({ expression }: VariableExpressionBoxProps) => { ) : expression.shorthandNumberAfterConvert === 'binarySecond' ? ( + ) : expression.shorthandNumberAfterConvert === 'binaryMultiply' ? ( + <> + ✖️{' '} + + + ) : expression.shorthandNumberAfterConvert === 'binaryAdd' ? ( + <> + ➕{' '} + + ) : ( <> )} diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index ecd3dee44..2e21b342b 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -380,18 +380,15 @@ export default () => ( と{' '} {' '} - に数字を入れ、 + に数字を入れて実行すると… - - {' '} - すると… - - 結果は {' '} + {' '} ➕{' '} - になるんだ。 + {' '} + に変換できる弁当箱になるんだ。 @@ -402,27 +399,16 @@ export default () => ( /> と{' '} - に数字を入れ、 -
- + に数字を入れて
- すると… + 実行すると… - , - ➕, - - ]} - description={ - <> - 結果は {' '} - ➕ {' '} - になる - - } - /> + + ➕{' '} + に
+ 変換できる弁当箱になる + ( と{' '} {' '} - に数字を入れ、 + に数字を入れて実行すると… - - {' '} - すると… - - 結果は {' '} + {' '} ✖️{' '} - になるんだ。 + {' '} + に変換できる弁当箱になるんだ。 @@ -643,27 +626,16 @@ export default () => ( /> と{' '} - に数字を入れ、 -
- + に数字を入れて
- すると… + 実行すると… - , - ✖️, - - ]} - description={ - <> - 結果は {' '} - ✖️ {' '} - になる - - } - /> + + ✖️{' '} + に
+ 変換できる弁当箱になる + Date: Sat, 19 Oct 2019 00:35:42 -0700 Subject: [PATCH 035/110] Remove runandconvert... from 9 --- src/contents/9.en.tsx | 30 ++++++++++++++---------------- src/contents/9.jp.tsx | 15 +++++++-------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/contents/9.en.tsx b/src/contents/9.en.tsx index 24afccfcc..d5bc4a700 100644 --- a/src/contents/9.en.tsx +++ b/src/contents/9.en.tsx @@ -95,7 +95,7 @@ export default () => ( What do you think happens if I combined it with a lunchbox that has{' '} - ? + and run it?

@@ -106,17 +106,13 @@ export default () => ( If I combined it with a lunchbox that has
- , and… + … - - - - - - - What happens? + What happens +
+ when you it? ( <>

Well, because it calculates {' '} - ➕ , the result - should be , right? + ➕ … +

+

+ It should become a lunchbox that can be converted to{' '} + , right?

) @@ -142,7 +141,9 @@ export default () => ( ]} description={ <> - The result should be + Should become a lunchbox +
+ that can be converted to …? } @@ -227,10 +228,7 @@ export default () => ( type: 'thinking', children: ( <> -

- Hmm… what’s going on? Last time, we got{' '} - … -

+

Hmm… what’s going on? Last time, it worked…

) } diff --git a/src/contents/9.jp.tsx b/src/contents/9.jp.tsx index 13726bcee..10fcfcda3 100644 --- a/src/contents/9.jp.tsx +++ b/src/contents/9.jp.tsx @@ -79,9 +79,7 @@ export default () => (

これを、前回サヤが考えた - がある弁当箱と合体させて、 - {' '} - すると、どうなると思う？ + がある弁当箱と合体させて、実行するとどうなると思う？

) @@ -92,9 +90,7 @@ export default () => ( と合体させて、
- -
- するとどうなる？ + 実行するとどうなる？ ( ➕{' '} を計算できるんだから、 - になるに決まっている + {' '} + に変換できる弁当箱になるに決まっている だろう？

@@ -124,7 +121,9 @@ export default () => ( ]} description={ <> - 結果は になるはず…？ + に変換できる +
+ 弁当箱になるはず…？ } /> From b2184490afba9b0bf9174bf7982b03e9bd3ce59a Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sat, 19 Oct 2019 15:53:37 -0700 Subject: [PATCH 036/110] Simplify 13 en --- scripts/lib/runnerConfigs.ts | 6 - src/components/Runners/Htir.tsx | 12 - src/components/Runners/index.ts | 1 - src/contents/13.en.tsx | 324 +++++++------------------- src/contents/13.jp.tsx | 7 +- src/lib/runners/htir.json | 387 -------------------------------- 6 files changed, 93 insertions(+), 644 deletions(-) delete mode 100644 src/components/Runners/Htir.tsx delete mode 100644 src/lib/runners/htir.json diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 74c9238a8..b5914b6fc 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -2154,12 +2154,6 @@ export const kjba: ExpressionRunnerShorthandConfig = { showPriorities: true } -export const htir: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', - initialExpressionContainer: initialExpressionContainers.jrfk, - showPriorities: true -} - export const peiy: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.aqni, diff --git a/src/components/Runners/Htir.tsx b/src/components/Runners/Htir.tsx deleted file mode 100644 index 7f6a45e2c..000000000 --- a/src/components/Runners/Htir.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/htir.json' - -const Htir = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Htir diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 460903c90..339cab78a 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -311,7 +311,6 @@ export { default as Ykqf } from 'src/components/Runners/Ykqf' export { default as Ifpo } from 'src/components/Runners/Ifpo' export { default as Cefx } from 'src/components/Runners/Cefx' export { default as Kjba } from 'src/components/Runners/Kjba' -export { default as Htir } from 'src/components/Runners/Htir' export { default as Peiy } from 'src/components/Runners/Peiy' export { default as Voeb } from 'src/components/Runners/Voeb' export { default as Deay } from 'src/components/Runners/Deay' diff --git a/src/contents/13.en.tsx b/src/contents/13.en.tsx index 3330996bf..18c765bb0 100644 --- a/src/contents/13.en.tsx +++ b/src/contents/13.en.tsx @@ -1008,22 +1008,13 @@ export default () => ( ) }, { - title: <>Add more stuff to the previous lunchbox, + title: ( + <> + Repeat three times + + ), content: ( <> - -

Here’s the lunchbox we used earlier on this page:

- - ) - } - ]} - /> - The lunchbox we used earlier on this page ( children: ( <>

- I just added some items to this lunchbox. The{' '} - yellow section is the added - items. + First: Take a look at this mathbox with{' '} + !

) } ]} /> - - The yellow section is the added items. - - -

Hmm… ok, whats’s so special about this lunchbox?

- - ) - } - ]} - /> - - ) - }, - { - title: <>Let’s run it!, - content: ( - <> + + A lunchbox with + ( children: ( <>

- Let’s {' '} - this lunchbox! -

-

- ( - - I will show all the steps on the next page, but we’ll - skip that for now - - .) + This mathbox repeats {' '} + three times, and calculates {' '} + ➕ .

) } ]} /> -

- -

- + + + + Repeats three times + + + -

- The result is . -

-

- Because we didn’t see all the steps, I don’t know how it - became though… -

- - ) - }, { type: 'saya', children: ( <> -

Yes, I will show all the steps on the next page.

- For now: Just assume that the result is{' '} - ! + I figured out how to reproduce this behavior using a + lunchbox!

) }, { - type: 'thinking', + type: 'surprised', children: ( <> -

Ok, but why is this lunchbox important?

+

Reall? Please show me how!

) } @@ -1131,7 +1083,7 @@ export default () => ( ) }, { - title: <>It can do additions of two numbers?, + title: <>Add more stuff to the previous lunchbox, content: ( <> ( type: 'saya', children: ( <> +

Here’s the lunchbox we used earlier on this page.

- Take a look: + We’ll make some changes to this lunchbox to reproduce{' '} + .

-
    - - - The original lunchbox had two numbers:{' '} - and{' '} - . - - - - - If you add them, it would be{' '} - … - - - - - …which is what happens when you{' '} - it. - - -
) } ]} /> - - The original lunchbox had two numbers: -
- and . -
- If you add them, it would be … - - - - …which is what happens when you -
- it. - + The lunchbox we used earlier on this page -

Hmm… that’s true…

- - ) - }, { type: 'saya', children: ( <>

- So: This lunchbox might be calculating{' '} - ➕{' '} - ? + I just added some items to this lunchbox. The{' '} + yellow section is the added + items.

) } ]} /> - - This lunchbox might be calculating -
- ➕{' '} - ? - + + The yellow section is the added items. + -

- So you’re saying…{' '} - - this lunchbox can do{' '} - additions of two numbers? - -

+

Hmm… ok, whats’s so special about this lunchbox?

) - } - ]} - /> - - ), - footer: { - content: ( - <> -

- You might be wondering:{' '} - - “Does it really become when you run - it?” - -

-

- If so, don’t worry! We’ll show you all the steps on the next - page, so just continue reading! 😉 -

- - ) - } - }, - { - title: ( - <> - It can reproduce ? - - ), - content: ( - <> - -

- Wait a minute:{' '} - - By using a mathbox with{' '} - , you can also - calculate ➕{' '} - . - -

+

It turns out that:

+
    + + + If you{' '} + the + above lunchbox, + + + + + It behaves exactly like the earlier mathbox that has{' '} + . + + +
+

Therefore, it becomes like this:

) } ]} /> - - By using a mathbox with -
- ,
- you can also calculate {' '} - ➕ . - + + If you this + lunchbox… + - + + Just like using , +
+ Repeat three times on{' '} + + +

Wow, really?

- So, maybe{' '} - - Saya’s lunchbox actually reproduced the - above mathbox with{' '} - ? - + If that’s true, that means we’ve reproduced{' '} + .

) @@ -1309,53 +1188,38 @@ export default () => ( ]} /> - This mathbox with -
- … + This mathbox with … - - …was reproduced by this lunchbox? 🤔 - + + Can be reproduced by this lunchbox?🤔 + +

But does it really work?

- If so, that means we just successfully{' '} - reproduced{' '} - ! + + We need to{' '} + it to + see if it’s correct. +

) - } - ]} - /> - , - 🔁, - , - 🍱, - 🔁 - ]} - description={ - <> - Did we just reproduce -
- ? - - } - /> - -

Let’s dive in deeper on the next page!

+

+ Yes, let’s{' '} + on the + next page to check! +

) } @@ -1363,21 +1227,7 @@ export default () => ( /> - ), - footer: { - content: ( - <> -

- If you’re confused:{' '} - - Don’t worry! If you read the next page, it should all make - sense. - {' '} - Just keep reading! 😉 -

- - ) - } + ) } ]} /> diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index c063f36d1..35fbc6add 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -1025,7 +1025,7 @@ export default () => ( children: ( <>

- この弁当箱は、以下のように{' '} + この計算箱は、以下のように{' '} を3回繰り返すことにより、 ➕{' '} を計算できるわけだよね。 @@ -1078,6 +1078,11 @@ export default () => (

先ほど登場した、複雑な部分を計算箱に置き換えた弁当箱に注目してみて！

+

+ これに変更を加えることで、「 + + 」を再現してみるよ。 +

) } diff --git a/src/lib/runners/htir.json b/src/lib/runners/htir.json deleted file mode 100644 index 90c7944e1..000000000 --- a/src/lib/runners/htir.json +++ /dev/null @@ -1,387 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "type": "conditional", - "state": "default", - "checkType": "isZero", - "condition": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "trueCase": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 2, - "maxNestedFunctionDepth": 0 - }, - "falseCase": { - "arg": { - "arg": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3, - 4 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 4 - ], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "pred", - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 4, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "add", - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1, - 2 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "numLeafNodes": 13, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - }, - { - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 5, - "maxNestedFunctionDepth": 0 - }, - "previouslyChangedExpressionState": "default", - "activePriority": 1, - "containerState": "done", - "numLeafNodes": 1 - } - ], - "speed": 1, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": true, - "hideFuncUnboundBadgeOnExplanation": true, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": true -} From e8610c9e00d82850736de38ea6e982a90b878419 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sat, 19 Oct 2019 17:03:19 -0700 Subject: [PATCH 037/110] Revise 10 --- scripts/lib/initialExpressionContainers.ts | 9 +++++++++ scripts/lib/runnerConfigs.ts | 5 +++++ src/components/Runners/Rchd.tsx | 12 ++++++++++++ src/components/Runners/index.ts | 1 + src/contents/10.en.tsx | 6 +++--- src/contents/10.jp.tsx | 6 +++--- 6 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 src/components/Runners/Rchd.tsx diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index debe77c93..7a5524461 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -377,6 +377,15 @@ export const pslb = initializeExpressionContainer({ } }) +export const gmzz = initializeExpressionContainer([ + { + shorthandFunc: 'add' + }, + { + shorthandNumber: 0 + } +]) + export const vibe = initializeExpressionContainer([ { shorthandFunc: 'add' diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index b5914b6fc..33ed16b0a 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -864,6 +864,11 @@ export const lizi: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.vibe } +export const rchd: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.gmzz +} + export const gnwm: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.lbkw diff --git a/src/components/Runners/Rchd.tsx b/src/components/Runners/Rchd.tsx new file mode 100644 index 000000000..66f2a134f --- /dev/null +++ b/src/components/Runners/Rchd.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/rchd.json' + +const Rchd = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Rchd diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 339cab78a..90b9a1e95 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -123,6 +123,7 @@ export { default as Zwpj } from 'src/components/Runners/Zwpj' export { default as Zzxj } from 'src/components/Runners/Zzxj' export { default as Zzyu } from 'src/components/Runners/Zzyu' export { default as Lizi } from 'src/components/Runners/Lizi' +export { default as Rchd } from 'src/components/Runners/Rchd' export { default as Gnwm } from 'src/components/Runners/Gnwm' export { default as Mcug } from 'src/components/Runners/Mcug' export { default as Aovj } from 'src/components/Runners/Aovj' diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index 6c1406e4a..7c1c8abb9 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -212,10 +212,10 @@ export default () => ( } ]} /> - - Reproduce {' '} + + Reproduce {' '} … - + Using a lunchbox ( } ]} /> - - {' '} + + {' '} の計算箱を… - + 弁当箱で再現した Date: Sat, 19 Oct 2019 17:03:32 -0700 Subject: [PATCH 038/110] Change uqth --- scripts/lib/initialExpressionContainers.ts | 2 +- src/contents/8.jp.tsx | 1306 ++++++++++++++++++-- src/lib/runners/dyoq.json | 42 +- src/lib/runners/hdhy.json | 255 +--- src/lib/runners/jsvg.json | 332 ++--- src/lib/runners/plde.json | 42 +- src/lib/runners/rchd.json | 59 + src/lib/runners/rhcv.json | 45 +- src/lib/runners/rjzw.json | 1009 +++------------ src/lib/runners/uexo.json | 372 +----- 10 files changed, 1712 insertions(+), 1752 deletions(-) create mode 100644 src/lib/runners/rchd.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 7a5524461..ce87e33bc 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -999,7 +999,7 @@ export const uzzl = initializeExpressionContainer(succParams('a', 'b', 'c')) export const uqth = initializeExpressionContainer([ succParams('a', 'b', 'c'), - numberParams('d', 'e', 1) + numberParams('d', 'e', 0) ]) export const oxuf = initializeExpressionContainer( diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 1a0321e9b..f2dab06c6 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -103,78 +103,6 @@ export default () => ( ) }, - { - type: 'saya', - children: ( - <> -

ふーん、どんな問題なの？

- - ) - }, - { - type: 'sad', - children: ( - <> -

じゃあ、手短に説明するね。

-

- - 以下の弁当箱の{' '} - {' '} - に、どのような法則に基づいて料理を入れると、「 - 1を足す効果{' '} - - 」がある弁当箱になるか、という問題なんだ。 - -

- - ) - } - ]} - /> - - 以下の弁当箱の {' '} - に、 -
- どのような法則に基づいて料理を入れると、 -
「1を足す効果{' '} - - 」があるようになる？ - - -

- すなわち、 - - ➕{' '} - {' '} - を計算できるようにしないといけない - - んだ。 -

- - ) - } - ]} - /> - - {' '} - に変換できる弁当箱と合体させて -
- - した時、 - - - - 結果が {' '} - ➕{' '} - にならないといけない - - ( } ]} /> - + 👧🏻 サヤちゃんの弁当箱 - + ( ]} /> ) + +// export default () => ( +// どうしよう？, +// content: ( +// <> +// 😭, ❓, 😭]} +// /> +//

ラムダ村の村人たちは、前回の問題に四苦八苦していました。

+// +// +//

だめだ…全然分からない！

+// +// ) +// }, +// { +// type: 'sad', +// children: ( +// <> +//

+// これを解かないと計算箱を返してもらえないのに…どうしよう… +//

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// title: <>サヤちゃん現る, +// content: ( +// <> +//

+// その時です。ラムダ村に暮らす少女の +// サヤちゃん{' '} +// 👧🏻{' '} +// が、問題に苦戦している村人たちに話しかけてきました。 +//

+// +// ラムダ村に暮らす少女の +// サヤちゃん +// +// } +// /> +// +//

ねえねえ、みんな何してるの？

+// +// ) +// }, +// { +// type: 'sad', +// children: ( +// <> +//

+// おお、サヤちゃんか。実は、にっくき悪魔 😈{' '} +// に計算箱を奪われてしまったんだ。 +//

+//

+// 奴が出題した問題を解かないと計算箱を返してもらえないんだけど、俺らには難しくて解けないんだよ。 +//

+// +// ) +// }, +// { +// type: 'saya', +// children: ( +// <> +//

ふーん、じゃあサヤも解くのを手伝うよ！

+// +// ) +// }, +// { +// type: 'roll', +// children: ( +// <> +//

+// 手伝ってくれるのはありがたいけど、この問題はママゴトじゃないんだよ。俺らがどれだけ頑張っても分からなかったんだ。 +//

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// title: <>サヤちゃんの弁当箱, +// content: ( +// <> +//

+// サヤちゃんは少し考えた後、 +// に料理を入れてみました。 +//

+// +//

+// ねえねえ、サヤも {' '} +// に料理を入れてみたんだけど、見てくれる？ +//

+// +// ) +// } +// ]} +// /> +// +// 👧🏻 サヤちゃんの弁当箱 +// +// +//

+// ふむふむ…どうせ上手くいかないと思うけど、試してみるか。 +//

+//

+// 前回もやったように、 +// +// {' '} +// に変換できる弁当箱と合体させて、 +// +//

+// +// +// +//

+// +// して、 +// +// 結果が になるか +// +// 確かめてみよう。どうせムリだろうけど！ +//

+// +// ) +// } +// ]} +// /> +// +// に変換できる弁当箱と、 +//
+// 👧🏻 サヤちゃんの弁当箱を合体させ… +// +// +// +// +//
+// して、結果が になれば +// 成功 🎉 +//
+// それ以外なら失敗 😭 +// +// +//

+// じゃあ、 +// +// してみよう！ +//

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// title: ( +// <> +// してみると… +// +// ), +// content: ( +// <> +// +// +// +// +// +// +// +// +// +// +// +// +//

つまり、最終的に以下のようになりました！

+// +// した結果 +// +// +//

こ、これはもしや…？

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// title: ( +// <> +// に変換できる +// +// ), +// content: ( +// <> +// +//

+// この弁当箱は、 +// に変換できます！ +//

+// +// ) +// } +// ]} +// /> +// +// +// +// +// +// +//

ということは、サヤちゃんの弁当箱は…

+//

+// +// {' '} +// に変換できる弁当箱と合体させ、 +// +// すると、結果が になる +// +// ということですね。 +//

+// +// ) +// } +// ]} +// /> +// +// に変換できる弁当箱と、 +//
+// 👧🏻 サヤちゃんの弁当箱を合体させ… +// +// +// +// +//
+// すると、結果が になる +// +// +//

+// つまり、 +// ➕{' '} +// が計算できたので、 +// 成功です！{' '} +// 🎉 +//

+// +// ) +// }, +// { +// type: 'saya', +// children: ( +// <> +//

やったー！

+// +// ) +// }, +// { +// type: 'surprised', +// children: ( +// <> +//

+// そんなバカな…！俺らがどれだけ頭をひねっても分からなかったのに、サヤちゃんにいとも簡単に解かれるなんて！ +//

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// title: ( +// <> +// ➕{' '} +// はできる？ +// +// ), +// content: ( +// <> +// +//

+// いや、まだ分からんぞ。 +// ➕{' '} +// ができるからといって、 +// +// 他の数字に対しても +// +// があるとは限らない。 +// +//

+//

+// たとえば、 +// +// ➕{' '} +// も計算できるのかどうか +// +// 確かめてみないと。 +//

+// +// ) +// } +// ]} +// /> +// , +// ➕, +// +// ]} +// description={<>これも計算できる？} +// /> +// +//

+// じゃあ、 +// +// に変換できる弁当箱と、 +// +//

+// +// +// +//

サヤが考えた弁当箱を合体させてみるね！

+// +// 👧🏻 サヤちゃんの弁当箱 +// +//

+// 合体したものを +// +// して、 +// +// 結果が になればいい +// +// んだよね。 +//

+// +// ) +// } +// ]} +// /> +// +// に変換できる弁当箱と、 +//
+// 👧🏻 サヤちゃんの弁当箱を合体させ… +// +// +// +// +//
+// して、結果が になれば +// 成功 🎉 +//
+// それ以外なら失敗 😭 +// +// +//

+// まずは実行してみるね。 +// +//

+//

今回は、最後まで止まらずに早送りします！

+// +// ) +// } +// ]} +// /> +// +// +//

結果はこうなったよ！

+// +// ) +// } +// ]} +// /> +// +// した結果 +// +// +//

+// この弁当箱は、 +// に変換できます！ +//

+// +// ) +// } +// ]} +// /> +// +// +// +// +// +// +//

+// つまり、 +// ➕{' '} +// が計算できたので、 +// またしても成功です！{' '} +// 🎉 +//

+// +// ) +// }, +// { +// type: 'saya', +// children: ( +// <> +//

わーい、わーい！

+// +// ) +// }, +// { +// type: 'surprised', +// children: ( +// <> +//

す、すごい…！

+// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// title: ( +// <> +// +// がある法則 +// +// ), +// content: ( +// <> +// +//

+// ではここで正解を言いましょう。 +// +// サヤちゃんが考えた弁当箱は、 +// +// がある弁当箱です。 +// +//

+//

+// だから、 +// サヤちゃんの答えが正解です！ +// おめでとうございます！🎉 +//

+// +// ) +// } +// ]} +// /> +// +// 👧🏻 サヤちゃんが考えた弁当箱には +//
+// +// がある +// +// +//

わーい、ミニオンさんありがとう！

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

+// さらに言うと、サヤちゃんが考えた弁当箱以外にも、 +// +// 以下の法則に当てはまる弁当箱であれば、 どれでも +// +// があります。 +// +//

+// +// ) +// } +// ]} +// /> +// +// この法則に当てはまる弁当箱であれば、 +//
+// +// がある +// +// +//

サヤが考えた弁当箱の場合、

+//
    +// +// 🅰️ は +// +// +// 🅱️ は +// +// +// は{' '} +// +// +//
+//

ということかな？

+// +// ) +// } +// ]} +// /> +// +// 🅰️ は 、
+// 🅱️ は 、
+// は +// +// +//

+// その通りです。サヤちゃんが考えた弁当箱は、ちゃんとこの法則に当てはまっているのです。 +//

+// +// この法則に当てはまる弁当箱であれば、 +//
+// +// がある +// +// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// title: <>同じ法則の、他の弁当箱も試してみる, +// content: ( +// <> +// +//

+// じゃあ、たとえばこの弁当箱でも、同じ法則に沿っているから、 +// +// があるってこと？ +//

+// +// 同じ法則で料理を入れてみた。 +//
+// +// はあるか？ +// +//

+// 🅰️ には 、 +// 🅱️ には 、 +// には{' '} +// +// を当てはめてみたよ。 +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

+// はい、 +// +// はありますよ。 +//

+//

+// +// 試しに、 +// {' '} +// に変換できるこちらの弁当箱と合体させて +// してみましょう。 +// +//

+// +// +// +//

+// 実行したとき、 +// +// 結果が {' '} +// に変換できる弁当箱になれば、 +// ➕{' '} +// を計算できたので成功 +// +// になります。 +//

+// +// ) +// } +// ]} +// /> +//

+// +//

+// +// +//

+// 結果、 +// {' '} +// に変換できる弁当箱が残りました！ +//

+// +// +// +//

+// つまり、 +// ➕{' '} +// を計算できたというわけです。 +//

+// +// ) +// }, +// { +// type: 'thinking', +// children: ( +// <> +//

+// なるほど、やっぱりこちらの弁当箱にも +// +// があるということか。 +//

+// +// サヤちゃんの弁当箱と同じく、こちらの +//
+// 弁当箱にも +// +// がある +// +// +// ) +// } +// ]} +// /> +// +// ) +// }, +// { +// type: 'summary', +// title: <>立ち止まって振り返ろう, +// content: ( +// <> +// +//

+// 俺らふだん頭を使っていないから、情報量が多すぎて疲れてしまった… +//

+//

ちょっとひと休みしてもらえないか？

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

いいですよ、ひと休みしましょう！

+//

+// ちなみに現時点で、 +// 中級編も半分を終えました +// 。つまり、本稿の折り返し地点を越えたということです。 +// +// 残るは中級編の残り半分と、上級編のみです。 +// +//

+//

+// いい機会なので、少し立ち止まって振り返ってみましょう。 +//

+// +// ) +// } +// ]} +// /> +//

+// まずこちらをご覧ください。これは、「 +// 」 +// を使うことで、 +// ➕{' '} +// を計算できる計算箱ですね。 +//

+// +// 「 +// 」を使うことで +//
+// ➕{' '} +// を計算できる計算箱。 +//
+// 実行すると になる +// +//

+// これまで学んだことを一言でまとめると、上の計算箱にあるような「 +// +// 」は、 +// 弁当箱で「再現」できる +// 、ということです。 +//

+// , +// , +// , +// 🍱, +// +// ]} +// description={ +// <> +// 計算箱の「 +// +// 」は、 +//
+// 弁当箱で「再現 +// 」することができる +// +// } +// /> +//

+// 「再現 +// 」できる、とはどういうことでしょうか？先ほどの計算箱の例で説明しますね。 +//

+// これを弁当箱で再現します +//

+// ステップ1: まず、 +// +// 計算箱の の代わりに、 +// +// に変換できる +// +// 弁当箱 +// +// を用意します。 +//

+// これの代わりに… +// +// +// に変換できる弁当箱を用意 +// +//

+// ステップ2: 次に、 +// +// 計算箱の の代わりに、 +// +// +// がある弁当箱を用意します。 +//

+// これの代わりに… +// +// +// +// がある弁当箱を用意 +//
(👧🏻 サヤちゃんが考えた弁当箱です) +// +//

+// ステップ3:{' '} +// このふたつを合体させた弁当箱は、先ほども説明した通り、 +// +// すると{' '} +// になります +// +// ね。 +//

+// +// に変換できる弁当箱と +//
+// +// がある弁当箱を合体 +// +//

+// つまり、先ほど登場した {' '} +// ➕ {' '} +// を計算できる計算箱は、 +//

+// +//

+// こちらの弁当箱で「再現」できる +// ということです。 +//

+// +// {' '} +// の計算箱を、弁当箱で再現 +// +//

+// これが、「計算箱を弁当箱で再現する +// 」ということなんですね。 +//

+// +// ) +// }, +// { +// type: 'summary', +// title: <>もっと複雑な計算箱も再現できる, +// content: ( +// <> +//

もちろん、もっと複雑な計算箱も弁当箱で再現できます。

+//

+// たとえば、初級その1に登場したこちらの計算箱をご覧ください。 +// すると、結果は{' '} +// になります。 +//

+// +//

+// これを弁当箱で再現するには、 +// +// に変換できる弁当箱と、 +// +// がある弁当箱を「2個 +// 」合体させればいい +// +// のです。 +//

+// +// に変換できる弁当箱と +//
+// +// がある弁当箱を「2個」
+// 合体すれば、 +// {' '} +// の計算箱を再現できる +// +//

+// 上の弁当箱は実行に時間がかかるので、ここでは早送りはしませんが、 +// +// {' '} +// ボタンを押すと、答えが {' '} +// になるのを確認できます。 +// +//

+//
+//

+// まとめると、 +// +// 計算箱の「 +// +// 」は、弁当箱で再現することができる +// +// のです。このポイントさえ覚えていただければ、細かいことは分からなくても大丈夫です！ +//

+// , +// , +// , +// 🍱, +// +// ]} +// description={ +// <> +// 計算箱の「 +// +// 」は、 +//
+// 弁当箱で「再現 +// 」することができる +// +// } +// /> +// +// ) +// }, +// { +// type: 'challengeProblem', +// title: <>他の機能も再現できる？, +// content: ( +// <> +//

+// ここで疑問なのですが、初級で説明した通り、計算箱には「 +// +// 」以外にも、「 +// +// 」や、「 +// +// 」がありましたよね。 +//

+// +// 「 +// 」の例 +// +// +// 「 +// 」の例 +//
+// ( を {' '} +// 回繰り返す) +// +//

+// +// これらの機能も、弁当箱で再現することができるのでしょうか？ +// +//

+// , +// 🍱, +// 🔁 +// ]} +// description={ +// <> +// 「 +// 」や +//
「 +// 」も、 +//
+// 弁当箱で「再現」できる？ +// +// } +// /> +//

+// +// この疑問については、後に答えが明らかになります。 +// +// 楽しみにしていてください。 +//

+// +// ) +// }, +// { +// type: 'sideNote', +// title: <>考えつかなくても大丈夫！, +// content: ( +// <> +// +//

ミニオン、ひとつ愚痴を聞いてもらえるかい？

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

はい、どうしました？

+// +// ) +// }, +// { +// type: 'sad', +// children: ( +// <> +//

+// さっきの問題、難しすぎやしないかい？普通は、サヤちゃんみたいに答えをとっさに思いつかないよ！ +//

+//

+// +// こういうのがパッと思いつけないと、コンピュータサイエンスを学ぶ資格はないのかな？ +// +//

+// +// ) +// } +// ]} +// /> +// +// さっきの答えの弁当箱。普通はこんなの、 +//
+// とっさに思いつかないよ！😢 +// +// +//

+// +// いえ、そんなことは全くありませんよ。 +// +// むしろ、こういう答えを思いつけるのはひと握りの天才だけです。 +//

+// +// ) +// }, +// { +// type: 'sad', +// children: ( +// <> +//

え、そうなの？

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

はい。先ほどの問題は超難問でしたから。

+//

+// +// 答えを思いつけなくても、答えを見て、「なるほど、そういうことだったのか」と理解できれば、コンピュータサイエンスを学ぶ素養は十分すぎるほどあります。 +// +//

+// +// ) +// }, +// { +// type: 'smile', +// children: ( +// <> +//

そっか…気が楽になったよ。ありがとう！

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

いえいえ。それでは、そろそろ話を戻しましょう！

+// +// ) +// } +// ]} +// /> +// 話を戻しましょう！} +// /> +// +// ) +// }, +// { +// title: <>話を戻すと…, +// content: ( +// <> +//

+// 悪魔による難しい問題に見事答えられたことで、村人たちは大喜びでした。 +//

+// +//

+// やった！サヤちゃんのおかげで問題に答えられたぞ！これで計算箱を返してもらえる！ +//

+// +// ) +// } +// ]} +// /> +//

しかし、当のサヤちゃんには何か腑に落ちない点があるようです。

+// +//

+// ミニオンさん、 +// +// おかしなことに気づいちゃったんだけど… +// +//

+// +// ) +// }, +// { +// type: 'dog', +// children: ( +// <> +//

はい、「おかしなこと」とは何ですか？

+// +// ) +// } +// ]} +// /> +//

+// サヤちゃんが気づいた、「 +// おかしなこと +// 」とは何なのでしょうか？次のページで説明していきます！ +//

+// +// +// +// ) +// } +// ]} +// /> +// ) diff --git a/src/lib/runners/dyoq.json b/src/lib/runners/dyoq.json index ba0994b19..9ef6a4f2f 100644 --- a/src/lib/runners/dyoq.json +++ b/src/lib/runners/dyoq.json @@ -31,37 +31,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -201,7 +179,7 @@ "priority": 1, "maxNestedFunctionDepth": 3 }, - "numLeafNodes": 6, + "numLeafNodes": 5, "containerState": "ready", "previouslyChangedExpressionState": "default" }, diff --git a/src/lib/runners/hdhy.json b/src/lib/runners/hdhy.json index 0bd765b31..ad30a7105 100644 --- a/src/lib/runners/hdhy.json +++ b/src/lib/runners/hdhy.json @@ -60,37 +60,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -129,7 +107,7 @@ "previouslyChangedExpressionState": "active", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -191,37 +169,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -260,7 +216,7 @@ "previouslyChangedExpressionState": "showFuncBound", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -322,37 +278,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -392,7 +326,7 @@ "matchExists": true, "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -454,37 +388,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "c", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "c", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -523,7 +435,7 @@ "previouslyChangedExpressionState": "betaReducePreviewAfter", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -585,37 +497,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "c", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "c", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -654,7 +544,7 @@ "previouslyChangedExpressionState": "betaReducePreviewCrossed", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -685,38 +575,17 @@ }, "body": { "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -747,7 +616,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 2, "containerState": "done", - "numLeafNodes": 3 + "numLeafNodes": 2 } ], "speed": 1, diff --git a/src/lib/runners/jsvg.json b/src/lib/runners/jsvg.json index 6af335c3f..bf8a37a68 100644 --- a/src/lib/runners/jsvg.json +++ b/src/lib/runners/jsvg.json @@ -31,37 +31,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -204,7 +182,7 @@ "previouslyChangedExpressionState": "active", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -237,37 +215,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -410,7 +366,7 @@ "previouslyChangedExpressionState": "showFuncUnbound", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -443,37 +399,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -617,7 +551,7 @@ "matchExists": true, "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -650,37 +584,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -792,37 +704,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -877,7 +767,7 @@ "previouslyChangedExpressionState": "betaReducePreviewAfter", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 7 + "numLeafNodes": 5 }, { "expression": { @@ -910,37 +800,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -1052,37 +920,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -1137,7 +983,7 @@ "previouslyChangedExpressionState": "betaReducePreviewCrossed", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 7 + "numLeafNodes": 5 }, { "expression": { @@ -1228,37 +1074,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -1305,7 +1129,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 1, "containerState": "ready", - "numLeafNodes": 5 + "numLeafNodes": 4 } ], "speed": 1, diff --git a/src/lib/runners/plde.json b/src/lib/runners/plde.json index ae419cbb6..973194900 100644 --- a/src/lib/runners/plde.json +++ b/src/lib/runners/plde.json @@ -31,37 +31,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -201,7 +179,7 @@ "priority": 1, "maxNestedFunctionDepth": 3 }, - "numLeafNodes": 6, + "numLeafNodes": 5, "containerState": "ready", "previouslyChangedExpressionState": "default" } diff --git a/src/lib/runners/rchd.json b/src/lib/runners/rchd.json new file mode 100644 index 000000000..0836ed3c7 --- /dev/null +++ b/src/lib/runners/rchd.json @@ -0,0 +1,59 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 0, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "shorthandFunc", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "shorthandFunc": "add", + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 2, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": true, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/rhcv.json b/src/lib/runners/rhcv.json index 06c226517..3b97226ea 100644 --- a/src/lib/runners/rhcv.json +++ b/src/lib/runners/rhcv.json @@ -29,38 +29,17 @@ }, "body": { "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -91,7 +70,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 2, "containerState": "done", - "numLeafNodes": 3 + "numLeafNodes": 2 } ], "speed": 1, diff --git a/src/lib/runners/rjzw.json b/src/lib/runners/rjzw.json index 4f1fec2fe..f082c91f3 100644 --- a/src/lib/runners/rjzw.json +++ b/src/lib/runners/rjzw.json @@ -31,37 +31,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -201,7 +179,7 @@ "priority": 1, "maxNestedFunctionDepth": 3 }, - "numLeafNodes": 6, + "numLeafNodes": 5, "containerState": "ready", "previouslyChangedExpressionState": "default" }, @@ -236,37 +214,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -409,7 +365,7 @@ "previouslyChangedExpressionState": "active", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -442,37 +398,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -615,7 +549,7 @@ "previouslyChangedExpressionState": "showFuncUnbound", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -648,37 +582,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -822,7 +734,7 @@ "matchExists": true, "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -855,37 +767,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -997,37 +887,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -1082,7 +950,7 @@ "previouslyChangedExpressionState": "betaReducePreviewAfter", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 7 + "numLeafNodes": 5 }, { "expression": { @@ -1115,37 +983,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -1257,37 +1103,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -1342,7 +1166,7 @@ "previouslyChangedExpressionState": "betaReducePreviewCrossed", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 7 + "numLeafNodes": 5 }, { "expression": { @@ -1433,37 +1257,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -1510,7 +1312,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 1, "containerState": "ready", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -1601,37 +1403,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -1678,7 +1458,7 @@ "previouslyChangedExpressionState": "active", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -1769,37 +1549,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -1846,7 +1604,7 @@ "previouslyChangedExpressionState": "showFuncUnbound", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -1911,7 +1669,7 @@ "arg": { "name": "d", "highlightType": "highlighted", - "topLeftBadgeType": "match", + "topLeftBadgeType": "unmatch", "bottomRightBadgeType": "funcArg", "type": "variable", "argPriorityAgg": [], @@ -1937,37 +1695,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -2012,10 +1748,10 @@ "maxNestedFunctionDepth": 4 }, "previouslyChangedExpressionState": "betaReducePreviewBefore", - "matchExists": true, + "matchExists": false, "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -2064,7 +1800,7 @@ "func": { "arg": { "name": "b", - "highlightType": "betaReduceCallArgHighlighted", + "highlightType": "removed", "topLeftBadgeType": "none", "bottomRightBadgeType": "callArg", "type": "variable", @@ -2079,7 +1815,7 @@ "func": { "arg": { "name": "d", - "highlightType": "active", + "highlightType": "removed", "topLeftBadgeType": "none", "bottomRightBadgeType": "funcArg", "type": "variable", @@ -2097,7 +1833,7 @@ "name": "e", "highlightType": "active", "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", + "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [], @@ -2106,162 +1842,6 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "state": "betaReducePreviewAfter", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "previouslyChangedExpressionState": "betaReducePreviewAfter", - "activePriority": 2, - "containerState": "stepped", - "numLeafNodes": 5 - }, - { - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "d", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { "name": "e", "highlightType": "active", "topLeftBadgeType": "none", @@ -2270,41 +1850,7 @@ "argPriorityAgg": [], "funcPriorityAgg": [], "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -2351,7 +1897,7 @@ "previouslyChangedExpressionState": "betaReducePreviewCrossed", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -2409,41 +1955,19 @@ 2 ], "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -2482,7 +2006,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 2, "containerState": "ready", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -2544,37 +2068,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -2613,7 +2115,7 @@ "previouslyChangedExpressionState": "active", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -2675,37 +2177,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -2744,7 +2224,7 @@ "previouslyChangedExpressionState": "showFuncBound", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -2806,37 +2286,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -2876,7 +2334,7 @@ "matchExists": true, "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -2938,37 +2396,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "c", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "c", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -3007,7 +2443,7 @@ "previouslyChangedExpressionState": "betaReducePreviewAfter", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -3069,37 +2505,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "c", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "c", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -3138,7 +2552,7 @@ "previouslyChangedExpressionState": "betaReducePreviewCrossed", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 4 + "numLeafNodes": 3 }, { "expression": { @@ -3169,38 +2583,17 @@ }, "body": { "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -3231,7 +2624,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 2, "containerState": "done", - "numLeafNodes": 3 + "numLeafNodes": 2 } ], "speed": 1, diff --git a/src/lib/runners/uexo.json b/src/lib/runners/uexo.json index 5013bd3d7..b2fc0c60a 100644 --- a/src/lib/runners/uexo.json +++ b/src/lib/runners/uexo.json @@ -89,37 +89,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -166,7 +144,7 @@ "previouslyChangedExpressionState": "active", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -257,37 +235,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -334,7 +290,7 @@ "previouslyChangedExpressionState": "showFuncUnbound", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -399,7 +355,7 @@ "arg": { "name": "d", "highlightType": "highlighted", - "topLeftBadgeType": "match", + "topLeftBadgeType": "unmatch", "bottomRightBadgeType": "funcArg", "type": "variable", "argPriorityAgg": [], @@ -425,37 +381,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -500,10 +434,10 @@ "maxNestedFunctionDepth": 4 }, "previouslyChangedExpressionState": "betaReducePreviewBefore", - "matchExists": true, + "matchExists": false, "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -552,7 +486,7 @@ "func": { "arg": { "name": "b", - "highlightType": "betaReduceCallArgHighlighted", + "highlightType": "removed", "topLeftBadgeType": "none", "bottomRightBadgeType": "callArg", "type": "variable", @@ -567,7 +501,7 @@ "func": { "arg": { "name": "d", - "highlightType": "active", + "highlightType": "removed", "topLeftBadgeType": "none", "bottomRightBadgeType": "funcArg", "type": "variable", @@ -585,7 +519,7 @@ "name": "e", "highlightType": "active", "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", + "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [], @@ -594,162 +528,6 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "state": "betaReducePreviewAfter", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "previouslyChangedExpressionState": "betaReducePreviewAfter", - "activePriority": 2, - "containerState": "stepped", - "numLeafNodes": 5 - }, - { - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "d", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { "name": "e", "highlightType": "active", "topLeftBadgeType": "none", @@ -758,41 +536,7 @@ "argPriorityAgg": [], "funcPriorityAgg": [], "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -839,7 +583,7 @@ "previouslyChangedExpressionState": "betaReducePreviewCrossed", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -901,37 +645,15 @@ "maxNestedFunctionDepth": 0 }, "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -970,7 +692,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 2, "containerState": "ready", - "numLeafNodes": 4 + "numLeafNodes": 3 } ], "speed": 1, From 750f539a66ca544f889980f42e28ca03a862cbc1 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sat, 19 Oct 2019 23:55:01 -0700 Subject: [PATCH 039/110] Start rewriting 8 --- scripts/lib/runnerConfigs.ts | 7 ++ src/components/Runners/Cpim.tsx | 12 ++ src/components/Runners/index.ts | 1 + src/contents/8.jp.tsx | 48 +++----- src/lib/runners/cpim.json | 205 ++++++++++++++++++++++++++++++++ 5 files changed, 240 insertions(+), 33 deletions(-) create mode 100644 src/components/Runners/Cpim.tsx create mode 100644 src/lib/runners/cpim.json diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 33ed16b0a..d3484185c 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1338,6 +1338,13 @@ export const plde: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const cpim: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.uqth, + showPriorities: true, + highlightOverrides: { a: 'highlighted', b: 'highlighted', c: 'highlighted' } +} + export const rjzw: ExpressionRunnerShorthandConfig = { runner: 'playButtonOnly', initialExpressionContainer: initialExpressionContainers.uqth, diff --git a/src/components/Runners/Cpim.tsx b/src/components/Runners/Cpim.tsx new file mode 100644 index 000000000..41f69ae1a --- /dev/null +++ b/src/components/Runners/Cpim.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/cpim.json' + +const Cpim = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Cpim diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 90b9a1e95..b94e723e6 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -201,6 +201,7 @@ export { default as Fhrd } from 'src/components/Runners/Fhrd' export { default as Bgxi } from 'src/components/Runners/Bgxi' export { default as Qrfw } from 'src/components/Runners/Qrfw' export { default as Plde } from 'src/components/Runners/Plde' +export { default as Cpim } from 'src/components/Runners/Cpim' export { default as Rjzw } from 'src/components/Runners/Rjzw' export { default as Jsvg } from 'src/components/Runners/Jsvg' export { default as Uexo } from 'src/components/Runners/Uexo' diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index f2dab06c6..b43fcee08 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -149,9 +149,14 @@ export default () => ( } ]} /> - - 👧🏻 サヤちゃんの弁当箱 - + + 👧🏻 それぞれの{' '} + に… + + + + 👧🏻 次のように料理を入れてみた！ + ( ふむふむ…どうせ上手くいかないと思うけど、試してみるか。

- 前回もやったように、 - - {' '} - に変換できる弁当箱と合体させて、 - -

- - - -

- - して、 - - 結果が になるか - - 確かめてみよう。どうせムリだろうけど！ + これを + して、 + になればいいんだよな。

) } ]} /> - - に変換できる弁当箱と、 -
- 👧🏻 サヤちゃんの弁当箱を合体させ… - + こちらの弁当箱を実行して… - + に変換できる
- して、結果が になれば - 成功 🎉 + 弁当箱になれば 成功{' '} + 🎉
それ以外なら失敗 😭 diff --git a/src/lib/runners/cpim.json b/src/lib/runners/cpim.json new file mode 100644 index 000000000..8277dfa05 --- /dev/null +++ b/src/lib/runners/cpim.json @@ -0,0 +1,205 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 5, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": { + "a": "highlighted", + "b": "highlighted", + "c": "highlighted" + }, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From 2bcf27e1e3fbc7b3109d61e8045a7804b0d2af17 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 00:45:18 -0700 Subject: [PATCH 040/110] Set memory size --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5f4e6a4d1..df820cbd3 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "scripts": "outDir/tsconfig.scripts.json/scripts" }, "scripts": { - "jp": "IS_DEVELOPMENT=true DEV_LOCALE=jp next -p 9991", - "en": "IS_DEVELOPMENT=true DEV_LOCALE=en next -p 9990", + "jp": "IS_DEVELOPMENT=true DEV_LOCALE=jp NODE_OPTIONS=--max_old_space_size=4096 next -p 9991", + "en": "IS_DEVELOPMENT=true DEV_LOCALE=en NODE_OPTIONS=--max_old_space_size=4096 next -p 9990", "jp:production": "PRODUCTION=jp next -p 9993", "en:production": "PRODUCTION=en next -p 9992", "dev": "cp tsconfig.dev.json tsconfig.json && rm -f report.*.json && rm -f *.log && rm -rf .next && concurrently \"yarn jp\" \"yarn en\"", From 1579fb973acea585adfc649cd4cec1d72ea7522c Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 00:46:14 -0700 Subject: [PATCH 041/110] Continue with 8 --- src/contents/8.jp.tsx | 50 +++++++------------------------------------ 1 file changed, 8 insertions(+), 42 deletions(-) diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index b43fcee08..2b074f8b9 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -247,7 +247,7 @@ export default () => ( { title: ( <> - に変換できる + に変換できる ), content: ( @@ -260,52 +260,21 @@ export default () => ( <>

この弁当箱は、 - に変換できます！ + に変換できます！

) } ]} /> - + - + - - -

ということは、サヤちゃんの弁当箱は…

-

- - {' '} - に変換できる弁当箱と合体させ、 - - すると、結果が になる - - ということですね。 -

- - ) - } - ]} - /> - - に変換できる弁当箱と、 -
- 👧🏻 サヤちゃんの弁当箱を合体させ… - - - - -
- すると、結果が になる - + + ( children: ( <>

- つまり、 - ➕{' '} - が計算できたので、 - 成功です！{' '} + つまり、成功です！{' '} 🎉

From 35a19f9d6d745d175f42064d13cac1db45225ab8 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 00:47:21 -0700 Subject: [PATCH 042/110] Update 8 --- src/contents/8.jp.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 2b074f8b9..e55c7196a 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -107,7 +107,12 @@ export default () => ( type: 'saya', children: ( <> -

ふーん、じゃあサヤも解くのを手伝うよ！

+

+ ふーん、 + + じゃあサヤも解くのを手伝うよ！ + +

) }, From fdc97db3fc91e4751e2b54b2ae08e4296a6de75d Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 01:53:02 -0700 Subject: [PATCH 043/110] Continue with 8 --- src/contents/8.jp.tsx | 175 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 158 insertions(+), 17 deletions(-) diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index e55c7196a..f02cf2bd9 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -243,22 +243,7 @@ export default () => (

こ、これはもしや…？

) - } - ]} - /> - - ) - }, - { - title: ( - <> - に変換できる - - ), - content: ( - <> - ( - ( ) }, + { + title: <>少し掘り下げてみよう, + content: ( + <> + +

とにかく、これで計算箱を返してもらえるぞ！

+ + ) + }, + { + type: 'dog', + children: ( + <> +

+ そうですね。しかしその前に、 + + ひとつだけ掘り下げたいことがあります + + 。少しの間、辛抱してお聞きください！ +

+ + ) + }, + { + type: 'thinking', + children: ( + <> +

掘り下げたいことだって？

+ + ) + }, + { + type: 'dog', + children: ( + <> +

+ はい。まず、ここまでをまとめると、下のように{' '} + + に変換できる弁当箱は、 + +

+ + + +

+ + 👧🏻{' '} + サヤちゃんの弁当箱を使って実行すると、 + {' '} + に変換できる弁当箱になります。 + +

+ + ) + } + ]} + /> + + 👧🏻 サヤちゃんの弁当箱を使って実行すると… + + + + に変換できる弁当箱になる + + +

+ つまり、👧🏻{' '} + サヤちゃんの弁当箱を使うことで、 +

+
    + + + に変換できる弁当箱が、 + + + + + に変換できる弁当箱になる + + +
+

というわけですね。

+ + ) + } + ]} + /> + , + , + + ]} + description={ + <> + に変換できる弁当箱が、 +
+ に変換できる弁当箱になる + + } + /> + + ) + }, + { + title: ( + <> + や {' '} + と組み合わせた場合は？ + + ), + content: ( + <> + +

+ では、ここで疑問です。👧🏻{' '} + サヤちゃんの弁当箱を、 +

+
    + + に変換できる弁当箱や、 + + + {' '} + に変換できる弁当箱と組み合わせた場合、 + +
+

結果はどうなるでしょう？

+ + ) + } + ]} + /> + + ) + }, { title: ( <> From 42ebf751621fc2ab055c1ec9454261c68be022dc Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 02:01:20 -0700 Subject: [PATCH 044/110] Continue with 8 --- scripts/lib/initialExpressionContainers.ts | 14 ++ scripts/lib/runnerConfigs.ts | 22 +++ src/components/Runners/Cqzt.tsx | 12 ++ src/components/Runners/Rqer.tsx | 12 ++ src/components/Runners/index.ts | 2 + src/contents/8.jp.tsx | 25 ++- src/lib/runners/cqzt.json | 175 +++++++++++++++++++++ src/lib/runners/rqer.json | 175 +++++++++++++++++++++ 8 files changed, 431 insertions(+), 6 deletions(-) create mode 100644 src/components/Runners/Cqzt.tsx create mode 100644 src/components/Runners/Rqer.tsx create mode 100644 src/lib/runners/cqzt.json create mode 100644 src/lib/runners/rqer.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index ce87e33bc..510f83c61 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -230,10 +230,24 @@ export const yljj = initializeDoneExpressionContainer({ shorthandNumber: 2, shorthandNumberAfterConvert: 'number' }) +export const zreh = initializeDoneExpressionContainer([ + succParams('a', 'b', 'c'), + { + shorthandNumber: 2, + shorthandNumberAfterConvert: 'number' + } +]) export const dpvy = initializeDoneExpressionContainer({ shorthandNumber: 1, shorthandNumberAfterConvert: 'number' }) +export const vzjq = initializeDoneExpressionContainer([ + succParams('a', 'b', 'c'), + { + shorthandNumber: 1, + shorthandNumberAfterConvert: 'number' + } +]) export const nskn = initializeExpressionContainer(numberParams('e', 'f', 2)) export const qbnd = initializeExpressionContainer(numberParams('k', 'l', 2)) export const tnyj = initializeExpressionContainer( diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index d3484185c..aa9ca8c3a 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -792,6 +792,28 @@ export const jzwg: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.dpvy } +export const cqzt: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.zreh, + highlightOverrides: { + a: 'highlighted', + b: 'highlighted', + c: 'highlighted' + } +} + +export const rqer: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.vzjq, + highlightOverrides: { + a: 'highlighted', + b: 'highlighted', + c: 'highlighted' + } +} + export const duuk: ExpressionRunnerShorthandConfig = { runner: 'simple', showPriorities: true, diff --git a/src/components/Runners/Cqzt.tsx b/src/components/Runners/Cqzt.tsx new file mode 100644 index 000000000..de219fb1d --- /dev/null +++ b/src/components/Runners/Cqzt.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/cqzt.json' + +const Cqzt = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Cqzt diff --git a/src/components/Runners/Rqer.tsx b/src/components/Runners/Rqer.tsx new file mode 100644 index 000000000..0c750fdf0 --- /dev/null +++ b/src/components/Runners/Rqer.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/rqer.json' + +const Rqer = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Rqer diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index b94e723e6..e9b1b11be 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -112,6 +112,8 @@ export { default as Vlob } from 'src/components/Runners/Vlob' export { default as Dubm } from 'src/components/Runners/Dubm' export { default as Rnug } from 'src/components/Runners/Rnug' export { default as Jzwg } from 'src/components/Runners/Jzwg' +export { default as Cqzt } from 'src/components/Runners/Cqzt' +export { default as Rqer } from 'src/components/Runners/Rqer' export { default as Duuk } from 'src/components/Runners/Duuk' export { default as Ehxq } from 'src/components/Runners/Ehxq' export { default as Weoz } from 'src/components/Runners/Weoz' diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index f02cf2bd9..ffeaf94ff 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -436,24 +436,37 @@ export default () => ( children: ( <>

- では、ここで疑問です。👧🏻{' '} - サヤちゃんの弁当箱を、 + では、ここで疑問なのですが…{' '} + + 👧🏻 サヤちゃんの弁当箱を、 +

    - に変換できる弁当箱や、 + + に変換できる弁当箱や、 + - {' '} - に変換できる弁当箱と組み合わせた場合、 + + {' '} + に変換できる弁当箱と組み合わせて、 +
-

結果はどうなるでしょう？

+

+ + {' '} + すると、結果はどうなるでしょう？ + +

) } ]} /> + + ) }, diff --git a/src/lib/runners/cqzt.json b/src/lib/runners/cqzt.json new file mode 100644 index 000000000..04aa1b3be --- /dev/null +++ b/src/lib/runners/cqzt.json @@ -0,0 +1,175 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 2, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 6, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": { + "a": "highlighted", + "b": "highlighted", + "c": "highlighted" + }, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/rqer.json b/src/lib/runners/rqer.json new file mode 100644 index 000000000..39a195ed9 --- /dev/null +++ b/src/lib/runners/rqer.json @@ -0,0 +1,175 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 1, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 6, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hidePlayButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": { + "a": "highlighted", + "b": "highlighted", + "c": "highlighted" + }, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From 1bffa66d99785538fff0b3ef25b78cb3de4de818 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 11:48:27 -0700 Subject: [PATCH 045/110] Continue with 8 --- src/contents/8.jp.tsx | 91 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index ffeaf94ff..8c3002ce7 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -465,8 +465,95 @@ export default () => ( } ]} /> - - + + に変換できる弁当箱と、 +
+ 👧🏻 サヤちゃんの弁当箱と組み合わせて… + + + + するとどうなる？ + +
+ + に変換できる弁当箱と、 +
+ 👧🏻 サヤちゃんの弁当箱と組み合わせて… + + + + するとどうなる？ + + +

うーん、分からないなあ…

+

+ 先ほどは、 + が {' '} + になったけど、 + と {' '} + はどうなるだろう？ +

+ + ) + } + ]} + /> + , + , + + ]} + description={ + <> + 先ほどは、 + が {' '} + になったけど… + + } + /> + , + , + ❓ + ]} + noBottomMargin + /> + , + , + ❓ + ]} + description={ + <> + や {' '} + は何になる？ + + } + /> + +

+ では、 + してみましょう！ +

+ + ) + } + ]} + /> ) }, From 1ffd2da067be1adfe0d7b29f04408cead8471c2b Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 15:28:24 -0700 Subject: [PATCH 046/110] Use playAndShowAllSteps button --- src/components/ExpressionRunnerControls.tsx | 4 +- src/components/H.tsx | 58 +++++++++++++++++++-- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/src/components/ExpressionRunnerControls.tsx b/src/components/ExpressionRunnerControls.tsx index a13fa6dca..c13dbabef 100644 --- a/src/components/ExpressionRunnerControls.tsx +++ b/src/components/ExpressionRunnerControls.tsx @@ -63,7 +63,7 @@ const ExpressionRunnerControls = ({ skipToTheEnd, convert }: ExpressionRunnerControlsProps) => { - const centerButtonWidth = convert ? 66 : 44 + const centerButtonWidth = convert ? 66 : 48 const sideButtonsWidth = (100 - centerButtonWidth) / 2 - 2 return (
) ) : ( - + ) ) : convert && convert !== 'toMathBoxPlay' ? ( diff --git a/src/components/H.tsx b/src/components/H.tsx index 243273c99..37c51c02d 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -24,7 +24,7 @@ import { episodeTitles } from 'src/lib/titles' import EpisodeContext from 'src/components/EpisodeContext' -import { colors } from 'src/lib/theme' +import { colors, fontSizes } from 'src/lib/theme' import { episodeCategory, numEpisodesExceptFirstAndLast @@ -168,6 +168,7 @@ interface HProps { | { name: 'goToOtherPage' } | { name: 'demoTitle' } | { name: 'whatTheNumberIsCaption' } + | { name: 'playAndShowAllSteps' } } const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { @@ -423,7 +424,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { return ( <> - {args.lowerCase ? 'r' : 'R'}un ⏭ + {args.lowerCase ? 'r' : 'R'}un ▶️ ) @@ -456,12 +457,59 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { ) } } + if (args.name === 'playAndShowAllSteps') { + if (locale === 'en') { + return ( + <> + + + Run ▶️ + + + (Show every step) + + + + ) + } else { + return ( + <> + + + 実行 ▶️ + + + (全ステップを表示) + + + + ) + } + } if (args.name === 'fastForwarding') { if (locale === 'en') { return ( <> - Playing… ▶️ + Running… ▶️ ) @@ -469,7 +517,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { return ( <> - 早送り中… ⏩ + 実行中… ▶️ ) @@ -1243,7 +1291,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { return ( <> - {args.lowerCase ? 'r' : 'R'}un ⏭ + {args.lowerCase ? 'r' : 'R'}un ▶️ {' '} and{args.addNewline ?
: ' '} From 1352e51d0a9c68a92795d72cc75b429d7e5bdb2d Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 15:33:36 -0700 Subject: [PATCH 047/110] =?UTF-8?q?helper:=20fastForwarding=20=E2=86=92=20?= =?UTF-8?q?running?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ExpressionRunnerPrecomputed.tsx | 2 +- src/components/H.tsx | 4 ++-- src/contents/13.en.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ExpressionRunnerPrecomputed.tsx b/src/components/ExpressionRunnerPrecomputed.tsx index bad11b297..0d13d5caf 100644 --- a/src/components/ExpressionRunnerPrecomputed.tsx +++ b/src/components/ExpressionRunnerPrecomputed.tsx @@ -219,7 +219,7 @@ const ExpressionRunnerPrecomputed = ({ )} {isPlaying && ( - + )} {progessBarVisible && ( diff --git a/src/components/H.tsx b/src/components/H.tsx index 37c51c02d..4277caf73 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -76,7 +76,7 @@ interface HProps { } | { name: 'next' } | { name: 'play'; lowerCase?: true } - | { name: 'fastForwarding' } + | { name: 'running' } | { name: 'pause' } | { name: 'fastForward'; lowerCase?: true } | { name: 'reset' } @@ -504,7 +504,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { ) } } - if (args.name === 'fastForwarding') { + if (args.name === 'running') { if (locale === 'en') { return ( <> diff --git a/src/contents/13.en.tsx b/src/contents/13.en.tsx index 18c765bb0..1b2ebe176 100644 --- a/src/contents/13.en.tsx +++ b/src/contents/13.en.tsx @@ -691,7 +691,7 @@ export default () => ( ⏩ ⏩ ⏩ - While playing, we’ll{' '} + While it’s running, we’ll{' '} dim the lunchbox so it’s easier for your eyes. From 634d2d1de54793c29ed40ebbf2d77779e26dedf6 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 15:40:02 -0700 Subject: [PATCH 048/110] =?UTF-8?q?play=20=E2=86=92=20run?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ExpressionRunnerControls.tsx | 16 ++++----- .../ExpressionRunnerExplanation.tsx | 6 ++-- .../ExpressionRunnerPrecomputed.tsx | 30 ++++++++-------- src/components/H.tsx | 12 +++---- src/contents/0.jp.tsx | 4 +-- src/contents/1.en.tsx | 8 ++--- src/contents/1.jp.tsx | 8 ++--- src/contents/10.en.tsx | 4 +-- src/contents/10.jp.tsx | 6 ++-- src/contents/11.en.tsx | 2 +- src/contents/11.jp.tsx | 2 +- src/contents/12.jp.tsx | 2 +- src/contents/13.en.tsx | 20 +++++------ src/contents/13.jp.tsx | 14 ++++---- src/contents/15.jp.tsx | 6 ++-- src/contents/16.jp.tsx | 5 ++- src/contents/2.en.tsx | 8 ++--- src/contents/2.jp.tsx | 8 ++--- src/contents/3.en.tsx | 16 ++++----- src/contents/3.jp.tsx | 20 +++++------ src/contents/4.en.tsx | 4 +-- src/contents/4.jp.tsx | 4 +-- src/contents/7.en.tsx | 4 +-- src/contents/7.jp.tsx | 6 ++-- src/contents/8.en.tsx | 4 +-- src/contents/8.jp.tsx | 34 +++++++++---------- src/contents/9.en.tsx | 2 +- src/contents/9.jp.tsx | 2 +- 28 files changed, 126 insertions(+), 131 deletions(-) diff --git a/src/components/ExpressionRunnerControls.tsx b/src/components/ExpressionRunnerControls.tsx index c13dbabef..7f6380e63 100644 --- a/src/components/ExpressionRunnerControls.tsx +++ b/src/components/ExpressionRunnerControls.tsx @@ -10,7 +10,7 @@ import locale from 'src/lib/locale' interface ExpressionRunnerControlsProps { canStepForward: boolean canStepBackward: boolean - isPlaying: boolean + isRunning: boolean showPlayButton: boolean skipToTheEnd: boolean onNextClick: () => void @@ -55,7 +55,7 @@ const ExpressionRunnerControls = ({ onNextClick, onPreviousClick, showPlayButton, - isPlaying, + isRunning, onAutoClick, onResetClick, onPauseClick, @@ -75,7 +75,7 @@ const ExpressionRunnerControls = ({ > {showPlayButton ? ( <> - {!isPlaying && canStepBackward && !skipToTheEnd ? ( + {!isRunning && canStepBackward && !skipToTheEnd ? ( {canStepForward ? ( - isPlaying ? ( + isRunning ? ( ) : skipToTheEnd ? ( convert ? ( @@ -145,7 +145,7 @@ const ExpressionRunnerControls = ({ ) ) : ( - + ) ) : ( @@ -159,7 +159,7 @@ const ExpressionRunnerControls = ({ )} {showPlayButton ? ( <> - {!isPlaying && canStepForward && !skipToTheEnd ? ( + {!isRunning && canStepForward && !skipToTheEnd ? ( ) ) : ( - !isPlaying && ( + !isRunning && ( { - const [{ isFastForwarding, isPlaying }, setPlaybackStatus] = useState< + const [{ isFastForwarding, isRunning }, setPlaybackStatus] = useState< PlaybackState >({ isFastForwarding: false, - isPlaying: false + isRunning: false }) const [currentIndex, setCurrentIndex] = useState(0) @@ -100,11 +100,11 @@ const ExpressionRunnerPrecomputed = ({ if (currentIndex + 1 >= expressionContainers.length - 1) { setPlaybackStatus({ isFastForwarding: false, - isPlaying: false + isRunning: false }) } }, - isPlaying ? autoplaySpeed(speed) : null + isRunning ? autoplaySpeed(speed) : null ) const stepForward = () => { @@ -132,14 +132,14 @@ const ExpressionRunnerPrecomputed = ({ const autoplay = () => { setPlaybackStatus({ - isPlaying: true, + isRunning: true, isFastForwarding: speed > FASTFORWARDING_THRESHOLD }) } const pause = () => { setPlaybackStatus({ - isPlaying: false, + isRunning: false, isFastForwarding: false }) } @@ -157,10 +157,10 @@ const ExpressionRunnerPrecomputed = ({ const explanationsVisible = explanationsVisibility === 'visible' || (explanationsVisibility === 'hiddenInitialPausedOnly' && - !isPlaying && + !isRunning && currentIndex > 0) const progessBarVisible = - !hidePlayButton && !skipToTheEnd && (isPlaying || atLeastOneStepTaken) + !hidePlayButton && !skipToTheEnd && (isRunning || atLeastOneStepTaken) const containerSize = functionDepthsToContainerSize( expressionContainers[currentIndex].expression.maxNestedFunctionDepth || 0 ) @@ -203,7 +203,7 @@ const ExpressionRunnerPrecomputed = ({ {explanationsVisible && ( )} - {children && !explanationsVisible && !isPlaying && ( + {children && !explanationsVisible && !isRunning && ( {children} )} - {isPlaying && ( + {isRunning && ( @@ -231,7 +231,7 @@ const ExpressionRunnerPrecomputed = ({
)} @@ -286,7 +286,7 @@ const ExpressionRunnerPrecomputed = ({
)} @@ -299,7 +299,7 @@ const ExpressionRunnerPrecomputed = ({ canStepForward={canStepForward} canStepBackward={atLeastOneStepTaken} showPlayButton={!hidePlayButton} - isPlaying={isPlaying} + isRunning={isRunning} onAutoClick={autoplay} onSkipToTheEndClick={stepToTheEnd} onResetClick={reset} diff --git a/src/components/H.tsx b/src/components/H.tsx index 4277caf73..0834a1b15 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -75,7 +75,7 @@ interface HProps { postfix?: string } | { name: 'next' } - | { name: 'play'; lowerCase?: true } + | { name: 'run'; lowerCase?: true } | { name: 'running' } | { name: 'pause' } | { name: 'fastForward'; lowerCase?: true } @@ -419,7 +419,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { ) } } - if (args.name === 'play') { + if (args.name === 'run') { if (locale === 'en') { return ( <> @@ -618,13 +618,13 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { return ( {args.capitalize ? 'T' : 't'} - ry pressing + ry pressing ) } else { return ( - を押してみてください: + を押してみてください: ) } @@ -828,7 +828,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { <> Question:{' '} - If we the above + If we the above lunchbox, will it eventually become the following? @@ -837,7 +837,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { return ( <> 上の弁当箱を - すると、 + すると、 最終的に下のようになるでしょうか？ ) diff --git a/src/contents/0.jp.tsx b/src/contents/0.jp.tsx index 656d07368..75a06e146 100644 --- a/src/contents/0.jp.tsx +++ b/src/contents/0.jp.tsx @@ -622,14 +622,14 @@ export default () => (

本稿では、以下のようなパズルを解きながらコンピュータサイエンスの題材を学んでいきます。以下のパズルがどういう仕組みかは次のページで説明しますが、とりあえず - {' '} + {' '} ボタンを押してみると、パズルが動くことを確認できます。

以下のようなパズルを解きながら学びます。
- を押してみて下さい！ + を押してみて下さい！

上記のように、 diff --git a/src/contents/1.en.tsx b/src/contents/1.en.tsx index d6c77bdf1..347ae89a9 100644 --- a/src/contents/1.en.tsx +++ b/src/contents/1.en.tsx @@ -119,7 +119,7 @@ export default () => ( />

Next, we’ll talk about how we can{' '} - this mathbox. + this mathbox.

) @@ -127,7 +127,7 @@ export default () => ( { title: ( <> - The button + The button ), content: ( @@ -135,7 +135,7 @@ export default () => (

Each mathbox has a{' '} - button + button . If you press it, the mathbox calculates the result.{' '} on the @@ -188,7 +188,7 @@ export default () => ( means… - If you it, the + If you it, the result will be {' '} ➕ . diff --git a/src/contents/1.jp.tsx b/src/contents/1.jp.tsx index 4ff3611aa..60a571fbe 100644 --- a/src/contents/1.jp.tsx +++ b/src/contents/1.jp.tsx @@ -127,7 +127,7 @@ export default () => ( { title: ( <> - ボタン + ボタン ), content: ( @@ -135,7 +135,7 @@ export default () => (

それぞれの計算箱には - ボタン + ボタン がついており、それを押すと計算が実行されます。試しに、下の計算箱で @@ -187,7 +187,7 @@ export default () => ( - すると結果は{' '} + すると結果は{' '} ➕{' '} になる @@ -236,7 +236,7 @@ export default () => ( 計算箱は「1を足す」だけではなく、「 1を引く 」計算をすることもできます。こちらの計算箱を - + してみてください:

diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index 7c1c8abb9..a5982dc6b 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -482,7 +482,7 @@ export default () => ( - If you it, the + If you it, the result would be
a lunchbox that can be converted to{' '} ➖{' '} @@ -639,7 +639,7 @@ export default () => ( children: ( <>

- Let’s it! + Let’s it!

) diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index 92d6924f4..3c28aa654 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -454,7 +454,7 @@ export default () => ( - すると、 + すると、
➖{' '} に変換できる弁当箱になる @@ -626,7 +626,7 @@ export default () => ( <>

じゃあ、 - + してみよう！

@@ -640,7 +640,7 @@ export default () => ( { title: ( <> - してみると… + してみると… ), content: ( diff --git a/src/contents/11.en.tsx b/src/contents/11.en.tsx index 175a2de79..df2c3c509 100644 --- a/src/contents/11.en.tsx +++ b/src/contents/11.en.tsx @@ -669,7 +669,7 @@ export default () => ( <>

Question: If we{' '} - , will it + , will it become like this?

diff --git a/src/contents/11.jp.tsx b/src/contents/11.jp.tsx index f4fa6566d..813fbbf40 100644 --- a/src/contents/11.jp.tsx +++ b/src/contents/11.jp.tsx @@ -638,7 +638,7 @@ export default () => ( <>

質問: これを - {' '} + {' '} すると、最終的に以下のようになるでしょうか？

diff --git a/src/contents/12.jp.tsx b/src/contents/12.jp.tsx index d76a676f1..c7cb7b824 100644 --- a/src/contents/12.jp.tsx +++ b/src/contents/12.jp.tsx @@ -642,7 +642,7 @@ export default () => (

これを - したとき、 + したとき、 先ほど同じく結果が になれば diff --git a/src/contents/13.en.tsx b/src/contents/13.en.tsx index 1b2ebe176..4616798b1 100644 --- a/src/contents/13.en.tsx +++ b/src/contents/13.en.tsx @@ -147,7 +147,7 @@ export default () => ( <>

Now, here’s a question: What happens when - you it? + you it?

) @@ -631,7 +631,7 @@ export default () => ( But I’m wondering:{' '} Would the result also be if - we the + we the original lunchbox directly?

@@ -642,7 +642,7 @@ export default () => ( /> 🍱 If we{' '} - +
the original lunchbox directly… @@ -1140,9 +1140,8 @@ export default () => (
    - If you{' '} - the - above lunchbox, + If you {' '} + the above lunchbox, @@ -1159,7 +1158,7 @@ export default () => ( ]} /> - If you this + If you this lunchbox… @@ -1204,7 +1203,7 @@ export default () => (

    We need to{' '} - it to + it to see if it’s correct.

    @@ -1216,9 +1215,8 @@ export default () => ( children: ( <>

    - Yes, let’s{' '} - on the - next page to check! + Yes, let’s {' '} + on the next page to check!

    ) diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index 35fbc6add..d6e72feb0 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -125,7 +125,7 @@ export default () => ( <>

    ここで質問です。上の弁当箱を - すると、 + すると、 どんな結果になるでしょう？ @@ -187,7 +187,7 @@ export default () => (

    サヤちゃん、まさか一瞬で頭の中で - したのかい？ + したのかい？

    @@ -507,7 +507,7 @@ export default () => ( <>

    あとは、これを - {' '} + {' '} するだけだよ。というわけで、

    @@ -618,10 +618,8 @@ export default () => (

    もともとの弁当箱を、そのまま - しても、結果は同じく {' '} - になっていたのかな？ + しても、結果は同じく{' '} + になっていたのかな？

    @@ -633,7 +631,7 @@ export default () => ( 🍱 もともとの弁当箱を、
    そのまま - しても… + しても… diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index 2e21b342b..32ab7994c 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -248,7 +248,7 @@ export default () => ( <>

    では、これを - {' '} + {' '} するとどうなるか確かめてみよう！

    @@ -988,7 +988,7 @@ export default () => ( 以下のように を使って省略表記できる。

    - を押してみると、ちゃんと{' '} + を押してみると、ちゃんと{' '} ✖️{' '} が計算できるぞ。

    @@ -1398,7 +1398,7 @@ export default () => ( 一番上に を入れて
    - すると… + すると…     (

    上の弁当箱は、 - すると 🅱️{' '} - になります。 + すると 🅱️ になります。

    それと同じで、先ほどの「ラムダ計算」の記述式も、 - すると + すると Bが残るのです。

    diff --git a/src/contents/2.en.tsx b/src/contents/2.en.tsx index 2bd3c187b..612954db9 100644 --- a/src/contents/2.en.tsx +++ b/src/contents/2.en.tsx @@ -418,7 +418,7 @@ export default () => ( content: ( <>

    - If you the above + If you the above mathbox,{' '} it automatically expands the bottom half before calculating the @@ -429,7 +429,7 @@ export default () => ( ’s.

    - If you this… + If you this… @@ -545,7 +545,7 @@ export default () => ( to the left of , then…     - When you it,{' '} + When you it,{' '} gets repeated for{' '} times. @@ -605,7 +605,7 @@ export default () => ( 🅱️ as .

    - If you it, it + If you it, it calculates ➕{' '} .

    diff --git a/src/contents/2.jp.tsx b/src/contents/2.jp.tsx index ea6fb67aa..6bb687764 100644 --- a/src/contents/2.jp.tsx +++ b/src/contents/2.jp.tsx @@ -157,7 +157,7 @@ export default () => ( />

    そのためにラムダ村の村人は、以下のような計算箱を - しようとしました。 + しようとしました。

    😉 これで {' '} @@ -351,7 +351,7 @@ export default () => (

    上の計算箱を - + すると、計算をする前に、下の部分が次のように変化します。 変化後には、 @@ -465,7 +465,7 @@ export default () => ( - すると、 + すると、 が{' '} 回分繰り返される。 @@ -525,7 +525,7 @@ export default () => (

    後は - するだけで、 + するだけで、 ➕{' '} を計算してくれます。

    diff --git a/src/contents/3.en.tsx b/src/contents/3.en.tsx index fa8bf37d2..bcba80961 100644 --- a/src/contents/3.en.tsx +++ b/src/contents/3.en.tsx @@ -480,7 +480,7 @@ export default () => (

    For now, let’s talk about how we can{' '} - {' '} + {' '} @@ -497,13 +497,13 @@ export default () => ( { title: ( <> - How to a lunchbox + How to a lunchbox ), content: ( <>

    - We can {' '} + We can {' '} , just like how we can run a mathbox.{' '} below: @@ -529,7 +529,7 @@ export default () => ( ]} /> - If you it… + If you it… @@ -545,7 +545,7 @@ export default () => ( There is actually a{' '} specific set of rules that determines what happens when you{' '} - a + a lunchbox.

    @@ -793,7 +793,7 @@ export default () => (

    - If you this, will + If you this, will it become the following lunchbox at the end?

    @@ -818,7 +818,7 @@ export default () => (

    - If you this, will + If you this, will it become the following lunchbox at the end?

    @@ -833,7 +833,7 @@ export default () => ( <>

    Here are the answers: If you{' '} - each, this is what + each, this is what happens:

    diff --git a/src/contents/3.jp.tsx b/src/contents/3.jp.tsx index 67b17c0d3..c9e561a6c 100644 --- a/src/contents/3.jp.tsx +++ b/src/contents/3.jp.tsx @@ -402,7 +402,7 @@ export default () => ( とりあえず今は、 の - について見ていこう。 + について見ていこう。

    @@ -417,7 +417,7 @@ export default () => ( title: ( <> 弁当箱を - + する ), @@ -427,7 +427,7 @@ export default () => ( は、計算箱と同じように - することができます。 + することができます。 試しに、 @@ -442,7 +442,7 @@ export default () => ( children: ( <>

    - すると、 + すると、 下のふたつの が消えて、 だけが残った！ @@ -454,7 +454,7 @@ export default () => ( ]} /> - すると… + すると… @@ -487,7 +487,7 @@ export default () => ( <> 弁当箱は、どんな法則に則って
    - されるでしょう？ + されるでしょう？ } /> @@ -611,7 +611,7 @@ export default () => ( では、 弁当箱のパズルは、 - + する際にどんな法則に則っているか 、そろそろ分かったかな？ @@ -714,7 +714,7 @@ export default () => ( これまでに4種類の を紹介しましたが、どれも - {' '} + {' '} する際にある法則に従っています。それが分かったかどうか、 でチェックしてみましょう！ @@ -730,7 +730,7 @@ export default () => (

    これを - すると、 + すると、 最終的に下のようになるでしょうか？ これまでの法則から予想してみてください。

    @@ -752,7 +752,7 @@ export default () => (

    こちらの を{' '} - + すると、

    diff --git a/src/contents/4.en.tsx b/src/contents/4.en.tsx index b451a43a2..328c4c4e1 100644 --- a/src/contents/4.en.tsx +++ b/src/contents/4.en.tsx @@ -214,7 +214,7 @@ export default () => ( If the bottom two items are the same     , then when you{' '} - it,{' '} + it,{' '} we’re left with the top item {' '} @@ -294,7 +294,7 @@ export default () => (

    In this case, when you{' '} - it,{' '} + it,{' '} we’re left with the bottom-right item {' '} diff --git a/src/contents/4.jp.tsx b/src/contents/4.jp.tsx index 66e3b46d9..a777b8aaf 100644 --- a/src/contents/4.jp.tsx +++ b/src/contents/4.jp.tsx @@ -183,7 +183,7 @@ export default () => ( もし下のふたつの料理が 同じなら、 - + したときに上にある 料理が残る @@ -258,7 +258,7 @@ export default () => (

    この場合は、 - + したときに右下にある 料理が残る diff --git a/src/contents/7.en.tsx b/src/contents/7.en.tsx index d9d321fca..fee275e4f 100644 --- a/src/contents/7.en.tsx +++ b/src/contents/7.en.tsx @@ -1269,7 +1269,7 @@ export default () => ( <>

    Let’s first see what happens when you{' '} - the above + the above lunchbox!

    @@ -1462,7 +1462,7 @@ export default () => ( If you combine with the lunchbox that can be
    converted to , and{' '} - it… + it… diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index 82e5665a3..acb28d3b2 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -37,7 +37,7 @@ export const Problem = () => ( - した後に + した後に
    に変換できる弁当箱になる？     @@ -351,7 +351,7 @@ export default () => ( それぞれの {' '} に、ある法則に基づいて料理を入れて - すると、 + すると、 @@ -371,7 +371,7 @@ export default () => ( - すると、 + すると、
    に変換できる弁当箱になる     diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index a2dc49a1e..41f342b58 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -324,7 +324,7 @@ export default () => ( <>

    Let’s first{' '} - it! + it!

    ) @@ -1103,7 +1103,7 @@ export default () => ( For example, take a look at this mathbox that appeared on Beginner 1. {' '} - If you it, the + If you it, the result will be .

    diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 8c3002ce7..ffeaa6a1f 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -173,7 +173,7 @@ export default () => (

    これを - して、 + して、 になればいいんだよな。

    @@ -199,7 +199,7 @@ export default () => ( <>

    じゃあ、 - + してみよう！

    @@ -213,7 +213,7 @@ export default () => ( { title: ( <> - してみると… + してみると… ), content: ( @@ -232,7 +232,7 @@ export default () => (

    つまり、最終的に以下のようになりました！

    - した結果 + した結果 (

- {' '} + {' '} すると、結果はどうなるでしょう？

@@ -472,7 +472,7 @@ export default () => ( - するとどうなる？ + するとどうなる？
@@ -482,7 +482,7 @@ export default () => ( - するとどうなる？ + するとどうなる？ ( <>

では、 - してみましょう！ + してみましょう！

) @@ -686,7 +686,7 @@ export default () => ( ]} /> - した結果 + した結果 ( 試しに、 {' '} に変換できるこちらの弁当箱と合体させて - してみましょう。 + してみましょう。

@@ -1161,7 +1161,7 @@ export default () => (

もちろん、もっと複雑な計算箱も弁当箱で再現できます。

たとえば、初級その1に登場したこちらの計算箱をご覧ください。 - すると、結果は{' '} + すると、結果は{' '} になります。

@@ -1636,7 +1636,7 @@ export default () => ( // <> //

// じゃあ、 -// +// // してみよう！ //

// @@ -1650,7 +1650,7 @@ export default () => ( // { // title: ( // <> -// してみると… +// してみると… // // ), // content: ( @@ -1669,7 +1669,7 @@ export default () => ( // //

つまり、最終的に以下のようになりました！

// -// した結果 +// した結果 // // ( // ]} // /> // -// した結果 +// した結果 // // ( // 試しに、 // {' '} // に変換できるこちらの弁当箱と合体させて -// してみましょう。 +// してみましょう。 // //

// @@ -2391,7 +2391,7 @@ export default () => ( //

もちろん、もっと複雑な計算箱も弁当箱で再現できます。

//

// たとえば、初級その1に登場したこちらの計算箱をご覧ください。 -// すると、結果は{' '} +// すると、結果は{' '} // になります。 //

// diff --git a/src/contents/9.en.tsx b/src/contents/9.en.tsx index d5bc4a700..b39c08753 100644 --- a/src/contents/9.en.tsx +++ b/src/contents/9.en.tsx @@ -112,7 +112,7 @@ export default () => ( What happens
- when you it? + when you it? ( <>

じゃあ、 - + してみてよ！

From b7fdb25b274058999746d9d0bb4577796fb5c74a Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 16:40:09 -0700 Subject: [PATCH 049/110] =?UTF-8?q?fastforwardskippable=20=E2=86=92=20run?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/H.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/H.tsx b/src/components/H.tsx index 0834a1b15..861463045 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -160,8 +160,8 @@ interface HProps { | { name: 'canBeConvertedCaption'; letter: VariableNames; number: number } | { name: 'skipToTheEnd' } | { name: 'skipToTheStoppingPoint' } - | { name: 'fastForwardSkippableToTheEnd' } - | { name: 'fastForwardSkippableToTheStoppingPoint' } + | { name: 'runSkippableToTheEnd' } + | { name: 'runSkippableToTheStoppingPoint' } | { name: 'slide' } | { name: 'testimonialsTitle' } | { name: 'testimonialsContent' } @@ -761,13 +761,13 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { {args.skippable && ( <> {' '} - + )} {args.skippableToTheStoppingPoint && ( <> {' '} - + )} @@ -795,12 +795,12 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { )} {args.skippable && ( <> - + )} {args.skippableToTheStoppingPoint && ( <> - + )} @@ -1564,7 +1564,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { return <>途中までスキップ } } - if (args.name === 'fastForwardSkippableToTheEnd') { + if (args.name === 'runSkippableToTheEnd') { if (locale === 'en') { return ( @@ -1579,7 +1579,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { ) } } - if (args.name === 'fastForwardSkippableToTheStoppingPoint') { + if (args.name === 'runSkippableToTheStoppingPoint') { if (locale === 'en') { return ( From a62ebe2f66e4451088061df3668ee381e6d86672 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 16:54:09 -0700 Subject: [PATCH 050/110] Remove skip to end emoji --- scripts/copyUsedEmojis.ts | 3 +-- src/components/Twemoji/23ed.tsx | 13 ------------- src/components/Twemoji/2754.tsx | 13 ------------- src/lib/emojisBundle.tsx | 4 ---- 4 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 src/components/Twemoji/23ed.tsx delete mode 100644 src/components/Twemoji/2754.tsx diff --git a/scripts/copyUsedEmojis.ts b/scripts/copyUsedEmojis.ts index 02bd32e57..7d4b09e88 100644 --- a/scripts/copyUsedEmojis.ts +++ b/scripts/copyUsedEmojis.ts @@ -106,8 +106,7 @@ const allUsedEmojis = [ '🧠', '📓', '😴', - '🚦', - '⏭' + '🚦' ]) ] diff --git a/src/components/Twemoji/23ed.tsx b/src/components/Twemoji/23ed.tsx deleted file mode 100644 index d6e7bd96f..000000000 --- a/src/components/Twemoji/23ed.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import * as React from 'react' - -const Svg23Ed = (props: React.SVGProps) => ( - - - - -) - -export default Svg23Ed diff --git a/src/components/Twemoji/2754.tsx b/src/components/Twemoji/2754.tsx deleted file mode 100644 index eb53f75de..000000000 --- a/src/components/Twemoji/2754.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import * as React from 'react' - -const Svg2754 = (props: React.SVGProps) => ( - - - - -) - -export default Svg2754 diff --git a/src/lib/emojisBundle.tsx b/src/lib/emojisBundle.tsx index 08873c8e0..9df10611e 100644 --- a/src/lib/emojisBundle.tsx +++ b/src/lib/emojisBundle.tsx @@ -108,7 +108,6 @@ import Emoji1f9ee from 'src/components/Twemoji/1f9ee' import Emoji2198 from 'src/components/Twemoji/2198' import Emoji21a9 from 'src/components/Twemoji/21a9' import Emoji23e9 from 'src/components/Twemoji/23e9' -import Emoji23ed from 'src/components/Twemoji/23ed' import Emoji23f8 from 'src/components/Twemoji/23f8' import Emoji25b6 from 'src/components/Twemoji/25b6' import Emoji26a0 from 'src/components/Twemoji/26a0' @@ -117,7 +116,6 @@ import Emoji2716 from 'src/components/Twemoji/2716' import Emoji2728 from 'src/components/Twemoji/2728' import Emoji274c from 'src/components/Twemoji/274c' import Emoji2753 from 'src/components/Twemoji/2753' -import Emoji2754 from 'src/components/Twemoji/2754' import Emoji2764 from 'src/components/Twemoji/2764' import Emoji2795 from 'src/components/Twemoji/2795' import Emoji2796 from 'src/components/Twemoji/2796' @@ -247,7 +245,6 @@ export default { '2198': Emoji2198, '21a9': Emoji21a9, '23e9': Emoji23e9, - '23ed': Emoji23ed, '23f8': Emoji23f8, '25b6': Emoji25b6, '26a0': Emoji26a0, @@ -256,7 +253,6 @@ export default { '2728': Emoji2728, '274c': Emoji274c, '2753': Emoji2753, - '2754': Emoji2754, '2764': Emoji2764, '2795': Emoji2795, '2796': Emoji2796, From 0c13e5cfd66cabb87686c9c261f6685864b27f3b Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 16:54:29 -0700 Subject: [PATCH 051/110] =?UTF-8?q?playbutton=20=E2=86=92=20runbutton?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/lib/buildExpressionContainers.ts | 4 +- ...uildExpressionRunnerConfigFromShorthand.ts | 18 +-- .../lib/expressionRunnerShorthandConfig.ts | 14 +- scripts/lib/runnerConfigs.ts | 124 +++++++++--------- scripts/precomputeExpressionContainers.ts | 4 +- src/components/ExpressionRunnerControls.tsx | 10 +- .../ExpressionRunnerPrecomputed.tsx | 12 +- src/lib/runners/aaov.json | 2 +- src/lib/runners/abnp.json | 2 +- src/lib/runners/aezk.json | 2 +- src/lib/runners/aflw.json | 2 +- src/lib/runners/afoh.json | 2 +- src/lib/runners/akik.json | 2 +- src/lib/runners/akjy.json | 2 +- src/lib/runners/aklf.json | 2 +- src/lib/runners/akug.json | 2 +- src/lib/runners/alca.json | 2 +- src/lib/runners/amjx.json | 2 +- src/lib/runners/amoq.json | 2 +- src/lib/runners/ancc.json | 2 +- src/lib/runners/anzh.json | 2 +- src/lib/runners/aone.json | 2 +- src/lib/runners/aovj.json | 2 +- src/lib/runners/apuz.json | 2 +- src/lib/runners/auks.json | 2 +- src/lib/runners/avcu.json | 2 +- src/lib/runners/avsl.json | 2 +- src/lib/runners/awbq.json | 2 +- src/lib/runners/awwn.json | 2 +- src/lib/runners/ayok.json | 2 +- src/lib/runners/ayrl.json | 2 +- src/lib/runners/bdme.json | 2 +- src/lib/runners/beiz.json | 2 +- src/lib/runners/bgfl.json | 2 +- src/lib/runners/bgko.json | 2 +- src/lib/runners/bgxi.json | 2 +- src/lib/runners/bhpw.json | 2 +- src/lib/runners/biit.json | 2 +- src/lib/runners/blvt.json | 2 +- src/lib/runners/bndi.json | 2 +- src/lib/runners/bnyo.json | 2 +- src/lib/runners/bras.json | 2 +- src/lib/runners/bwff.json | 2 +- src/lib/runners/bwnp.json | 2 +- src/lib/runners/bxuv.json | 2 +- src/lib/runners/cawl.json | 2 +- src/lib/runners/cbmn.json | 2 +- src/lib/runners/cefx.json | 2 +- src/lib/runners/cjxe.json | 2 +- src/lib/runners/cldb.json | 2 +- src/lib/runners/cmla.json | 2 +- src/lib/runners/cowm.json | 2 +- src/lib/runners/cpdy.json | 2 +- src/lib/runners/cpim.json | 2 +- src/lib/runners/cpkp.json | 2 +- src/lib/runners/cqzt.json | 2 +- src/lib/runners/crvj.json | 2 +- src/lib/runners/cuwg.json | 2 +- src/lib/runners/cvtc.json | 2 +- src/lib/runners/cyyp.json | 2 +- src/lib/runners/deay.json | 2 +- src/lib/runners/dewi.json | 2 +- src/lib/runners/dfjp.json | 2 +- src/lib/runners/dgpx.json | 2 +- src/lib/runners/dgyc.json | 2 +- src/lib/runners/dhiu.json | 2 +- src/lib/runners/dhzf.json | 2 +- src/lib/runners/diis.json | 2 +- src/lib/runners/ditw.json | 2 +- src/lib/runners/dkdt.json | 2 +- src/lib/runners/dkiy.json | 2 +- src/lib/runners/dmrz.json | 2 +- src/lib/runners/dogu.json | 2 +- src/lib/runners/dqdv.json | 2 +- src/lib/runners/dqey.json | 2 +- src/lib/runners/dqwh.json | 2 +- src/lib/runners/dtzu.json | 2 +- src/lib/runners/dubm.json | 2 +- src/lib/runners/duuk.json | 2 +- src/lib/runners/dvfg.json | 2 +- src/lib/runners/dvpl.json | 2 +- src/lib/runners/dwmc.json | 2 +- src/lib/runners/dwzy.json | 2 +- src/lib/runners/dyoq.json | 2 +- src/lib/runners/eagi.json | 2 +- src/lib/runners/ednv.json | 2 +- src/lib/runners/edzu.json | 2 +- src/lib/runners/ehxq.json | 2 +- src/lib/runners/eijx.json | 2 +- src/lib/runners/elku.json | 2 +- src/lib/runners/elyq.json | 2 +- src/lib/runners/envj.json | 2 +- src/lib/runners/eozk.json | 2 +- src/lib/runners/epoi.json | 2 +- src/lib/runners/etae.json | 2 +- src/lib/runners/etku.json | 2 +- src/lib/runners/evqx.json | 2 +- src/lib/runners/eweo.json | 2 +- src/lib/runners/ewfr.json | 2 +- src/lib/runners/exbn.json | 2 +- src/lib/runners/ezmz.json | 2 +- src/lib/runners/fclo.json | 2 +- src/lib/runners/fdig.json | 2 +- src/lib/runners/fhkl.json | 2 +- src/lib/runners/fhrd.json | 2 +- src/lib/runners/fkat.json | 2 +- src/lib/runners/fkqu.json | 2 +- src/lib/runners/fkvy.json | 2 +- src/lib/runners/fljg.json | 2 +- src/lib/runners/fsgq.json | 2 +- src/lib/runners/fton.json | 2 +- src/lib/runners/fxde.json | 2 +- src/lib/runners/fxok.json | 2 +- src/lib/runners/fzpz.json | 2 +- src/lib/runners/gemh.json | 2 +- src/lib/runners/ggxl.json | 2 +- src/lib/runners/ghwe.json | 2 +- src/lib/runners/glbk.json | 2 +- src/lib/runners/gmgs.json | 2 +- src/lib/runners/gmzn.json | 2 +- src/lib/runners/gngw.json | 2 +- src/lib/runners/gnwm.json | 2 +- src/lib/runners/gpat.json | 2 +- src/lib/runners/grla.json | 2 +- src/lib/runners/gtdu.json | 2 +- src/lib/runners/guhy.json | 2 +- src/lib/runners/gvxz.json | 2 +- src/lib/runners/gwtp.json | 2 +- src/lib/runners/gzuj.json | 2 +- src/lib/runners/hafp.json | 2 +- src/lib/runners/hbbv.json | 2 +- src/lib/runners/hdhy.json | 2 +- src/lib/runners/hdxc.json | 2 +- src/lib/runners/hehx.json | 2 +- src/lib/runners/hhjq.json | 2 +- src/lib/runners/hkbs.json | 2 +- src/lib/runners/hkfq.json | 2 +- src/lib/runners/hluq.json | 2 +- src/lib/runners/hnyn.json | 2 +- src/lib/runners/hvfb.json | 2 +- src/lib/runners/hvqh.json | 2 +- src/lib/runners/hvqy.json | 2 +- src/lib/runners/hykj.json | 2 +- src/lib/runners/iatt.json | 2 +- src/lib/runners/iczf.json | 2 +- src/lib/runners/ifiq.json | 2 +- src/lib/runners/ifpo.json | 2 +- src/lib/runners/igrl.json | 2 +- src/lib/runners/ilpo.json | 2 +- src/lib/runners/ilvq.json | 2 +- src/lib/runners/immq.json | 2 +- src/lib/runners/imyd.json | 2 +- src/lib/runners/issq.json | 2 +- src/lib/runners/itbm.json | 2 +- src/lib/runners/itis.json | 2 +- src/lib/runners/ivol.json | 2 +- src/lib/runners/iwmu.json | 2 +- src/lib/runners/izgz.json | 2 +- src/lib/runners/jaqs.json | 2 +- src/lib/runners/jarm.json | 2 +- src/lib/runners/jbam.json | 2 +- src/lib/runners/jbqw.json | 2 +- src/lib/runners/jehv.json | 2 +- src/lib/runners/jguj.json | 2 +- src/lib/runners/jiqb.json | 2 +- src/lib/runners/jiua.json | 2 +- src/lib/runners/jjet.json | 2 +- src/lib/runners/jjjh.json | 2 +- src/lib/runners/jmmp.json | 2 +- src/lib/runners/joaq.json | 2 +- src/lib/runners/jsvg.json | 2 +- src/lib/runners/jwah.json | 2 +- src/lib/runners/jwce.json | 2 +- src/lib/runners/jwdn.json | 2 +- src/lib/runners/jwzh.json | 2 +- src/lib/runners/jxvy.json | 2 +- src/lib/runners/jyqf.json | 2 +- src/lib/runners/jzwg.json | 2 +- src/lib/runners/kbnn.json | 2 +- src/lib/runners/kdgv.json | 2 +- src/lib/runners/keck.json | 2 +- src/lib/runners/kfru.json | 2 +- src/lib/runners/kiiq.json | 2 +- src/lib/runners/kizi.json | 2 +- src/lib/runners/kjba.json | 2 +- src/lib/runners/kmgw.json | 2 +- src/lib/runners/kmyl.json | 2 +- src/lib/runners/knhw.json | 2 +- src/lib/runners/kosw.json | 2 +- src/lib/runners/kvso.json | 2 +- src/lib/runners/kwyy.json | 2 +- src/lib/runners/kzkg.json | 2 +- src/lib/runners/laea.json | 2 +- src/lib/runners/ldcq.json | 2 +- src/lib/runners/ldqk.json | 2 +- src/lib/runners/lipt.json | 2 +- src/lib/runners/lizi.json | 2 +- src/lib/runners/loai.json | 2 +- src/lib/runners/ltpe.json | 2 +- src/lib/runners/lwoq.json | 2 +- src/lib/runners/lxgj.json | 2 +- src/lib/runners/lxhc.json | 2 +- src/lib/runners/lxrk.json | 2 +- src/lib/runners/mbje.json | 2 +- src/lib/runners/mcug.json | 2 +- src/lib/runners/mepb.json | 2 +- src/lib/runners/mgku.json | 2 +- src/lib/runners/mhgm.json | 2 +- src/lib/runners/mhyv.json | 2 +- src/lib/runners/mibj.json | 2 +- src/lib/runners/mifg.json | 2 +- src/lib/runners/mlnt.json | 2 +- src/lib/runners/mqvu.json | 2 +- src/lib/runners/msiw.json | 2 +- src/lib/runners/msrk.json | 2 +- src/lib/runners/mutg.json | 2 +- src/lib/runners/myjz.json | 2 +- src/lib/runners/mzqc.json | 2 +- src/lib/runners/mzys.json | 2 +- src/lib/runners/nbck.json | 2 +- src/lib/runners/ngxc.json | 2 +- src/lib/runners/nhqo.json | 2 +- src/lib/runners/niwv.json | 2 +- src/lib/runners/nlbn.json | 2 +- src/lib/runners/nlyu.json | 2 +- src/lib/runners/nmbt.json | 2 +- src/lib/runners/nmmz.json | 2 +- src/lib/runners/nmrp.json | 2 +- src/lib/runners/nngz.json | 2 +- src/lib/runners/nntn.json | 2 +- src/lib/runners/nplf.json | 2 +- src/lib/runners/nuco.json | 2 +- src/lib/runners/nvdn.json | 2 +- src/lib/runners/nvqu.json | 2 +- src/lib/runners/nxjv.json | 2 +- src/lib/runners/ochk.json | 2 +- src/lib/runners/olqy.json | 2 +- src/lib/runners/olyw.json | 2 +- src/lib/runners/oork.json | 2 +- src/lib/runners/ooya.json | 2 +- src/lib/runners/oqpi.json | 2 +- src/lib/runners/osff.json | 2 +- src/lib/runners/osqo.json | 2 +- src/lib/runners/oukl.json | 2 +- src/lib/runners/ovua.json | 2 +- src/lib/runners/owpg.json | 2 +- src/lib/runners/oykb.json | 2 +- src/lib/runners/ozbe.json | 2 +- src/lib/runners/ozxi.json | 2 +- src/lib/runners/pbhg.json | 2 +- src/lib/runners/pbop.json | 2 +- src/lib/runners/peiy.json | 2 +- src/lib/runners/pgxb.json | 2 +- src/lib/runners/pirb.json | 2 +- src/lib/runners/plbv.json | 2 +- src/lib/runners/plde.json | 2 +- src/lib/runners/pmdm.json | 2 +- src/lib/runners/poha.json | 2 +- src/lib/runners/potg.json | 2 +- src/lib/runners/psyv.json | 2 +- src/lib/runners/qcmh.json | 2 +- src/lib/runners/qfbk.json | 2 +- src/lib/runners/qgau.json | 2 +- src/lib/runners/qlcq.json | 2 +- src/lib/runners/qoms.json | 2 +- src/lib/runners/qrfw.json | 2 +- src/lib/runners/qrgc.json | 2 +- src/lib/runners/qsoa.json | 2 +- src/lib/runners/qurt.json | 2 +- src/lib/runners/qwdg.json | 2 +- src/lib/runners/qxob.json | 2 +- src/lib/runners/qycx.json | 2 +- src/lib/runners/rakk.json | 2 +- src/lib/runners/rbup.json | 2 +- src/lib/runners/rchd.json | 2 +- src/lib/runners/rdae.json | 2 +- src/lib/runners/rgta.json | 2 +- src/lib/runners/rhcv.json | 2 +- src/lib/runners/rhoa.json | 2 +- src/lib/runners/rico.json | 2 +- src/lib/runners/rivc.json | 2 +- src/lib/runners/rjfy.json | 2 +- src/lib/runners/rjho.json | 2 +- src/lib/runners/rjzw.json | 2 +- src/lib/runners/rnug.json | 2 +- src/lib/runners/roko.json | 2 +- src/lib/runners/rqer.json | 2 +- src/lib/runners/rqjo.json | 2 +- src/lib/runners/rrmc.json | 2 +- src/lib/runners/rtza.json | 2 +- src/lib/runners/rviy.json | 2 +- src/lib/runners/rypq.json | 2 +- src/lib/runners/ryqp.json | 2 +- src/lib/runners/seie.json | 2 +- src/lib/runners/sgfj.json | 2 +- src/lib/runners/sgnp.json | 2 +- src/lib/runners/skoo.json | 2 +- src/lib/runners/smdm.json | 2 +- src/lib/runners/snlf.json | 2 +- src/lib/runners/spga.json | 2 +- src/lib/runners/sskt.json | 2 +- src/lib/runners/stda.json | 2 +- src/lib/runners/sucz.json | 2 +- src/lib/runners/svbd.json | 2 +- src/lib/runners/sxnt.json | 2 +- src/lib/runners/tfsi.json | 2 +- src/lib/runners/thkn.json | 2 +- src/lib/runners/tjaf.json | 2 +- src/lib/runners/toem.json | 2 +- src/lib/runners/tpyg.json | 2 +- src/lib/runners/trwj.json | 2 +- src/lib/runners/txxw.json | 2 +- src/lib/runners/udxn.json | 2 +- src/lib/runners/uexo.json | 2 +- src/lib/runners/ufjx.json | 2 +- src/lib/runners/ugvz.json | 2 +- src/lib/runners/uhqo.json | 2 +- src/lib/runners/uiwl.json | 2 +- src/lib/runners/unxf.json | 2 +- src/lib/runners/uppk.json | 2 +- src/lib/runners/uvmv.json | 2 +- src/lib/runners/uwgj.json | 2 +- src/lib/runners/uwma.json | 2 +- src/lib/runners/uwyn.json | 2 +- src/lib/runners/vcqp.json | 2 +- src/lib/runners/vdhd.json | 2 +- src/lib/runners/veft.json | 2 +- src/lib/runners/vfdw.json | 2 +- src/lib/runners/vilr.json | 2 +- src/lib/runners/vlhb.json | 2 +- src/lib/runners/vlob.json | 2 +- src/lib/runners/vmkg.json | 2 +- src/lib/runners/voeb.json | 2 +- src/lib/runners/vowa.json | 2 +- src/lib/runners/vozu.json | 2 +- src/lib/runners/vqwp.json | 2 +- src/lib/runners/vqyl.json | 2 +- src/lib/runners/vsvt.json | 2 +- src/lib/runners/vvjn.json | 2 +- src/lib/runners/vwvb.json | 2 +- src/lib/runners/wcer.json | 2 +- src/lib/runners/wenx.json | 2 +- src/lib/runners/weoz.json | 2 +- src/lib/runners/wgby.json | 2 +- src/lib/runners/whbu.json | 2 +- src/lib/runners/whrn.json | 2 +- src/lib/runners/wjwu.json | 2 +- src/lib/runners/wopl.json | 2 +- src/lib/runners/wqml.json | 2 +- src/lib/runners/wtup.json | 2 +- src/lib/runners/wunw.json | 2 +- src/lib/runners/wwtl.json | 2 +- src/lib/runners/wzqv.json | 2 +- src/lib/runners/xbki.json | 2 +- src/lib/runners/xhdq.json | 2 +- src/lib/runners/xhul.json | 2 +- src/lib/runners/xjzx.json | 2 +- src/lib/runners/xkcm.json | 2 +- src/lib/runners/xlgb.json | 2 +- src/lib/runners/xmqp.json | 2 +- src/lib/runners/xpks.json | 2 +- src/lib/runners/xqjd.json | 2 +- src/lib/runners/xusi.json | 2 +- src/lib/runners/xwzc.json | 2 +- src/lib/runners/xxan.json | 2 +- src/lib/runners/xxas.json | 2 +- src/lib/runners/yabb.json | 2 +- src/lib/runners/ybne.json | 2 +- src/lib/runners/ycpk.json | 2 +- src/lib/runners/ycxr.json | 2 +- src/lib/runners/yfwd.json | 2 +- src/lib/runners/yiri.json | 2 +- src/lib/runners/yjur.json | 2 +- src/lib/runners/ykqf.json | 2 +- src/lib/runners/ylav.json | 2 +- src/lib/runners/ynoy.json | 2 +- src/lib/runners/ysxf.json | 2 +- src/lib/runners/ywpq.json | 2 +- src/lib/runners/yxel.json | 2 +- src/lib/runners/yyfi.json | 2 +- src/lib/runners/zcwk.json | 2 +- src/lib/runners/zdpf.json | 2 +- src/lib/runners/zemy.json | 2 +- src/lib/runners/zick.json | 2 +- src/lib/runners/zkon.json | 2 +- src/lib/runners/zlfx.json | 2 +- src/lib/runners/zsxo.json | 2 +- src/lib/runners/zuus.json | 2 +- src/lib/runners/zwpj.json | 2 +- src/lib/runners/zwut.json | 2 +- src/lib/runners/zwvj.json | 2 +- src/lib/runners/zzhq.json | 2 +- src/lib/runners/zzxj.json | 2 +- src/lib/runners/zzyu.json | 2 +- src/types/ExpressionRunnerTypes.ts | 2 +- 395 files changed, 481 insertions(+), 481 deletions(-) diff --git a/scripts/lib/buildExpressionContainers.ts b/scripts/lib/buildExpressionContainers.ts index 0e7e772c7..5b13b2bd9 100644 --- a/scripts/lib/buildExpressionContainers.ts +++ b/scripts/lib/buildExpressionContainers.ts @@ -18,7 +18,7 @@ const buildExpressionContainers = ({ hideControls, lastAllowedExpressionState, lastAllowedExpressionStateAfterIterations, - hidePlayButton + hideRunButton }: ExpressionRunnerConfig): readonly ExpressionContainer[] => { if (initialExpressionContainer) { let currentExpressionContainer: SteppedExpressionContainer = initialExpressionContainer @@ -96,7 +96,7 @@ const buildExpressionContainers = ({ ) results.push(currentExpressionContainer) - if (hidePlayButton) { + if (hideRunButton) { break } diff --git a/scripts/lib/buildExpressionRunnerConfigFromShorthand.ts b/scripts/lib/buildExpressionRunnerConfigFromShorthand.ts index d9d13acd6..a9a4c460c 100644 --- a/scripts/lib/buildExpressionRunnerConfigFromShorthand.ts +++ b/scripts/lib/buildExpressionRunnerConfigFromShorthand.ts @@ -1,11 +1,11 @@ import { ExpressionRunnerShorthandConfig, expressionRunnerSimpleConfigDefault, - expressionRunnerPlayButtonOnlyConfigDefault, + expressionRunnerRunButtonOnlyConfigDefault, expressionRunnerSingleStepConfigDefault, expressionRunnerPredefinedConfigDefault, isExpressionRunnerSimpleConfig, - isExpressionRunnerPlayButtonOnlyConfig, + isExpressionRunnerRunButtonOnlyConfig, isExpressionRunnerSingleStepConfig } from 'scripts/lib/expressionRunnerShorthandConfig' import { ExpressionContainer } from 'src/types/ExpressionContainerTypes' @@ -27,7 +27,7 @@ export interface ExpressionRunnerConfig { initializeInstructions: readonly InitializeInstruction[] lastAllowedExpressionState?: ExpressionContainer['previouslyChangedExpressionState'] lastAllowedExpressionStateAfterIterations?: number - hidePlayButton?: boolean + hideRunButton?: boolean speed: number showAllShowSteps?: boolean skipAlphaConvert?: boolean @@ -51,7 +51,7 @@ const expressionRunnerDefaults = { explanationsVisibility: 'visible', initializeInstructions: [], skipToTheEnd: false, - hidePlayButton: false, + hideRunButton: false, speed: 1, hideFuncUnboundBadgeOnExplanation: false, highlightOverridesCallArgAndFuncUnboundOnly: false, @@ -152,7 +152,7 @@ const buildExpressionRunnerConfigFromShorthand = ( }), crossed } - } else if (isExpressionRunnerPlayButtonOnlyConfig(config)) { + } else if (isExpressionRunnerRunButtonOnlyConfig(config)) { const { initialExpressionContainer, initialState, @@ -171,8 +171,8 @@ const buildExpressionRunnerConfigFromShorthand = ( explanationsVisibility } = mergeWithDefault< typeof config, - typeof expressionRunnerPlayButtonOnlyConfigDefault - >(config, expressionRunnerPlayButtonOnlyConfigDefault) + typeof expressionRunnerRunButtonOnlyConfigDefault + >(config, expressionRunnerRunButtonOnlyConfigDefault) runnerProps = { speed, @@ -215,7 +215,7 @@ const buildExpressionRunnerConfigFromShorthand = ( initialExpressionContainer, hidePriorities: !showPriorities, hideFuncUnboundBadgeOnExplanation, - hidePlayButton: true, + hideRunButton: true, explanationsVisibility, lastAllowedExpressionState: finalState, lastAllowedExpressionStateAfterIterations: nextIterations, @@ -246,7 +246,7 @@ const buildExpressionRunnerConfigFromShorthand = ( initialExpressionContainers, hidePriorities: !showPriorities, hideFuncUnboundBadgeOnExplanation, - hidePlayButton: false, + hideRunButton: false, explanationsVisibility, lastAllowedExpressionStateAfterIterations: nextIterations, showAllShowSteps, diff --git a/scripts/lib/expressionRunnerShorthandConfig.ts b/scripts/lib/expressionRunnerShorthandConfig.ts index c48897e4e..0596da39f 100644 --- a/scripts/lib/expressionRunnerShorthandConfig.ts +++ b/scripts/lib/expressionRunnerShorthandConfig.ts @@ -36,7 +36,7 @@ export function isExpressionRunnerSimpleConfig( return c.runner === 'simple' } -export const expressionRunnerPlayButtonOnlyConfigDefault = { +export const expressionRunnerRunButtonOnlyConfigDefault = { initialState: 'default', skipToTheEnd: true, hideFuncUnboundBadgeOnExplanation: true, @@ -46,14 +46,14 @@ export const expressionRunnerPlayButtonOnlyConfigDefault = { explanationsVisibility: 'hiddenInitialPausedOnly' } -export function isExpressionRunnerPlayButtonOnlyConfig( +export function isExpressionRunnerRunButtonOnlyConfig( c: ExpressionRunnerShorthandConfig -): c is ExpressionRunnerPlayButtonOnlyConfig { - return c.runner === 'playButtonOnly' +): c is ExpressionRunnerRunButtonOnlyConfig { + return c.runner === 'runButtonOnly' } -interface ExpressionRunnerPlayButtonOnlyConfig { - runner: 'playButtonOnly' +interface ExpressionRunnerRunButtonOnlyConfig { + runner: 'runButtonOnly' initialExpressionContainer: SteppedExpressionContainer initialState?: ExpressionContainer['previouslyChangedExpressionState'] skipToTheEnd?: boolean @@ -124,6 +124,6 @@ interface ExpressionRunnerPredefinedConfig { export type ExpressionRunnerShorthandConfig = | ExpressionRunnerSimpleConfig - | ExpressionRunnerPlayButtonOnlyConfig + | ExpressionRunnerRunButtonOnlyConfig | ExpressionRunnerSingleStepConfig | ExpressionRunnerPredefinedConfig diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index aa9ca8c3a..94d3e71f4 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -36,7 +36,7 @@ export const wwtl: ExpressionRunnerShorthandConfig = { } export const vdhd: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, initialExpressionContainer: initialExpressionContainers.pisd, initialState: 'showFuncUnbound', @@ -123,7 +123,7 @@ export const mhyv: ExpressionRunnerShorthandConfig = { } export const myjz: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, initialExpressionContainer: initialExpressionContainers.drvy, showPriorities: true, @@ -132,7 +132,7 @@ export const myjz: ExpressionRunnerShorthandConfig = { } export const ayok: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.drvy, showPriorities: true, skipToTheEnd: false, @@ -140,7 +140,7 @@ export const ayok: ExpressionRunnerShorthandConfig = { } export const thkn: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.oyph, showPriorities: true, skipToTheEnd: false @@ -183,7 +183,7 @@ export const oork: ExpressionRunnerShorthandConfig = { } export const diis: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.hrdv, initialState: 'showFuncBound', skipToTheEnd: false, @@ -204,7 +204,7 @@ export const dqey: ExpressionRunnerShorthandConfig = { } export const zemy: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, initialExpressionContainer: initialExpressionContainers.hrdv, initialState: 'active', @@ -226,14 +226,14 @@ export const rgta: ExpressionRunnerShorthandConfig = { } export const cuwg: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.rlzd, showPriorities: true, skipToTheEnd: false } export const rivc: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.sisf } @@ -369,7 +369,7 @@ export const uvmv: ExpressionRunnerShorthandConfig = { } export const mutg: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.neny } @@ -379,14 +379,14 @@ export const hvqh: ExpressionRunnerShorthandConfig = { } export const hdxc: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.epon, showPriorities: true, skipToTheEnd: false } export const hykj: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, initialExpressionContainer: initialExpressionContainers.lqti, initialState: 'showFuncUnbound', @@ -425,12 +425,12 @@ export const imyd: ExpressionRunnerShorthandConfig = { } export const itbm: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.nyhe } export const izgz: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.lqti, initialState: 'betaReducePreviewAfter', showPriorities: true, @@ -438,14 +438,14 @@ export const izgz: ExpressionRunnerShorthandConfig = { } export const jbam: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.txbv, initialState: 'active', skipToTheEnd: false } export const hluq: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.sisf, initialState: 'active', skipToTheEnd: false @@ -477,7 +477,7 @@ export const knhw: ExpressionRunnerShorthandConfig = { } export const kvso: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.pisd, nextIterations: 1, initialState: 'showFuncBound', @@ -495,7 +495,7 @@ export const sgnp: ExpressionRunnerShorthandConfig = { } export const beiz: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.pisd, showPriorities: true, skipToTheEnd: false @@ -508,7 +508,7 @@ export const laea: ExpressionRunnerShorthandConfig = { } export const nmmz: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.ysyy } @@ -859,14 +859,14 @@ export const vvjn: ExpressionRunnerShorthandConfig = { } export const wunw: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.nyhe, initialState: 'active', skipToTheEnd: false } export const zwpj: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.txbv } @@ -877,7 +877,7 @@ export const zzxj: ExpressionRunnerShorthandConfig = { } export const zzyu: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.gvjy } @@ -897,12 +897,12 @@ export const gnwm: ExpressionRunnerShorthandConfig = { } export const mcug: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.vibe } export const aovj: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.kfwf } @@ -929,7 +929,7 @@ export const fdig: ExpressionRunnerShorthandConfig = { } export const xmqp: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.qtns } @@ -939,22 +939,22 @@ export const ditw: ExpressionRunnerShorthandConfig = { } export const jiqb: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.gjyx } export const eagi: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.qcio } export const yjur: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.wsia } export const amoq: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.rnth } @@ -964,7 +964,7 @@ export const dfjp: ExpressionRunnerShorthandConfig = { } export const lxrk: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.bwig } @@ -1065,7 +1065,7 @@ export const immq: ExpressionRunnerShorthandConfig = { } export const zuus: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.zbzu, initialState: 'active', skipToTheEnd: false @@ -1292,7 +1292,7 @@ export const ufjx: ExpressionRunnerShorthandConfig = { } export const dhiu: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.kwqc, skipToTheEnd: false, showPriorities: true, @@ -1301,7 +1301,7 @@ export const dhiu: ExpressionRunnerShorthandConfig = { } export const akjy: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.kwqc, skipToTheEnd: false, showPriorities: true, @@ -1311,7 +1311,7 @@ export const akjy: ExpressionRunnerShorthandConfig = { } export const hnyn: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.kwqc, skipToTheEnd: false, showPriorities: true, @@ -1368,14 +1368,14 @@ export const cpim: ExpressionRunnerShorthandConfig = { } export const rjzw: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.uqth, showPriorities: true, skipToTheEnd: false } export const jsvg: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.uqth, showPriorities: true, skipToTheEnd: false, @@ -1384,7 +1384,7 @@ export const jsvg: ExpressionRunnerShorthandConfig = { } export const uexo: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.uqth, showPriorities: true, skipToTheEnd: false, @@ -1394,7 +1394,7 @@ export const uexo: ExpressionRunnerShorthandConfig = { } export const hdhy: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.uqth, showPriorities: true, skipToTheEnd: false, @@ -1424,7 +1424,7 @@ export const awwn: ExpressionRunnerShorthandConfig = { } export const nlbn: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.ngth, showPriorities: true, skipToTheEnd: false, @@ -1486,7 +1486,7 @@ export const cjxe: ExpressionRunnerShorthandConfig = { } export const oqpi: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.mtyb, showPriorities: true, skipToTheEnd: false, @@ -1527,7 +1527,7 @@ export const ybne: ExpressionRunnerShorthandConfig = { } export const akik: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.qdoh, showPriorities: true, skipToTheEnd: false, @@ -1551,7 +1551,7 @@ export const vqwp: ExpressionRunnerShorthandConfig = { } export const exbn: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.henz, showPriorities: true, skipToTheEnd: false, @@ -1738,7 +1738,7 @@ export const niwv: ExpressionRunnerShorthandConfig = { } export const fsgq: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.qdoh, showPriorities: true, initialState: 'alphaConvertDone', @@ -1785,7 +1785,7 @@ export const ylav: ExpressionRunnerShorthandConfig = { } export const zwut: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.udaf, showPriorities: true, skipToTheEnd: false, @@ -1804,7 +1804,7 @@ export const xusi: ExpressionRunnerShorthandConfig = { } export const lipt: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.udaf, showPriorities: true, skipToTheEnd: false, @@ -1834,7 +1834,7 @@ export const zwvj: ExpressionRunnerShorthandConfig = { } export const ifiq: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.lwpw, showPriorities: true, skipToTheEnd: false, @@ -1926,7 +1926,7 @@ export const elyq: ExpressionRunnerShorthandConfig = { } export const nmrp: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, initialExpressionContainer: initialExpressionContainers.psdd, showPriorities: true, @@ -1954,7 +1954,7 @@ export const ooya: ExpressionRunnerShorthandConfig = { } export const gpat: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, initialExpressionContainer: initialExpressionContainers.nnqw, showPriorities: true, @@ -1992,7 +1992,7 @@ export const kfru: ExpressionRunnerShorthandConfig = { } export const svbd: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, initialExpressionContainer: initialExpressionContainers.exhr, showPriorities: true, @@ -2130,7 +2130,7 @@ export const zcwk: ExpressionRunnerShorthandConfig = { } export const gmzn: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, skipActive: true, initialExpressionContainer: initialExpressionContainers.aiyb, @@ -2139,7 +2139,7 @@ export const gmzn: ExpressionRunnerShorthandConfig = { } export const uiwl: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, skipActive: true, initialExpressionContainer: initialExpressionContainers.aiyb, @@ -2148,7 +2148,7 @@ export const uiwl: ExpressionRunnerShorthandConfig = { } export const ynoy: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, speed: 4, skipActive: true, @@ -2210,7 +2210,7 @@ export const mbje: ExpressionRunnerShorthandConfig = { } export const ovua: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, skipActive: true, initialExpressionContainer: initialExpressionContainers.jrfk, @@ -2291,7 +2291,7 @@ export const fkvy: ExpressionRunnerShorthandConfig = { } export const dwmc: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, skipActive: true, initialExpressionContainer: initialExpressionContainers.jrfk, @@ -2329,7 +2329,7 @@ export const qgau: ExpressionRunnerShorthandConfig = { } export const uwyn: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, skipActive: true, initialExpressionContainer: initialExpressionContainers.jrfk, @@ -2375,7 +2375,7 @@ export const ysxf: ExpressionRunnerShorthandConfig = { } export const snlf: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, skipActive: true, initialExpressionContainer: initialExpressionContainers.jrfk, @@ -2529,7 +2529,7 @@ export const tpyg: ExpressionRunnerShorthandConfig = { } export const ugvz: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, skipActive: true, speed: 2, @@ -2575,7 +2575,7 @@ export const vqyl: ExpressionRunnerShorthandConfig = { } export const wzqv: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, skipActive: true, speed: 2, @@ -2607,7 +2607,7 @@ export const trwj: ExpressionRunnerShorthandConfig = { } export const potg: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.babw, showPriorities: true } @@ -2632,7 +2632,7 @@ export const gemh: ExpressionRunnerShorthandConfig = { } export const unxf: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, skipActive: true, initialExpressionContainer: initialExpressionContainers.glvb, @@ -2652,7 +2652,7 @@ export const zlfx: ExpressionRunnerShorthandConfig = { } export const rrmc: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, initialExpressionContainer: initialExpressionContainers.jypn, showPriorities: true, @@ -2677,7 +2677,7 @@ export const gzuj: ExpressionRunnerShorthandConfig = { } export const ancc: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, initialExpressionContainer: initialExpressionContainers.jypn, showPriorities: true, @@ -2703,7 +2703,7 @@ export const kmgw: ExpressionRunnerShorthandConfig = { } export const xbki: ExpressionRunnerShorthandConfig = { - runner: 'playButtonOnly', + runner: 'runButtonOnly', skipToTheEnd: false, initialExpressionContainer: initialExpressionContainers.jvmi, showPriorities: true, diff --git a/scripts/precomputeExpressionContainers.ts b/scripts/precomputeExpressionContainers.ts index 88faa0797..3e6bbf6eb 100644 --- a/scripts/precomputeExpressionContainers.ts +++ b/scripts/precomputeExpressionContainers.ts @@ -15,7 +15,7 @@ const precomputeFile = (key: string) => { hideControls, explanationsVisibility, hidePriorities, - hidePlayButton, + hideRunButton, showAllShowSteps, hideBottomRightBadges, skipToTheEnd, @@ -38,7 +38,7 @@ const precomputeFile = (key: string) => { hideControls, explanationsVisibility, hidePriorities, - hidePlayButton, + hideRunButton, hideBottomRightBadges, skipToTheEnd, hideFuncUnboundBadgeOnExplanation, diff --git a/src/components/ExpressionRunnerControls.tsx b/src/components/ExpressionRunnerControls.tsx index 7f6380e63..6cfe920cf 100644 --- a/src/components/ExpressionRunnerControls.tsx +++ b/src/components/ExpressionRunnerControls.tsx @@ -11,7 +11,7 @@ interface ExpressionRunnerControlsProps { canStepForward: boolean canStepBackward: boolean isRunning: boolean - showPlayButton: boolean + showRunButton: boolean skipToTheEnd: boolean onNextClick: () => void onPreviousClick: () => void @@ -54,7 +54,7 @@ const ExpressionRunnerControls = ({ canStepBackward, onNextClick, onPreviousClick, - showPlayButton, + showRunButton, isRunning, onAutoClick, onResetClick, @@ -73,7 +73,7 @@ const ExpressionRunnerControls = ({ margin: ${spaces(1)} -2px 0 -2px; `} > - {showPlayButton ? ( + {showRunButton ? ( <> {!isRunning && canStepBackward && !skipToTheEnd ? ( )} - {showPlayButton && ( + {showRunButton && ( )} - {showPlayButton ? ( + {showRunButton ? ( <> {!isRunning && canStepForward && !skipToTheEnd ? ( 0) const progessBarVisible = - !hidePlayButton && !skipToTheEnd && (isRunning || atLeastOneStepTaken) + !hideRunButton && !skipToTheEnd && (isRunning || atLeastOneStepTaken) const containerSize = functionDepthsToContainerSize( expressionContainers[currentIndex].expression.maxNestedFunctionDepth || 0 ) @@ -298,7 +298,7 @@ const ExpressionRunnerPrecomputed = ({ onPreviousClick={stepBackward} canStepForward={canStepForward} canStepBackward={atLeastOneStepTaken} - showPlayButton={!hidePlayButton} + showRunButton={!hideRunButton} isRunning={isRunning} onAutoClick={autoplay} onSkipToTheEndClick={stepToTheEnd} @@ -313,7 +313,7 @@ const ExpressionRunnerPrecomputed = ({ size={containerSize === 'xxs' ? 'xs' : 'sm'} horizontalPadding={0} > - {!hidePlayButton && + {!hideRunButton && canStepForward && !skipToTheEnd && (resetClicked || speed > 1) && ( @@ -349,7 +349,7 @@ const ExpressionRunnerPrecomputed = ({ currentIndex === expressionContainers.length - 1 && expressionContainers[expressionContainers.length - 1] .containerState !== 'done' && - !hidePlayButton && ( + !hideRunButton && ( Date: Sun, 20 Oct 2019 17:15:36 -0700 Subject: [PATCH 052/110] =?UTF-8?q?play=20=E2=86=92=20run?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ExpressionRunnerControls.tsx | 2 +- src/components/H.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/ExpressionRunnerControls.tsx b/src/components/ExpressionRunnerControls.tsx index 6cfe920cf..40379df19 100644 --- a/src/components/ExpressionRunnerControls.tsx +++ b/src/components/ExpressionRunnerControls.tsx @@ -148,7 +148,7 @@ const ExpressionRunnerControls = ({ ) ) : ( - + ) ) : convert && convert !== 'toMathBoxPlay' ? ( diff --git a/src/components/H.tsx b/src/components/H.tsx index 861463045..cd29f5648 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -168,7 +168,7 @@ interface HProps { | { name: 'goToOtherPage' } | { name: 'demoTitle' } | { name: 'whatTheNumberIsCaption' } - | { name: 'playAndShowAllSteps' } + | { name: 'runAndShowAllSteps' } } const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { @@ -457,7 +457,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { ) } } - if (args.name === 'playAndShowAllSteps') { + if (args.name === 'runAndShowAllSteps') { if (locale === 'en') { return ( <> From 628d8debed74e8bba3caa91b7626e4797fffff6f Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 17:16:55 -0700 Subject: [PATCH 053/110] Highspeed --- src/components/ExpressionRunnerPrecomputed.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/ExpressionRunnerPrecomputed.tsx b/src/components/ExpressionRunnerPrecomputed.tsx index 350369c0d..b26a53e08 100644 --- a/src/components/ExpressionRunnerPrecomputed.tsx +++ b/src/components/ExpressionRunnerPrecomputed.tsx @@ -48,10 +48,10 @@ export interface ExpressionRunnerPrecomputedProps { } const autoplaySpeed = (speed: number) => 1000 / speed -const FASTFORWARDING_THRESHOLD = 2 +const HIGHSPEED_THRESHOLD = 2 interface PlaybackState { - isFastForwarding: boolean + isHighSpeed: boolean isRunning: boolean } @@ -76,10 +76,10 @@ const ExpressionRunnerPrecomputed = ({ crossed, showBottomProgressBar }: ExpressionRunnerPrecomputedProps) => { - const [{ isFastForwarding, isRunning }, setPlaybackStatus] = useState< + const [{ isHighSpeed, isRunning }, setPlaybackStatus] = useState< PlaybackState >({ - isFastForwarding: false, + isHighSpeed: false, isRunning: false }) @@ -99,7 +99,7 @@ const ExpressionRunnerPrecomputed = ({ // Don't use else: stop immediately if reaches the end if (currentIndex + 1 >= expressionContainers.length - 1) { setPlaybackStatus({ - isFastForwarding: false, + isHighSpeed: false, isRunning: false }) } @@ -133,14 +133,14 @@ const ExpressionRunnerPrecomputed = ({ const autoplay = () => { setPlaybackStatus({ isRunning: true, - isFastForwarding: speed > FASTFORWARDING_THRESHOLD + isHighSpeed: speed > HIGHSPEED_THRESHOLD }) } const pause = () => { setPlaybackStatus({ isRunning: false, - isFastForwarding: false + isHighSpeed: false }) } @@ -246,7 +246,7 @@ const ExpressionRunnerPrecomputed = ({ css={[ css` line-height: ${lineHeights(1.3, { ignoreLocale: true })}; - opacity: ${isFastForwarding ? 0.5 : 1}; + opacity: ${isHighSpeed ? 0.5 : 1}; position: relative; background-color: ${colors('white')}; ` From b20fa87408a283cb535f50c9d1c454a2c58f1683 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 18:08:14 -0700 Subject: [PATCH 054/110] PressRun --- src/components/H.tsx | 8 +-- .../InlineRunButtonShowAllSteps.tsx | 50 ++++++++++++++ src/contents/10.en.tsx | 4 +- src/contents/10.jp.tsx | 4 +- src/contents/12.en.tsx | 6 +- src/contents/12.jp.tsx | 6 +- src/contents/13.en.tsx | 4 +- src/contents/13.jp.tsx | 4 +- src/contents/14.jp.tsx | 8 +-- src/contents/15.jp.tsx | 2 +- src/contents/16.jp.tsx | 2 +- src/contents/4.en.tsx | 8 +-- src/contents/4.jp.tsx | 66 ++++++++++++------- src/contents/5.en.tsx | 18 ++--- src/contents/5.jp.tsx | 12 ++-- src/contents/7.en.tsx | 6 +- src/contents/7.jp.tsx | 6 +- src/contents/8.en.tsx | 4 +- src/contents/8.jp.tsx | 8 +-- src/contents/9.en.tsx | 6 +- src/contents/9.jp.tsx | 6 +- 21 files changed, 152 insertions(+), 86 deletions(-) create mode 100644 src/components/InlineRunButtonShowAllSteps.tsx diff --git a/src/components/H.tsx b/src/components/H.tsx index cd29f5648..10858a22d 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -102,7 +102,7 @@ interface HProps { | { name: 'whatHappensAtTheEndQuestion' } | { name: 'lookAtThisBentoBox'; lowerCase?: true } | { - name: 'pressFastForward' + name: 'pressRun' skipColon?: boolean mentionRightArrow?: boolean girl?: boolean @@ -736,12 +736,12 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { ) } } - if (args.name === 'pressFastForward') { + if (args.name === 'pressRun') { if (locale === 'en') { return ( <> - Press + Press {args.mentionRightArrow || args.skippable || args.skippableToTheStoppingPoint @@ -776,7 +776,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { return ( <> - を押してみて + を押してみて {!args.girl && <>ください} {args.mentionRightArrow || args.skippable || diff --git a/src/components/InlineRunButtonShowAllSteps.tsx b/src/components/InlineRunButtonShowAllSteps.tsx new file mode 100644 index 000000000..cbb0240e2 --- /dev/null +++ b/src/components/InlineRunButtonShowAllSteps.tsx @@ -0,0 +1,50 @@ +/** @jsx jsx */ +import { css, jsx } from '@emotion/core' +import { colors, spaces, fontSizes, fitWithinMobileWidth } from 'src/lib/theme' +import H from 'src/components/H' +import { P } from 'src/components/ContentTags' +import ExpressionRunnerButton from 'src/components/ExpressionRunnerButton' + +const InlineRunButtonShowAllSteps = ({ + children +}: { + children: React.ReactNode +}) => ( +

+ + + + + {children} + +

+) + +export default InlineRunButtonShowAllSteps diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index a5982dc6b..abb2cdf71 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -663,7 +663,7 @@ export default () => (

@@ -991,7 +991,7 @@ export default () => (

- +

) diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index 3c28aa654..6f398c6a7 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -649,7 +649,7 @@ export default () => ( それでは、上記の弁当箱を実行してみましょう！途中まで早送りしてみますね。 @@ -970,7 +970,7 @@ export default () => (

- +

) diff --git a/src/contents/12.en.tsx b/src/contents/12.en.tsx index e5146cc6f..b98625874 100644 --- a/src/contents/12.en.tsx +++ b/src/contents/12.en.tsx @@ -214,7 +214,7 @@ export default () => (

Let’s try running it!{' '} - +

) @@ -373,7 +373,7 @@ export default () => (

Let’s try running it!{' '} - +

) @@ -714,7 +714,7 @@ export default () => ( <>

Let’s run it!{' '} - +

) diff --git a/src/contents/12.jp.tsx b/src/contents/12.jp.tsx index c7cb7b824..43a376464 100644 --- a/src/contents/12.jp.tsx +++ b/src/contents/12.jp.tsx @@ -218,7 +218,7 @@ export default () => (

入れてみると次のようになるよ。 - +

) @@ -385,7 +385,7 @@ export default () => (

入れてみると次のようになるよ。 - +

) @@ -744,7 +744,7 @@ export default () => ( <>

というわけで、 - +

) diff --git a/src/contents/13.en.tsx b/src/contents/13.en.tsx index 4616798b1..57d1585f3 100644 --- a/src/contents/13.en.tsx +++ b/src/contents/13.en.tsx @@ -523,7 +523,7 @@ export default () => ( <>

Let’s run it!{' '} - +

) @@ -553,7 +553,7 @@ export default () => (

- +

) diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index d6e72feb0..873b26ac0 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -509,7 +509,7 @@ export default () => ( あとは、これを {' '} するだけだよ。というわけで、 - +

) @@ -535,7 +535,7 @@ export default () => ( んだ。

- +

) diff --git a/src/contents/14.jp.tsx b/src/contents/14.jp.tsx index de85a4ba0..84e792466 100644 --- a/src/contents/14.jp.tsx +++ b/src/contents/14.jp.tsx @@ -198,7 +198,7 @@ export default () => ( <>

というわけで、 - +

    @@ -376,7 +376,7 @@ export default () => ( <>

    では、続きを見てみよう！ - +

    ) @@ -553,7 +553,7 @@ export default () => ( <>

    再度、🍱 を省略する前の状態に戻したよ。 - +

    ) @@ -728,7 +728,7 @@ export default () => (

    これが最後だよ！ 🍱 を省略する前の状態に戻したので、 - +

    ) diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index 32ab7994c..cbbca9360 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -265,7 +265,7 @@ export default () => ( <>

    では、 - 。 + 。

      diff --git a/src/contents/16.jp.tsx b/src/contents/16.jp.tsx index 890919a4d..af74b694a 100644 --- a/src/contents/16.jp.tsx +++ b/src/contents/16.jp.tsx @@ -511,7 +511,7 @@ export default () => (

      上の弁当箱は、 すると 🅱️ になります。 - +

      diff --git a/src/contents/4.en.tsx b/src/contents/4.en.tsx index 328c4c4e1..e3a162009 100644 --- a/src/contents/4.en.tsx +++ b/src/contents/4.en.tsx @@ -958,12 +958,12 @@ export default () => (

      Here’s the previous example with one item on the top.{' '} - +

      Here’s the previous example with two items on the - top. + top.

      @@ -1144,12 +1144,12 @@ export default () => (

      Here’s the previous example with one item on the top.{' '} - +

      Here’s the previous example with two items on the - top. + top.

      diff --git a/src/contents/4.jp.tsx b/src/contents/4.jp.tsx index a777b8aaf..3986bdff8 100644 --- a/src/contents/4.jp.tsx +++ b/src/contents/4.jp.tsx @@ -11,6 +11,7 @@ import BottomRightBadge from 'src/components/BottomRightBadge' import TopLeftBadgeWrapper from 'src/components/TopLeftBadgeWrapper' import BubbleQuotes from 'src/components/BubbleQuotes' import EmojiSeparator from 'src/components/EmojiSeparator' +import CustomEmoji from 'src/components/CustomEmoji' import Emoji from 'src/components/Emoji' import EmojiWithText from 'src/components/EmojiWithText' import EmojiForLetter from 'src/components/EmojiForLetter' @@ -18,6 +19,7 @@ import * as R from 'src/components/Runners' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' import H from 'src/components/H' import NextLessonButton from 'src/components/NextLessonButton' +import InlineRunButtonShowAllSteps from 'src/components/InlineRunButtonShowAllSteps' export const BasicRules = ({ includeFuncUnbound @@ -886,31 +888,42 @@ export default () => ( ) }, { - title: ( - <> - で見てみましょう - - ), + title: <>全てのステップを見てみましょう, content: ( <>

      - では、最初から最後まで - で見てみましょう。 - 機能を使うと、 - 各ステップを自動で見ていくことができます。 + では、最初から最後まで全てのステップを見てみましょう。こちらの「 + 全ステップを表示 + 」できるボタンを使って + {' '} + すると、各ステップを自動で見ることができます。

      + + このボタンを使うと… +
      +       + 早送りすると、各ステップが自動で見れる} + size="mdsm" + nodes={[ + 🍱, + , + 🍱, + , + 🍱, + , + 🍱 + ]} + description={<>各ステップを自動で見ることができる} />

      こちらは、上にひとつの料理がある例です。 - +

      こちらは、上にふたつの料理がある例です。 - +

      @@ -1058,33 +1071,36 @@ export default () => ( ) }, { - title: ( - <> - - で見てみましょう - - ), + title: <>全てのステップを見てみましょう, content: ( <>

      復習のために、 と{' '} - が一致しなかった場合も、最初から最後まで - で見てみましょう。 + が一致しなかった場合も、最初から最後まで前ステップ見てみましょう。

      早送りで復習しよう！} + size="mdsm" + nodes={[ + 🍱, + , + 🍱, + , + 🍱, + , + 🍱 + ]} + description={<>前ステップを見てみましょう！} />

      こちらは、上にひとつの料理がある例です。 - +

      こちらは、上にふたつの料理がある例です。 - +

      diff --git a/src/contents/5.en.tsx b/src/contents/5.en.tsx index 9291ee16a..e05e037f8 100644 --- a/src/contents/5.en.tsx +++ b/src/contents/5.en.tsx @@ -845,7 +845,7 @@ export default () => ( <>

      Let’s keep going to the end.{' '} - +

      ) @@ -853,7 +853,7 @@ export default () => ( ]} />

      - +

      ( ]} />

      - +

      ( ]} />

      - +

      ( ]} />

      - +

      ( ]} />

      - +

      ( 1’s

      - The rest is simple. + The rest is simple.

      @@ -1810,7 +1810,7 @@ export default () => (

      - The rest is simple. + The rest is simple.

      ( ]} />

      - +

      ( ]} />

      - +

      ( ]} />

      - +

      ( />

      では、 - +

      ( />

      では、 - +

      (

      残りは で見てみましょう。 - +

      @@ -1837,7 +1837,7 @@ export default () => ( />

      では、 - +

      (

      @@ -113,7 +113,7 @@ export const StepTwo = () => (

      @@ -141,7 +141,7 @@ export const StepThree = () => (

      diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index acb28d3b2..33be14695 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -74,7 +74,7 @@ export const StepOne = () => (

      @@ -117,7 +117,7 @@ export const StepTwo = () => (

      @@ -147,7 +147,7 @@ export const StepThree = () => (

      diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index 41f342b58..c292f0d6b 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -593,7 +593,7 @@ export default () => ( <>

      Let’s run it.{' '} - +

      This time, we won’t stop until the end!

      @@ -876,7 +876,7 @@ export default () => ( ]} />

      - +

      ( <>

      まずは実行してみるね。 - +

      今回は、最後まで止まらずに早送りします！

      @@ -945,7 +945,7 @@ export default () => ( ]} />

      - +

      ( // <> //

      // まずは実行してみるね。 -// +// //

      //

      今回は、最後まで止まらずに早送りします！

      // @@ -2175,7 +2175,7 @@ export default () => ( // ]} // /> //

      -// +// //

      // // ( content: ( <>

      - +

      ( ]} />

      - +

      What used last time: @@ -1146,7 +1146,7 @@ export default () => ( <>

      Let’s continue then!{' '} - +

      ) diff --git a/src/contents/9.jp.tsx b/src/contents/9.jp.tsx index 0071e9a97..833e7eefc 100644 --- a/src/contents/9.jp.tsx +++ b/src/contents/9.jp.tsx @@ -152,7 +152,7 @@ export default () => ( <>

      それでは、 - +

      ( ]} />

      - +

      前回実行した弁当箱: @@ -1144,7 +1144,7 @@ export default () => ( <>

      では、最後まで進めてみましょう。 - +

      ) From 63a840e307106ce5d126c504f72dbae31f486f9c Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 18:30:02 -0700 Subject: [PATCH 055/110] Rewrite fastforward for 4 --- src/contents/4.en.tsx | 65 +++++++++++++++++++++++++++---------------- src/contents/4.jp.tsx | 1 - src/contents/9.en.tsx | 3 +- 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/src/contents/4.en.tsx b/src/contents/4.en.tsx index e3a162009..136e7b374 100644 --- a/src/contents/4.en.tsx +++ b/src/contents/4.en.tsx @@ -15,6 +15,8 @@ import BubbleQuotes from 'src/components/BubbleQuotes' import EmojiSeparator from 'src/components/EmojiSeparator' import Emoji from 'src/components/Emoji' import EmojiWithText from 'src/components/EmojiWithText' +import InlineRunButtonShowAllSteps from 'src/components/InlineRunButtonShowAllSteps' +import CustomEmoji from 'src/components/CustomEmoji' import EmojiForLetter from 'src/components/EmojiForLetter' import * as R from 'src/components/Runners' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' @@ -930,35 +932,46 @@ export default () => ( ) }, { - title: ( - <> - Let’s - - ), + title: <>Putting it together, content: ( <>

      To wrap up, let’s go through the entire process{' '} from the beginning to the end.{' '} +

      +

      - We’ll be using the button + We’ll be using the button with the{' '} + “Show every step” functionality , which automatically goes through each step.

      + + If you use this button… + + 🍱, + , + 🍱, + , + 🍱, + , + 🍱 + ]} description={ <> - The button: + You’ll be able to see all steps
      - Automatically goes through each step + automatically } />

      Here’s the previous example with one item on the - top.{' '} - + top.

      @@ -1116,35 +1129,39 @@ export default () => ( ) }, { - title: ( - <> - Let’s - - ), + title: <>Let’s show all the steps, content: ( <>

      - Review Time: Let’s use the{' '} - button again, this time for - cases where{' '} + Review Time: Let’s show all the steps again - this + time for cases where{' '} ’s and{' '} ’s don’t match.

      🍱, + , + 🍱, + , + 🍱, + , + 🍱 + ]} description={ <> - Let’s use the button - again + Let’s see all the steps +
      + from the beginning to the end! } />

      Here’s the previous example with one item on the - top.{' '} - + top.

      diff --git a/src/contents/4.jp.tsx b/src/contents/4.jp.tsx index 3986bdff8..801ef7bea 100644 --- a/src/contents/4.jp.tsx +++ b/src/contents/4.jp.tsx @@ -900,7 +900,6 @@ export default () => (

      このボタンを使うと… -
      ( children: ( <>

      - Let’s continue then!{' '} - + Let’s continue then!

      ) From 807369f4920fc078d8d1bce32277c78614ae547b Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 19:19:12 -0700 Subject: [PATCH 056/110] Fix 5 jp --- src/contents/5.jp.tsx | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/src/contents/5.jp.tsx b/src/contents/5.jp.tsx index 7497a3d6d..3faeeb98c 100644 --- a/src/contents/5.jp.tsx +++ b/src/contents/5.jp.tsx @@ -757,9 +757,7 @@ export default () => ( children: ( <>

      - あとは前回とやり方は変わらない。 - {' '} - で最後まで見てみよう。 + あとは前回とやり方は変わらない。最後まで見てみよう。

      ) @@ -802,10 +800,7 @@ export default () => ( type: 'devil', children: ( <> -

      - では復習のために、最初から最後まで - で見てみよう。 -

      +

      では復習のために、最初から最後まで見てみよう。

      ) } @@ -933,7 +928,7 @@ export default () => ( が残るはずだ。

      - で見てみよう！ + してみよう！

      ) @@ -1361,10 +1356,7 @@ export default () => ( } ]} /> -

      - では、ここからは - で見ていきましょう！ -

      +

      では、最後まで見ていきましょう！

      ( が残るはずだ。

      - で見てみよう！ + してみよう！

      ) @@ -1511,8 +1503,7 @@ export default () => ( のペアからはじめる

      - 残りは - で見てみましょう。 + では、最後まで見てみましょう。

      @@ -1733,10 +1724,7 @@ export default () => ( {' '} はこうなる -

      - 残りは - で見ていきましょう: -

      +

      では、最後まで見ていきましょう:

      ( が残るはずだ。

      - で見てみよう！ + してみよう！

      ) From 556005f7b19de868ee5123d7fc46f55ed9d6b1c7 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 19:23:58 -0700 Subject: [PATCH 057/110] Fix 5 en --- src/contents/5.en.tsx | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/contents/5.en.tsx b/src/contents/5.en.tsx index e05e037f8..638d81382 100644 --- a/src/contents/5.en.tsx +++ b/src/contents/5.en.tsx @@ -891,7 +891,7 @@ export default () => (

      Ok, let’s do a review just in case.

      We’ll run it from the beginning to the end using the{' '} - button. + button.

      ) @@ -993,8 +993,7 @@ export default () => ( at the end.

      - Let’s{' '} - it + Let’s it to check!

      @@ -1428,8 +1427,8 @@ export default () => ( <>

      The rest is simple though. Let’s{' '} - it - from here. + it from + here to the end.

      ) @@ -1515,8 +1514,7 @@ export default () => ( instead of .

      - Let’s{' '} - it + Let’s it to check!

      @@ -1910,8 +1908,7 @@ export default () => ( .

      - Let’s{' '} - it + Let’s it to check!

      From 5c5d6cab69b11e47dfb71487bdbaa674cacbe79a Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 19:30:21 -0700 Subject: [PATCH 058/110] Remove fastForward --- src/components/H.tsx | 20 -------------------- src/contents/10.en.tsx | 9 ++++----- src/contents/10.jp.tsx | 6 +++--- src/contents/13.en.tsx | 7 +++---- src/contents/13.jp.tsx | 9 +++------ src/contents/14.jp.tsx | 8 ++++---- src/contents/15.jp.tsx | 16 ++++++++-------- src/contents/7.en.tsx | 4 ++-- src/contents/7.jp.tsx | 2 +- 9 files changed, 28 insertions(+), 53 deletions(-) diff --git a/src/components/H.tsx b/src/components/H.tsx index 10858a22d..e5ca8fb5b 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -78,7 +78,6 @@ interface HProps { | { name: 'run'; lowerCase?: true } | { name: 'running' } | { name: 'pause' } - | { name: 'fastForward'; lowerCase?: true } | { name: 'reset' } | { name: 'previous' } | { name: 'done' } @@ -438,25 +437,6 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { ) } } - if (args.name === 'fastForward') { - if (locale === 'en') { - return ( - <> - - {args.lowerCase ? 'p' : 'P'}lay ▶️ - - - ) - } else { - return ( - <> - - 早送り ⏩ - - - ) - } - } if (args.name === 'runAndShowAllSteps') { if (locale === 'en') { return ( diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index abb2cdf71..219fa5e54 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -656,8 +656,8 @@ export default () => (

      Let’s run the above lunchbox.{' '} - We’ll it - for a while and pause for an explanation. + We’ll it for a + while and pause for an explanation.

      @@ -748,9 +748,8 @@ export default () => ( became .

      - Now, just{' '} - {' '} - until the end! + Now, let’s {' '} + it until the end!

      ) diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index 6f398c6a7..8f78eb120 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -738,9 +738,9 @@ export default () => ( に変えました。

      - では、最後まで - - してみてください！ + では、 + {' '} + して最後まで見てみましょう！

      ) diff --git a/src/contents/13.en.tsx b/src/contents/13.en.tsx index 57d1585f3..7a5247c9c 100644 --- a/src/contents/13.en.tsx +++ b/src/contents/13.en.tsx @@ -678,15 +678,14 @@ export default () => ( children: ( <>

      - Let’s{' '} - {' '} - the original lunchbox directly! + Let’s the + original lunchbox directly!

        There are so many steps, so we’ll{' '} - change the playback speed to 3x. + increase the playback speed to 3x. {' '} ⏩ ⏩ ⏩ diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index 873b26ac0..44a242c62 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -666,20 +666,17 @@ export default () => ( <>

        では、もともとの弁当箱を - - してみましょう！ + してみましょう！

          ステップ数が非常に多いので、 - - 3倍速で早送りします！ - {' '} + 3倍速で進めます！{' '} ⏩ ⏩ ⏩ - 早送り中は、目に優しくなるように弁当箱を半透明にしています。 + 実行中は、目に優しくなるように弁当箱を半透明にしています。 diff --git a/src/contents/14.jp.tsx b/src/contents/14.jp.tsx index 84e792466..be5dbf0f8 100644 --- a/src/contents/14.jp.tsx +++ b/src/contents/14.jp.tsx @@ -117,7 +117,7 @@ export default () => ( <>

          今回は、前回サヤが考えた弁当箱を - して、 + して、 途中、弁当箱がどう変化するかを確認してみる @@ -139,7 +139,7 @@ export default () => ( /> 前回の弁当箱は、 - すると… + すると… (

          そして - {' '} - していくと、終了直前に以下のようになった + {' '} + すると、終了直前に以下のようになった よね。

          diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index cbbca9360..ce80765b7 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -490,7 +490,7 @@ export default () => ( に変換できる弁当箱を{' '} と{' '} に入れて、 - してみよう。 + してみよう。

          @@ -1152,7 +1152,7 @@ export default () => ( <>

          これを - してみよう！ + してみよう！

          {/* TODO: NOTE - we skip a lot of steps */}
            @@ -1207,8 +1207,8 @@ export default () => ( の階乗を自動で計算してくれるんだ。

            - というわけで、最後まで - してみよう！ + というわけで、 + して最後まで見てみよう！

            ) @@ -1224,8 +1224,8 @@ export default () => ( <>

            というわけで、先ほどの弁当箱は - {' '} - すると以下のように変化することで、 + {' '} + すると、以下のように変化することで、 {' '} の階乗を自動で計算してくれるんだ。

            @@ -1238,7 +1238,7 @@ export default () => ( 上の部分に を追加
            して - すると… + すると… @@ -1308,7 +1308,7 @@ export default () => ( <>

            これも - してみよう！ + してみよう！

            ) diff --git a/src/contents/7.en.tsx b/src/contents/7.en.tsx index 6280f87d6..3e34884cb 100644 --- a/src/contents/7.en.tsx +++ b/src/contents/7.en.tsx @@ -58,7 +58,7 @@ export const StepOne = () => ( children: ( <>

            - Let’s it! + Let’s it!

            First:{' '} @@ -1316,7 +1316,7 @@ export default () => ( { title: ( <> - Let’s + Let’s it! ), content: ( diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index 33be14695..a46f8c217 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -55,7 +55,7 @@ export const StepOne = () => ( <>

            それでは、 - していきましょう！ + しましょう！

            まず、 From a89e0b02937121d460424425240e09bda2d78a88 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 19:37:00 -0700 Subject: [PATCH 059/110] =?UTF-8?q?Remove=20=E6=97=A9=E9=80=81=E3=82=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/contents/10.jp.tsx | 6 ++---- src/contents/14.jp.tsx | 12 ++++++------ src/contents/15.jp.tsx | 6 +++--- src/contents/7.jp.tsx | 4 ++-- src/contents/8.jp.tsx | 8 ++++---- src/contents/9.jp.tsx | 2 +- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index 8f78eb120..54d78a905 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -646,7 +646,7 @@ export default () => ( content: ( <>

            - それでは、上記の弁当箱を実行してみましょう！途中まで早送りしてみますね。 + それでは、上記の弁当箱を実行してみましょう！途中まで進めてみますね。 (

              今回は、 - - 最後まで止まらずに早送りするね！ - + 最後まで止まらずに実行するね！ 複雑なので、 diff --git a/src/contents/14.jp.tsx b/src/contents/14.jp.tsx index be5dbf0f8..367bf27cd 100644 --- a/src/contents/14.jp.tsx +++ b/src/contents/14.jp.tsx @@ -167,7 +167,7 @@ export default () => (

              なるほど、 - 早送りをすることで、途中で何が起きているか確かめてみようってことだね。 + 途中で何が起きているか確かめてみようってことだね。

              @@ -177,7 +177,7 @@ export default () => ( type: 'saya', children: ( <> -

              それじゃあ、早送りしてみよう！

              +

              それじゃあ、実行してみよう！

              ) } @@ -187,7 +187,7 @@ export default () => ( ) }, { - title: <>早送りしてみる, + title: <>実行してみる, content: ( <> (

              そう。つまり上の「 - 」を使った計算箱は、今回早送りした弁当箱で再現できるということなんだ。 + 」を使った計算箱は、今回実行した弁当箱で再現できるということなんだ。

              ) @@ -1012,7 +1012,7 @@ export default () => ( children: ( <>

              - 上の弁当箱も早送りすると、先ほどと同じように、終了直前に以下のようになる。だから、繰り返しの機能と同じことができるんだ。 + 上の弁当箱も実行すると、先ほどと同じように、終了直前に以下のようになる。だから、繰り返しの機能と同じことができるんだ。

              ) @@ -1022,7 +1022,7 @@ export default () => ( 先ほどと同じように、
              - 早送りが終わる直前に + 実行が終わる直前に
              以下のようになり…               diff --git a/src/contents/15.jp.tsx b/src/contents/15.jp.tsx index ce80765b7..f81a7f28c 100644 --- a/src/contents/15.jp.tsx +++ b/src/contents/15.jp.tsx @@ -260,7 +260,7 @@ export default () => ( ) }, { - title: <>早送りしてみると…, + title: <>実行してみると…, content: ( <>

              @@ -1158,11 +1158,11 @@ export default () => (

                ステップ数が非常に多いので、途中のいくつかのステップを省略した上で、 - 3倍速で早送りするぞ。{' '} + 3倍速で進めるぞ。{' '} ⏩ ⏩ ⏩ - 早送り中は、目に優しくなるように弁当箱を半透明にしている。 + 実行中は、目に優しくなるように弁当箱を半透明にしている。 待てない場合は、「 diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index a46f8c217..290fd9818 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -626,7 +626,7 @@ export default () => ( } }, { - title: <>早送りしてみよう, + title: <>実行してみよう, content: ( <> @@ -2122,7 +2122,7 @@ export default () => ( // } // }, // { -// title: <>早送りしてみよう, +// title: <>実行してみよう, // content: ( // <> // diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 4a0b05905..62371d839 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -666,7 +666,7 @@ export default () => ( まずは実行してみるね。

                -

                今回は、最後まで止まらずに早送りします！

                +

                今回は、最後まで止まらずに実行します！

                ) } @@ -1185,7 +1185,7 @@ export default () => ( の計算箱を再現できる

                - 上の弁当箱は実行に時間がかかるので、ここでは早送りはしませんが、 + 上の弁当箱を実行するのは、時間がかかるので今回は行いませんが、 {' '} ボタンを押すと、答えが {' '} @@ -1896,7 +1896,7 @@ export default () => ( // まずは実行してみるね。 // //

                -//

                今回は、最後まで止まらずに早送りします！

                +//

                今回は、最後まで止まらずに実行します！

                // // ) // } @@ -2415,7 +2415,7 @@ export default () => ( // の計算箱を再現できる // //

                -// 上の弁当箱は実行に時間がかかるので、ここでは早送りはしませんが、 +// 上の弁当箱を実行するのは、時間がかかるので今回は行いませんが、 // // {' '} // ボタンを押すと、答えが {' '} diff --git a/src/contents/9.jp.tsx b/src/contents/9.jp.tsx index 833e7eefc..9cf3580ca 100644 --- a/src/contents/9.jp.tsx +++ b/src/contents/9.jp.tsx @@ -1292,7 +1292,7 @@ export default () => ( 暗記する必要はありません。 - 早送り中に自動で行われますから。 + 実行中に自動で行われますから。

                なんとなく「 From 5f048fb843dadbfa666a5c7fb70e4ff0309c878c Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 21:27:00 -0700 Subject: [PATCH 060/110] Continue with 8 --- scripts/lib/initialExpressionContainers.ts | 8 +- scripts/lib/runnerConfigs.ts | 9 +- src/contents/8.jp.tsx | 184 +++- src/lib/runners/awwn.json | 51 +- src/lib/runners/nlbn.json | 945 ++++++--------------- src/lib/runners/spga.json | 45 +- src/lib/runners/zsxo.json | 47 +- 7 files changed, 482 insertions(+), 807 deletions(-) diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 510f83c61..2e57bf468 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -281,7 +281,7 @@ export const qyqi = initializeExpressionContainer( numberParamsHighlightNumber('d', 'b', 1) ) export const entt = initializeExpressionContainer( - numberParamsHighlightNumber('f', 'g', 2) + numberParamsHighlightNumber('f', 'g', 1) ) export const dupe = initializeExpressionContainer({ @@ -1026,7 +1026,7 @@ export const fhyo = initializeExpressionContainer( export const ngth = initializeExpressionContainer([ succParams('a', 'b', 'c'), - numberParams('f', 'g', 2) + numberParams('f', 'g', 1) ]) export const disc = initializeExpressionContainer( @@ -1265,10 +1265,6 @@ export const qrvj = initializeExpressionContainer({ shorthandNumberAfterConvert: 'trueCase' }) -export const zfym = initializeExpressionContainer( - numberParamsHighlightNumber('f', 'g', 1) -) - export const nnqw = initializeExpressionContainer( isZeroParams( 'a', diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 94d3e71f4..ffd82f5ea 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1420,7 +1420,12 @@ export const rico: ExpressionRunnerShorthandConfig = { export const awwn: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.ngth, - showPriorities: true + showPriorities: true, + highlightOverrides: { + a: 'highlighted', + b: 'highlighted', + c: 'highlighted' + } } export const nlbn: ExpressionRunnerShorthandConfig = { @@ -1948,7 +1953,7 @@ export const bndi: ExpressionRunnerShorthandConfig = { export const ooya: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.zfym, + initialExpressionContainer: initialExpressionContainers.entt, showPriorities: true, bottomRightBadgeOverrides: { f: '🅰️', g: '🅱️' } } diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 62371d839..ff70a668d 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -468,7 +468,7 @@ export default () => ( に変換できる弁当箱と、
                - 👧🏻 サヤちゃんの弁当箱と組み合わせて… + 👧🏻 サヤちゃんの弁当箱を組み合わせて…                 @@ -478,7 +478,7 @@ export default () => ( に変換できる弁当箱と、
                - 👧🏻 サヤちゃんの弁当箱と組み合わせて… + 👧🏻 サヤちゃんの弁当箱を組み合わせて…                 @@ -495,8 +495,10 @@ export default () => ( 先ほどは、 が {' '} になったけど、 - と {' '} - はどうなるだろう？ + + と{' '} + はどうなるだろう？ +

                ) @@ -539,6 +541,89 @@ export default () => ( } /> + +

                + では、それぞれ {' '} + してみましょう！ +

                + + ) + } + ]} + /> + + ) + }, + { + title: ( + <> + は何になる？ + + ), + content: ( + <> + +

                + まず、 + に変換できる弁当箱と、 + 👧🏻{' '} + サヤちゃんの弁当箱を組み合わせた場合を見てみましょう！ +

                + + ) + } + ]} + /> + + に変換できる弁当箱と、 +
                + 👧🏻 サヤちゃんの弁当箱を組み合わせて… +                 + + + するとどうなる？ + + +

                + ここでは、こちらの {' '} + に変換できる弁当箱を使ってみます！ +

                + + + +

                + これを 👧🏻{' '} + サヤちゃんの弁当箱と合体させてみます。 +

                + + ) + } + ]} + /> + + 👧🏻 サヤちゃんの弁当箱と合体 + ( <>

                では、 - してみましょう！ + {' '} + してみましょう！今回は、途中で止まりません。 + +

                + + ) + } + ]} + /> + + +

                + 最後に残ったこちらの弁当箱は、 + に変換できる弁当箱です！ +

                + + ) + } + ]} + /> + + + + +

                ということは…

                +
                  + + + に変換できる弁当箱が、 + + + + + {' '} + に変換できる弁当箱になったのか？ + + +
                + + ) + } + ]} + /> + + に変換できる弁当箱と、 +
                + 👧🏻 サヤちゃんの弁当箱を組み合わせて… +                 + + + すると、 +
                + に変換できる弁当箱になる +                 + +

                + つまり、👧🏻{' '} + サヤちゃんの弁当箱を使うことで、 + が {' '} + になった、というわけですね。

                ) } ]} /> + , + , + + ]} + description={ + <> + が {' '} + になった + + } + /> ) }, diff --git a/src/lib/runners/awwn.json b/src/lib/runners/awwn.json index 41e75b11e..f99b56c41 100644 --- a/src/lib/runners/awwn.json +++ b/src/lib/runners/awwn.json @@ -32,38 +32,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -222,7 +201,7 @@ "priority": 1, "maxNestedFunctionDepth": 3 }, - "numLeafNodes": 7, + "numLeafNodes": 6, "containerState": "ready", "previouslyChangedExpressionState": "default" } @@ -237,7 +216,11 @@ "hideFuncUnboundBadgeOnExplanation": false, "highlightOverridesCallArgAndFuncUnboundOnly": false, "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, + "highlightOverrides": { + "a": "highlighted", + "b": "highlighted", + "c": "highlighted" + }, "highlightOverrideActiveAfterStart": false, "highlightFunctions": false, "showBottomProgressBar": false diff --git a/src/lib/runners/nlbn.json b/src/lib/runners/nlbn.json index c2486e177..9fb285f0e 100644 --- a/src/lib/runners/nlbn.json +++ b/src/lib/runners/nlbn.json @@ -32,38 +32,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -222,7 +201,7 @@ "priority": 1, "maxNestedFunctionDepth": 3 }, - "numLeafNodes": 7, + "numLeafNodes": 6, "containerState": "ready", "previouslyChangedExpressionState": "default" }, @@ -258,38 +237,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -451,7 +409,7 @@ "previouslyChangedExpressionState": "active", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 7 + "numLeafNodes": 6 }, { "expression": { @@ -485,38 +443,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -678,7 +615,7 @@ "previouslyChangedExpressionState": "showFuncUnbound", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 7 + "numLeafNodes": 6 }, { "expression": { @@ -712,38 +649,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -906,7 +822,7 @@ "matchExists": true, "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 7 + "numLeafNodes": 6 }, { "expression": { @@ -940,38 +856,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -1103,38 +998,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -1208,7 +1082,7 @@ "previouslyChangedExpressionState": "betaReducePreviewAfter", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 9 + "numLeafNodes": 7 }, { "expression": { @@ -1242,38 +1116,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -1405,39 +1258,18 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 }, "func": { "name": "f", @@ -1510,7 +1342,7 @@ "previouslyChangedExpressionState": "betaReducePreviewCrossed", "activePriority": 1, "containerState": "stepped", - "numLeafNodes": 9 + "numLeafNodes": 7 }, { "expression": { @@ -1602,38 +1434,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -1699,7 +1510,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 1, "containerState": "ready", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -1791,38 +1602,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -1888,7 +1678,7 @@ "previouslyChangedExpressionState": "active", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -1980,38 +1770,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -2077,7 +1846,7 @@ "previouslyChangedExpressionState": "showFuncUnbound", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -2169,38 +1938,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -2267,7 +2015,7 @@ "matchExists": true, "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -2359,38 +2107,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -2456,7 +2183,7 @@ "previouslyChangedExpressionState": "betaReducePreviewAfter", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -2548,38 +2275,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -2645,7 +2351,7 @@ "previouslyChangedExpressionState": "betaReducePreviewCrossed", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 6 + "numLeafNodes": 5 }, { "expression": { @@ -2708,38 +2414,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -2797,7 +2482,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 2, "containerState": "ready", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -2860,38 +2545,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -2949,7 +2613,7 @@ "previouslyChangedExpressionState": "active", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -3012,38 +2676,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -3101,7 +2744,7 @@ "previouslyChangedExpressionState": "showFuncBound", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -3164,38 +2807,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -3254,7 +2876,7 @@ "matchExists": true, "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -3317,38 +2939,17 @@ }, "body": { "arg": { - "arg": { - "name": "c", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "c", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -3406,7 +3007,7 @@ "previouslyChangedExpressionState": "betaReducePreviewAfter", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -3469,38 +3070,17 @@ }, "body": { "arg": { - "arg": { - "name": "c", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "c", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -3558,7 +3138,7 @@ "previouslyChangedExpressionState": "betaReducePreviewCrossed", "activePriority": 2, "containerState": "stepped", - "numLeafNodes": 5 + "numLeafNodes": 4 }, { "expression": { @@ -3590,39 +3170,18 @@ "body": { "arg": { "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -3672,7 +3231,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 2, "containerState": "done", - "numLeafNodes": 4 + "numLeafNodes": 3 } ], "speed": 1.25, diff --git a/src/lib/runners/spga.json b/src/lib/runners/spga.json index a85867e8c..be58209b1 100644 --- a/src/lib/runners/spga.json +++ b/src/lib/runners/spga.json @@ -29,38 +29,17 @@ }, "body": { "arg": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -88,7 +67,7 @@ "type": "function", "maxNestedFunctionDepth": 2 }, - "numLeafNodes": 3, + "numLeafNodes": 2, "containerState": "ready", "previouslyChangedExpressionState": "default" } diff --git a/src/lib/runners/zsxo.json b/src/lib/runners/zsxo.json index 798da14c9..e12071039 100644 --- a/src/lib/runners/zsxo.json +++ b/src/lib/runners/zsxo.json @@ -30,39 +30,18 @@ "body": { "arg": { "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, "maxNestedFunctionDepth": 0 }, "func": { @@ -112,7 +91,7 @@ "previouslyChangedExpressionState": "default", "activePriority": 2, "containerState": "done", - "numLeafNodes": 4 + "numLeafNodes": 3 } ], "speed": 1, From 3376a920e0d090172f8abf7ccac3806627ce7a83 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 20 Oct 2019 21:44:55 -0700 Subject: [PATCH 061/110] Continue with 8 --- src/contents/8.jp.tsx | 79 ++++--------------------------------------- 1 file changed, 7 insertions(+), 72 deletions(-) diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index ff70a668d..1ad0376cf 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -435,27 +435,12 @@ export default () => ( type: 'dog', children: ( <> +

                では、ここで疑問なのですが…

                - では、ここで疑問なのですが…{' '} 👧🏻 サヤちゃんの弁当箱を、 - -

                -
                  - - - に変換できる弁当箱や、 - - - - - {' '} - に変換できる弁当箱と組み合わせて、 - - -
                -

                - + {' '} + に変換できる弁当箱と組み合わせて {' '} すると、結果はどうなるでしょう？ @@ -474,16 +459,6 @@ export default () => ( するとどうなる？ -

                - - に変換できる弁当箱と、 -
                - 👧🏻 サヤちゃんの弁当箱を組み合わせて… -                 - - - するとどうなる？ - ( が {' '} になったけど、 - と{' '} - はどうなるだろう？ + はどうなるだろう？

                @@ -525,19 +499,9 @@ export default () => ( , ❓ ]} - noBottomMargin - /> - , - , - ❓ - ]} description={ <> - や {' '} - は何になる？ + は何になる？ } /> @@ -547,10 +511,7 @@ export default () => ( type: 'dog', children: ( <> -

                - では、それぞれ {' '} - してみましょう！ -

                +

                では、試してみましょう！

                ) } @@ -574,33 +535,7 @@ export default () => ( children: ( <>

                - まず、 - に変換できる弁当箱と、 - 👧🏻{' '} - サヤちゃんの弁当箱を組み合わせた場合を見てみましょう！ -

                - - ) - } - ]} - /> - - に変換できる弁当箱と、 -
                - 👧🏻 サヤちゃんの弁当箱を組み合わせて… -                 - - - するとどうなる？ - - -

                - ここでは、こちらの {' '} + 今回は、こちらの {' '} に変換できる弁当箱を使ってみます！

                From 92990b4dbb45ae5f1da542d2db18a4d88d2c7265 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 21 Oct 2019 15:20:55 -0700 Subject: [PATCH 062/110] Continue with 8 --- scripts/lib/initialExpressionContainers.ts | 2 + scripts/lib/runnerConfigs.ts | 6 + src/components/Runners/Ymtp.tsx | 12 + src/components/Runners/index.ts | 1 + src/components/VariableExpressionBox.tsx | 5 + src/contents/1.en.tsx | 13 +- src/contents/1.jp.tsx | 13 +- src/contents/8.jp.tsx | 294 +++++++++++++++++++++ src/lib/letterEmojiMappingJson.json | 1 + src/lib/runners/ymtp.json | 35 +++ src/types/VariableNames.ts | 1 + 11 files changed, 369 insertions(+), 14 deletions(-) create mode 100644 src/components/Runners/Ymtp.tsx create mode 100644 src/lib/runners/ymtp.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 2e57bf468..37d35c96e 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1085,6 +1085,8 @@ export const henz = initializeExpressionContainer([ numberParams('d', { name: 'e', highlighted: true }, 1) ]) +export const tsms = initializeExpressionContainer('blankNumberPlusOne') + export const kipz = initializeExpressionContainer([ { arg: 'a', diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index ffd82f5ea..0588c16d9 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1225,6 +1225,12 @@ export const qsoa: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const ymtp: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.tsms, + showPriorities: true +} + export const qrgc: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.cyhx, diff --git a/src/components/Runners/Ymtp.tsx b/src/components/Runners/Ymtp.tsx new file mode 100644 index 000000000..447fe7319 --- /dev/null +++ b/src/components/Runners/Ymtp.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/ymtp.json' + +const Ymtp = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Ymtp diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index e9b1b11be..09d8e9c3a 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -184,6 +184,7 @@ export { default as Vfdw } from 'src/components/Runners/Vfdw' export { default as Jiua } from 'src/components/Runners/Jiua' export { default as Aone } from 'src/components/Runners/Aone' export { default as Qsoa } from 'src/components/Runners/Qsoa' +export { default as Ymtp } from 'src/components/Runners/Ymtp' export { default as Qrgc } from 'src/components/Runners/Qrgc' export { default as Jxvy } from 'src/components/Runners/Jxvy' export { default as Lwoq } from 'src/components/Runners/Lwoq' diff --git a/src/components/VariableExpressionBox.tsx b/src/components/VariableExpressionBox.tsx index 00ff96769..b16b948fc 100644 --- a/src/components/VariableExpressionBox.tsx +++ b/src/components/VariableExpressionBox.tsx @@ -285,6 +285,11 @@ const VariableEmoji = ({ expression }: VariableExpressionBoxProps) => { ) : expression.shorthandFunc === 'pred' && expression.highlightType !== 'removed' ? ( + ) : expression.name === 'blankNumberPlusOne' ? ( + <> + {' '} + ➕ + ) : customEmojiToComponent[ expression.name as keyof typeof customEmojiToComponent ] && expression.highlightType !== 'removed' ? ( diff --git a/src/contents/1.en.tsx b/src/contents/1.en.tsx index 347ae89a9..dcf9e24c8 100644 --- a/src/contents/1.en.tsx +++ b/src/contents/1.en.tsx @@ -193,13 +193,12 @@ export default () => ( ➕ .
              - , - ➕, - - ]} - /> + + If you it, +
              + the result will be {' '} + ➕ . +

              This is the first feature of mathbox:{' '} diff --git a/src/contents/1.jp.tsx b/src/contents/1.jp.tsx index 60a571fbe..367f1b887 100644 --- a/src/contents/1.jp.tsx +++ b/src/contents/1.jp.tsx @@ -194,13 +194,12 @@ export default () => (

            ということです。

            - , - ➕, - - ]} - /> + + すると結果は +
            + ➕{' '} + になる +

            これが、計算箱に備わっている機能のひとつ、「 diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 1ad0376cf..70fb26b74 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -23,6 +23,24 @@ import { Problem, StepOne, StepTwo, StepThree } from 'src/contents/7.jp' import EmojiWithText from 'src/components/EmojiWithText' import NextLessonButton from 'src/components/NextLessonButton' +const BlankNumberPlusOne = () => ( + <> + + 👧🏻 サヤちゃんの弁当箱と、 +
            + に変換できる弁当箱を +
            + 合体させて実行すると、 +             + + + ➕{' '} + に
            + 変換できる弁当箱になる +             + +) + export default () => ( ( ) }, + { + title: <>1を足すことができる, + content: ( + <> + +

            + つまり、👧🏻 サヤちゃんの弁当箱を使うと、 +

            +
              + + + が{' '} + になり、 + + + + + が{' '} + になります。 + + +
            + , + , + + ]} + noBottomMargin + /> + , + , + + ]} + noTopMargin + description={ + <> + が{' '} + に、 + が{' '} + に + + } + /> +

            つまり、どういうことか分かりますか？

            + + ) + }, + { + type: 'saya', + children: ( + <> +

            + もしかして… + + を足すことができるのかな？ + +

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            サヤちゃん、その通りです！

            + + ) + }, + { + type: 'thinking', + children: ( + <> +

            え、どういうこと？

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            + つまり、 + + 仮に 👧🏻 サヤちゃんの弁当箱と{' '} + {' '} + に変換できる弁当箱を合体させて実行すると、 + +

            +

            + + 結果は {' '} + ➕ {' '} + に変換できる弁当箱になる + + 、というわけです！ +

            + + ) + } + ]} + /> + + +

            + が{' '} + ➕{' '} + になるから、「 + 1を足すことができる + 」というわけですね。 +

            + + ) + } + ]} + /> + , + , + , + ➕, + + ]} + description={ + <> + が{' '} + ➕{' '} + になる + + } + /> + + ) + }, + { + title: ( + <> + 計算箱の と同じことができる？ + + ), + content: ( + <> + +

            + ここで思い出してほしいのですが…計算箱にも「 + + 」がありますよね。 +

            +

            + 計算箱ではこれを使うことで、何らかの数字に1を足すことができます。 +

            + + ) + } + ]} + /> + + 計算箱は、「 + + 」を使うことで… + + + 何らかの数字に1を足すことができる + +

            + 今回学んだのは、 + + 「1を足す」という計算は、弁当箱でも行うことができる + + 、ということです。 +

            + + ) + } + ]} + /> + , + 🍱, + + ]} + description={ + <> + 「1を足す」という計算は、 +
            + 弁当箱でも行うことができる + + } + /> + +

            + 弁当箱を使う場合は、 + + の代わりに{' '} + 👧🏻 サヤちゃんの弁当箱を使う + + ことで、1を足す計算を行うことができます。 +

            + + ) + } + ]} + /> + + + +

            + つまり、 + + 計算箱の「 + + 」は、弁当箱を使って「再現」できる + + ということなんです。 +

            + + ) + } + ]} + /> + , + , + , + 🍱, + + ]} + description={ + <> + 計算箱の「 + + 」は、 +
            + 弁当箱で「再現 + 」することができる + + } + /> + + ) + }, { title: ( <> diff --git a/src/lib/letterEmojiMappingJson.json b/src/lib/letterEmojiMappingJson.json index ae84353c5..326590bc0 100644 --- a/src/lib/letterEmojiMappingJson.json +++ b/src/lib/letterEmojiMappingJson.json @@ -31,6 +31,7 @@ "Amult": "❓", "Bsingle": "❓", "blankNumber": "❓", + "blankNumberPlusOne": "❓", "shorthandFunc": "❓", "questionFoodGrey": "❓", "C": "❓", diff --git a/src/lib/runners/ymtp.json b/src/lib/runners/ymtp.json new file mode 100644 index 000000000..6fc409603 --- /dev/null +++ b/src/lib/runners/ymtp.json @@ -0,0 +1,35 @@ +{ + "expressionContainers": [ + { + "expression": { + "name": "blankNumberPlusOne", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 1, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/types/VariableNames.ts b/src/types/VariableNames.ts index 3b8d8aeb7..2cf8a0bb8 100644 --- a/src/types/VariableNames.ts +++ b/src/types/VariableNames.ts @@ -31,6 +31,7 @@ export type VariableNames = | 'Amult' | 'Bsingle' | 'blankNumber' + | 'blankNumberPlusOne' | 'shorthandFunc' | 'questionFoodGrey' | 'C' From 2067d63003f4c3209ae5c72d07a7df7d641e4c0d Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 21 Oct 2019 16:06:13 -0700 Subject: [PATCH 063/110] Continue with 8 --- scripts/lib/initialExpressionContainers.ts | 7 + scripts/lib/runnerConfigs.ts | 32 ++ src/components/Runners/Byaf.tsx | 12 + src/components/Runners/Caem.tsx | 12 + src/components/Runners/Ehsw.tsx | 12 + src/components/Runners/Ifqp.tsx | 12 + src/components/Runners/index.ts | 4 + src/contents/8.jp.tsx | 193 +++++++- src/lib/runners/byaf.json | 512 +++++++++++++++++++++ src/lib/runners/caem.json | 381 +++++++++++++++ src/lib/runners/ehsw.json | 113 +++++ src/lib/runners/ifqp.json | 155 +++++++ 12 files changed, 1444 insertions(+), 1 deletion(-) create mode 100644 src/components/Runners/Byaf.tsx create mode 100644 src/components/Runners/Caem.tsx create mode 100644 src/components/Runners/Ehsw.tsx create mode 100644 src/components/Runners/Ifqp.tsx create mode 100644 src/lib/runners/byaf.json create mode 100644 src/lib/runners/caem.json create mode 100644 src/lib/runners/ehsw.json create mode 100644 src/lib/runners/ifqp.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 37d35c96e..df9af1ccd 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -277,6 +277,9 @@ export const dqgs = initializeExpressionContainer(numberParams('f', 'g', 2)) export const zdlx = initializeExpressionContainer( numberParamsHighlightNumber('d', 'e', 1) ) +export const aocc = initializeExpressionContainer( + numberParamsHighlightNumber('d', 'e', 2) +) export const qyqi = initializeExpressionContainer( numberParamsHighlightNumber('d', 'b', 1) ) @@ -1024,6 +1027,10 @@ export const fhyo = initializeExpressionContainer( numberParamsHighlightNumber('b', 'c', 3) ) +export const yywl = initializeExpressionContainer( + numberParamsHighlightNumber('b', 'c', 4) +) + export const ngth = initializeExpressionContainer([ succParams('a', 'b', 'c'), numberParams('f', 'g', 1) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 0588c16d9..4a9aa4bba 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1171,6 +1171,13 @@ export const rbup: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { d: '🅰️', e: '🅱️' } } +export const ehsw: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.aocc, + showPriorities: true, + bottomRightBadgeOverrides: { d: '🅰️', e: '🅱️' } +} + export const cmla: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.qyqi, @@ -1456,6 +1463,13 @@ export const nngz: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { c: '🅱️', b: '🅰️' } } +export const ifqp: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.yywl, + showPriorities: true, + bottomRightBadgeOverrides: { c: '🅱️', b: '🅰️' } +} + export const nvqu: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.disc, @@ -1515,6 +1529,24 @@ export const dyoq: ExpressionRunnerShorthandConfig = { convert: 'toMathBoxPlay' } +export const caem: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.jxur, + showPriorities: true, + highlightOverrides: { + a: 'highlighted', + b: 'highlighted', + c: 'highlighted' + } +} + +export const byaf: ExpressionRunnerShorthandConfig = { + runner: 'runButtonOnly', + initialExpressionContainer: initialExpressionContainers.jxur, + showPriorities: true, + skipAlphaConvert: true +} + export const xhdq: ExpressionRunnerShorthandConfig = { runner: 'predefined', initialExpressionContainers: [ diff --git a/src/components/Runners/Byaf.tsx b/src/components/Runners/Byaf.tsx new file mode 100644 index 000000000..d0249896d --- /dev/null +++ b/src/components/Runners/Byaf.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/byaf.json' + +const Byaf = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Byaf diff --git a/src/components/Runners/Caem.tsx b/src/components/Runners/Caem.tsx new file mode 100644 index 000000000..6fef996ab --- /dev/null +++ b/src/components/Runners/Caem.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/caem.json' + +const Caem = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Caem diff --git a/src/components/Runners/Ehsw.tsx b/src/components/Runners/Ehsw.tsx new file mode 100644 index 000000000..71766935e --- /dev/null +++ b/src/components/Runners/Ehsw.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/ehsw.json' + +const Ehsw = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Ehsw diff --git a/src/components/Runners/Ifqp.tsx b/src/components/Runners/Ifqp.tsx new file mode 100644 index 000000000..5399b0b7c --- /dev/null +++ b/src/components/Runners/Ifqp.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/ifqp.json' + +const Ifqp = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Ifqp diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 09d8e9c3a..1159be2e0 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -176,6 +176,7 @@ export { default as Dvfg } from 'src/components/Runners/Dvfg' export { default as Hkbs } from 'src/components/Runners/Hkbs' export { default as Fxde } from 'src/components/Runners/Fxde' export { default as Rbup } from 'src/components/Runners/Rbup' +export { default as Ehsw } from 'src/components/Runners/Ehsw' export { default as Cmla } from 'src/components/Runners/Cmla' export { default as Ilvq } from 'src/components/Runners/Ilvq' export { default as Spga } from 'src/components/Runners/Spga' @@ -215,6 +216,7 @@ export { default as Awwn } from 'src/components/Runners/Awwn' export { default as Nlbn } from 'src/components/Runners/Nlbn' export { default as Zsxo } from 'src/components/Runners/Zsxo' export { default as Nngz } from 'src/components/Runners/Nngz' +export { default as Ifqp } from 'src/components/Runners/Ifqp' export { default as Nvqu } from 'src/components/Runners/Nvqu' export { default as Blvt } from 'src/components/Runners/Blvt' export { default as Oykb } from 'src/components/Runners/Oykb' @@ -223,6 +225,8 @@ export { default as Udxn } from 'src/components/Runners/Udxn' export { default as Cjxe } from 'src/components/Runners/Cjxe' export { default as Oqpi } from 'src/components/Runners/Oqpi' export { default as Dyoq } from 'src/components/Runners/Dyoq' +export { default as Caem } from 'src/components/Runners/Caem' +export { default as Byaf } from 'src/components/Runners/Byaf' export { default as Xhdq } from 'src/components/Runners/Xhdq' export { default as Nhqo } from 'src/components/Runners/Nhqo' export { default as Ybne } from 'src/components/Runners/Ybne' diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 70fb26b74..28723fc8b 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -916,7 +916,6 @@ export default () => ( } ]} /> - ( ) }, + { + title: <>もっと複雑な計算箱も再現できる, + content: ( + <> + +

            + もちろん、もっと複雑な計算箱も弁当箱で再現できます。 +

            +

            + たとえば、初級その1に登場したこちらの計算箱をご覧ください。 + すると、結果は{' '} + になります。 +

            + + ) + } + ]} + /> + + +

            + これを弁当箱で「再現 + 」するには、どうすればいいか分かりますか？ +

            + + ) + }, + { + type: 'saya', + children: ( + <> +

            + 分かった！まず、 + に変換できる弁当箱を用意して… +

            + + ) + } + ]} + /> + + + + +

            + そして、先ほどの 👧🏻 サヤの弁当箱と「 + 2回 + 」組み合わせればいいんじゃないかな？ +

            + + ) + } + ]} + /> + + に変換できる弁当箱を、 +
            + 👧🏻 サヤちゃんの弁当箱と +
            「2回 + 」組み合わせることで、 +
            + {' '} + を再現する +             + +

            + 正解です！では、 + を押してみてください。 +

            +

            + ( + + 今回は時間省略のため、途中のステップを見せるのは省略します！ + + ) +

            + + ) + } + ]} + /> + + +

            + 最後に残ったこちらの弁当箱は、 + に変換できる弁当箱です！ +

            + + ) + } + ]} + /> + + + +

            + これを弁当箱で再現するには、 + + に変換できる弁当箱と、 + + がある弁当箱を「2個 + 」合体させればいい + + のです。 +

            + + + に変換できる弁当箱と +
            + + がある弁当箱を「2個」
            + 合体すれば、 + {' '} + の計算箱を再現できる +             +

            + 上の弁当箱を実行するのは、時間がかかるので今回は行いませんが、 + + {' '} + ボタンを押すと、答えが {' '} + になるのを確認できます。 + +

            +
            +

            + まとめると、 + + 計算箱の「 + + 」は、弁当箱で再現することができる + + のです。このポイントさえ覚えていただければ、細かいことは分からなくても大丈夫です！ +

            + , + , + , + 🍱, + + ]} + description={ + <> + 計算箱の「 + + 」は、 +
            + 弁当箱で「再現 + 」することができる + + } + /> + + ) + }, { title: ( <> diff --git a/src/lib/runners/byaf.json b/src/lib/runners/byaf.json new file mode 100644 index 000000000..b9b51ef11 --- /dev/null +++ b/src/lib/runners/byaf.json @@ -0,0 +1,512 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 3 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 11, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2, + 3, + 4 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 4 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 4, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 3, + "containerState": "done", + "numLeafNodes": 5 + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": true, + "hideFuncUnboundBadgeOnExplanation": true, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": true +} diff --git a/src/lib/runners/caem.json b/src/lib/runners/caem.json new file mode 100644 index 000000000..c0a470b91 --- /dev/null +++ b/src/lib/runners/caem.json @@ -0,0 +1,381 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 3 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 11, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": { + "a": "highlighted", + "b": "highlighted", + "c": "highlighted" + }, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": true +} diff --git a/src/lib/runners/ehsw.json b/src/lib/runners/ehsw.json new file mode 100644 index 000000000..a0d0e24a2 --- /dev/null +++ b/src/lib/runners/ehsw.json @@ -0,0 +1,113 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": { + "d": "🅰️", + "e": "🅱️" + }, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/ifqp.json b/src/lib/runners/ifqp.json new file mode 100644 index 000000000..ef58143f5 --- /dev/null +++ b/src/lib/runners/ifqp.json @@ -0,0 +1,155 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2, + 3, + 4 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 4 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 4, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 5, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": { + "c": "🅱️", + "b": "🅰️" + }, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From 2a827c1df12166aea2f2469a5c503ebb9e65da81 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 21 Oct 2019 16:21:23 -0700 Subject: [PATCH 064/110] Finish 8 --- scripts/lib/initialExpressionContainers.ts | 11 + scripts/lib/runnerConfigs.ts | 11 + src/components/Runners/Oifs.tsx | 12 + src/components/Runners/Tcyv.tsx | 12 + src/components/Runners/index.ts | 2 + src/contents/8.jp.tsx | 688 +-------------------- src/lib/runners/oifs.json | 304 +++++++++ src/lib/runners/tcyv.json | 81 +++ 8 files changed, 440 insertions(+), 681 deletions(-) create mode 100644 src/components/Runners/Oifs.tsx create mode 100644 src/components/Runners/Tcyv.tsx create mode 100644 src/lib/runners/oifs.json create mode 100644 src/lib/runners/tcyv.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index df9af1ccd..e2afda99e 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -2285,6 +2285,17 @@ export const jxur = initializeExpressionContainer([ [succParams('a', 'b', 'c'), numberParams('d', 'e', 2)] ]) +export const sqcx = initializeExpressionContainer([ + succParams('a', 'b', 'c'), + [ + succParams('a', 'b', 'c'), + { + shorthandNumberAfterConvert: 'number', + shorthandNumber: 2 + } + ] +]) + export const rjyq = initializeDoneExpressionContainer({ shorthandNumber: 6 }) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 4a9aa4bba..c72f74686 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -938,6 +938,11 @@ export const ditw: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.ofza } +export const tcyv: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.gjyx +} + export const jiqb: ExpressionRunnerShorthandConfig = { runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.gjyx @@ -1529,6 +1534,12 @@ export const dyoq: ExpressionRunnerShorthandConfig = { convert: 'toMathBoxPlay' } +export const oifs: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.sqcx, + showPriorities: true +} + export const caem: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.jxur, diff --git a/src/components/Runners/Oifs.tsx b/src/components/Runners/Oifs.tsx new file mode 100644 index 000000000..43ab35c08 --- /dev/null +++ b/src/components/Runners/Oifs.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/oifs.json' + +const Oifs = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Oifs diff --git a/src/components/Runners/Tcyv.tsx b/src/components/Runners/Tcyv.tsx new file mode 100644 index 000000000..8a8d45602 --- /dev/null +++ b/src/components/Runners/Tcyv.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/tcyv.json' + +const Tcyv = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Tcyv diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 1159be2e0..c04df48f0 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -135,6 +135,7 @@ export { default as Ggxl } from 'src/components/Runners/Ggxl' export { default as Fdig } from 'src/components/Runners/Fdig' export { default as Xmqp } from 'src/components/Runners/Xmqp' export { default as Ditw } from 'src/components/Runners/Ditw' +export { default as Tcyv } from 'src/components/Runners/Tcyv' export { default as Jiqb } from 'src/components/Runners/Jiqb' export { default as Eagi } from 'src/components/Runners/Eagi' export { default as Yjur } from 'src/components/Runners/Yjur' @@ -225,6 +226,7 @@ export { default as Udxn } from 'src/components/Runners/Udxn' export { default as Cjxe } from 'src/components/Runners/Cjxe' export { default as Oqpi } from 'src/components/Runners/Oqpi' export { default as Dyoq } from 'src/components/Runners/Dyoq' +export { default as Oifs } from 'src/components/Runners/Oifs' export { default as Caem } from 'src/components/Runners/Caem' export { default as Byaf } from 'src/components/Runners/Byaf' export { default as Xhdq } from 'src/components/Runners/Xhdq' diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 28723fc8b..97b4a5ff2 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -1091,197 +1091,6 @@ export default () => ( }} /> -

            - これを弁当箱で再現するには、 - - に変換できる弁当箱と、 - - がある弁当箱を「2個 - 」合体させればいい - - のです。 -

            - - - に変換できる弁当箱と -
            - - がある弁当箱を「2個」
            - 合体すれば、 - {' '} - の計算箱を再現できる -             -

            - 上の弁当箱を実行するのは、時間がかかるので今回は行いませんが、 - - {' '} - ボタンを押すと、答えが {' '} - になるのを確認できます。 - -

            -
            -

            - まとめると、 - - 計算箱の「 - - 」は、弁当箱で再現することができる - - のです。このポイントさえ覚えていただければ、細かいことは分からなくても大丈夫です！ -

            - , - , - , - 🍱, - - ]} - description={ - <> - 計算箱の「 - - 」は、 -
            - 弁当箱で「再現 - 」することができる - - } - /> - - ) - }, - { - title: ( - <> - ➕{' '} - はできる？ - - ), - content: ( - <> - -

            - いや、まだ分からんぞ。 - ➕{' '} - ができるからといって、 - - 他の数字に対しても - - があるとは限らない。 - -

            -

            - たとえば、 - - ➕{' '} - も計算できるのかどうか - - 確かめてみないと。 -

            - - ) - } - ]} - /> - , - ➕, - - ]} - description={<>これも計算できる？} - /> - -

            - じゃあ、 - - に変換できる弁当箱と、 - -

            - - - -

            サヤが考えた弁当箱を合体させてみるね！

            - - 👧🏻 サヤちゃんの弁当箱 - -

            - 合体したものを - - して、 - - 結果が になればいい - - んだよね。 -

            - - ) - } - ]} - /> - - に変換できる弁当箱と、 -
            - 👧🏻 サヤちゃんの弁当箱を合体させ… -             - - - -
            - して、結果が になれば - 成功 🎉 -
            - それ以外なら失敗 😭 -             - -

            - まずは実行してみるね。 - -

            -

            今回は、最後まで止まらずに実行します！

            - - ) - } - ]} - /> - - -

            結果はこうなったよ！

            - - ) - } - ]} - /> - - した結果 - ( children: ( <>

            - この弁当箱は、 - に変換できます！ + つまり、先ほどの計算箱を「再現」できた、というわけですね。

            ) } ]} /> - - - + こちらの計算箱は… - - -

            - つまり、 - ➕{' '} - が計算できたので、 - またしても成功です！{' '} - 🎉 -

            - - ) - }, - { - type: 'saya', - children: ( - <> -

            わーい、わーい！

            - - ) - }, - { - type: 'surprised', - children: ( - <> -

            す、すごい…！

            - - ) - } - ]} - /> - - ) - }, - { - title: ( - <> - - がある法則 - - ), - content: ( - <> - -

            - ではここで正解を言いましょう。 - - サヤちゃんが考えた弁当箱は、 - - がある弁当箱です。 - -

            -

            - だから、 - サヤちゃんの答えが正解です！ - おめでとうございます！🎉 -

            - - ) - } - ]} - /> - - 👧🏻 サヤちゃんが考えた弁当箱には -
            - - がある -             - -

            わーい、ミニオンさんありがとう！

            - - ) - }, - { - type: 'dog', - children: ( - <> -

            - さらに言うと、サヤちゃんが考えた弁当箱以外にも、 - - 以下の法則に当てはまる弁当箱であれば、 どれでも - - があります。 - -

            - - ) - } - ]} - /> - - この法則に当てはまる弁当箱であれば、 -
            - - がある -             - -

            サヤが考えた弁当箱の場合、

            -
              - - 🅰️ は - - - 🅱️ は - - - は{' '} - - -
            -

            ということかな？

            - - ) - } - ]} - /> - - 🅰️ は 、
            - 🅱️ は 、
            - は -             - -

            - その通りです。サヤちゃんが考えた弁当箱は、ちゃんとこの法則に当てはまっているのです。 -

            - - この法則に当てはまる弁当箱であれば、 -
            - - がある -             - - ) - } - ]} - /> - - ) - }, - { - title: <>同じ法則の、他の弁当箱も試してみる, - content: ( - <> - -

            - じゃあ、たとえばこの弁当箱でも、同じ法則に沿っているから、 - - があるってこと？ -

            - - 同じ法則で料理を入れてみた。 -
            - - はあるか？ -             -

            - 🅰️ には 、 - 🅱️ には 、 - には{' '} - - を当てはめてみたよ。 -

            - - ) - }, - { - type: 'dog', - children: ( - <> -

            - はい、 - - はありますよ。 -

            -

            - - 試しに、 - {' '} - に変換できるこちらの弁当箱と合体させて - してみましょう。 - -

            - - - -

            - 実行したとき、 - - 結果が {' '} - に変換できる弁当箱になれば、 - ➕{' '} - を計算できたので成功 - - になります。 -

            - - ) - } - ]} - /> -

            - -

            - - -

            - 結果、 - {' '} - に変換できる弁当箱が残りました！ -

            - - - -

            - つまり、 - ➕{' '} - を計算できたというわけです。 -

            - - ) - }, - { - type: 'thinking', - children: ( - <> -

            - なるほど、やっぱりこちらの弁当箱にも - - があるということか。 -

            - - サヤちゃんの弁当箱と同じく、こちらの -
            - 弁当箱にも - - がある -             - - ) - } - ]} - /> - - ) - }, - { - type: 'summary', - title: <>立ち止まって振り返ろう, - content: ( - <> - -

            - 俺らふだん頭を使っていないから、情報量が多すぎて疲れてしまった… -

            -

            ちょっとひと休みしてもらえないか？

            - - ) - }, - { - type: 'dog', - children: ( - <> -

            いいですよ、ひと休みしましょう！

            -

            - ちなみに現時点で、 - 中級編も半分を終えました - 。つまり、本稿の折り返し地点を越えたということです。 - - 残るは中級編の残り半分と、上級編のみです。 - -

            -

            - いい機会なので、少し立ち止まって振り返ってみましょう。 -

            - - ) - } - ]} - /> -

            - まずこちらをご覧ください。これは、「 - 」 - を使うことで、 - ➕{' '} - を計算できる計算箱ですね。 -

            - - 「 - 」を使うことで -
            - ➕{' '} - を計算できる計算箱。 -
            - 実行すると になる -             -

            - これまで学んだことを一言でまとめると、上の計算箱にあるような「 - - 」は、 - 弁当箱で「再現」できる - 、ということです。 -

            - , - , - , - 🍱, - - ]} - description={ - <> - 計算箱の「 - - 」は、 -
            - 弁当箱で「再現 - 」することができる - - } - /> -

            - 「再現 - 」できる、とはどういうことでしょうか？先ほどの計算箱の例で説明しますね。 -

            - これを弁当箱で再現します -

            - ステップ1: まず、 - - 計算箱の の代わりに、 - - に変換できる - - 弁当箱 - - を用意します。 -

            - これの代わりに… - - - に変換できる弁当箱を用意 - -

            - ステップ2: 次に、 - - 計算箱の の代わりに、 - - - がある弁当箱を用意します。 -

            - これの代わりに… + +
            + こちらの弁当箱で「再現」できる！ - - - がある弁当箱を用意 -
            (👧🏻 サヤちゃんが考えた弁当箱です) -             -

            - ステップ3:{' '} - このふたつを合体させた弁当箱は、先ほども説明した通り、 - - すると{' '} - になります - - ね。 -

            - - に変換できる弁当箱と -
            - - がある弁当箱を合体 -             -

            - つまり、先ほど登場した {' '} - ➕ {' '} - を計算できる計算箱は、 -

            - -

            - こちらの弁当箱で「再現」できる - ということです。 -

            - - {' '} - の計算箱を、弁当箱で再現 - -

            - これが、「計算箱を弁当箱で再現する - 」ということなんですね。 -

            - - ) - }, - { - type: 'summary', - title: <>もっと複雑な計算箱も再現できる, - content: ( - <> -

            もちろん、もっと複雑な計算箱も弁当箱で再現できます。

            -

            - たとえば、初級その1に登場したこちらの計算箱をご覧ください。 - すると、結果は{' '} - になります。 -

            - -

            - これを弁当箱で再現するには、 - - に変換できる弁当箱と、 - - がある弁当箱を「2個 - 」合体させればいい - - のです。 -

            - - に変換できる弁当箱と -
            - - がある弁当箱を「2個」
            - 合体すれば、 - {' '} - の計算箱を再現できる -             -

            - 上の弁当箱を実行するのは、時間がかかるので今回は行いませんが、 - - {' '} - ボタンを押すと、答えが {' '} - になるのを確認できます。 - -

            +

            まとめると、 @@ -1802,7 +1128,7 @@ export default () => ( , , 🍱, - + ]} description={ <> diff --git a/src/lib/runners/oifs.json b/src/lib/runners/oifs.json new file mode 100644 index 000000000..519dd14d9 --- /dev/null +++ b/src/lib/runners/oifs.json @@ -0,0 +1,304 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 2, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 3 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 10, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": true +} diff --git a/src/lib/runners/tcyv.json b/src/lib/runners/tcyv.json new file mode 100644 index 000000000..8dc38a82a --- /dev/null +++ b/src/lib/runners/tcyv.json @@ -0,0 +1,81 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "shorthandFunc", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "shorthandFunc": "add", + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "shorthandFunc", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "shorthandFunc": "add", + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 3, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": true, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From 84173afbd705f96f95a59d6d597fd73147ce9eb9 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 21 Oct 2019 17:29:04 -0700 Subject: [PATCH 065/110] EmojiForLetter and EmojiWithText --- src/contents/8.jp.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 97b4a5ff2..d63ce7427 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -15,12 +15,10 @@ import EmojiNumber from 'src/components/EmojiNumber' import Emoji from 'src/components/Emoji' import H from 'src/components/H' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' -import EmojiForLetter from 'src/components/EmojiForLetter' import ExpressionRunnerCaptionOnly from 'src/components/ExpressionRunnerCaptionOnly' import EmojiSeparator from 'src/components/EmojiSeparator' import * as R from 'src/components/Runners' import { Problem, StepOne, StepTwo, StepThree } from 'src/contents/7.jp' -import EmojiWithText from 'src/components/EmojiWithText' import NextLessonButton from 'src/components/NextLessonButton' const BlankNumberPlusOne = () => ( From 7825713b868c0f0f4f3946f584f0963cc0b96ac2 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 21 Oct 2019 19:26:58 -0700 Subject: [PATCH 066/110] Rewrite 13 --- scripts/lib/initialExpressionContainers.ts | 47 +- scripts/lib/runnerConfigs.ts | 25 +- src/components/Runners/{Gmgs.tsx => Qwzy.tsx} | 6 +- src/components/Runners/index.ts | 2 +- src/contents/13.en.tsx | 20 +- src/contents/13.jp.tsx | 22 +- src/lib/runners/ayrl.json | 12 +- src/lib/runners/bnyo.json | 26 +- src/lib/runners/gmgs.json | 155 -- src/lib/runners/hkfq.json | 26 +- src/lib/runners/itis.json | 14 +- src/lib/runners/poha.json | 34 +- src/lib/runners/qwzy.json | 36 + src/lib/runners/uwgj.json | 14 +- src/lib/runners/vcqp.json | 15 +- src/lib/runners/wgby.json | 14 +- src/lib/runners/ynoy.json | 1308 ++++++++--------- src/lib/runners/ywpq.json | 30 +- 18 files changed, 853 insertions(+), 953 deletions(-) rename src/components/Runners/{Gmgs.tsx => Qwzy.tsx} (63%) delete mode 100644 src/lib/runners/gmgs.json create mode 100644 src/lib/runners/qwzy.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index e2afda99e..175b804bb 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -13,6 +13,10 @@ import { numberParamsHighlightNonNumber } from 'scripts/lib/churchEncodingParams' +export const prxd = initializeExpressionContainer({ + shorthandFunc: 'add' +}) + export const nyhe = initializeExpressionContainer([ { arg: 'a', @@ -1382,11 +1386,11 @@ export const gbbo = initializeExpressionContainer([ 'd', 'e', numberParams('g', 'h', 2), - [succParams('i', 'j', 'k'), 'f'], + [succParams('a', 'b', 'c'), 'f'], 'f' ) }, - numberParams('l', 'm', 3) + numberParams('i', 'j', 3) ]) export const nden = initializeExpressionContainer([ @@ -1399,15 +1403,15 @@ export const nden = initializeExpressionContainer([ highlighted('d'), highlighted('e'), numberParams(highlighted('g'), highlighted('h'), 2), - [succParams(highlighted('i'), highlighted('j'), highlighted('k')), 'f'], + [succParams(highlighted('a'), highlighted('b'), highlighted('c')), 'f'], 'f' ) }, - numberParams(highlighted('l'), highlighted('m'), 3) + numberParams(highlighted('i'), highlighted('j'), 3) ]) export const loem = initializeExpressionContainer( - numberParamsHighlightNumber('l', 'm', 3) + numberParamsHighlightNumber('i', 'j', 3) ) export const wvsk = initializeExpressionContainer([ @@ -1420,7 +1424,7 @@ export const wvsk = initializeExpressionContainer([ 'd', 'e', numberParams('g', 'h', 2), - [succParams('i', 'j', 'k'), 'f'], + [succParams('a', 'b', 'c'), 'f'], 'f' ) }, @@ -1440,7 +1444,7 @@ export const nuux = initializeExpressionContainer([ 'd', 'e', numberParams('g', 'h', 2), - [succParams('i', 'j', 'k'), 'f'], + [succParams('a', 'b', 'c'), 'f'], 'f' ) }, @@ -1462,7 +1466,7 @@ export const aqul = initializeExpressionContainer([ shorthandNumber: 2, initialHighlight: true }, - [succParams('i', 'j', 'k'), 'f'], + [succParams('a', 'b', 'c'), 'f'], 'f' ) }, @@ -1483,7 +1487,7 @@ export const snye = initializeExpressionContainer([ { shorthandNumber: 2 }, - [succParams('i', 'j', 'k'), 'f'], + [succParams('a', 'b', 'c'), 'f'], 'f' ) }, @@ -1492,9 +1496,28 @@ export const snye = initializeExpressionContainer([ } ]) -export const aqvq = initializeExpressionContainer( - succParams('i', 'j', 'k', true) -) +export const syvj = initializeExpressionContainer([ + { + arg: 'f', + body: isZeroParams( + 'a', + 'b', + 'c', + 'd', + 'e', + { + shorthandNumber: 2 + }, + [succParams(highlighted('a'), highlighted('b'), highlighted('c')), 'f'], + 'f' + ) + }, + { + shorthandNumber: 3 + } +]) + +export const aqvq = initializeExpressionContainer(succParams('a', 'b', 'c')) export const abrk = initializeExpressionContainer([ { diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index c72f74686..c75994302 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -67,6 +67,11 @@ export const aezk: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const qwzy: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.prxd +} + export const igrl: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.lqti, @@ -2077,8 +2082,8 @@ export const ywpq: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.gbbo, showPriorities: true, highlightOverrides: { - l: 'highlighted', - m: 'highlighted' + i: 'highlighted', + j: 'highlighted' } } @@ -2113,13 +2118,8 @@ export const wgby: ExpressionRunnerShorthandConfig = { export const poha: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.snye, - showPriorities: true, - highlightOverrides: { - i: 'highlighted', - j: 'highlighted', - k: 'highlighted' - } + initialExpressionContainer: initialExpressionContainers.syvj, + showPriorities: true } export const vcqp: ExpressionRunnerShorthandConfig = { @@ -2210,13 +2210,6 @@ export const ynoy: ExpressionRunnerShorthandConfig = { showPriorities: true } -export const gmgs: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.teba, - showPriorities: true, - bottomRightBadgeOverrides: { j: '🅰️', k: '🅱️' } -} - export const ykqf: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.awxe, diff --git a/src/components/Runners/Gmgs.tsx b/src/components/Runners/Qwzy.tsx similarity index 63% rename from src/components/Runners/Gmgs.tsx rename to src/components/Runners/Qwzy.tsx index 1b2bba265..879813df2 100644 --- a/src/components/Runners/Gmgs.tsx +++ b/src/components/Runners/Qwzy.tsx @@ -1,12 +1,12 @@ import React from 'react' import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/gmgs.json' +import config from 'src/lib/runners/qwzy.json' -const Gmgs = ({ children }: { children?: React.ReactNode }) => ( +const Qwzy = ({ children }: { children?: React.ReactNode }) => ( // @ts-ignore {children} ) -export default Gmgs +export default Qwzy diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index c04df48f0..736233612 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -6,6 +6,7 @@ export { default as Vdhd } from 'src/components/Runners/Vdhd' export { default as Ltpe } from 'src/components/Runners/Ltpe' export { default as Apuz } from 'src/components/Runners/Apuz' export { default as Aezk } from 'src/components/Runners/Aezk' +export { default as Qwzy } from 'src/components/Runners/Qwzy' export { default as Igrl } from 'src/components/Runners/Igrl' export { default as Uppk } from 'src/components/Runners/Uppk' export { default as Qfbk } from 'src/components/Runners/Qfbk' @@ -317,7 +318,6 @@ export { default as Zcwk } from 'src/components/Runners/Zcwk' export { default as Gmzn } from 'src/components/Runners/Gmzn' export { default as Uiwl } from 'src/components/Runners/Uiwl' export { default as Ynoy } from 'src/components/Runners/Ynoy' -export { default as Gmgs } from 'src/components/Runners/Gmgs' export { default as Ykqf } from 'src/components/Runners/Ykqf' export { default as Ifpo } from 'src/components/Runners/Ifpo' export { default as Cefx } from 'src/components/Runners/Cefx' diff --git a/src/contents/13.en.tsx b/src/contents/13.en.tsx index 7a5247c9c..21815ec39 100644 --- a/src/contents/13.en.tsx +++ b/src/contents/13.en.tsx @@ -257,7 +257,7 @@ export default () => ( @@ -382,14 +382,18 @@ export default () => ( children: ( <>

            - This looks like a lunchbox that has{' '} - ! + This looks like 👧🏻 Saya’s lunchbox that + can reproduce{' '} + !

            - A lunchbox with + 👧🏻 Saya’s lunchbox that can{' '} + reproduce
            - +             + + ) }, @@ -718,15 +722,15 @@ export default () => ( The final result is a lunchbox that can be converted to{' '} .

            - + - +

            If you{' '} ( @@ -369,15 +369,19 @@ export default () => (

            これはもしかして… - 中級その3でやった、 - - がある弁当箱かな？ + 中級その3で 👧🏻 サヤちゃんが考えた、 + + を再現できる弁当箱かな？

            - - がある弁当箱 + 👧🏻 サヤちゃんが考えた、 +
            + + を再現できる弁当箱             + + ) }, @@ -706,15 +710,15 @@ export default () => ( ですね。

            - + - +

            つまり、 Date: Mon, 21 Oct 2019 20:44:55 -0700 Subject: [PATCH 067/110] Rewrite 9 --- scripts/lib/initialExpressionContainers.ts | 2 +- src/contents/9.en.tsx | 27 ++++++------ src/contents/9.jp.tsx | 48 +++++++++++++--------- src/lib/runners/nhqo.json | 15 ++++--- 4 files changed, 50 insertions(+), 42 deletions(-) diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 175b804bb..b41b49713 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1063,7 +1063,7 @@ export const mtyb = initializeExpressionContainer([ ]) export const orfr = initializeExpressionContainer([ - succParams('a', 'b', 'c', true), + succParams(highlighted('a'), highlighted('b'), highlighted('c')), numberParams('d', 'b', 1) ]) diff --git a/src/contents/9.en.tsx b/src/contents/9.en.tsx index e3337f4ac..054ade403 100644 --- a/src/contents/9.en.tsx +++ b/src/contents/9.en.tsx @@ -92,10 +92,11 @@ export default () => ( children: ( <>

            + What do you think happens{' '} - What do you think happens if I combined it with a - lunchbox that has{' '} - and run it? + if I combined it with my lunchbox that{' '} + reproduces{' '} + ?

            @@ -104,9 +105,9 @@ export default () => ( ]} /> - If I combined it with a lunchbox that has + If I combined it with my lunchbox that
            - … + reproduces …             @@ -1212,14 +1213,14 @@ export default () => ( content: ( <>

            - If you combine 👧🏻 Saya’s lunchbox which has{' '} - … + If you combine 👧🏻 Saya’s lunchbox which reproduces{' '} + …

            - - 👧🏻 Saya’s lunchbox which as + + 👧🏻 Saya’s lunchbox which reproduces
            - -             + +

            …with the following lunchbox which can be converted to{' '} … @@ -1330,8 +1331,8 @@ export default () => ( children: ( <>

            - Anyway: We figured out how to do{' '} - ! + Anyway: We figured out how to reproduce{' '} + !

            The devil! As you promised, give us our mathboxes back! diff --git a/src/contents/9.jp.tsx b/src/contents/9.jp.tsx index 9cf3580ca..34592e547 100644 --- a/src/contents/9.jp.tsx +++ b/src/contents/9.jp.tsx @@ -29,11 +29,7 @@ export default () => ( title: <>サヤちゃんの疑問, content: ( <> -

            - サヤちゃんは、 - - がある弁当箱について、あることに気が付きました。 -

            +

            サヤちゃんは、あることに気が付きました。

            ( children: ( <>

            - これを、前回サヤが考えた - - がある弁当箱と合体させて、実行するとどうなると思う？ + これを、 + + 前回サヤが考えた「 + + 」を再現できる弁当箱と合体させて、実行するとどうなる + + と思う？

            ) @@ -87,8 +87,11 @@ export default () => ( ]} /> - - と合体させて、 + 「 + + 」を再現できる +
            + 弁当箱と合体させて、
            実行するとどうなる？             @@ -1211,14 +1214,19 @@ export default () => ( content: ( <>

            - 前回サヤちゃんが考えた - - がある弁当箱は、 + 前回サヤちゃんが考えた「 + + 」を再現できる弁当箱は、

            - - - がある弁当箱 - + + 👧🏻 サヤちゃんが考えた +
            + 「 + + 」を +
            + 再現できる弁当箱 +

            次の @@ -1318,9 +1326,9 @@ export default () => ( children: ( <>

            - いろいろあったけど、これで、 - - がある弁当箱は完璧にマスターしたぞ！ + いろいろあったけど、これで、 「 + 」 + を再現できる弁当箱は完璧にマスターしたぞ！

            悪魔よ、約束通り計算箱は返してもらう！

            diff --git a/src/lib/runners/nhqo.json b/src/lib/runners/nhqo.json index 2d7631f7e..d2df316d9 100644 --- a/src/lib/runners/nhqo.json +++ b/src/lib/runners/nhqo.json @@ -73,7 +73,7 @@ "func": { "arg": { "name": "a", - "highlightType": "default", + "highlightType": "initialHighlighted", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", "type": "variable", @@ -88,7 +88,7 @@ "body": { "arg": { "name": "b", - "highlightType": "default", + "highlightType": "initialHighlighted", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", "type": "variable", @@ -101,7 +101,7 @@ "body": { "arg": { "name": "c", - "highlightType": "default", + "highlightType": "initialHighlighted", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", "type": "variable", @@ -115,7 +115,7 @@ "arg": { "arg": { "name": "c", - "highlightType": "default", + "highlightType": "initialHighlighted", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", "type": "variable", @@ -131,7 +131,7 @@ "func": { "arg": { "name": "b", - "highlightType": "default", + "highlightType": "initialHighlighted", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", "type": "variable", @@ -145,7 +145,7 @@ }, "func": { "name": "a", - "highlightType": "default", + "highlightType": "initialHighlighted", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", "type": "variable", @@ -170,7 +170,7 @@ }, "func": { "name": "b", - "highlightType": "default", + "highlightType": "initialHighlighted", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", "type": "variable", @@ -194,7 +194,6 @@ "maxNestedFunctionDepth": 2 }, "type": "function", - "meta": "plusOneEffect", "maxNestedFunctionDepth": 3 }, "state": "default", From 5a14d0562d00e3225f7235c7632cd676a891496f Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 21 Oct 2019 21:03:24 -0700 Subject: [PATCH 068/110] Start 9 --- src/contents/8.en.tsx | 18 ++++++++++++++++++ src/contents/8.jp.tsx | 5 +++-- src/contents/9.en.tsx | 21 ++++++++++++++++++++- src/contents/9.jp.tsx | 17 +++++++++++++++++ 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index c292f0d6b..b3ec00fb5 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -24,6 +24,24 @@ import EmojiWithText from 'src/components/EmojiWithText' import NextLessonButton from 'src/components/NextLessonButton' import { StepOne, StepTwo, StepThree } from 'src/contents/7.en' +export const BlankNumberPlusOne = () => ( + <> + + 👧🏻 サヤちゃんの弁当箱と、 +
            + に変換できる弁当箱を +
            + 合体させて実行すると、 +             + + + ➕{' '} + に
            + 変換できる弁当箱になる +             + +) + export default () => ( ( +export const BlankNumberPlusOne = () => ( <> 👧🏻 サヤちゃんの弁当箱と、 @@ -830,9 +830,10 @@ export default () => ( ) }, { + type: 'summary', title: ( <> - 計算箱の と同じことができる？ + 計算箱の と同じことができる ), content: ( diff --git a/src/contents/9.en.tsx b/src/contents/9.en.tsx index 054ade403..58580740e 100644 --- a/src/contents/9.en.tsx +++ b/src/contents/9.en.tsx @@ -24,6 +24,7 @@ import BottomRightBadge from 'src/components/BottomRightBadge' import TwoColGrid from 'src/components/TwoColGrid' import * as R from 'src/components/Runners' import NextLessonButton from 'src/components/NextLessonButton' +import { BlankNumberPlusOne } from 'src/contents/8.en' export const SpecialRule = () => ( <> @@ -48,7 +49,25 @@ export default () => ( Saya’s Question, + type: 'summary', + title: <>Quick review, + content: ( + <> +

            + On the last page, we learned that: By using{' '} + 👧🏻 Saya’s lunchbox, we can{' '} + reproduce{' '} + of a mathbox. +

            + +

            + That’s it for the quick review. Let’s continue! +

            + + ) + }, + { + title: <>Saya’s question, content: ( <>

            Looks like Saya noticed something strange.

            diff --git a/src/contents/9.jp.tsx b/src/contents/9.jp.tsx index 34592e547..bd4e63e50 100644 --- a/src/contents/9.jp.tsx +++ b/src/contents/9.jp.tsx @@ -21,10 +21,27 @@ import BottomRightBadge from 'src/components/BottomRightBadge' import TwoColGrid from 'src/components/TwoColGrid' import * as R from 'src/components/Runners' import NextLessonButton from 'src/components/NextLessonButton' +import { BlankNumberPlusOne } from 'src/contents/8.jp' export default () => ( 前回の復習, + content: ( + <> +

            + 前回は、👧🏻{' '} + サヤちゃんの弁当箱を使うことで、計算箱の「 + + 」を再現できることを学びました。 +

            + +

            それでは、話を進めましょう！

            + + ) + }, { title: <>サヤちゃんの疑問, content: ( From 62a15b4c2a462f6650429e3b16fa9aaa718a2e14 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 21 Oct 2019 21:22:51 -0700 Subject: [PATCH 069/110] Rewrite 10 --- src/contents/10.en.tsx | 9 ++++----- src/contents/10.jp.tsx | 11 ++++++----- src/lib/titles.ts | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index 219fa5e54..9920b8e4a 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -212,12 +212,11 @@ export default () => ( } ]} /> - - Reproduce {' '} - … - + + Reproduce … + - Using a lunchbox + Using a lunchbox ( } ]} /> - - {' '} - の計算箱を… - + + 計算箱の「 + + 」を… + - 弁当箱で再現した + 弁当箱で再現した Date: Mon, 21 Oct 2019 23:39:25 -0700 Subject: [PATCH 070/110] Start revising 10 --- scripts/lib/initialExpressionContainers.ts | 1 + scripts/lib/runnerConfigs.ts | 6 ++++ src/components/Runners/Jfgb.tsx | 12 ++++++++ src/components/Runners/index.ts | 1 + src/components/VariableExpressionBox.tsx | 5 ++++ src/contents/10.jp.tsx | 19 +++++++----- src/lib/letterEmojiMappingJson.json | 1 + src/lib/runners/jfgb.json | 35 ++++++++++++++++++++++ src/types/VariableNames.ts | 1 + 9 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 src/components/Runners/Jfgb.tsx create mode 100644 src/lib/runners/jfgb.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index b41b49713..5a3f8644f 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1097,6 +1097,7 @@ export const henz = initializeExpressionContainer([ ]) export const tsms = initializeExpressionContainer('blankNumberPlusOne') +export const hipa = initializeExpressionContainer('blankNumberMinusOne') export const kipz = initializeExpressionContainer([ { diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index c75994302..2dbb5d985 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1248,6 +1248,12 @@ export const ymtp: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const jfgb: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.hipa, + showPriorities: true +} + export const qrgc: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.cyhx, diff --git a/src/components/Runners/Jfgb.tsx b/src/components/Runners/Jfgb.tsx new file mode 100644 index 000000000..8b7a5416f --- /dev/null +++ b/src/components/Runners/Jfgb.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/jfgb.json' + +const Jfgb = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Jfgb diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 736233612..7159c39f4 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -188,6 +188,7 @@ export { default as Jiua } from 'src/components/Runners/Jiua' export { default as Aone } from 'src/components/Runners/Aone' export { default as Qsoa } from 'src/components/Runners/Qsoa' export { default as Ymtp } from 'src/components/Runners/Ymtp' +export { default as Jfgb } from 'src/components/Runners/Jfgb' export { default as Qrgc } from 'src/components/Runners/Qrgc' export { default as Jxvy } from 'src/components/Runners/Jxvy' export { default as Lwoq } from 'src/components/Runners/Lwoq' diff --git a/src/components/VariableExpressionBox.tsx b/src/components/VariableExpressionBox.tsx index b16b948fc..0f235c2e4 100644 --- a/src/components/VariableExpressionBox.tsx +++ b/src/components/VariableExpressionBox.tsx @@ -290,6 +290,11 @@ const VariableEmoji = ({ expression }: VariableExpressionBoxProps) => { {' '} ➕ + ) : expression.name === 'blankNumberMinusOne' ? ( + <> + {' '} + ➖ + ) : customEmojiToComponent[ expression.name as keyof typeof customEmojiToComponent ] && expression.highlightType !== 'removed' ? ( diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index 374f3e5db..0a939c754 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -322,8 +322,7 @@ export default () => ( { title: ( <> - - がある弁当箱のヒント + 「」 を再現するヒント ), content: ( @@ -345,17 +344,21 @@ export default () => ( type: 'dog', children: ( <> -

            わかりました。こちらの弁当箱をご覧ください。

            - 前回と同じく、 - - それぞれの {' '} - には何らかの料理が入ります。 - + わかりました。では、「 + 」 + を再現するヒントを教えましょう！

            ) } + //

            + // 前回と同じく、 + // + // それぞれの {' '} + // には何らかの料理が入ります。 + // + //

            ]} /> diff --git a/src/lib/letterEmojiMappingJson.json b/src/lib/letterEmojiMappingJson.json index 326590bc0..5c0116d8c 100644 --- a/src/lib/letterEmojiMappingJson.json +++ b/src/lib/letterEmojiMappingJson.json @@ -32,6 +32,7 @@ "Bsingle": "❓", "blankNumber": "❓", "blankNumberPlusOne": "❓", + "blankNumberMinusOne": "❓", "shorthandFunc": "❓", "questionFoodGrey": "❓", "C": "❓", diff --git a/src/lib/runners/jfgb.json b/src/lib/runners/jfgb.json new file mode 100644 index 000000000..a6635dd73 --- /dev/null +++ b/src/lib/runners/jfgb.json @@ -0,0 +1,35 @@ +{ + "expressionContainers": [ + { + "expression": { + "name": "blankNumberMinusOne", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 1, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/types/VariableNames.ts b/src/types/VariableNames.ts index 2cf8a0bb8..0795b1cf7 100644 --- a/src/types/VariableNames.ts +++ b/src/types/VariableNames.ts @@ -32,6 +32,7 @@ export type VariableNames = | 'Bsingle' | 'blankNumber' | 'blankNumberPlusOne' + | 'blankNumberMinusOne' | 'shorthandFunc' | 'questionFoodGrey' | 'C' From d0753c43f50ab0528a0ade1c31ab3a8292ac8396 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 21 Oct 2019 23:49:30 -0700 Subject: [PATCH 071/110] Continue with 9 --- src/components/ExpressionRunnerPrecomputed.tsx | 13 ++++++++++--- src/components/TwoColContext.tsx | 8 ++++---- src/components/TwoColGrid.tsx | 12 +++++++++--- src/contents/9.en.tsx | 3 +++ src/contents/9.jp.tsx | 3 +++ 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/components/ExpressionRunnerPrecomputed.tsx b/src/components/ExpressionRunnerPrecomputed.tsx index b26a53e08..c436234f2 100644 --- a/src/components/ExpressionRunnerPrecomputed.tsx +++ b/src/components/ExpressionRunnerPrecomputed.tsx @@ -168,10 +168,17 @@ const ExpressionRunnerPrecomputed = ({ expressionContainers[currentIndex].numLeafNodes ) - const { inTwoCol } = useContext(TwoColContext) + const { maxVariableSize } = useContext(TwoColContext) - if (inTwoCol && (variableSize === 'lg' || variableSize === 'md')) { - variableSize = 'sm' + if (maxVariableSize) { + if (maxVariableSize === 'md' && variableSize === 'lg') { + variableSize = 'md' + } else if ( + maxVariableSize === 'sm' && + (variableSize === 'lg' || variableSize === 'md') + ) { + variableSize = 'sm' + } } return ( diff --git a/src/components/TwoColContext.tsx b/src/components/TwoColContext.tsx index 16ea06f50..63551ac3a 100644 --- a/src/components/TwoColContext.tsx +++ b/src/components/TwoColContext.tsx @@ -1,9 +1,9 @@ import React from 'react' -export interface TwoColContext { - inTwoCol?: boolean +export interface TwoColContextProps { + maxVariableSize?: 'sm' | 'md' } -export const twoColContext: TwoColContext = {} +export const twoColContext: TwoColContextProps = {} -export default React.createContext(twoColContext) +export default React.createContext(twoColContext) diff --git a/src/components/TwoColGrid.tsx b/src/components/TwoColGrid.tsx index 9d39cb541..a5fe6bd53 100644 --- a/src/components/TwoColGrid.tsx +++ b/src/components/TwoColGrid.tsx @@ -2,22 +2,24 @@ import { css, jsx } from '@emotion/core' import Flex from 'src/components/Flex' import { spaces } from 'src/lib/theme' -import TwoColContext from 'src/components/TwoColContext' +import TwoColContext, { TwoColContextProps } from 'src/components/TwoColContext' const TwoColGrid = ({ left, right, noTopNegativeMargin, - noBottomNegativeMargin + noBottomNegativeMargin, + maxVariableSize }: { left: React.ReactNode right: React.ReactNode noTopNegativeMargin?: boolean noBottomNegativeMargin?: boolean + maxVariableSize: TwoColContextProps['maxVariableSize'] }) => ( ) +TwoColGrid.defaultProps = { + maxVariableSize: 'md' +} + export default TwoColGrid diff --git a/src/contents/9.en.tsx b/src/contents/9.en.tsx index 58580740e..36fa16361 100644 --- a/src/contents/9.en.tsx +++ b/src/contents/9.en.tsx @@ -566,6 +566,7 @@ export default () => ( ]} /> @@ -663,6 +664,7 @@ export default () => ( ]} /> @@ -697,6 +699,7 @@ export default () => ( ]} /> diff --git a/src/contents/9.jp.tsx b/src/contents/9.jp.tsx index bd4e63e50..ae67e43f7 100644 --- a/src/contents/9.jp.tsx +++ b/src/contents/9.jp.tsx @@ -575,6 +575,7 @@ export default () => ( ]} /> @@ -661,6 +662,7 @@ export default () => ( ]} /> @@ -697,6 +699,7 @@ export default () => ( ]} /> From 44c2cc291fb9765fc0175dcf7496bc4275635502 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Mon, 21 Oct 2019 23:52:55 -0700 Subject: [PATCH 072/110] Continue with 10 --- src/contents/10.jp.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index 0a939c754..c7f3a11d7 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -361,6 +361,11 @@ export default () => ( //

            ]} /> + + + + + それぞれの には
            From 632b61150ab51501fdd8232c8d2932d7288ec35b Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 00:08:41 -0700 Subject: [PATCH 073/110] Continue with 10 --- scripts/lib/initialExpressionContainers.ts | 3 +- src/contents/10.jp.tsx | 136 +++++++-------------- src/lib/runners/xqjd.json | 1 - 3 files changed, 42 insertions(+), 98 deletions(-) diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 5a3f8644f..e2e6166ff 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1134,8 +1134,7 @@ export const xwlj = initializeExpressionContainer([ 'questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', - 'questionFoodGrey', - true + 'questionFoodGrey' ), { shorthandNumberAfterConvert: 'blank' diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index c7f3a11d7..d79cb2771 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -345,9 +345,13 @@ export default () => ( children: ( <>

            - わかりました。では、「 - 」 - を再現するヒントを教えましょう！ + わかりました。では、 + + 「 + 」 + を弁当箱で再現するヒント + + を教えましょう！

            ) @@ -366,63 +370,42 @@ export default () => ( - - それぞれの には -
            - 何らかの料理が入る -             -

            なんか、めちゃくちゃ複雑な弁当箱だな…

            - - ) - }, { type: 'dog', children: ( <>

            - そして、 - - それぞれの {' '} - に、ある法則に基づいて料理を入れると、 - - がある弁当箱になります。 - + 「 + + 」を弁当箱で再現するには、以下の弁当箱にある{' '} + {' '} + に、ある法則に基づいて料理を入れる必要があります。

            ) } ]} /> - + それぞれの に、
            - ある法則に基づいて料理を入れると、 + ある法則に基づいて料理を入れると、
            - - がある弁当箱になる -             + 「 + + 」を +
            + 再現することができる +             -

            - なに、 - - だって？ -

            -

            - 前回の - - の真逆なのかな？ -

            +

            なんか、めちゃくちゃ複雑な弁当箱だな…

            ) }, @@ -430,36 +413,20 @@ export default () => ( type: 'dog', children: ( <> -

            その通りです。

            -
              - - 上の - - がある弁当箱を、 - - - - ある数字 {' '} - に変換できる弁当箱と合体させて実行すると、 - - - - - ➖{' '} - に変換できる弁当箱になる - - -
            +

            + そうですね。正しく{' '} + {' '} + に料理を当てはめることができれば、以下のように1を引く計算を行うことができます。 +

            ) } ]} /> - に変換できる弁当箱と、 + に変換できる弁当箱と
            - - がある弁当箱を合体させ… + 合体させ…             @@ -471,46 +438,23 @@ export default () => (

            - つまりこれを使えば、計算箱の「 - - 」を再現できるというわけだな。 + では、 + {' '} + にそれぞれ何が入るか考えてみてください！

            ) - } - ]} - /> - - 計算箱の「 - - 」は… - - - - - がある弁当箱を -
            - 使えば、再現できる -             - - ) - }, - { - title: <>サヤちゃんが考えた弁当箱, - content: ( - <> -

            - しかし…こんな複雑な弁当箱の{' '} + うーん、こんな複雑な弁当箱の{' '} {' '} を正しい法則で埋めるなんて…何日かかってもできなさそうだ！

            @@ -519,11 +463,13 @@ export default () => ( } ]} /> - - それぞれの には -
            - 何らかの料理が入る -             + + ) + }, + { + title: <>サヤちゃんが考えた弁当箱, + content: ( + <>

            村人たちが困っていると、またサヤちゃんが何かひらめいたようです。

            diff --git a/src/lib/runners/xqjd.json b/src/lib/runners/xqjd.json index a51cb626d..9e5ca469c 100644 --- a/src/lib/runners/xqjd.json +++ b/src/lib/runners/xqjd.json @@ -248,7 +248,6 @@ "maxNestedFunctionDepth": 4 }, "type": "function", - "meta": "minusOneEffect", "maxNestedFunctionDepth": 5 }, "state": "default", From d03a0e22dea39218fdd936fa0b390c55b8b4a9d5 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 00:21:51 -0700 Subject: [PATCH 074/110] Continue with 10 --- src/components/CardContent.tsx | 2 + src/contents/10.en.tsx | 332 +++++++++++++++++---------------- src/contents/10.jp.tsx | 294 +++++++++++++++-------------- 3 files changed, 325 insertions(+), 303 deletions(-) diff --git a/src/components/CardContent.tsx b/src/components/CardContent.tsx index 414567a43..68bebf4e4 100644 --- a/src/components/CardContent.tsx +++ b/src/components/CardContent.tsx @@ -7,6 +7,7 @@ export interface CardContentProps { preview?: { content: React.ReactNode text: React.ReactNode + afterText?: React.ReactNode } } @@ -28,6 +29,7 @@ const CardContent = ({ preview, children }: CardContentProps) => { {preview.text}

            + {preview.afterText} )} {!previewOnly && children} diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index 9920b8e4a..d7b0da65e 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -1276,167 +1276,6 @@ export default () => ( ) }, - { - type: 'sideNote', - title: ( - <> - Side Note: Does this have anything to do with computer science or Y - combinator? - - ), - preview: { - content: ( - <> -

            - You might be wondering:{' '} - - “I understand the puzzles, but does it have anything to do - with Y combinator or{' '} - computer science?” - -

            - - Does it have anything to do with -
            - Y combinator or computer science? - - } - /> -

            - First, about Y combinator: You’ll learn about Y - combinator on the advanced levels, which will start from the - next page. -

            -

            - Spoiler:{' '} - - Y combinator is actually a special kind of a lunchbox. - {' '} - You’ll soon find out what that means! -

            - - Y combinator is actually -
            - a special kind of a lunchbox - - } - /> -

            - Next, about computer science: You’ll learn about - the relationship between the lunchboxes and computer science - after we’re done with the advanced levels. -

            -

            - However,{' '} - - if you want to know more now, press “Continue reading about - computer science” below. - {' '} - Otherwise, you should keep reading instead. -

            - - ), - text: <>Continue reading about computer science - }, - content: ( - <> -
            - -
            -

            - Now, let’s talk about mathboxes and{' '} - 🍱 lunchboxes. -

            -

            - - Mathboxes are also computers: - {' '} - Mathboxes can compute basic additions and subtractions. So, we can - say that they’re computers, too. -

            - ➕, - , - ➖ - ]} - description={ - <> - Mathboxes are also computers - - } - /> -

            - - 🍱 Lunchboxes might be computers too? - {' '} - How about lunchboxes? It seems so far that lunchboxes can add and - subtract 1.{' '} - - That means lunchboxes might be computers, too. - -

            - - 🍱 Lunchboxes might be computers too? - - } - /> -

            - In fact: We’ll soon learn that lunchboxes are indeed - computers. Furthermore,{' '} - - Lunchboxes were actually a topic of computer science research - more than 80 years ago. - {' '} - This research was influential and became a foundation of modern - computer science. -

            - - Lunchboxes were a topic of -
            - computer science research -
            - more than 80 years ago. - - } - /> -

            - This is all we can say now. We’ll talk more in detail - after we’re done with the advanced levels. For now, just keep the - following in mind 😉: -

            -
              - - A computer is a computer device. - - - - Lunchboxes were a topic of computer science research more than - 80 years ago. - - - - - That research was influential and became a foundation of - modern computer science. - - -
            - - ) - }, { title: <>That’s it for the intermediate levels!, content: ( @@ -1609,6 +1448,177 @@ export default () => ( ) + }, + { + type: 'sideNote', + title: ( + <> + Side Note: Does this have anything to do with computer science or Y + combinator? + + ), + preview: { + content: ( + <> +

            + You might be wondering:{' '} + + “I understand the puzzles, but does it have anything to do + with Y combinator or{' '} + computer science?” + +

            + + Does it have anything to do with +
            + Y combinator or computer science? + + } + /> +

            + First, about Y combinator: You’ll learn about Y + combinator on the advanced levels, which will start from the + next page. +

            +

            + Spoiler:{' '} + + Y combinator is actually a special kind of a lunchbox. + {' '} + You’ll soon find out what that means! +

            + + Y combinator is actually +
            + a special kind of a lunchbox + + } + /> +

            + Next, about computer science: You’ll learn about + the relationship between the lunchboxes and computer science + after we’re done with the advanced levels. +

            +

            + However,{' '} + + if you want to know more now, press “Continue reading about + computer science” below. + {' '} +

            + + ), + text: <>Continue reading about computer science, + afterText: ( + <> +

            + Otherwise, you should keep reading instead by pressing this + button: +

            + + + ) + }, + content: ( + <> +
            + +
            +

            + Now, let’s talk about mathboxes and{' '} + 🍱 lunchboxes. +

            +

            + + Mathboxes are also computers: + {' '} + Mathboxes can compute basic additions and subtractions. So, we can + say that they’re computers, too. +

            + ➕, + , + ➖ + ]} + description={ + <> + Mathboxes are also computers + + } + /> +

            + + 🍱 Lunchboxes might be computers too? + {' '} + How about lunchboxes? It seems so far that lunchboxes can add and + subtract 1.{' '} + + That means lunchboxes might be computers, too. + +

            + + 🍱 Lunchboxes might be computers too? + + } + /> +

            + In fact: We’ll soon learn that lunchboxes are indeed + computers. Furthermore,{' '} + + Lunchboxes were actually a topic of computer science research + more than 80 years ago. + {' '} + This research was influential and became a foundation of modern + computer science. +

            + + Lunchboxes were a topic of +
            + computer science research +
            + more than 80 years ago. + + } + /> +

            + This is all we can say now. We’ll talk more in detail + after we’re done with the advanced levels. For now, just keep the + following in mind 😉: +

            +
              + + A computer is a computer device. + + + + Lunchboxes were a topic of computer science research more than + 80 years ago. + + + + + That research was influential and became a foundation of + modern computer science. + + +
            +

            Ok, let’s go to the advanced levels!

            + + + ) } ]} /> diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index d79cb2771..7ec142e05 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -1210,6 +1210,147 @@ export default () => ( ) }, + { + title: <>中級はここまで！, + content: ( + <> + + +

            + どうだ、「 + + 」も、弁当箱で再現したぞ！(やったのは俺らじゃなくて{' '} + 👧🏻 サヤちゃんだけど…) +

            +

            + 約束通り、「 + + 」がある計算箱も返してもらう！ +

            + + ) + }, + { + type: 'devil', + children: ( + <> +

            ぐぬぬ…では、返してやろう！

            + + ) + }, + { + type: 'celebrate', + children: ( + <> +

            + やったー！🎉 🎉{' '} + 🎉 +

            + + ) + } + ]} + /> + + 「 + 」も返してもらった！ + + +

            + しかし、 + + 「 + 」がある計算箱は、まだ返すわけにはいかないな。 + +

            +

            + 返してほしかったら、これらも弁当箱で再現してみるんだな！ +

            + + ) + } + ]} + /> + + + を{' '} + 回
            + 繰り返す +             + + 弁当箱で再現} + /> + + } + right={ + <> + + を{' '} + 回
            + 繰り返す +             + + 弁当箱で再現} + /> + + } + /> + +

            + 難しそう…しかし、こっちには 👧🏻{' '} + サヤちゃんがいる！彼女ならなんとかしてくれるはずだ！ +

            + + ) + }, + { + type: 'devil', + children: ( + <> +

            + ちなみに、中級編はここまでだ。 + 決着は、次からはじまる上級編でつけよう！ +

            + + ) + }, + { + type: 'brave', + children: ( + <> +

            よーし、望むところだ！上級編へ進もう！

            + + ) + } + ]} + /> + + + ) + }, { type: 'sideNote', title: ( @@ -1218,6 +1359,14 @@ export default () => ( ), preview: { + afterText: ( + <> +

            + 「上級編が終わるまで説明はいいや」という方は、こちらのボタンから先に進んでください！ +

            + + + ), content: ( <>

            @@ -1262,7 +1411,7 @@ export default () => ( 上級編をすべて終えたあとに詳しく説明します が、「いま気になる！ - 」という方は、↓の「コンピュータサイエンスとの繋がりについて読む」を押してください。「上級編が終わるまで待ちたい」という方は、読み飛ばしても大丈夫です。 + 」という方は、↓の「コンピュータサイエンスとの繋がりについて読む」を押してください。

            ), @@ -1359,148 +1508,9 @@ export default () => (

          - ということだけ頭に入れておいてください！😉 + ということだけ頭に入れておいてください！😉{' '} + では、先に進みましょう！

          - - ) - }, - { - title: <>中級はここまで！, - content: ( - <> - - -

          - どうだ、「 - - 」も、弁当箱で再現したぞ！(やったのは俺らじゃなくて{' '} - 👧🏻 サヤちゃんだけど…) -

          -

          - 約束通り、「 - - 」がある計算箱も返してもらう！ -

          - - ) - }, - { - type: 'devil', - children: ( - <> -

          ぐぬぬ…では、返してやろう！

          - - ) - }, - { - type: 'celebrate', - children: ( - <> -

          - やったー！🎉 🎉{' '} - 🎉 -

          - - ) - } - ]} - /> - - 「 - 」も返してもらった！ - - -

          - しかし、 - - 「 - 」がある計算箱は、まだ返すわけにはいかないな。 - -

          -

          - 返してほしかったら、これらも弁当箱で再現してみるんだな！ -

          - - ) - } - ]} - /> - - - を{' '} - 回
          - 繰り返す -           - - 弁当箱で再現} - /> - - } - right={ - <> - - を{' '} - 回
          - 繰り返す -           - - 弁当箱で再現} - /> - - } - /> - -

          - 難しそう…しかし、こっちには 👧🏻{' '} - サヤちゃんがいる！彼女ならなんとかしてくれるはずだ！ -

          - - ) - }, - { - type: 'devil', - children: ( - <> -

          - ちなみに、中級編はここまでだ。 - 決着は、次からはじまる上級編でつけよう！ -

          - - ) - }, - { - type: 'brave', - children: ( - <> -

          よーし、望むところだ！上級編へ進もう！

          - - ) - } - ]} - /> ) From 8adeb80d961b5652488487e796cfd8314ae037f6 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 11:02:54 -0700 Subject: [PATCH 075/110] Continue with 10 --- scripts/lib/initialExpressionContainers.ts | 8 + scripts/lib/runnerConfigs.ts | 16 + src/components/Runners/Hiag.tsx | 12 + src/components/Runners/Sldg.tsx | 12 + src/components/Runners/index.ts | 2 + src/contents/10.jp.tsx | 116 ++++--- src/lib/runners/hiag.json | 278 +++++++++++++++++ src/lib/runners/sldg.json | 333 +++++++++++++++++++++ 8 files changed, 730 insertions(+), 47 deletions(-) create mode 100644 src/components/Runners/Hiag.tsx create mode 100644 src/components/Runners/Sldg.tsx create mode 100644 src/lib/runners/hiag.json create mode 100644 src/lib/runners/sldg.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index e2e6166ff..b060eb868 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1154,6 +1154,14 @@ export const udaf = initializeExpressionContainer([ numberParams('g', 'h', 1) ]) +export const nhpm = initializeExpressionContainer([ + predParams('a', 'b', 'c', 'd', 'e', 'f'), + { + shorthandNumberAfterConvert: 'number', + shorthandNumber: 1 + } +]) + export const csai = initializeExpressionContainer( numberParamsHighlightNumber('b', 'c', 0) ) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 2dbb5d985..bb785cfd6 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1849,6 +1849,22 @@ export const ylav: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const sldg: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.udaf, + showPriorities: true, + highlightOverrides: { + g: 'highlighted', + h: 'highlighted' + } +} + +export const hiag: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.nhpm, + showPriorities: true +} + export const zwut: ExpressionRunnerShorthandConfig = { runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.udaf, diff --git a/src/components/Runners/Hiag.tsx b/src/components/Runners/Hiag.tsx new file mode 100644 index 000000000..52dd8f0a7 --- /dev/null +++ b/src/components/Runners/Hiag.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/hiag.json' + +const Hiag = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Hiag diff --git a/src/components/Runners/Sldg.tsx b/src/components/Runners/Sldg.tsx new file mode 100644 index 000000000..b52a51c12 --- /dev/null +++ b/src/components/Runners/Sldg.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/sldg.json' + +const Sldg = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Sldg diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 7159c39f4..c27dd1415 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -266,6 +266,8 @@ export { default as Xqjd } from 'src/components/Runners/Xqjd' export { default as Cldb } from 'src/components/Runners/Cldb' export { default as Dqdv } from 'src/components/Runners/Dqdv' export { default as Ylav } from 'src/components/Runners/Ylav' +export { default as Sldg } from 'src/components/Runners/Sldg' +export { default as Hiag } from 'src/components/Runners/Hiag' export { default as Zwut } from 'src/components/Runners/Zwut' export { default as Xusi } from 'src/components/Runners/Xusi' export { default as Lipt } from 'src/components/Runners/Lipt' diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index 7ec142e05..34750e48e 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -379,9 +379,13 @@ export default () => (

          「 - 」を弁当箱で再現するには、以下の弁当箱にある{' '} - {' '} - に、ある法則に基づいて料理を入れる必要があります。 + 」を弁当箱で再現するには、 + + 以下の弁当箱にある{' '} + {' '} + に、ある法則に基づいて料理を入れる + + 必要があります。

          ) @@ -513,66 +517,85 @@ export default () => (

          ふむふむ…まさか今回も一発で正解なんてことはありえないと思うけど、とりあえず試してみるか。

          + + ) + }, + { + type: 'saya', + children: ( + <>

          - 前回もやったように、 + まず、 {' '} - に変換できる弁当箱と合体させてみよう。 + に変換できる弁当箱と合体させてみよう！

          - - -

          - 今回は - - があるかどうかを確かめたいわけだから、 + それで、 + + 結果が になれば + + 、 ➖{' '} - が計算できないといけない。 -

          - , - ➖, - - ]} - /> -

          - つまり、実行した時に、 - - 結果が{' '} - - に変換できる弁当箱 - - になれば成功というわけだ。 - + {' '} + を計算できるということだよね。

          ) } ]} /> - - に変換できる弁当箱と、 + + に変換できる弁当箱と
          - 👧🏻 サヤちゃんの弁当箱を合体させ… -           + 合体させて… + 実行したときに、 に変換できる
          - 弁当箱になれば成功{' '} + 弁当箱になれば、 + ➖{' '} + を
          + 計算できるので成功{' '} 🎉
          それ以外なら失敗 😭           + +

          + では、こちらの + + {' '} + に変換できる弁当箱と合体させて、 + してみよう！ + +

          + + + +

          合体させるとこうなるよ！

          + + ) + } + ]} + /> + + に変換できる弁当箱と合体 + ( children: ( <>

          - じゃあ、 - - してみよう！ + よし、 + してみよう！

          ) @@ -601,7 +623,7 @@ export default () => ( content: ( <>

          - それでは、上記の弁当箱を実行してみましょう！途中まで進めてみますね。 + それでは、 ( } ]} /> - - に変換できる弁当箱と、 + + に変換できる弁当箱と
          👧🏻 サヤちゃんの弁当箱を合体させ… -           + 実行すると、 diff --git a/src/lib/runners/hiag.json b/src/lib/runners/hiag.json new file mode 100644 index 000000000..d53e071db --- /dev/null +++ b/src/lib/runners/hiag.json @@ -0,0 +1,278 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 1, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "type": "function", + "maxNestedFunctionDepth": 5 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 5 + }, + "numLeafNodes": 8, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/sldg.json b/src/lib/runners/sldg.json new file mode 100644 index 000000000..07f2a722a --- /dev/null +++ b/src/lib/runners/sldg.json @@ -0,0 +1,333 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "type": "function", + "maxNestedFunctionDepth": 5 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 5 + }, + "numLeafNodes": 8, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": { + "g": "highlighted", + "h": "highlighted" + }, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From ca445d49dd661dcc95fdda9f461747cd6e9fadf6 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 11:28:23 -0700 Subject: [PATCH 076/110] Continue with 10 --- scripts/lib/initialExpressionContainers.ts | 8 + scripts/lib/runnerConfigs.ts | 16 + src/components/Runners/Dtle.tsx | 12 + src/components/Runners/Gqct.tsx | 12 + src/components/Runners/index.ts | 2 + src/contents/10.en.tsx | 4 +- src/contents/10.jp.tsx | 104 ++++-- src/contents/9.en.tsx | 2 +- src/lib/runners/dtle.json | 354 +++++++++++++++++++++ src/lib/runners/gqct.json | 278 ++++++++++++++++ 10 files changed, 754 insertions(+), 38 deletions(-) create mode 100644 src/components/Runners/Dtle.tsx create mode 100644 src/components/Runners/Gqct.tsx create mode 100644 src/lib/runners/dtle.json create mode 100644 src/lib/runners/gqct.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index b060eb868..0a762a474 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1162,6 +1162,14 @@ export const nhpm = initializeExpressionContainer([ } ]) +export const yjhv = initializeExpressionContainer([ + predParams('a', 'b', 'c', 'd', 'e', 'f'), + { + shorthandNumberAfterConvert: 'number', + shorthandNumber: 2 + } +]) + export const csai = initializeExpressionContainer( numberParamsHighlightNumber('b', 'c', 0) ) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index bb785cfd6..87b0a6389 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1859,12 +1859,28 @@ export const sldg: ExpressionRunnerShorthandConfig = { } } +export const dtle: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.lwpw, + showPriorities: true, + highlightOverrides: { + g: 'highlighted', + h: 'highlighted' + } +} + export const hiag: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.nhpm, showPriorities: true } +export const gqct: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.yjhv, + showPriorities: true +} + export const zwut: ExpressionRunnerShorthandConfig = { runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.udaf, diff --git a/src/components/Runners/Dtle.tsx b/src/components/Runners/Dtle.tsx new file mode 100644 index 000000000..2ad15f72a --- /dev/null +++ b/src/components/Runners/Dtle.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/dtle.json' + +const Dtle = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Dtle diff --git a/src/components/Runners/Gqct.tsx b/src/components/Runners/Gqct.tsx new file mode 100644 index 000000000..2ea4a35dd --- /dev/null +++ b/src/components/Runners/Gqct.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/gqct.json' + +const Gqct = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Gqct diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index c27dd1415..2bf889b35 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -267,7 +267,9 @@ export { default as Cldb } from 'src/components/Runners/Cldb' export { default as Dqdv } from 'src/components/Runners/Dqdv' export { default as Ylav } from 'src/components/Runners/Ylav' export { default as Sldg } from 'src/components/Runners/Sldg' +export { default as Dtle } from 'src/components/Runners/Dtle' export { default as Hiag } from 'src/components/Runners/Hiag' +export { default as Gqct } from 'src/components/Runners/Gqct' export { default as Zwut } from 'src/components/Runners/Zwut' export { default as Xusi } from 'src/components/Runners/Xusi' export { default as Lipt } from 'src/components/Runners/Lipt' diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index d7b0da65e..470952486 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -1043,7 +1043,7 @@ export default () => ( type: 'devil', children: ( <> -

          Ugh…

          +

          Grr…

          ) } @@ -1303,7 +1303,7 @@ export default () => ( type: 'devil', children: ( <> -

          Ugh…!

          +

          Grr…!

          ) }, diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index 34750e48e..b3090c88a 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -843,9 +843,8 @@ export default () => ( ➖{' '} が計算できたからといって、 - その弁当箱に - - があるとはまだ言い切れない + 「 + 」を再現できたとはまだ言い切れない ぞ。

          @@ -861,14 +860,21 @@ export default () => ( } ]} /> - , - ➖, - - ]} - description={<>これも計算できる？} - /> + + に変換できる弁当箱と +
          + 👧🏻 サヤちゃんの弁当箱を合体させ… +           + + + 実行したときに、 + に変換できる +
          + 弁当箱になれば成功{' '} + 🎉 +
          + それ以外なら失敗 😭 +           ( }} /> -

          - 合体したものを実行して、 - - {' '} - に変換できる弁当箱になればいい - - んだよね。 -

          +

          合体させるとこうなるよ！

          ) } ]} /> - - に変換できる弁当箱と、 -
          - 👧🏻 サヤちゃんの弁当箱を合体させ… -           - - - 実行したときに、 - に変換できる -
          - 弁当箱になれば成功{' '} - 🎉 -
          - それ以外なら失敗 😭 -           + + に変換できる弁当箱と合体 + +

          + よし、 + してみよう！ +

          + + ) + }, { type: 'saya', children: ( <> -

          まずは実行してみるね。

            今回は、 @@ -973,6 +970,43 @@ export default () => ( args={{ name: 'canBeConvertedCaption', number: 1, letter: 'b' }} /> + +

            ということは、サヤちゃんの弁当箱は…

            +
              + + + {' '} + に変換できる弁当箱と合体させて実行すると、{' '} + + + + + に変換できる弁当箱になる + + +
            +

            ということですね。

            + + ) + } + ]} + /> + + に変換できる弁当箱と +
            + 👧🏻 サヤちゃんの弁当箱を合体させ… +             + + + 実行すると、 +
            + に変換できる弁当箱になる +             ( type: 'devil', children: ( <> -

            Ugh…!

            +

            Grr…!

            ) } diff --git a/src/lib/runners/dtle.json b/src/lib/runners/dtle.json new file mode 100644 index 000000000..0f3128038 --- /dev/null +++ b/src/lib/runners/dtle.json @@ -0,0 +1,354 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "type": "function", + "maxNestedFunctionDepth": 5 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 5 + }, + "numLeafNodes": 9, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": { + "g": "highlighted", + "h": "highlighted" + }, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/gqct.json b/src/lib/runners/gqct.json new file mode 100644 index 000000000..b3d6729af --- /dev/null +++ b/src/lib/runners/gqct.json @@ -0,0 +1,278 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 2, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "type": "function", + "maxNestedFunctionDepth": 5 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 5 + }, + "numLeafNodes": 8, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From 7d2a3d7c186ed6e3abf8e245dd644f05665dc5bb Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 11:35:07 -0700 Subject: [PATCH 077/110] Fix emoji size --- src/components/VariableExpressionBox.tsx | 33 ++++++++++++------------ 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/components/VariableExpressionBox.tsx b/src/components/VariableExpressionBox.tsx index 0f235c2e4..a7a33ad6d 100644 --- a/src/components/VariableExpressionBox.tsx +++ b/src/components/VariableExpressionBox.tsx @@ -56,7 +56,6 @@ const VariableEmoji = ({ expression }: VariableExpressionBoxProps) => { return (
            @@ -90,38 +89,40 @@ const VariableEmoji = ({ expression }: VariableExpressionBoxProps) => { `} > {expression.shorthandNumber !== undefined ? ( - + ) : expression.shorthandNumberAfterConvert === 'blank' ? ( - + ) : expression.shorthandNumberAfterConvert === 'blankPlusOne' ? ( <> - ➕{' '} - + {' '} + ➕ ) : expression.shorthandNumberAfterConvert === 'blankMinusOne' ? ( <> - ➖{' '} - + {' '} + ➖ ) : expression.shorthandNumberAfterConvert === 'trueCase' ? ( - + ) : expression.shorthandNumberAfterConvert === 'falseCase' ? ( - + ) : expression.shorthandNumberAfterConvert === 'condition' ? ( - + ) : expression.shorthandNumberAfterConvert === 'binaryFirst' ? ( - + ) : expression.shorthandNumberAfterConvert === 'binarySecond' ? ( - + ) : expression.shorthandNumberAfterConvert === 'binaryMultiply' ? ( <> - ✖️{' '} - + {' '} + ✖️{' '} + ) : expression.shorthandNumberAfterConvert === 'binaryAdd' ? ( <> - ➕{' '} - + {' '} + ➕{' '} + ) : ( <> From 10c28b0c3728e30e0bcfa6fd454ae8bb0ff00799 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 12:33:38 -0700 Subject: [PATCH 078/110] Continue with 10 --- src/contents/10.jp.tsx | 136 +++++------------------------------------ 1 file changed, 15 insertions(+), 121 deletions(-) diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index b3090c88a..fcb81b299 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -1047,8 +1047,8 @@ export default () => ( { title: ( <> - - がある法則 + 「 + 」を再現できた！ ), content: ( @@ -1062,9 +1062,9 @@ export default () => (

            まさか、こうも簡単に正解されるとは思わなかったが…

            - サヤちゃんが考えた弁当箱は、 - - がある弁当箱だ！ + サヤちゃんが考えた弁当箱は、 「 + 」 + を再現できる弁当箱だ！ {' '} 🎉

            @@ -1073,12 +1073,15 @@ export default () => ( } ]} /> - - 👧🏻 サヤちゃんが考えた弁当箱には + + 「」 は… + + + + 👧🏻 サヤちゃんが考えた弁当箱で、
            - - がある -             + 再現できる！ + ( ) }, - { - type: 'devil', - children: ( - <> -

            - ちなみに、サヤちゃんが考えた弁当箱以外にも、 - - 以下の法則に当てはまる弁当箱であれば、 どれでも - - があるぞ。 - -

            - - ) - } - ]} - /> - - この法則に当てはまる弁当箱であれば、 -
            - - がある -             - -

            - たしかにサヤちゃんの弁当箱は、上の法則に当てはまっている… -

            よくこんなの分かったなあ。サヤちゃんは天才なのかもしれない！

            @@ -1141,35 +1116,13 @@ export default () => ( } ]} /> - - ) - }, - { - type: 'summary', - title: ( - <> - 「 - 」も再現できた！ - - ), - content: ( - <> -

            - 今回学んだことを一言でまとめると、 - - 計算箱の「 - - 」も、弁当箱で「再現」できる - - 、ということです。 -

            , , , 🍱, - + ]} description={ <> @@ -1182,65 +1135,6 @@ export default () => ( } /> -

            - たとえば、以下のような {' '} - ➖ {' '} - を計算する計算箱をご覧ください。 -

            - - ➖{' '} - を計算できる - -

            - これを弁当箱で再現するには、 - - に変換できる弁当箱と、 - - がある弁当箱を合体すればいい - - のです。 -

            - - に変換できる弁当箱と -
            - - がある弁当箱を -
            - 合体すれば、 - {' '} - の計算箱を再現できる -             - - -
            -

            - まとめると、 - - 計算箱の「 - - 」も、弁当箱で再現することができる - - のです。このポイントさえ覚えていただければ、細かいことは分からなくても大丈夫です！ -

            - , - , - , - 🍱, - - ]} - description={ - <> - 計算箱の「 - - 」も、 -
            - 弁当箱で「再現 - 」することができる - - } - /> ( children: ( <>

            - 今回の「 + ちなみに、今回の「 」を再現する問題も、超難問です。だから、サヤちゃんのように答えを思いつけなくても大丈夫です。

            From c90ad3a47eb0011c2144751e95c697c0a3d1f3d2 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 13:36:37 -0700 Subject: [PATCH 079/110] Footer for 8 --- scripts/lib/initialExpressionContainers.ts | 8 +- src/contents/8.jp.tsx | 107 ++++++++++++++++++++- src/lib/runners/blvt.json | 1 - src/lib/runners/oykb.json | 1 - 4 files changed, 108 insertions(+), 9 deletions(-) diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 0a762a474..1d5e0525b 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1040,13 +1040,9 @@ export const ngth = initializeExpressionContainer([ numberParams('f', 'g', 1) ]) -export const disc = initializeExpressionContainer( - succParams('a', 'b', 'c', true) -) +export const disc = initializeExpressionContainer(succParams('a', 'b', 'c')) -export const blns = initializeExpressionContainer( - succParams('A', 'B', 'C', true) -) +export const blns = initializeExpressionContainer(succParams('A', 'B', 'C')) export const ojsm = initializeExpressionContainer(succParams('h', 'i', 'j')) export const zgad = initializeExpressionContainer( diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index c5b7f63c8..9f6d53cb6 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -11,7 +11,10 @@ import { } from 'src/components/ContentTags' import CustomEmoji from 'src/components/CustomEmoji' import BubbleQuotes from 'src/components/BubbleQuotes' +import CardContent from 'src/components/CardContent' import EmojiNumber from 'src/components/EmojiNumber' +import EmojiWithText from 'src/components/EmojiWithText' +import EmojiForLetter from 'src/components/EmojiForLetter' import Emoji from 'src/components/Emoji' import H from 'src/components/H' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' @@ -1141,7 +1144,109 @@ export default () => ( } /> - ) + ), + footer: { + content: ( + <> + +
            +

            + 👧🏻 サヤちゃんが考えた弁当箱以外にも、 + + 以下の法則に当てはまる弁当箱であれば、どれでも 「 + + 」を再現できます。 + +

            + + この法則に当てはまる弁当箱であれば、 +
            + 「 + 」を再現できる +             +

            + 👧🏻 サヤちゃんが考えた弁当箱の場合、 +

            +
              + + 🅰️ は + + + 🅱️ は + + + は + +
            +

            でした。

            + + 🅰️ は 、 + 🅱️ は 、 + は + +

            他にも、例えば

            +
              + + 🅰️ は + + + 🅱️ は + + + は + +
            +

            + にしても、「 + + 」を再現することができます。 +

            + + 🅰️ は 、 + 🅱️ は 、 + は + 。
            + これも「 + + 」を +
            + 再現できる！ +             +

            + つまり、「 + + 」を再現できる弁当箱は、👧🏻{' '} + サヤちゃんが考えた弁当箱以外にもたくさんあるということですね！ +

            + + } + preview={{ + text: <>続きを読む, + content: ( + <> +

            + ちなみに: 「 + + 」を再現できる弁当箱は、 + + 👧🏻{' '} + サヤちゃんが考えた弁当箱以外にもあります。 + + つまり、正解は他にもあるのです。 +

            +

            + 気になる方は、↓の「続きを読む」を押してみてください。 + (読まなくても先に進めます！) +

            + + ) + }} + /> + + ) + } }, { type: 'challengeProblem', diff --git a/src/lib/runners/blvt.json b/src/lib/runners/blvt.json index 26988748f..1c30621c5 100644 --- a/src/lib/runners/blvt.json +++ b/src/lib/runners/blvt.json @@ -123,7 +123,6 @@ "maxNestedFunctionDepth": 2 }, "type": "function", - "meta": "plusOneEffect", "maxNestedFunctionDepth": 3 }, "numLeafNodes": 4, diff --git a/src/lib/runners/oykb.json b/src/lib/runners/oykb.json index 2552a36fd..5ebc9e3c2 100644 --- a/src/lib/runners/oykb.json +++ b/src/lib/runners/oykb.json @@ -123,7 +123,6 @@ "maxNestedFunctionDepth": 2 }, "type": "function", - "meta": "plusOneEffect", "maxNestedFunctionDepth": 3 }, "numLeafNodes": 4, From edda03d34bc9604828a27684cf98c609677c16ce Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 14:14:41 -0700 Subject: [PATCH 080/110] Finish 10 --- scripts/lib/initialExpressionContainers.ts | 6 +- scripts/lib/runnerConfigs.ts | 14 ++ src/components/Runners/Onyr.tsx | 12 + src/components/Runners/index.ts | 1 + src/contents/10.jp.tsx | 69 +++++- src/lib/runners/cbmn.json | 1 - src/lib/runners/onyr.json | 261 +++++++++++++++++++++ 7 files changed, 354 insertions(+), 10 deletions(-) create mode 100644 src/components/Runners/Onyr.tsx create mode 100644 src/lib/runners/onyr.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 1d5e0525b..353d10247 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1188,7 +1188,11 @@ export const wosn = initializeExpressionContainer( ) export const vfwt = initializeExpressionContainer( - predParams('A', 'B', 'C', 'D', 'E', 'F', true) + predParams('A', 'B', 'C', 'D', 'E', 'F') +) + +export const ccjv = initializeExpressionContainer( + predParams('g', 'h', 'i', 'j', 'k', 'l') ) export const yvkr = initializeExpressionContainer([ diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 87b0a6389..92db91ae2 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1505,6 +1505,20 @@ export const oykb: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { b: '🅱️', a: '🅰️', c: 'C' } } +export const onyr: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.ccjv, + showPriorities: true, + bottomRightBadgeOverrides: { + h: '🅱️', + g: '🅰️', + i: 'C', + j: 'D', + k: 'E', + l: 'F' + } +} + export const dvpl: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.ojsm, diff --git a/src/components/Runners/Onyr.tsx b/src/components/Runners/Onyr.tsx new file mode 100644 index 000000000..d2dc66f1f --- /dev/null +++ b/src/components/Runners/Onyr.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/onyr.json' + +const Onyr = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Onyr diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 2bf889b35..2d30b849c 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -223,6 +223,7 @@ export { default as Ifqp } from 'src/components/Runners/Ifqp' export { default as Nvqu } from 'src/components/Runners/Nvqu' export { default as Blvt } from 'src/components/Runners/Blvt' export { default as Oykb } from 'src/components/Runners/Oykb' +export { default as Onyr } from 'src/components/Runners/Onyr' export { default as Dvpl } from 'src/components/Runners/Dvpl' export { default as Udxn } from 'src/components/Runners/Udxn' export { default as Cjxe } from 'src/components/Runners/Cjxe' diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index fcb81b299..a87d586c4 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -12,11 +12,13 @@ import { import H from 'src/components/H' import BubbleQuotes from 'src/components/BubbleQuotes' import EmojiNumber from 'src/components/EmojiNumber' +import EmojiForLetter from 'src/components/EmojiForLetter' import BottomRightBadge from 'src/components/BottomRightBadge' import EmojiSeparator from 'src/components/EmojiSeparator' import CustomEmoji from 'src/components/CustomEmoji' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' import EmojiWithText from 'src/components/EmojiWithText' +import CardContent from 'src/components/CardContent' import Emoji from 'src/components/Emoji' import ExpressionRunnerCaptionOnly from 'src/components/ExpressionRunnerCaptionOnly' import TwoColGrid from 'src/components/TwoColGrid' @@ -356,13 +358,6 @@ export default () => ( ) } - //

            - // 前回と同じく、 - // - // それぞれの {' '} - // には何らかの料理が入ります。 - // - //

            ]} /> @@ -1158,7 +1153,65 @@ export default () => ( ]} /> - ) + ), + footer: { + content: ( + <> + +
            +

            + 👧🏻 サヤちゃんが考えた弁当箱以外にも、 + + 以下の法則に当てはまる弁当箱であれば、どれでも 「 + + 」を再現できます。 + +

            + + この法則に当てはまる弁当箱であれば、 +
            + 「 + 」を再現できる +             +

            + たとえば、以下のような弁当箱でも、「 + + 」を再現することができます。 +

            + + これも「 + + 」を再現できる + + + } + preview={{ + text: <>続きを読む, + content: ( + <> +

            + ちなみに: 「 + + 」を再現できる弁当箱は、 + + 👧🏻{' '} + サヤちゃんが考えた弁当箱以外にもあります。 + + つまり、正解は他にもあるのです。 +

            +

            + 気になる方は、↓の「続きを読む」を押してみてください。 + (読まなくても先に進めます！) +

            + + ) + }} + /> + + ) + } }, { title: <>中級はここまで！, diff --git a/src/lib/runners/cbmn.json b/src/lib/runners/cbmn.json index a9d9970cd..b7eb45e85 100644 --- a/src/lib/runners/cbmn.json +++ b/src/lib/runners/cbmn.json @@ -230,7 +230,6 @@ "maxNestedFunctionDepth": 4 }, "type": "function", - "meta": "minusOneEffect", "maxNestedFunctionDepth": 5 }, "numLeafNodes": 6, diff --git a/src/lib/runners/onyr.json b/src/lib/runners/onyr.json new file mode 100644 index 000000000..f8cdd3afb --- /dev/null +++ b/src/lib/runners/onyr.json @@ -0,0 +1,261 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "i", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "l", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "l", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "arg": { + "name": "l", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "i", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "arg": { + "name": "j", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "k", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "j", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "k", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "type": "function", + "maxNestedFunctionDepth": 5 + }, + "numLeafNodes": 6, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": { + "h": "🅱️", + "g": "🅰️", + "i": "C", + "j": "D", + "k": "E", + "l": "F" + }, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From 3efb57ba2eb78e4d0e9db41e122f19e5c0712db1 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 14:25:16 -0700 Subject: [PATCH 081/110] Continue with 12 --- scripts/lib/initialExpressionContainers.ts | 13 ++ scripts/lib/runnerConfigs.ts | 13 ++ src/components/Runners/Imhz.tsx | 12 ++ src/components/Runners/index.ts | 1 + src/contents/10.jp.tsx | 1 + src/contents/12.jp.tsx | 90 ++++++--- src/lib/runners/imhz.json | 209 +++++++++++++++++++++ 7 files changed, 312 insertions(+), 27 deletions(-) create mode 100644 src/components/Runners/Imhz.tsx create mode 100644 src/lib/runners/imhz.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 353d10247..1f65c749f 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1392,6 +1392,19 @@ export const lcce = initializeExpressionContainer( ) ) +export const vwlq = initializeExpressionContainer( + isZeroParams( + 'f', + 'g', + 'h', + 'i', + 'j', + { shorthandNumberAfterConvert: 'trueCase' }, + { shorthandNumberAfterConvert: 'falseCase' }, + { shorthandNumberAfterConvert: 'condition' } + ) +) + export const gbbo = initializeExpressionContainer([ { arg: 'f', diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 92db91ae2..aa1682108 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -2117,6 +2117,19 @@ export const fton: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const imhz: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.vwlq, + showPriorities: true, + bottomRightBadgeOverrides: { + g: '🅱️', + f: '🅰️', + h: 'C', + i: 'D', + j: 'E' + } +} + export const bnyo: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.gbbo, diff --git a/src/components/Runners/Imhz.tsx b/src/components/Runners/Imhz.tsx new file mode 100644 index 000000000..537ea8122 --- /dev/null +++ b/src/components/Runners/Imhz.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/imhz.json' + +const Imhz = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Imhz diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 2d30b849c..2a360ed33 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -304,6 +304,7 @@ export { default as Jbqw } from 'src/components/Runners/Jbqw' export { default as Kfru } from 'src/components/Runners/Kfru' export { default as Svbd } from 'src/components/Runners/Svbd' export { default as Fton } from 'src/components/Runners/Fton' +export { default as Imhz } from 'src/components/Runners/Imhz' export { default as Bnyo } from 'src/components/Runners/Bnyo' export { default as Hkfq } from 'src/components/Runners/Hkfq' export { default as Ywpq } from 'src/components/Runners/Ywpq' diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index a87d586c4..a7488faaf 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -1040,6 +1040,7 @@ export default () => ( ) }, { + type: 'summary', title: ( <> 「 diff --git a/src/contents/12.jp.tsx b/src/contents/12.jp.tsx index 43a376464..1e57608a8 100644 --- a/src/contents/12.jp.tsx +++ b/src/contents/12.jp.tsx @@ -5,11 +5,14 @@ import { HighlightBold, Highlight, Ul, - UlLi + Hr, + UlLi, + Bold } from 'src/components/ContentTags' import H from 'src/components/H' import BubbleQuotes from 'src/components/BubbleQuotes' import EmojiNumber from 'src/components/EmojiNumber' +import CardContent from 'src/components/CardContent' import EmojiSeparator from 'src/components/EmojiSeparator' import CustomEmoji from 'src/components/CustomEmoji' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' @@ -840,31 +843,6 @@ export default () => ( ) }, - { - type: 'dog', - children: ( - <> -

            - ちなみに、 - - 以下のような 🅰️ 🅱️{' '} - {' '} - {' '} - の法則に沿っていれば、それぞれに何の料理が入っていても、条件分岐の機能を再現することができます。 - -

            - - ) - } - ]} - /> - - 以下の法則に当てはまる弁当箱で -
            - あれば、条件分岐の機能を再現できる -             - ( } /> - ) + ), + footer: { + content: ( + <> + +
            +

            + 👧🏻 サヤちゃんが考えた弁当箱以外にも、 + + 以下の法則に当てはまる弁当箱であれば、どれでも 「 + + 」を再現できます。 + +

            + + この法則に当てはまる弁当箱であれば、 +
            + 「 + 」を再現できる +             +

            + たとえば、以下のような弁当箱でも、「 + + 」を再現することができます。 +

            + + これも「 + + 」を再現できる + + + } + preview={{ + text: <>続きを読む, + content: ( + <> +

            + ちなみに: 「 + + 」を再現できる弁当箱は、 + + 👧🏻{' '} + サヤちゃんが考えた弁当箱以外にもあります。 + + つまり、正解は他にもあるのです。 +

            +

            + 気になる方は、↓の「続きを読む」を押してみてください。 + (読まなくても先に進めます！) +

            + + ) + }} + /> + + ) + } }, { title: <>繰り返しの機能は？, diff --git a/src/lib/runners/imhz.json b/src/lib/runners/imhz.json new file mode 100644 index 000000000..e3a9abbc8 --- /dev/null +++ b/src/lib/runners/imhz.json @@ -0,0 +1,209 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "blankNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 4 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumberAfterConvert": "falseCase", + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "blankNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumberAfterConvert": "trueCase", + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "i", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "arg": { + "name": "j", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "func": { + "name": "blankNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2, + 3, + 4 + ], + "emphasizePriority": false, + "bound": true, + "shorthandNumberAfterConvert": "condition", + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 4, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 8, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": { + "g": "🅱️", + "f": "🅰️", + "h": "C", + "i": "D", + "j": "E" + }, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From 2104e24351b2e5e8910ab20e4f1e26e166685f11 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 15:12:39 -0700 Subject: [PATCH 082/110] Rewrite 14 --- scripts/lib/initialExpressionContainers.ts | 14 ++ scripts/lib/runnerConfigs.ts | 6 + src/components/Runners/Beug.tsx | 12 ++ src/components/Runners/index.ts | 1 + src/contents/10.jp.tsx | 1 - src/contents/14.jp.tsx | 77 ++++++--- src/lib/runners/beug.json | 191 +++++++++++++++++++++ 7 files changed, 276 insertions(+), 26 deletions(-) create mode 100644 src/components/Runners/Beug.tsx create mode 100644 src/lib/runners/beug.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 1f65c749f..3eaaf68ae 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -2212,6 +2212,20 @@ export const psxr = initializeExpressionContainer({ ] }) +export const mqoa = initializeExpressionContainer({ + arg: 'C', + body: [ + { + arg: 'D', + body: ['C', ['D', 'D']] + }, + { + arg: 'D', + body: ['C', ['D', 'D']] + } + ] +}) + export const silw = initializeExpressionContainer([ [ addParams('a', 'b', 'c', 'd'), diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index aa1682108..71887ec19 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -2615,6 +2615,12 @@ export const rjho: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const beug: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.mqoa, + showPriorities: true +} + export const hvfb: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.silw, diff --git a/src/components/Runners/Beug.tsx b/src/components/Runners/Beug.tsx new file mode 100644 index 000000000..405278b77 --- /dev/null +++ b/src/components/Runners/Beug.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/beug.json' + +const Beug = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Beug diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 2a360ed33..cf5c19364 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -369,6 +369,7 @@ export { default as Anzh } from 'src/components/Runners/Anzh' export { default as Zkon } from 'src/components/Runners/Zkon' export { default as Xjzx } from 'src/components/Runners/Xjzx' export { default as Rjho } from 'src/components/Runners/Rjho' +export { default as Beug } from 'src/components/Runners/Beug' export { default as Hvfb } from 'src/components/Runners/Hvfb' export { default as Dmrz } from 'src/components/Runners/Dmrz' export { default as Tpyg } from 'src/components/Runners/Tpyg' diff --git a/src/contents/10.jp.tsx b/src/contents/10.jp.tsx index a7488faaf..fa537ef1d 100644 --- a/src/contents/10.jp.tsx +++ b/src/contents/10.jp.tsx @@ -12,7 +12,6 @@ import { import H from 'src/components/H' import BubbleQuotes from 'src/components/BubbleQuotes' import EmojiNumber from 'src/components/EmojiNumber' -import EmojiForLetter from 'src/components/EmojiForLetter' import BottomRightBadge from 'src/components/BottomRightBadge' import EmojiSeparator from 'src/components/EmojiSeparator' import CustomEmoji from 'src/components/CustomEmoji' diff --git a/src/contents/14.jp.tsx b/src/contents/14.jp.tsx index 367bf27cd..019c93e3b 100644 --- a/src/contents/14.jp.tsx +++ b/src/contents/14.jp.tsx @@ -5,12 +5,15 @@ import { HighlightBold, Highlight, Ul, - UlLi + UlLi, + Bold, + Hr } from 'src/components/ContentTags' import H from 'src/components/H' import BubbleQuotes from 'src/components/BubbleQuotes' import Emoji from 'src/components/Emoji' import EmojiNumber from 'src/components/EmojiNumber' +import CardContent from 'src/components/CardContent' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' import InlineBorder from 'src/components/InlineBorder' import CustomEmoji from 'src/components/CustomEmoji' @@ -1362,26 +1365,6 @@ export default () => ( ) }, - { - type: 'dog', - children: ( - <> -

            - ちなみに、以下のような法則に当てはまる弁当箱は、どれも「 - Yコンビネータ - 」と呼べるんですよ。 -

            - - ) - } - ]} - /> - - この法則に当てはまる弁当箱は全部 -
            「Yコンビネータ」 -             - (

            そうなんだ。でもすごいね。 - こんなシンプルな、 - 🅰️ と 🅱️{' '} - の二種類の料理しかない弁当箱が、繰り返しを可能にするなんて… + こんなシンプルな、二種類の料理しかない弁当箱が、繰り返しを可能にするなんて…

            @@ -1425,7 +1406,53 @@ export default () => ( } /> - ) + ), + footer: { + content: ( + <> + +

            +

            + + 以下の法則に当てはまる弁当箱は、どれも 「 + Yコンビネータ + 」です。 + +

            + + この法則に当てはまる弁当箱は全部 +
            「Yコンビネータ」 +             +

            + たとえば、以下のような弁当箱も「 + Yコンビネータ + 」です。 +

            + + これも「 + Yコンビネータ」 + + + } + preview={{ + text: <>続きを読む, + content: ( + <> +

            + ちなみに: 上の弁当箱以外にも、「 + Yコンビネータ + 」の弁当箱は存在します。気になる方は、↓の「続きを読む」を押してみてください。 + (読まなくても先に進めます！) +

            + + ) + }} + /> + + ) + } }, { title: <>繰り返しの機能を返してもらえる？, diff --git a/src/lib/runners/beug.json b/src/lib/runners/beug.json new file mode 100644 index 000000000..5e7ff98c0 --- /dev/null +++ b/src/lib/runners/beug.json @@ -0,0 +1,191 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "C", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "D", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "D", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "D", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "C", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "D", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "D", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "D", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "C", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 6, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From cc9464ec871a32af434152b74b1139935c73bd94 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 15:12:48 -0700 Subject: [PATCH 083/110] Remove commented code --- src/contents/7.jp.tsx | 1530 ----------------------------------------- src/contents/8.jp.tsx | 1230 --------------------------------- 2 files changed, 2760 deletions(-) diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index 290fd9818..9b04e521f 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -913,1533 +913,3 @@ export default () => ( ]} /> ) - -// export default () => ( -// 難易度が急激に上がります, -// content: ( -// <> -//

            -// -// このページから難易度が急激に上がります。 -// -// 弁当箱も、以前に比べて複雑になります。 -//

            -// 難易度が上がり、弁当箱も複雑に} -// /> -//

            -// ただ、 -// -// 内容を完全に理解する必要はありません。少しくらい分からなくても、雰囲気で読み進めていただいて大丈夫です。 -// -// また、先に進んでから読み返すことで理解できる場合もあるので、分からなくてもとりあえず先に進んでみてください。 -//

            -// 完全に理解する必要はありません！} -// /> -// -// ) -// }, -// { -// title: <>問題の説明, -// content: ( -// <> -// -//

            -// では約束通り、 -// -// これから出す問題に答えることができたら、計算箱を返してやろう！ -// -//

            -// -// ) -// } -// ]} -// /> -// , -// 😈, -// -// ]} -// description={ -// <> -// これから出す難しい問題に -//
            -// 答えられたら計算箱を返してやろう！ -// -// } -// /> -// -//

            -// この問題は非常に難しい -// から覚悟するんだな。ミニオン、問題を説明するんだ！ -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            -// わかりました。まず、 -// 。 -//

            -//

            -// {' '} -// がたくさんありますが、それぞれの{' '} -// -// {' '} -// には何らかの料理が入ります。 -// -//

            -// -// ) -// } -// ]} -// /> -// -// それぞれの には -//
            -// 何らかの料理が入る -//             -// -//

            何だか複雑そうな弁当箱だなあ…

            -//

            -// -// {' '} -// にはそれぞれ何の料理が入るの？ -// -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            -// それが今回の問題です！ -// -// 村人のみなさんには、 -// {' '} -// には何の料理が入るかを当ててもらいます。 -// -//

            -// -// ) -// } -// ]} -// /> -// -// -// に何が入るかを -//
            -// 当ててもらいます！🐶 -//             -//             -// -//

            -// でも、まだ何の情報もないから… -// {' '} -// に何が入るかなんて分かんないよ。 -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            -// その通りです。まだ説明することがありますから。では、続けますね！ -//

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// title: ( -// <> -// -// -// ), -// content: ( -// <> -// -//

            -// 先ほどの弁当箱は、 -// -// それぞれの {' '} -// に、ある法則に基づいて料理を入れると… -// -//

            -//

            -// -// -// がある弁当箱になります。 -// -//

            -// -// ) -// } -// ]} -// /> -// -// それぞれの に、 -//
            -// ある法則に基づいて料理を入れると、 -//
            -// -// がある弁当箱になる -//             -// -//

            -// 背景に {' '} -// の模様がついた！ -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            -// そうですね。背景にある{' '} -// {' '} -// の模様は単に、 -// -// があるということを表しているだけです。 -//

            -// -// ) -// }, -// { -// type: 'thinking', -// children: ( -// <> -//

            -// その -// -// ってどういう効果なの？ -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            では、説明しますね！

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// type: 'summary', -// title: ( -// <> -// -// の説明 -// -// ), -// content: ( -// <> -// -//

            -// -// とはどういう効果を説明しますね。 -//

            -//

            -// まず、 -// -// ある数字 {' '} -// に変換できる弁当箱と合体させてみます。 -// -//

            -// -// ) -// } -// ]} -// /> - -// -// に変換できる弁当箱と、 -//
            -// -// がある弁当箱を合体 -//             -// -//

            この合体した弁当箱を、

            -// -//

            -// すると、 -// -// 結果は {' '} -// ➕ {' '} -// -// になるのです。 -//

            -// -// ) -// } -// ]} -// /> -// -// -//
            -// すると、結果は {' '} -// ➕ になる -//             -// -//

            -// これが -// -// です。 -//

            -//

            -// 一言で言うと、 -// に変換できる弁当箱を{' '} -// ➕{' '} -// にできるんです！ -//

            -// -// ) -// } -// ]} -// /> -// , -// , -// , -// ➕, -// -// ]} -// description={ -// <> -// に変換できる弁当箱を -//
            -// ➕{' '} -// にできる -// -// } -// /> -// -//

            うーん、具体例で説明してくれる？

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// title: ( -// <> -// が になる -// -// ), -// content: ( -// <> -// -//

            -// では、具体例で説明しましょう！ -// : -//

            -// -// ) -// } -// ]} -// /> -// -// -//

            -// 前回の復習ですが、この弁当箱は、ぼくが計算箱に変換すると{' '} -// になります。 -//

            -// -// ) -// } -// ]} -// /> -// -// -// -// -// -// -//

            -// では上の弁当箱を、先ほどの -// -// がある弁当箱と -// 合体させてみます。 -//

            -// -// ) -// } -// ]} -// /> -// -// -// がある弁当箱と合体 -// -// -//

            -// では、この弁当箱を「 -// -// -// -// 」するとどうなるか見てみましょう。 -//

            -// -// ) -// } -// ]} -// /> -// -// -//

            -// になった！ -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            そうなんです！つまり、

            -//
              -// -// -// に変換できる弁当箱と、 -// -// -// -// -// 先ほどの -// -// がある弁当箱を合体させて、 -// -// -//
            -// -//

            -// を押すと、 -// -// 結果は になる -// -// ということです。 -//

            -// -// ) -// } -// ]} -// /> -// -// に変換できる弁当箱と、 -//
            -// -// がある弁当箱を合体させ… -//             -// -// -// -//
            -// すると、結果は になる -//             -// -//

            -// つまりざっくり言うと、 -// -// が{' '} -// になった -// -// というわけです。 -//

            -// -// ) -// } -// ]} -// /> -// , -// , -// -// ]} -// description={ -// <> -// ざっくり言うと、 -// が {' '} -// になった -// -// } -// /> -// -// ) -// }, -// { -// title: ( -// <> -// が になる -// -// ), -// content: ( -// <> -// -//

            -// 続いて、 -// 。 -//

            -// -// ) -// } -// ]} -// /> -// -// -//

            -// この弁当箱は、ぼくが計算箱に変換すると{' '} -// になります。 -//

            -// -// ) -// } -// ]} -// /> -// -// -// -// -// -// -//

            -// この弁当箱も、 -// -// 先ほどの -// -// がある弁当箱と合体させてみました。 -// -//

            -// -// ) -// } -// ]} -// /> -// -// -// がある弁当箱と合体 -// -// -//

            -// こちらを「 -// -// -// -// 」するとどうなるか確かめてみてください！ -//

            -// -// ) -// } -// ]} -// /> -// -// -//

            -// になった！ -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            そうなんです！まとめると、以下のようになります。

            -// -// ) -// } -// ]} -// /> - -// -// に変換できる弁当箱と、 -//
            -// -// がある弁当箱を合体させ… -//             -// -// -// -//
            -// すると、結果は になる -//             -// -//

            -// ざっくり言うと、今度は{' '} -// -// が{' '} -// になった -// -// のです。 -//

            -// -// ) -// } -// ]} -// /> -// , -// , -// -// ]} -// description={ -// <> -// ざっくり言うと、 -// が {' '} -// になった -// -// } -// /> -// -// ) -// }, -// { -// type: 'summary', -// title: <>まとめ, -// content: ( -// <> -// -//

            まとめると、

            -//
              -// -// -// ある数字 {' '} -// に変換できる弁当箱と、 -// -// -// -// -// -// がある弁当箱を合体させ、 -// -// -//
            -// -//

            -// を押すと、 -// -// 結果は {' '} -// ➕ になる -// -// のです。 -//

            -// -// ) -// } -// ]} -// /> -// -// に変換できる弁当箱と、 -//
            -// -// がある弁当箱を合体させ… -//             -// -// -// -//
            -// すると、結果は {' '} -// ➕ になる -//             -// -// ) -// }, -// { -// type: 'challengeProblem', -// title: <>計算箱を賭けた問題, -// content: ( -// <> -// -//

            -// では、ここで問題です。 -// -// この弁当箱に、どのような法則に基づいて{' '} -// {' '} -// に料理を入れると… -// -//

            -// -// ) -// } -// ]} -// /> -// -// -// どのような法則に基づいて -//
            -// に料理を入れると… -//             -//             -// -//

            -// 先ほどのような、 -// -// -// がある弁当箱になるでしょう？ -// -//

            -// -// ) -// } -// ]} -// /> -// -// -// -// がある弁当箱になる？ -// -// -// -//

            -// つまり、 -// -// それぞれの {' '} -// に何を入れたら、 -// -// があるか当てろってこと？ -// -//

            -// -// ) -// } -// ]} -// /> -// -// それぞれの に何を入れたら -//
            -// -// がある弁当箱になる？ -//             -// -// -// -//

            -// はい、その通りです！ -// -// ある法則に基づいて{' '} -// {' '} -// に料理を入れた時に限り -// -// 、 -// がある弁当箱になります。 -//

            -//

            -// -// それがどんな法則が、当ててみよう！ -// -// という問題です。 -//

            -// -// ) -// }, -// { -// type: 'devil', -// children: ( -// <> -//

            -// この問題こそが、以前から話していた「難しい問題」だ。 -// -// これを解けたら、約束通り計算箱を返してやろう！ -// -//

            -// -// ) -// } -// ]} -// /> -// , -// 😈, -// -// ]} -// description={<>この問題が解けたら、計算箱を返してやろう！} -// /> -// -// ) -// }, -// { -// title: ( -// <> -// 試しに適当な料理を入れてみる -// -// ), -// content: ( -// <> -// -//

            -// うーん… -// -// 問題を完全に理解できた自信がないし、どうやって解けばいいかさっぱり分からない！ -// -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            大丈夫、安心してください！

            -//

            -// -// 試しに、 -// {' '} -// に適当な料理を入れてみると、問題を理解できると思います。 -// -//

            -// -// ) -// } -// ]} -// /> -// -// {' '} -// に適当な料理を入れてみて下さい！🐶 -// -// -//

            -// わかった。じゃあとりあえず、 -// {' '} -// に適当な料理を入れてみよう。 -//

            -//

            -// -// 、 -// 、 -// -// を適当な組み合わせで{' '} -// {' '} -// に入れてみたよ。 -// -//

            -// -// ) -// } -// ]} -// /> -// -// {' '} -// を適当に{' '} -// に入れてみた -// -// -//

            -// この弁当箱に、 -// -// があれば -// 成功 🎉 -// 、なければ失敗{' '} -// 😭 ということかな？ -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            -// そうですね。そして、 -// -// があるかどうかを確かめるには、まず{' '} -// ➕{' '} -// {' '} -// が計算できるかを確かめてみます。 -//

            -// -// ) -// } -// ]} -// /> -// , -// ➕, -// -// ]} -// description={ -// <> -// ➕{' '} -// が計算できるか確かめる -// -// } -// /> -// -//

            -// つまり、以下のように {' '} -// に変換できる弁当箱と合体させたときに… -//

            -//

            -// 結果が {' '} -// にならないといけないのです。 -//

            -// -// ) -// } -// ]} -// /> -// -// に変換できる弁当箱と、 -//
            -// 先ほどの弁当箱を合体させ… -//             -// -// -// -// して… -// -// -// -// -// 結果が になれば -//
            -// -// があるので -// 成功 🎉 -//
            -// それ以外なら失敗 😭 -//             -// -// ) -// }, -// { -// title: ( -// <> -// -// があるかチェック -// -// ), -// content: ( -// <> -// -//

            -// では、 -// ➕{' '} -// {' '} -// が計算できるか確かめるために、冒頭にも登場した、 -// {' '} -// に変換できる弁当箱を使って試してみましょう。 -//

            -// -// ) -// } -// ]} -// /> -// -// -// -// -//

            -// これを先ほどの弁当箱と組み合わせて、 -// -// し、 -// -// ➕{' '} -// を計算できればいい -// -// んだな。 -//

            -//

            -// すなわち、 -// -// 結果が になれば -// 成功 🎉 -// 、それ以外なら -// -// 失敗 -// 😭{' '} -// -// というわけか。 -//

            -// -// ) -// } -// ]} -// /> -// -// に変換できる弁当箱と、 -//
            -// 先ほどの弁当箱を合体させ… -//             -// -// -// -// して… -// -// -// -// -// 結果が になれば -// 成功 🎉 -//
            -// それ以外なら失敗 😭 -//             -// -//

            では、上の弁当箱を実行したらどうなるか見ていこう！

            -// -// ) -// } -// ]} -// /> -// -// ), -// footer: { -// content: ( -// <> -// -//
            -// -// -// } -// preview={{ -// text: <>初級編の内容を復習する, -// content: ( -// <> -//

            -// 復習が必要ですか？: 今回の弁当箱では、 -// 初級その5で学んだ法則が登場 -// します。 -//

            -//

            -// 復習したい場合は、↓の「初級編の内容を復習する」を押してください。 -//

            -// -// ) -// }} -// /> -// -// ) -// } -// }, -// { -// title: <>実行してみよう, -// content: ( -// <> -// -// -// -// -// -// -// -// -// -// -// -// -// -//

            つまり、最終的に以下のようになりました！

            -// -// ) -// } -// ]} -// /> -// 実行結果 -// -// ) -// }, -// { -// title: <>計算箱に変換できない, -// content: ( -// <> -// -//

            -// 実行を終えたので、 -// {' '} -// したいところですが… -//

            -//

            -// 残念ながら、 -// -// この弁当箱はぼくが計算箱に変換することができません。 -// -//

            -// -// ) -// } -// ]} -// /> -// -// ❌ 計算箱に変換できない ❌ -// -// -//

            -// 理由は、 -// -// 以下の法則に沿っていないからです。 -// -//

            -// -// -// -//

            -// -// 右上には 🅱️{' '} -// の料理がひとつないといけませんが、ここでは{' '} -// 🅰️ になっている -// -// ので、計算箱に変換できないのです。 -//

            -// -// ) -// } -// ]} -// /> -// -// 右上が 🅱️ の ではなく、 -//
            -// 🅰️ の なので -//
            -// 計算箱に変換できない -//             -// -//

            -// ダメか… -// -// もし仮に右上が -// -// ではなくて -// -// だったら、 -// に変換できていたのになあ。 -// -// あとちょっとだったのに！ -//

            -// -// ) -// } -// ]} -// /> -// -// もし仮に右上が -// -//
            -// だったら、 -// に変換できていた -//             -// -// -// -// ) -// }, -// { -// title: ( -// <> -// -// は無い -// -// ), -// content: ( -// <> -// -//

            -// つまり、実行しても{' '} -// {' '} -// に変換できる弁当箱になりませんでした。 -//

            -// -// ) -// } -// ]} -// /> -// -// に変換できる弁当箱と合体させ… -// -// -// -// 実行したところ、 -//
            -// -// {' '} -// に変換できる弁当箱にならなかった -// -//             -// -//

            -// だから、 -// -// 先ほどの弁当箱に、 -// -// は無い -// -// のです。つまり、 -// 不正解でした！ -//

            -// -// ) -// } -// ]} -// /> -// -// -// は無い -// -// -//

            -// 残念…やっぱり、適当に{' '} -// {' '} -// に料理を埋めても正解にはならないかあ… -//

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// type: 'challengeProblem', -// title: <>問題をもう一度, -// content: ( -// <> -// -//

            -// 問題の意味が分かったでしょうか？では、もう一度聞きますね。 -//

            -//

            -// -// この弁当箱に、どのような法則に基づいて{' '} -// {' '} -// に料理を入れると… -// -//

            -// -// ) -// } -// ]} -// /> -// -// -// どのような法則に基づいて {' '} -// に料理を入れると… -// -// -// -//

            -// -// -// がある弁当箱になるでしょう？ -// -//

            -// -// ) -// } -// ]} -// /> -// -// -// -// がある弁当箱になる？ -// -// -// -//

            -// 繰り返しますが、先ほど適当に料理を入れた以下の弁当箱は、不正解でした！ -//

            -// -// ) -// } -// ]} -// /> -// こちらは不正解だった -// -//

            -// うーん…問題の意味は分かったけど、答え方が分からない！ -//

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// title: <>答えは次のページに, -// content: ( -// <> -//

            -// せっかく計算箱を返してもらえるチャンスなのに、問題が難しくて村人は苦戦しているようですね。 -//

            -// 難しすぎて見当もつかない！} -// /> -//

            -// しかし、 -// 次のページで答えが判明します。 -// ぜひ先に進んでみてください！ -//

            -// -// -// ) -// } -// ]} -// /> -// ) diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 9f6d53cb6..9943e9add 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -1470,1233 +1470,3 @@ export default () => ( ]} /> ) - -// export default () => ( -// どうしよう？, -// content: ( -// <> -// 😭, ❓, 😭]} -// /> -//

            ラムダ村の村人たちは、前回の問題に四苦八苦していました。

            -// -// -//

            だめだ…全然分からない！

            -// -// ) -// }, -// { -// type: 'sad', -// children: ( -// <> -//

            -// これを解かないと計算箱を返してもらえないのに…どうしよう… -//

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// title: <>サヤちゃん現る, -// content: ( -// <> -//

            -// その時です。ラムダ村に暮らす少女の -// サヤちゃん{' '} -// 👧🏻{' '} -// が、問題に苦戦している村人たちに話しかけてきました。 -//

            -// -// ラムダ村に暮らす少女の -// サヤちゃん -// -// } -// /> -// -//

            ねえねえ、みんな何してるの？

            -// -// ) -// }, -// { -// type: 'sad', -// children: ( -// <> -//

            -// おお、サヤちゃんか。実は、にっくき悪魔 😈{' '} -// に計算箱を奪われてしまったんだ。 -//

            -//

            -// 奴が出題した問題を解かないと計算箱を返してもらえないんだけど、俺らには難しくて解けないんだよ。 -//

            -// -// ) -// }, -// { -// type: 'saya', -// children: ( -// <> -//

            ふーん、じゃあサヤも解くのを手伝うよ！

            -// -// ) -// }, -// { -// type: 'roll', -// children: ( -// <> -//

            -// 手伝ってくれるのはありがたいけど、この問題はママゴトじゃないんだよ。俺らがどれだけ頑張っても分からなかったんだ。 -//

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// title: <>サヤちゃんの弁当箱, -// content: ( -// <> -//

            -// サヤちゃんは少し考えた後、 -// に料理を入れてみました。 -//

            -// -//

            -// ねえねえ、サヤも {' '} -// に料理を入れてみたんだけど、見てくれる？ -//

            -// -// ) -// } -// ]} -// /> -// -// 👧🏻 サヤちゃんの弁当箱 -// -// -//

            -// ふむふむ…どうせ上手くいかないと思うけど、試してみるか。 -//

            -//

            -// 前回もやったように、 -// -// {' '} -// に変換できる弁当箱と合体させて、 -// -//

            -// -// -// -//

            -// -// して、 -// -// 結果が になるか -// -// 確かめてみよう。どうせムリだろうけど！ -//

            -// -// ) -// } -// ]} -// /> -// -// に変換できる弁当箱と、 -//
            -// 👧🏻 サヤちゃんの弁当箱を合体させ… -//             -// -// -// -//
            -// して、結果が になれば -// 成功 🎉 -//
            -// それ以外なら失敗 😭 -//             -// -//

            -// じゃあ、 -// -// してみよう！ -//

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// title: ( -// <> -// してみると… -// -// ), -// content: ( -// <> -// -// -// -// -// -// -// -// -// -// -// -// -//

            つまり、最終的に以下のようになりました！

            -// -// した結果 -// -// -//

            こ、これはもしや…？

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// title: ( -// <> -// に変換できる -// -// ), -// content: ( -// <> -// -//

            -// この弁当箱は、 -// に変換できます！ -//

            -// -// ) -// } -// ]} -// /> -// -// -// -// -// -// -//

            ということは、サヤちゃんの弁当箱は…

            -//

            -// -// {' '} -// に変換できる弁当箱と合体させ、 -// -// すると、結果が になる -// -// ということですね。 -//

            -// -// ) -// } -// ]} -// /> -// -// に変換できる弁当箱と、 -//
            -// 👧🏻 サヤちゃんの弁当箱を合体させ… -//             -// -// -// -//
            -// すると、結果が になる -//             -// -//

            -// つまり、 -// ➕{' '} -// が計算できたので、 -// 成功です！{' '} -// 🎉 -//

            -// -// ) -// }, -// { -// type: 'saya', -// children: ( -// <> -//

            やったー！

            -// -// ) -// }, -// { -// type: 'surprised', -// children: ( -// <> -//

            -// そんなバカな…！俺らがどれだけ頭をひねっても分からなかったのに、サヤちゃんにいとも簡単に解かれるなんて！ -//

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// title: ( -// <> -// ➕{' '} -// はできる？ -// -// ), -// content: ( -// <> -// -//

            -// いや、まだ分からんぞ。 -// ➕{' '} -// ができるからといって、 -// -// 他の数字に対しても -// -// があるとは限らない。 -// -//

            -//

            -// たとえば、 -// -// ➕{' '} -// も計算できるのかどうか -// -// 確かめてみないと。 -//

            -// -// ) -// } -// ]} -// /> -// , -// ➕, -// -// ]} -// description={<>これも計算できる？} -// /> -// -//

            -// じゃあ、 -// -// に変換できる弁当箱と、 -// -//

            -// -// -// -//

            サヤが考えた弁当箱を合体させてみるね！

            -// -// 👧🏻 サヤちゃんの弁当箱 -// -//

            -// 合体したものを -// -// して、 -// -// 結果が になればいい -// -// んだよね。 -//

            -// -// ) -// } -// ]} -// /> -// -// に変換できる弁当箱と、 -//
            -// 👧🏻 サヤちゃんの弁当箱を合体させ… -//             -// -// -// -//
            -// して、結果が になれば -// 成功 🎉 -//
            -// それ以外なら失敗 😭 -//             -// -//

            -// まずは実行してみるね。 -// -//

            -//

            今回は、最後まで止まらずに実行します！

            -// -// ) -// } -// ]} -// /> -// -// -//

            結果はこうなったよ！

            -// -// ) -// } -// ]} -// /> -// -// した結果 -// -// -//

            -// この弁当箱は、 -// に変換できます！ -//

            -// -// ) -// } -// ]} -// /> -// -// -// -// -// -// -//

            -// つまり、 -// ➕{' '} -// が計算できたので、 -// またしても成功です！{' '} -// 🎉 -//

            -// -// ) -// }, -// { -// type: 'saya', -// children: ( -// <> -//

            わーい、わーい！

            -// -// ) -// }, -// { -// type: 'surprised', -// children: ( -// <> -//

            す、すごい…！

            -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// title: ( -// <> -// -// がある法則 -// -// ), -// content: ( -// <> -// -//

            -// ではここで正解を言いましょう。 -// -// サヤちゃんが考えた弁当箱は、 -// -// がある弁当箱です。 -// -//

            -//

            -// だから、 -// サヤちゃんの答えが正解です！ -// おめでとうございます！🎉 -//

            -// -// ) -// } -// ]} -// /> -// -// 👧🏻 サヤちゃんが考えた弁当箱には -//
            -// -// がある -//             -// -//

            わーい、ミニオンさんありがとう！

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            -// さらに言うと、サヤちゃんが考えた弁当箱以外にも、 -// -// 以下の法則に当てはまる弁当箱であれば、 どれでも -// -// があります。 -// -//

            -// -// ) -// } -// ]} -// /> -// -// この法則に当てはまる弁当箱であれば、 -//
            -// -// がある -//             -// -//

            サヤが考えた弁当箱の場合、

            -//
              -// -// 🅰️ は -// -// -// 🅱️ は -// -// -// は{' '} -// -// -//
            -//

            ということかな？

            -// -// ) -// } -// ]} -// /> -// -// 🅰️ は 、
            -// 🅱️ は 、
            -// は -//             -// -//

            -// その通りです。サヤちゃんが考えた弁当箱は、ちゃんとこの法則に当てはまっているのです。 -//

            -// -// この法則に当てはまる弁当箱であれば、 -//
            -// -// がある -//             -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// title: <>同じ法則の、他の弁当箱も試してみる, -// content: ( -// <> -// -//

            -// じゃあ、たとえばこの弁当箱でも、同じ法則に沿っているから、 -// -// があるってこと？ -//

            -// -// 同じ法則で料理を入れてみた。 -//
            -// -// はあるか？ -//             -//

            -// 🅰️ には 、 -// 🅱️ には 、 -// には{' '} -// -// を当てはめてみたよ。 -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            -// はい、 -// -// はありますよ。 -//

            -//

            -// -// 試しに、 -// {' '} -// に変換できるこちらの弁当箱と合体させて -// してみましょう。 -// -//

            -// -// -// -//

            -// 実行したとき、 -// -// 結果が {' '} -// に変換できる弁当箱になれば、 -// ➕{' '} -// を計算できたので成功 -// -// になります。 -//

            -// -// ) -// } -// ]} -// /> -//

            -// -//

            -// -// -//

            -// 結果、 -// {' '} -// に変換できる弁当箱が残りました！ -//

            -// -// -// -//

            -// つまり、 -// ➕{' '} -// を計算できたというわけです。 -//

            -// -// ) -// }, -// { -// type: 'thinking', -// children: ( -// <> -//

            -// なるほど、やっぱりこちらの弁当箱にも -// -// があるということか。 -//

            -// -// サヤちゃんの弁当箱と同じく、こちらの -//
            -// 弁当箱にも -// -// がある -//             -// -// ) -// } -// ]} -// /> -// -// ) -// }, -// { -// type: 'summary', -// title: <>立ち止まって振り返ろう, -// content: ( -// <> -// -//

            -// 俺らふだん頭を使っていないから、情報量が多すぎて疲れてしまった… -//

            -//

            ちょっとひと休みしてもらえないか？

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            いいですよ、ひと休みしましょう！

            -//

            -// ちなみに現時点で、 -// 中級編も半分を終えました -// 。つまり、本稿の折り返し地点を越えたということです。 -// -// 残るは中級編の残り半分と、上級編のみです。 -// -//

            -//

            -// いい機会なので、少し立ち止まって振り返ってみましょう。 -//

            -// -// ) -// } -// ]} -// /> -//

            -// まずこちらをご覧ください。これは、「 -// 」 -// を使うことで、 -// ➕{' '} -// を計算できる計算箱ですね。 -//

            -// -// 「 -// 」を使うことで -//
            -// ➕{' '} -// を計算できる計算箱。 -//
            -// 実行すると になる -//             -//

            -// これまで学んだことを一言でまとめると、上の計算箱にあるような「 -// -// 」は、 -// 弁当箱で「再現」できる -// 、ということです。 -//

            -// , -// , -// , -// 🍱, -// -// ]} -// description={ -// <> -// 計算箱の「 -// -// 」は、 -//
            -// 弁当箱で「再現 -// 」することができる -// -// } -// /> -//

            -// 「再現 -// 」できる、とはどういうことでしょうか？先ほどの計算箱の例で説明しますね。 -//

            -// これを弁当箱で再現します -//

            -// ステップ1: まず、 -// -// 計算箱の の代わりに、 -// -// に変換できる -// -// 弁当箱 -// -// を用意します。 -//

            -// これの代わりに… -// -// -// に変換できる弁当箱を用意 -// -//

            -// ステップ2: 次に、 -// -// 計算箱の の代わりに、 -// -// -// がある弁当箱を用意します。 -//

            -// これの代わりに… -// -// -// -// がある弁当箱を用意 -//
            (👧🏻 サヤちゃんが考えた弁当箱です) -//             -//

            -// ステップ3:{' '} -// このふたつを合体させた弁当箱は、先ほども説明した通り、 -// -// すると{' '} -// になります -// -// ね。 -//

            -// -// に変換できる弁当箱と -//
            -// -// がある弁当箱を合体 -//             -//

            -// つまり、先ほど登場した {' '} -// ➕ {' '} -// を計算できる計算箱は、 -//

            -// -//

            -// こちらの弁当箱で「再現」できる -// ということです。 -//

            -// -// {' '} -// の計算箱を、弁当箱で再現 -// -//

            -// これが、「計算箱を弁当箱で再現する -// 」ということなんですね。 -//

            -// -// ) -// }, -// { -// type: 'summary', -// title: <>もっと複雑な計算箱も再現できる, -// content: ( -// <> -//

            もちろん、もっと複雑な計算箱も弁当箱で再現できます。

            -//

            -// たとえば、初級その1に登場したこちらの計算箱をご覧ください。 -// すると、結果は{' '} -// になります。 -//

            -// -//

            -// これを弁当箱で再現するには、 -// -// に変換できる弁当箱と、 -// -// がある弁当箱を「2個 -// 」合体させればいい -// -// のです。 -//

            -// -// に変換できる弁当箱と -//
            -// -// がある弁当箱を「2個」
            -// 合体すれば、 -// {' '} -// の計算箱を再現できる -//             -//

            -// 上の弁当箱を実行するのは、時間がかかるので今回は行いませんが、 -// -// {' '} -// ボタンを押すと、答えが {' '} -// になるのを確認できます。 -// -//

            -//
            -//

            -// まとめると、 -// -// 計算箱の「 -// -// 」は、弁当箱で再現することができる -// -// のです。このポイントさえ覚えていただければ、細かいことは分からなくても大丈夫です！ -//

            -// , -// , -// , -// 🍱, -// -// ]} -// description={ -// <> -// 計算箱の「 -// -// 」は、 -//
            -// 弁当箱で「再現 -// 」することができる -// -// } -// /> -// -// ) -// }, -// { -// type: 'challengeProblem', -// title: <>他の機能も再現できる？, -// content: ( -// <> -//

            -// ここで疑問なのですが、初級で説明した通り、計算箱には「 -// -// 」以外にも、「 -// -// 」や、「 -// -// 」がありましたよね。 -//

            -// -// 「 -// 」の例 -// -// -// 「 -// 」の例 -//
            -// ( を {' '} -// 回繰り返す) -//             -//

            -// -// これらの機能も、弁当箱で再現することができるのでしょうか？ -// -//

            -// , -// 🍱, -// 🔁 -// ]} -// description={ -// <> -// 「 -// 」や -//
            「 -// 」も、 -//
            -// 弁当箱で「再現」できる？ -// -// } -// /> -//

            -// -// この疑問については、後に答えが明らかになります。 -// -// 楽しみにしていてください。 -//

            -// -// ) -// }, -// { -// type: 'sideNote', -// title: <>考えつかなくても大丈夫！, -// content: ( -// <> -// -//

            ミニオン、ひとつ愚痴を聞いてもらえるかい？

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            はい、どうしました？

            -// -// ) -// }, -// { -// type: 'sad', -// children: ( -// <> -//

            -// さっきの問題、難しすぎやしないかい？普通は、サヤちゃんみたいに答えをとっさに思いつかないよ！ -//

            -//

            -// -// こういうのがパッと思いつけないと、コンピュータサイエンスを学ぶ資格はないのかな？ -// -//

            -// -// ) -// } -// ]} -// /> -// -// さっきの答えの弁当箱。普通はこんなの、 -//
            -// とっさに思いつかないよ！😢 -//             -// -//

            -// -// いえ、そんなことは全くありませんよ。 -// -// むしろ、こういう答えを思いつけるのはひと握りの天才だけです。 -//

            -// -// ) -// }, -// { -// type: 'sad', -// children: ( -// <> -//

            え、そうなの？

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            はい。先ほどの問題は超難問でしたから。

            -//

            -// -// 答えを思いつけなくても、答えを見て、「なるほど、そういうことだったのか」と理解できれば、コンピュータサイエンスを学ぶ素養は十分すぎるほどあります。 -// -//

            -// -// ) -// }, -// { -// type: 'smile', -// children: ( -// <> -//

            そっか…気が楽になったよ。ありがとう！

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            いえいえ。それでは、そろそろ話を戻しましょう！

            -// -// ) -// } -// ]} -// /> -// 話を戻しましょう！} -// /> -// -// ) -// }, -// { -// title: <>話を戻すと…, -// content: ( -// <> -//

            -// 悪魔による難しい問題に見事答えられたことで、村人たちは大喜びでした。 -//

            -// -//

            -// やった！サヤちゃんのおかげで問題に答えられたぞ！これで計算箱を返してもらえる！ -//

            -// -// ) -// } -// ]} -// /> -//

            しかし、当のサヤちゃんには何か腑に落ちない点があるようです。

            -// -//

            -// ミニオンさん、 -// -// おかしなことに気づいちゃったんだけど… -// -//

            -// -// ) -// }, -// { -// type: 'dog', -// children: ( -// <> -//

            はい、「おかしなこと」とは何ですか？

            -// -// ) -// } -// ]} -// /> -//

            -// サヤちゃんが気づいた、「 -// おかしなこと -// 」とは何なのでしょうか？次のページで説明していきます！ -//

            -// -// -// -// ) -// } -// ]} -// /> -// ) From 41098c575dd14a7af15bc47e1b8ac0e7fbbe75f1 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 15:28:55 -0700 Subject: [PATCH 084/110] Rewrite 16 --- scripts/lib/initialExpressionContainers.ts | 10 +++++----- scripts/lib/runnerConfigs.ts | 6 +++++- src/contents/16.jp.tsx | 21 +++++++++++++------- src/lib/runners/beug.json | 23 ++++++++++++---------- 4 files changed, 37 insertions(+), 23 deletions(-) diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 3eaaf68ae..76a7da0b6 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -2213,15 +2213,15 @@ export const psxr = initializeExpressionContainer({ }) export const mqoa = initializeExpressionContainer({ - arg: 'C', + arg: 'c', body: [ { - arg: 'D', - body: ['C', ['D', 'D']] + arg: 'd', + body: ['c', ['d', 'd']] }, { - arg: 'D', - body: ['C', ['D', 'D']] + arg: 'd', + body: ['c', ['d', 'd']] } ] }) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 71887ec19..9544cfa87 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -2618,7 +2618,11 @@ export const rjho: ExpressionRunnerShorthandConfig = { export const beug: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.mqoa, - showPriorities: true + showPriorities: true, + bottomRightBadgeOverrides: { + c: '🅰️', + d: '🅱️' + } } export const hvfb: ExpressionRunnerShorthandConfig = { diff --git a/src/contents/16.jp.tsx b/src/contents/16.jp.tsx index af74b694a..00427216c 100644 --- a/src/contents/16.jp.tsx +++ b/src/contents/16.jp.tsx @@ -16,6 +16,7 @@ import { } from 'src/components/ContentTags' import EmojiSeparator from 'src/components/EmojiSeparator' import EmojiNumber from 'src/components/EmojiNumber' +import EmojiWithText from 'src/components/EmojiWithText' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' import H from 'src/components/H' import Emoji from 'src/components/Emoji' @@ -528,18 +529,24 @@ export default () => ( もちろん、もっと複雑なラムダ計算の記述式もあります。たとえば、こちらをご覧ください。この記述式は、何を表しているか分かりますか？

            λA.(λB.A(B B))(λB.A(B B)) +

            これを弁当箱にすると、次のようになります。

            +

            - 答えを言うと、上の記述式は + もし 🅰️ に を、 + 🅱️ に{' '} + を当てはめると、以下のようになります。つまり、先ほどのラムダ計算の記述式は Yコンビネータを表している - のです。つまり、下の弁当箱とまったく同じです。 + のです。

            - - 上のラムダ計算の記述式は、 + λA.(λB.A(B B))(λB.A(B B)) + + + 先ほどのラムダ計算の記述式は、
            「Yコンビネータ - 」の弁当箱と同じ -             + 」を表している +

            - つまり本稿では、 + まとめると、本稿では、 実はみなさんにラムダ計算を教えていたのです。 diff --git a/src/lib/runners/beug.json b/src/lib/runners/beug.json index 5e7ff98c0..e956c845b 100644 --- a/src/lib/runners/beug.json +++ b/src/lib/runners/beug.json @@ -3,7 +3,7 @@ { "expression": { "arg": { - "name": "C", + "name": "c", "highlightType": "default", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", @@ -17,7 +17,7 @@ "body": { "arg": { "arg": { - "name": "D", + "name": "d", "highlightType": "default", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", @@ -33,7 +33,7 @@ "body": { "arg": { "arg": { - "name": "D", + "name": "d", "highlightType": "default", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", @@ -48,7 +48,7 @@ "maxNestedFunctionDepth": 0 }, "func": { - "name": "D", + "name": "d", "highlightType": "default", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", @@ -67,7 +67,7 @@ "maxNestedFunctionDepth": 0 }, "func": { - "name": "C", + "name": "c", "highlightType": "default", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", @@ -90,7 +90,7 @@ }, "func": { "arg": { - "name": "D", + "name": "d", "highlightType": "default", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", @@ -106,7 +106,7 @@ "body": { "arg": { "arg": { - "name": "D", + "name": "d", "highlightType": "default", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", @@ -121,7 +121,7 @@ "maxNestedFunctionDepth": 0 }, "func": { - "name": "D", + "name": "d", "highlightType": "default", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", @@ -140,7 +140,7 @@ "maxNestedFunctionDepth": 0 }, "func": { - "name": "C", + "name": "c", "highlightType": "default", "topLeftBadgeType": "none", "bottomRightBadgeType": "none", @@ -183,7 +183,10 @@ "skipToTheEnd": false, "hideFuncUnboundBadgeOnExplanation": false, "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, + "bottomRightBadgeOverrides": { + "c": "🅰️", + "d": "🅱️" + }, "highlightOverrides": {}, "highlightOverrideActiveAfterStart": false, "highlightFunctions": false, From c8e865f0ba393d8d57864cb01cea72b9f218e29a Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 19:26:54 -0700 Subject: [PATCH 085/110] Continue with 7 --- src/contents/7.en.tsx | 83 +++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 47 deletions(-) diff --git a/src/contents/7.en.tsx b/src/contents/7.en.tsx index 3e34884cb..89ca78c34 100644 --- a/src/contents/7.en.tsx +++ b/src/contents/7.en.tsx @@ -249,49 +249,51 @@ export default () => ( /> .

            -

            - Important:{' '} - - Each icon - represents some food item. - -

            ) } ]} /> - - Each icon represents some - food item - + -

            It looks pretty complicated…

            - So: Which food item goes into each{' '} - icon? + We learned on the last page that:{' '} + + I can convert this lunchbox to{' '} + . +

            ) - }, + } + ]} + /> + + + + + +

            - That’s what you’ll need to figure out! + Next:{' '} + We combine it with this lunchbox.

            - - This question is about figuring out which food item - goes into each {' '} - icon. - + Each icon{' '} + represents some food item, but we’ll + talk about that later.

            ) @@ -299,44 +301,31 @@ export default () => ( ]} /> - You need to figure out which food item + Combine with this lunchbox.
            - goes into each icon!{' '} - 🐶 + Each icon represents a + food item             -

            Hmm… ok, but how can we figure that out?

            - - ) - }, { type: 'dog', children: ( <> -

            - I’m not done explaining yet! -

            -

            - - I’ll give you more information now, and your goal is - to find out what goes into each{' '} - icon based on - that information. - -

            +

            If you combine them, it’ll look like this:

            ) - }, + } + ]} + /> + After combining the two lunchboxes + -

            Okay, keep explaining then!

            +

            Now, let me tell you the question!

            ) } From c422a5baf5552a6d2a53b40e66e70f019b2b23fc Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 21:57:25 -0700 Subject: [PATCH 086/110] Update 7 --- src/contents/7.en.tsx | 1091 +++++++++-------------------------------- src/contents/7.jp.tsx | 4 +- 2 files changed, 221 insertions(+), 874 deletions(-) diff --git a/src/contents/7.en.tsx b/src/contents/7.en.tsx index 89ca78c34..260300f98 100644 --- a/src/contents/7.en.tsx +++ b/src/contents/7.en.tsx @@ -3,6 +3,7 @@ import EpisodeCardList from 'src/components/EpisodeCardList' import { P, Highlight, + HighlightBold, Ul, UlLi, Bold, @@ -15,7 +16,6 @@ import EmojiNumber from 'src/components/EmojiNumber' import Emoji from 'src/components/Emoji' import EmojiForLetter from 'src/components/EmojiForLetter' import CardContent from 'src/components/CardContent' -import InlineRunAndConvertToMathboxButton from 'src/components/InlineRunAndConvertToMathboxButton' import H from 'src/components/H' import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' import ExpressionRunnerCaptionOnly from 'src/components/ExpressionRunnerCaptionOnly' @@ -26,26 +26,24 @@ import InlinePrioritiesLabel from 'src/components/InlinePrioritiesLabel' import NextLessonButton from 'src/components/NextLessonButton' import { Beginner5Rules } from 'src/contents/5.en' -const OnePlusOneTest = () => ( +export const Problem = () => ( <> - - Combine with the “random” lunchbox -
            - you came up with earlier, and then… -             - - + - + Challenge: +
            + Fill each icon in such a way + that,             -             + - - If it becomes ,{' '} - success. 🎉 -
            - Otherwise, failure 😭 -             + + + After you it, +
            + the resulting lunchbox can be converted to . +             +             ) @@ -335,9 +333,10 @@ export default () => ( ) }, { + type: 'challengeProblem', title: ( <> - + to ), content: ( @@ -349,116 +348,97 @@ export default () => ( children: ( <>

            - Here’s the requirement:{' '} - - You must fill each{' '} - icon in a way - such that, the resulting lunchbox has{' '} - - - - . - + Now:

            +
              + + + If you fill each{' '} + icon with + the correct food item, + + + + + After running it, it becomes a lunchbox that can be + converted to . + + +
            ) } ]} /> - - You must fill each in a - way + + If you fill each icon with
            - such that, the resulting lunchbox has + the correct food item, +             + + + After running it, it becomes a lunchbox
            - . -             + that can be converted to . + -

            The background image changed!

            - - ) - }, { type: 'dog', children: ( <>

            - Yes, this new background just means that the lunchbox - has{' '} - - - - . + Because the top lunchbox can be converted to{' '} + ,

            - - ) - }, - { - type: 'thinking', - children: ( - <> + + +

            - But what does{' '} - - - {' '} - mean? + It means that:

            - - ) - }, - { - type: 'dog', - children: ( - <> -

            Let me explain!

            +
              + By running the combined lunchbox, + + + A lunchbox that can be converted to{' '} + … + + + + + Becomes a lunchbox that can be converted to{' '} + . + + +
            ) } ]} /> - - ) - }, - { - type: 'summary', - title: ( - <> - How works - - ), - content: ( - <> - -

            - Here’s how works. -

            -

            - First: Let’s combine it with a lunchbox - that can be converted to{' '} - . -

            - - ) - } + , + , + ]} + description={ + <> + A lunchbox that can be converted to +
            + becomes a lunchbox +
            + that can be converted to + + } /> - - Combine a lunchbox that can be converted to{' '} - -
            - with a lunchbox with -             ( children: ( <>

            - If you run the above lunchbox and convert it using this - button: -

            - -

            - It will become {' '} - ➕ . + Now, here’s the challenge:

            +
              + + + Fill each {' '} + icon in a way such that, + + + + + After you it, + + + + + The resulting lunchbox can be converted to{' '} + . + + +
            ) } ]} /> - - If you{' '} - - - -
            - it will become {' '} - ➕ -             +

            - This is how {' '} - works. + This is the “very difficult question” I’ve + been talking about.

            - It can take a lunchbox that can be converted to{' '} - , and turn it into{' '} - ➕{' '} - . + + If you solve this, I’ll give you the mathboxes back! +

            ) @@ -511,179 +495,128 @@ export default () => ( /> , - , - , - ➕, - + , + 😈, + ]} description={ <> - Take a lunchbox that can be converted to{' '} - ,
            - and turn it into {' '} - ➕ . + If you solve this, +
            + I’ll give you the mathboxes back! } /> - -

            Hmm… I’m still a bit confused.

            -

            Can you explain with concrete examples?

            - - ) - } - ]} - /> ) }, { - title: ( - <> - becomes - - ), + title: <>Try filling with random items, content: ( <> -

            - Here’s a concrete example:{' '} - : -

            +

            Hmm… I don’t know if I understood the problem.

            +

            And I have no clue how to solve it!

            ) - } - ]} - /> - -

            - This lunchbox can be converted to{' '} - . + No problem! First,{' '} + + try filling each{' '} + icon with a{' '} + random food item. +

            -

            (We talked about this conversion on the last page!)

            - - ) - } - ]} - /> - - - - - -

            - Now, let’s combine the above lunchbox with a lunchbox - that has . + By doing so, you’ll be able to understand the problem + better.

            ) } ]} /> - - Combine with a lunchbox + + Try filling each icon
            - that has -             + with a random food item! 🐶 + +

            Ok, let me try…

            - Now, let’s{' '} - - : + Here it is: I randomly filled each{' '} + icon with{' '} + , a{' '} + , or a{' '} + .

            ) } ]} /> - + + {' '} + を適当に{' '} + に入れてみた +

            - It became ! + Now, we’ll the above + lunchbox, and…

            - - ) - }, - { - type: 'dog', - children: ( - <> -

            Yes! So,

              - If you combine a lunchbox that can be converted to{' '} - … + If it becomes a lunchbox that can be converted to{' '} + , it’s a{' '} + success! 🎉 - With a lunchbox that has{' '} - , and do: + If not, then it’s a failure.{' '} + 😭
            - -

            - It will become . -

            ) } ]} /> - - Combine a lunchbox that can be converted to{' '} - -
            - with a lunchbox that has -             + + We’ll this lunchbox, and… + - - If you{' '} - , + + If it becomes a lunchbox that can be
            - it will become -             + converted to ,{' '} + success. 🎉 +
            + Otherwise, failure 😭 + ( children: ( <>

            - Basically, became{' '} - . + Ok, let’s it!

            ) } ]} /> - , - , - - ]} - description={ - <> - became - - } - /> - - ) - }, - { - title: ( - <> - becomes ), - content: ( - <> - + +
            + + + } + preview={{ + text: <>Do a Quick Review, + content: ( <>

            - Let’s try another example.{' '} - : + Need a review?: To solve the above + lunchbox,{' '} + + we’ll need to use the rules from{' '} + Beginner 5. +

            - - ) - } - ]} - /> - -

            - This can be converted to : -

            - - ) - } - ]} - /> - - - - - - -

            - Let’s combine it with a lunchbox that has{' '} - : -

            - - ) - } - ]} - /> - - Combine with a lunchbox -
            - that has -             - -

            - Now, let’s{' '} - - : -

            - - ) - } - ]} - /> - - -

            - It became ! -

            - - ) - }, - { - type: 'dog', - children: ( - <> -

            Yes! Here’s the summary of what happened:

            - - ) - } - ]} - /> - - Combine a lunchbox that can be converted to{' '} - -
            - with a lunchbox that has -             - - - If you{' '} - , -
            - it will become -             - -

            - This time, became{' '} - . -

            - - ) - } - ]} - /> - , - , - - ]} - description={ - <> - became - - } - /> - - ) - }, - { - type: 'summary', - title: <>Summary, - content: ( - <> - -

            Therefore,

            -
              - - - If you combine a lunchbox that can be converted to{' '} - … - - - - - With a lunchbox that has{' '} - , and do: - - -
            - -

            - - It will become {' '} - ➕ . - -

            - - ) - } - ]} - /> - - Combine a lunchbox that can be converted to{' '} - -
            - with a lunchbox that has -             - - - If you{' '} - , -
            - it will become {' '} - ➕ -             - - ) - }, - { - type: 'challengeProblem', - title: <>The Challenge, - content: ( - <> - -

            - Now, here’s the challenge:{' '} - - Fill each icon - in a way such that, the resulting lunchbox has{' '} - . - -

            - - ) - } - ]} - /> - - Fill each icon in a way - such that, -
            - the resulting lunchbox has -
            - . -             - -

            - So,{' '} - - you’re asking what goes in each{' '} - icon? - -

            - - ) - }, - { - type: 'dog', - children: ( - <> -

            - Yes! If you fill each{' '} - icon correctly, - it should be able to turn{' '} - into{' '} - ➕{' '} - . -

            - - ) - } - ]} - /> - - If you do it correctly, -
            - it should be able to turn into{' '} - ➕{' '} - . -             - - - -

            - This is the “very difficult question” I’ve - been talking about. -

            -

            - - If you solve this, I’ll give you the mathboxes back! - -

            - - ) - } - ]} - /> - , - 😈, - - ]} - description={ - <> - If you solve this, -
            - I’ll give you the mathboxes back! - - } - /> - - ) - }, - { - title: <>Try filling with random items, - content: ( - <> - -

            Hmm… I don’t know if I understood the problem.

            -

            And I have no clue how to solve it!

            - - ) - }, - { - type: 'dog', - children: ( - <> -

            - No problem! First,{' '} - - try filling each{' '} - icon with a{' '} - random food item. - -

            -

            - By doing so, you’ll be able to understand the problem - better. -

            - - ) - } - ]} - /> - - Try filling each icon -
            - with a random food item! 🐶 -             - -

            Ok, let me try…

            -

            - Here it is: I randomly filled each{' '} - icon with{' '} - , a{' '} - , or a{' '} - . -

            - - ) - } - ]} - /> - - Randomly filled each with {' '} - - - -

            - So you’re saying: -

            -
              - - If this lunchbox has{' '} - , it’s a{' '} - success. 🎉 - - - If not, then it’s a failure{' '} - 😭 - -
            -

            Is that right?

            - - ) - }, - { - type: 'dog', - children: ( - <> -

            - Yes! And to check if it has{' '} - … -

            -

            - - We need to first confirm that it can do{' '} - ➕{' '} - . - -

            - - ) - } - ]} - /> - , - ➕, - - ]} - description={ - <> - We need to first confirm that it can do -
            - ➕{' '} - - - } - /> - -

            - Which means:{' '} - - If you combine it with a lunchbox that can be - converted with … - -

            -

            - - The result needs to be . - -

            - - ) - } - ]} - /> - - Combine it with a lunchbox -
            - that can be converted to -             - - - - - - - - - If it becomes ,{' '} - success. 🎉 -
            - Otherwise, failure 😭 -             - - ) - }, - { - title: ( - <> - Check to see if it has - - ), - content: ( - <> - -

            - To check if it can calculate {' '} - ➕ , let’s use - a lunchbox that can be converted to{' '} - . -

            - - ) - } - ]} - /> - - - - -

            - Let’s combine this with the “random” lunchbox you came - up with earlier… -

            -

            - And check to see if it can calculate{' '} - ➕{' '} - . -

            - - ) - } - ]} - /> - - -

            - Let’s first see what happens when you{' '} - the above - lunchbox! -

            - - ) - } - ]} - /> - - ), - footer: { - content: ( - <> - -
            - - - } - preview={{ - text: <>Do a Quick Review, - content: ( - <> -

            - Need a review?: To solve the above - lunchbox,{' '} - - we’ll need to use the rules from{' '} - Beginner 5. - -

            -

            - If you want to review them,{' '} - press “Do a Quick Review” below. + If you want to review them,{' '} + press “Do a Quick Review” below.

            ) @@ -1420,14 +785,14 @@ export default () => ( it could have been converted to - + ) }, { title: ( <> - There’s no + Failure 😭 ), content: ( @@ -1440,7 +805,7 @@ export default () => ( <>

            So: Because it didn’t become{' '} - at the end… + at the end…

            ) @@ -1448,16 +813,13 @@ export default () => ( ]} /> - If you combine with the lunchbox that can be -
            - converted to , and{' '} - it… + When you it…             - It does not become a lunchbox that can be + It didn’t become a lunchbox
            - converted to + that can be converted to             ( type: 'dog', children: ( <> -

            - Therefore, you were incorrect! -

            -

            - The lunchbox you came up with does not{' '} - have . -

            +

            Therefore, your answer was incorrect!

            ) } ]} /> + + Filling each icon… + + - The lunchbox you came up with does not have -
            - + In the following way was incorrect{' '} + 😭             ( }, { type: 'challengeProblem', - title: <>Presenting the question one more time, + title: <>Let’s try again, content: ( <> ( Hopefully you understand what the problem is asking. So let’s state it again:

            -

            - - Fill each icon - in a way such that… - -

            - - ) - } - ]} - /> - - Fill each icon in a way - such that… - - -

            - - The resulting lunchbox has{' '} - . - -

            +
              + + + Fill each {' '} + icon in a way such that, + + + + + After you it, + + + + + The resulting lunchbox can be converted to{' '} + . + + +
            ) } ]} /> - - The resulting lunchbox has -
            - . -             + ( ある法則に基づいて料理を入れ、 - + すると、
            に変換できる弁当箱になる -             + Date: Tue, 22 Oct 2019 22:06:41 -0700 Subject: [PATCH 087/110] Remove_runner --- bin/remove_runner | 5 + src/components/Runners/Akug.tsx | 12 -- src/components/Runners/Aone.tsx | 12 -- src/components/Runners/Ezmz.tsx | 12 -- src/components/Runners/Fxde.tsx | 12 -- src/components/Runners/Ilvq.tsx | 12 -- src/components/Runners/Jiua.tsx | 12 -- src/components/Runners/Lwoq.tsx | 12 -- src/components/Runners/Ufjx.tsx | 12 -- src/components/Runners/Vfdw.tsx | 12 -- src/components/Runners/Xxan.tsx | 12 -- src/components/Runners/index.ts | 10 -- src/lib/runners/akug.json | 245 ----------------------------- src/lib/runners/aone.json | 172 --------------------- src/lib/runners/ezmz.json | 243 ----------------------------- src/lib/runners/fxde.json | 89 ----------- src/lib/runners/ilvq.json | 110 ------------- src/lib/runners/jiua.json | 172 --------------------- src/lib/runners/lwoq.json | 147 ------------------ src/lib/runners/ufjx.json | 205 ------------------------- src/lib/runners/vfdw.json | 264 -------------------------------- src/lib/runners/xxan.json | 171 --------------------- 22 files changed, 5 insertions(+), 1948 deletions(-) create mode 100755 bin/remove_runner delete mode 100644 src/components/Runners/Akug.tsx delete mode 100644 src/components/Runners/Aone.tsx delete mode 100644 src/components/Runners/Ezmz.tsx delete mode 100644 src/components/Runners/Fxde.tsx delete mode 100644 src/components/Runners/Ilvq.tsx delete mode 100644 src/components/Runners/Jiua.tsx delete mode 100644 src/components/Runners/Lwoq.tsx delete mode 100644 src/components/Runners/Ufjx.tsx delete mode 100644 src/components/Runners/Vfdw.tsx delete mode 100644 src/components/Runners/Xxan.tsx delete mode 100644 src/lib/runners/akug.json delete mode 100644 src/lib/runners/aone.json delete mode 100644 src/lib/runners/ezmz.json delete mode 100644 src/lib/runners/fxde.json delete mode 100644 src/lib/runners/ilvq.json delete mode 100644 src/lib/runners/jiua.json delete mode 100644 src/lib/runners/lwoq.json delete mode 100644 src/lib/runners/ufjx.json delete mode 100644 src/lib/runners/vfdw.json delete mode 100644 src/lib/runners/xxan.json diff --git a/bin/remove_runner b/bin/remove_runner new file mode 100755 index 000000000..cdc817ca5 --- /dev/null +++ b/bin/remove_runner @@ -0,0 +1,5 @@ +#!/bin/sh + +find src/components/Runners/ -iname "$1.tsx" -exec rm {} \; +rm -f src/lib/runners/$1.json +sed -i "/$1/Id" src/components/Runners/index.ts \ No newline at end of file diff --git a/src/components/Runners/Akug.tsx b/src/components/Runners/Akug.tsx deleted file mode 100644 index 5467bc299..000000000 --- a/src/components/Runners/Akug.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/akug.json' - -const Akug = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Akug diff --git a/src/components/Runners/Aone.tsx b/src/components/Runners/Aone.tsx deleted file mode 100644 index 3dd1fd3d1..000000000 --- a/src/components/Runners/Aone.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/aone.json' - -const Aone = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Aone diff --git a/src/components/Runners/Ezmz.tsx b/src/components/Runners/Ezmz.tsx deleted file mode 100644 index f90a16c15..000000000 --- a/src/components/Runners/Ezmz.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/ezmz.json' - -const Ezmz = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Ezmz diff --git a/src/components/Runners/Fxde.tsx b/src/components/Runners/Fxde.tsx deleted file mode 100644 index 7f9c6df83..000000000 --- a/src/components/Runners/Fxde.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/fxde.json' - -const Fxde = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Fxde diff --git a/src/components/Runners/Ilvq.tsx b/src/components/Runners/Ilvq.tsx deleted file mode 100644 index 0fe0798ce..000000000 --- a/src/components/Runners/Ilvq.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/ilvq.json' - -const Ilvq = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Ilvq diff --git a/src/components/Runners/Jiua.tsx b/src/components/Runners/Jiua.tsx deleted file mode 100644 index 652349205..000000000 --- a/src/components/Runners/Jiua.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/jiua.json' - -const Jiua = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Jiua diff --git a/src/components/Runners/Lwoq.tsx b/src/components/Runners/Lwoq.tsx deleted file mode 100644 index be280dcbd..000000000 --- a/src/components/Runners/Lwoq.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/lwoq.json' - -const Lwoq = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Lwoq diff --git a/src/components/Runners/Ufjx.tsx b/src/components/Runners/Ufjx.tsx deleted file mode 100644 index 2bfeb25b4..000000000 --- a/src/components/Runners/Ufjx.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/ufjx.json' - -const Ufjx = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Ufjx diff --git a/src/components/Runners/Vfdw.tsx b/src/components/Runners/Vfdw.tsx deleted file mode 100644 index 81e1dded5..000000000 --- a/src/components/Runners/Vfdw.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/vfdw.json' - -const Vfdw = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Vfdw diff --git a/src/components/Runners/Xxan.tsx b/src/components/Runners/Xxan.tsx deleted file mode 100644 index 6617faa85..000000000 --- a/src/components/Runners/Xxan.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/xxan.json' - -const Xxan = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Xxan diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index cf5c19364..fa10b5c37 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -171,34 +171,24 @@ export { default as Fzpz } from 'src/components/Runners/Fzpz' export { default as Whrn } from 'src/components/Runners/Whrn' export { default as Jguj } from 'src/components/Runners/Jguj' export { default as Fljg } from 'src/components/Runners/Fljg' -export { default as Ezmz } from 'src/components/Runners/Ezmz' export { default as Biit } from 'src/components/Runners/Biit' export { default as Pbop } from 'src/components/Runners/Pbop' export { default as Dvfg } from 'src/components/Runners/Dvfg' export { default as Hkbs } from 'src/components/Runners/Hkbs' -export { default as Fxde } from 'src/components/Runners/Fxde' export { default as Rbup } from 'src/components/Runners/Rbup' export { default as Ehsw } from 'src/components/Runners/Ehsw' export { default as Cmla } from 'src/components/Runners/Cmla' -export { default as Ilvq } from 'src/components/Runners/Ilvq' export { default as Spga } from 'src/components/Runners/Spga' -export { default as Akug } from 'src/components/Runners/Akug' -export { default as Vfdw } from 'src/components/Runners/Vfdw' -export { default as Jiua } from 'src/components/Runners/Jiua' -export { default as Aone } from 'src/components/Runners/Aone' export { default as Qsoa } from 'src/components/Runners/Qsoa' export { default as Ymtp } from 'src/components/Runners/Ymtp' export { default as Jfgb } from 'src/components/Runners/Jfgb' export { default as Qrgc } from 'src/components/Runners/Qrgc' export { default as Jxvy } from 'src/components/Runners/Jxvy' -export { default as Lwoq } from 'src/components/Runners/Lwoq' export { default as Olyw } from 'src/components/Runners/Olyw' export { default as Tjaf } from 'src/components/Runners/Tjaf' export { default as Avcu } from 'src/components/Runners/Avcu' export { default as Dewi } from 'src/components/Runners/Dewi' -export { default as Xxan } from 'src/components/Runners/Xxan' export { default as Nuco } from 'src/components/Runners/Nuco' -export { default as Ufjx } from 'src/components/Runners/Ufjx' export { default as Dhiu } from 'src/components/Runners/Dhiu' export { default as Akjy } from 'src/components/Runners/Akjy' export { default as Hnyn } from 'src/components/Runners/Hnyn' diff --git a/src/lib/runners/akug.json b/src/lib/runners/akug.json deleted file mode 100644 index d3ffe98e1..000000000 --- a/src/lib/runners/akug.json +++ /dev/null @@ -1,245 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "meta": "plusOneEffect", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 7, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/aone.json b/src/lib/runners/aone.json deleted file mode 100644 index b12aa04c4..000000000 --- a/src/lib/runners/aone.json +++ /dev/null @@ -1,172 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 2, - "shorthandNumberAfterConvert": "number", - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "meta": "plusOneEffect", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/ezmz.json b/src/lib/runners/ezmz.json deleted file mode 100644 index 2c3fa3bf0..000000000 --- a/src/lib/runners/ezmz.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "meta": "plusOneEffect", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - }, - { - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 2, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "done", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": true, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "convert": "toMathBoxPlay", - "showBottomProgressBar": false -} diff --git a/src/lib/runners/fxde.json b/src/lib/runners/fxde.json deleted file mode 100644 index 54501161b..000000000 --- a/src/lib/runners/fxde.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "numLeafNodes": 2, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/ilvq.json b/src/lib/runners/ilvq.json deleted file mode 100644 index 38ed66b41..000000000 --- a/src/lib/runners/ilvq.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "numLeafNodes": 3, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/jiua.json b/src/lib/runners/jiua.json deleted file mode 100644 index 21dd90fbd..000000000 --- a/src/lib/runners/jiua.json +++ /dev/null @@ -1,172 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 1, - "shorthandNumberAfterConvert": "number", - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "meta": "plusOneEffect", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/lwoq.json b/src/lib/runners/lwoq.json deleted file mode 100644 index 4af1f36e3..000000000 --- a/src/lib/runners/lwoq.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 4, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/ufjx.json b/src/lib/runners/ufjx.json deleted file mode 100644 index 7d2fc7006..000000000 --- a/src/lib/runners/ufjx.json +++ /dev/null @@ -1,205 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 5, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": { - "a": "highlighted", - "b": "highlighted", - "c": "highlighted" - }, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/vfdw.json b/src/lib/runners/vfdw.json deleted file mode 100644 index fb3413665..000000000 --- a/src/lib/runners/vfdw.json +++ /dev/null @@ -1,264 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "meta": "plusOneEffect", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 7, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - }, - { - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 3, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "done", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": true, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "convert": "toMathBoxPlay", - "showBottomProgressBar": false -} diff --git a/src/lib/runners/xxan.json b/src/lib/runners/xxan.json deleted file mode 100644 index 0a789dcd2..000000000 --- a/src/lib/runners/xxan.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 1, - "shorthandNumberAfterConvert": "number", - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} From d105ce90b50e2211cec3af434c9c275a1eab0b9b Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 22:21:42 -0700 Subject: [PATCH 088/110] clean_runners --- bin/clean_runners | 11 ++ src/components/Runners/Avcu.tsx | 12 -- src/components/Runners/Biit.tsx | 12 -- src/components/Runners/Cqzt.tsx | 12 -- src/components/Runners/Deay.tsx | 12 -- src/components/Runners/Dewi.tsx | 12 -- src/components/Runners/Fljg.tsx | 12 -- src/components/Runners/Rchd.tsx | 12 -- src/components/Runners/Tjaf.tsx | 12 -- src/components/Runners/Voeb.tsx | 12 -- src/components/Runners/index.ts | 9 -- src/lib/runners/avcu.json | 170 ------------------------ src/lib/runners/biit.json | 36 ----- src/lib/runners/cqzt.json | 175 ------------------------- src/lib/runners/deay.json | 125 ------------------ src/lib/runners/dewi.json | 171 ------------------------ src/lib/runners/fljg.json | 224 -------------------------------- src/lib/runners/rchd.json | 59 --------- src/lib/runners/tjaf.json | 170 ------------------------ src/lib/runners/voeb.json | 62 --------- 20 files changed, 11 insertions(+), 1309 deletions(-) create mode 100755 bin/clean_runners delete mode 100644 src/components/Runners/Avcu.tsx delete mode 100644 src/components/Runners/Biit.tsx delete mode 100644 src/components/Runners/Cqzt.tsx delete mode 100644 src/components/Runners/Deay.tsx delete mode 100644 src/components/Runners/Dewi.tsx delete mode 100644 src/components/Runners/Fljg.tsx delete mode 100644 src/components/Runners/Rchd.tsx delete mode 100644 src/components/Runners/Tjaf.tsx delete mode 100644 src/components/Runners/Voeb.tsx delete mode 100644 src/lib/runners/avcu.json delete mode 100644 src/lib/runners/biit.json delete mode 100644 src/lib/runners/cqzt.json delete mode 100644 src/lib/runners/deay.json delete mode 100644 src/lib/runners/dewi.json delete mode 100644 src/lib/runners/fljg.json delete mode 100644 src/lib/runners/rchd.json delete mode 100644 src/lib/runners/tjaf.json delete mode 100644 src/lib/runners/voeb.json diff --git a/bin/clean_runners b/bin/clean_runners new file mode 100755 index 000000000..faa2ebc13 --- /dev/null +++ b/bin/clean_runners @@ -0,0 +1,11 @@ +#!/bin/sh + +for f in src/lib/runners/*.json +do + RUNNER="$(cut -d'/' -f4 <<<$f)" + RUNNER="$(cut -d'.' -f1 <<<$RUNNER)" + if ! [[ $(rg -i " ( - // @ts-ignore - - {children} - -) - -export default Avcu diff --git a/src/components/Runners/Biit.tsx b/src/components/Runners/Biit.tsx deleted file mode 100644 index ad0b9fd0a..000000000 --- a/src/components/Runners/Biit.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/biit.json' - -const Biit = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Biit diff --git a/src/components/Runners/Cqzt.tsx b/src/components/Runners/Cqzt.tsx deleted file mode 100644 index de219fb1d..000000000 --- a/src/components/Runners/Cqzt.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/cqzt.json' - -const Cqzt = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Cqzt diff --git a/src/components/Runners/Deay.tsx b/src/components/Runners/Deay.tsx deleted file mode 100644 index f367d232e..000000000 --- a/src/components/Runners/Deay.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/deay.json' - -const Deay = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Deay diff --git a/src/components/Runners/Dewi.tsx b/src/components/Runners/Dewi.tsx deleted file mode 100644 index 7588642b1..000000000 --- a/src/components/Runners/Dewi.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/dewi.json' - -const Dewi = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Dewi diff --git a/src/components/Runners/Fljg.tsx b/src/components/Runners/Fljg.tsx deleted file mode 100644 index 57a544198..000000000 --- a/src/components/Runners/Fljg.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/fljg.json' - -const Fljg = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Fljg diff --git a/src/components/Runners/Rchd.tsx b/src/components/Runners/Rchd.tsx deleted file mode 100644 index 66f2a134f..000000000 --- a/src/components/Runners/Rchd.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/rchd.json' - -const Rchd = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Rchd diff --git a/src/components/Runners/Tjaf.tsx b/src/components/Runners/Tjaf.tsx deleted file mode 100644 index aadc3a096..000000000 --- a/src/components/Runners/Tjaf.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/tjaf.json' - -const Tjaf = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Tjaf diff --git a/src/components/Runners/Voeb.tsx b/src/components/Runners/Voeb.tsx deleted file mode 100644 index 61a9f9d71..000000000 --- a/src/components/Runners/Voeb.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/voeb.json' - -const Voeb = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Voeb diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index fa10b5c37..094317450 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -113,7 +113,6 @@ export { default as Vlob } from 'src/components/Runners/Vlob' export { default as Dubm } from 'src/components/Runners/Dubm' export { default as Rnug } from 'src/components/Runners/Rnug' export { default as Jzwg } from 'src/components/Runners/Jzwg' -export { default as Cqzt } from 'src/components/Runners/Cqzt' export { default as Rqer } from 'src/components/Runners/Rqer' export { default as Duuk } from 'src/components/Runners/Duuk' export { default as Ehxq } from 'src/components/Runners/Ehxq' @@ -126,7 +125,6 @@ export { default as Zwpj } from 'src/components/Runners/Zwpj' export { default as Zzxj } from 'src/components/Runners/Zzxj' export { default as Zzyu } from 'src/components/Runners/Zzyu' export { default as Lizi } from 'src/components/Runners/Lizi' -export { default as Rchd } from 'src/components/Runners/Rchd' export { default as Gnwm } from 'src/components/Runners/Gnwm' export { default as Mcug } from 'src/components/Runners/Mcug' export { default as Aovj } from 'src/components/Runners/Aovj' @@ -170,8 +168,6 @@ export { default as Stda } from 'src/components/Runners/Stda' export { default as Fzpz } from 'src/components/Runners/Fzpz' export { default as Whrn } from 'src/components/Runners/Whrn' export { default as Jguj } from 'src/components/Runners/Jguj' -export { default as Fljg } from 'src/components/Runners/Fljg' -export { default as Biit } from 'src/components/Runners/Biit' export { default as Pbop } from 'src/components/Runners/Pbop' export { default as Dvfg } from 'src/components/Runners/Dvfg' export { default as Hkbs } from 'src/components/Runners/Hkbs' @@ -185,9 +181,6 @@ export { default as Jfgb } from 'src/components/Runners/Jfgb' export { default as Qrgc } from 'src/components/Runners/Qrgc' export { default as Jxvy } from 'src/components/Runners/Jxvy' export { default as Olyw } from 'src/components/Runners/Olyw' -export { default as Tjaf } from 'src/components/Runners/Tjaf' -export { default as Avcu } from 'src/components/Runners/Avcu' -export { default as Dewi } from 'src/components/Runners/Dewi' export { default as Nuco } from 'src/components/Runners/Nuco' export { default as Dhiu } from 'src/components/Runners/Dhiu' export { default as Akjy } from 'src/components/Runners/Akjy' @@ -320,8 +313,6 @@ export { default as Ifpo } from 'src/components/Runners/Ifpo' export { default as Cefx } from 'src/components/Runners/Cefx' export { default as Kjba } from 'src/components/Runners/Kjba' export { default as Peiy } from 'src/components/Runners/Peiy' -export { default as Voeb } from 'src/components/Runners/Voeb' -export { default as Deay } from 'src/components/Runners/Deay' export { default as Mbje } from 'src/components/Runners/Mbje' export { default as Ovua } from 'src/components/Runners/Ovua' export { default as Bras } from 'src/components/Runners/Bras' diff --git a/src/lib/runners/avcu.json b/src/lib/runners/avcu.json deleted file mode 100644 index 50cc5a849..000000000 --- a/src/lib/runners/avcu.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "blankNumber", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumberAfterConvert": "blank", - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/biit.json b/src/lib/runners/biit.json deleted file mode 100644 index 07802a1cb..000000000 --- a/src/lib/runners/biit.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "add", - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/cqzt.json b/src/lib/runners/cqzt.json deleted file mode 100644 index 6c3b163dd..000000000 --- a/src/lib/runners/cqzt.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 2, - "shorthandNumberAfterConvert": "number", - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 6, - "containerState": "done", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": { - "a": "highlighted", - "b": "highlighted", - "c": "highlighted" - }, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/deay.json b/src/lib/runners/deay.json deleted file mode 100644 index db939c1d8..000000000 --- a/src/lib/runners/deay.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "arg": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3, - 4 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 6, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 4 - ], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "add", - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 4, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "add", - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "add", - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "add", - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 5, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": true, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/dewi.json b/src/lib/runners/dewi.json deleted file mode 100644 index f18b9d9d2..000000000 --- a/src/lib/runners/dewi.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 1, - "shorthandNumberAfterConvert": "number", - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/fljg.json b/src/lib/runners/fljg.json deleted file mode 100644 index 9a1db4234..000000000 --- a/src/lib/runners/fljg.json +++ /dev/null @@ -1,224 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "meta": "plusOneEffect", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/rchd.json b/src/lib/runners/rchd.json deleted file mode 100644 index 9af617720..000000000 --- a/src/lib/runners/rchd.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 0, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "add", - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 2, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": true, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/tjaf.json b/src/lib/runners/tjaf.json deleted file mode 100644 index cfeca1cb9..000000000 --- a/src/lib/runners/tjaf.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "blankNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumberAfterConvert": "blank", - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/voeb.json b/src/lib/runners/voeb.json deleted file mode 100644 index f5d3683b0..000000000 --- a/src/lib/runners/voeb.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 6, - "maxNestedFunctionDepth": 0 - }, - "func": { - "type": "repeat", - "count": 4, - "child": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "add" - } - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 2, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": true, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} From 1e155a26e1b8bf4dbedcc0e464852d0112f5c9a5 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 22:34:26 -0700 Subject: [PATCH 089/110] Remove duplicates --- scripts/lib/initialExpressionContainers.ts | 16 -- scripts/lib/runnerConfigs.ts | 4 +- src/components/Runners/Qrfw.tsx | 12 -- src/components/Runners/Spga.tsx | 12 -- src/components/Runners/Whrn.tsx | 12 -- src/components/Runners/index.ts | 3 - src/contents/7.en.tsx | 4 +- src/contents/7.jp.tsx | 2 +- src/contents/8.en.tsx | 20 +- src/contents/8.jp.tsx | 8 +- src/contents/demo.en.tsx | 4 +- src/contents/demo.jp.tsx | 4 +- src/lib/runners/qrfw.json | 147 --------------- src/lib/runners/spga.json | 92 ---------- src/lib/runners/whrn.json | 201 --------------------- 15 files changed, 23 insertions(+), 518 deletions(-) delete mode 100644 src/components/Runners/Qrfw.tsx delete mode 100644 src/components/Runners/Spga.tsx delete mode 100644 src/components/Runners/Whrn.tsx delete mode 100644 src/lib/runners/qrfw.json delete mode 100644 src/lib/runners/spga.json delete mode 100644 src/lib/runners/whrn.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 76a7da0b6..721dec016 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -897,20 +897,6 @@ export const mzms = initializeExpressionContainer([ numberParams('d', 'e', 0) ]) -export const ipgy = initializeExpressionContainer([ - { - arg: 'a', - body: { - arg: 'b', - body: { - arg: 'c', - body: ['b', ['a', 'b', 'b']] - } - } - }, - numberParams('d', 'e', 0) -]) - export const ktus = initializeExpressionContainer({ arg: 'a', body: { @@ -1016,8 +1002,6 @@ export const abbh = initializeExpressionContainer( numberParamsHighlightNonNumber('b', 'c', 1) ) -export const uzzl = initializeExpressionContainer(succParams('a', 'b', 'c')) - export const uqth = initializeExpressionContainer([ succParams('a', 'b', 'c'), numberParams('d', 'e', 0) diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 9544cfa87..32bb4ea0e 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1117,7 +1117,7 @@ export const fzpz: ExpressionRunnerShorthandConfig = { export const whrn: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ipgy, + initialExpressionContainer: initialExpressionContainers.kwqc, showPriorities: true } @@ -1379,7 +1379,7 @@ export const bgxi: ExpressionRunnerShorthandConfig = { export const qrfw: ExpressionRunnerShorthandConfig = { runner: 'simple', - initialExpressionContainer: initialExpressionContainers.uzzl, + initialExpressionContainer: initialExpressionContainers.aqvq, showPriorities: true } diff --git a/src/components/Runners/Qrfw.tsx b/src/components/Runners/Qrfw.tsx deleted file mode 100644 index b1bd6d57a..000000000 --- a/src/components/Runners/Qrfw.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/qrfw.json' - -const Qrfw = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Qrfw diff --git a/src/components/Runners/Spga.tsx b/src/components/Runners/Spga.tsx deleted file mode 100644 index ed88aa0a6..000000000 --- a/src/components/Runners/Spga.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/spga.json' - -const Spga = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Spga diff --git a/src/components/Runners/Whrn.tsx b/src/components/Runners/Whrn.tsx deleted file mode 100644 index 96a05c151..000000000 --- a/src/components/Runners/Whrn.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/whrn.json' - -const Whrn = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Whrn diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 094317450..635f86961 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -166,7 +166,6 @@ export { default as Ozxi } from 'src/components/Runners/Ozxi' export { default as Envj } from 'src/components/Runners/Envj' export { default as Stda } from 'src/components/Runners/Stda' export { default as Fzpz } from 'src/components/Runners/Fzpz' -export { default as Whrn } from 'src/components/Runners/Whrn' export { default as Jguj } from 'src/components/Runners/Jguj' export { default as Pbop } from 'src/components/Runners/Pbop' export { default as Dvfg } from 'src/components/Runners/Dvfg' @@ -174,7 +173,6 @@ export { default as Hkbs } from 'src/components/Runners/Hkbs' export { default as Rbup } from 'src/components/Runners/Rbup' export { default as Ehsw } from 'src/components/Runners/Ehsw' export { default as Cmla } from 'src/components/Runners/Cmla' -export { default as Spga } from 'src/components/Runners/Spga' export { default as Qsoa } from 'src/components/Runners/Qsoa' export { default as Ymtp } from 'src/components/Runners/Ymtp' export { default as Jfgb } from 'src/components/Runners/Jfgb' @@ -189,7 +187,6 @@ export { default as Bwff } from 'src/components/Runners/Bwff' export { default as Xwzc } from 'src/components/Runners/Xwzc' export { default as Fhrd } from 'src/components/Runners/Fhrd' export { default as Bgxi } from 'src/components/Runners/Bgxi' -export { default as Qrfw } from 'src/components/Runners/Qrfw' export { default as Plde } from 'src/components/Runners/Plde' export { default as Cpim } from 'src/components/Runners/Cpim' export { default as Rjzw } from 'src/components/Runners/Rjzw' diff --git a/src/contents/7.en.tsx b/src/contents/7.en.tsx index 260300f98..d7f9f24d8 100644 --- a/src/contents/7.en.tsx +++ b/src/contents/7.en.tsx @@ -605,9 +605,9 @@ export default () => ( } ]} /> - + We’ll this lunchbox, and… - + If it becomes a lunchbox that can be diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index f43a3c59c..1ec57d71d 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -569,7 +569,7 @@ export default () => ( } ]} /> - こちらの弁当箱を実行して… + こちらの弁当箱を実行して… に変換できる diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index b3ec00fb5..7f0ad6a0e 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -275,9 +275,9 @@ export default () => ( } ]} /> - + 👧🏻 Saya’s Lunchbox - + ( Ok, so let me combine this lunchbox that can be converted to …

            - + ( number: 2 }} /> - +

            With the lunchbox I came up with earlier!

            - + 👧🏻 Saya’s lunchbox - +

            We want the result to be , right? @@ -1072,12 +1072,12 @@ export default () => (

            Instead of this… - + Use a lunchbox that has

            (👧🏻 Saya’s lunchbox) -             +

            Step 3: If you combine them and then{' '} … @@ -1274,11 +1274,11 @@ export default () => ( } ]} /> - + There’s no way we could’ve come up with
            this answer! -             + ( 今回は、こちらの {' '} に変換できる弁当箱を使ってみます！

            - + ( number: 1 }} /> - +

            これを 👧🏻{' '} サヤちゃんの弁当箱と合体させてみます。 @@ -1344,11 +1344,11 @@ export default () => ( } ]} /> - + さっきの答えの弁当箱。普通はこんなの、
            とっさに思いつかないよ！😢 -             + ( ), content: ( <> - + ( number: 2 }} /> - +

            diff --git a/src/contents/demo.jp.tsx b/src/contents/demo.jp.tsx index adb555d07..df33c37bb 100644 --- a/src/contents/demo.jp.tsx +++ b/src/contents/demo.jp.tsx @@ -229,7 +229,7 @@ const DemoCardList = () => ( ), content: ( <> - + ( number: 2 }} /> - +
            diff --git a/src/lib/runners/qrfw.json b/src/lib/runners/qrfw.json deleted file mode 100644 index 727031ba0..000000000 --- a/src/lib/runners/qrfw.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 4, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/spga.json b/src/lib/runners/spga.json deleted file mode 100644 index be58209b1..000000000 --- a/src/lib/runners/spga.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "f", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "numLeafNodes": 2, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": { - "f": "🅰️", - "g": "🅱️" - }, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/whrn.json b/src/lib/runners/whrn.json deleted file mode 100644 index 31e852325..000000000 --- a/src/lib/runners/whrn.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 5, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} From 5a70a97fd8975609cd0463d7adede8e421471b00 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 22:56:03 -0700 Subject: [PATCH 090/110] Continue revising 8 --- src/contents/8.en.tsx | 1436 ++++++++++++++++++++++++++++++++++++++++- src/contents/8.jp.tsx | 3 +- 2 files changed, 1437 insertions(+), 2 deletions(-) diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index 7f0ad6a0e..dcbde459c 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -22,7 +22,8 @@ import EmojiSeparator from 'src/components/EmojiSeparator' import * as R from 'src/components/Runners' import EmojiWithText from 'src/components/EmojiWithText' import NextLessonButton from 'src/components/NextLessonButton' -import { StepOne, StepTwo, StepThree } from 'src/contents/7.en' +import { Problem, StepOne, StepTwo, StepThree } from 'src/contents/7.en' +import CardContent from 'src/components/CardContent' export const BlankNumberPlusOne = () => ( <> @@ -45,6 +46,1439 @@ export const BlankNumberPlusOne = () => ( export default () => ( We’re doomed!, + content: ( + <> + 😭, ❓, 😭]} + /> +

            + The villagers in Lambda Village were struggling with this + difficult problem: +

            + + +

            Hmm… I have no clue!

            + + ) + }, + { + type: 'sad', + children: ( + <> +

            + But we need to solve this to get our mathboxes{' '} + back! We’re doomed! +

            + + ) + } + ]} + /> + + ) + }, + { + title: <>Saya to the rescue, + content: ( + <> +

            + That’s when Saya 👧🏻, a + little girl who lives in Lambda Village, appeared. +

            + + Saya,
            a little girl who lives in Lambda + Village + + } + /> + +

            Hey guys! What are you doing there?

            + + ) + }, + { + type: 'sad', + children: ( + <> +

            + Oh, hey Saya. Well, we have some bad news. The devil{' '} + 😈 has stolen our mathboxes{' '} + . +

            +

            + To get them back, we need to solve this difficult + question. But it’s too hard for us! +

            + + ) + }, + { + type: 'saya', + children: ( + <> +

            I see. I’ll help you then!

            + + ) + }, + { + type: 'roll', + children: ( + <> +

            We appreciate it, but this isn’t for kids.

            +

            + We adults tried hard but couldn’t solve it. So I doubt + you can. +

            + + ) + } + ]} + /> + + ) + }, + { + title: <>Saya’s Lunchbox, + content: ( + <> +

            + Saya spent some time thinking, and came up with the following + lunchbox: +

            + +

            + Hey, I filled each{' '} + icon as follows. + Can you take a look? +

            + + ) + } + ]} + /> + + 👧🏻 I filled each{' '} + icon… + + + + 👧🏻 As follows! + + +

            + Hmm… I don’t think it’s going to work, but we’ll try + anyway. +

            +

            + + We’ll this, and see if + the result is a lunchbox that can be converted to{' '} + . + +

            + + ) + } + ]} + /> + We’ll this lunchbox, and… + + + If it becomes a lunchbox
            that can be converted to , success. 🎉 +
            + Otherwise, failure 😭 +             + +

            + Let’s first{' '} + it! +

            + + ) + } + ]} + /> + + ) + }, + { + title: ( + <> + What happens if you it? + + ), + content: ( + <> + + + + + + + + + + + + + +

            So this is the final result!

            + + ) + } + ]} + /> + + Final Result + + +

            Wait…! It can’t be…!

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            + The resulting lunchbox can be converted to{' '} + ! +

            + + ) + } + ]} + /> + + + + + + +

            + So, it’s a success!{' '} + 🎉 +

            + + ) + }, + { + type: 'saya', + children: ( + <> +

            Yay!

            + + ) + }, + { + type: 'surprised', + children: ( + <> +

            No way! We tried so hard but couldn’t solve it…

            +

            Can’t believe Saya solved it so easily!

            + + ) + } + ]} + /> + + ) + }, + { + title: <>Let’s dive in a little deeper, + content: ( + <> + +

            とにかく、これで計算箱を返してもらえるぞ！

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            + そうですね。しかしその前に、 + + ひとつだけ掘り下げたいことがあります + + 。少しの間、辛抱してお聞きください！ +

            + + ) + }, + { + type: 'thinking', + children: ( + <> +

            掘り下げたいことだって？

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            + はい。まず、ここまでをまとめると、下のように{' '} + + に変換できる弁当箱は、 + +

            + + + +

            + + 👧🏻{' '} + サヤちゃんの弁当箱を使って実行すると、 + {' '} + に変換できる弁当箱になります。 + +

            + + ) + } + ]} + /> + + 👧🏻 サヤちゃんの弁当箱を使って実行すると… + + + + に変換できる弁当箱になる + + +

            + つまり、👧🏻{' '} + サヤちゃんの弁当箱を使うことで、 +

            +
              + + + に変換できる弁当箱が、 + + + + + に変換できる弁当箱になる + + +
            +

            というわけですね。

            + + ) + } + ]} + /> + , + , + + ]} + description={ + <> + に変換できる弁当箱が、 +
            + に変換できる弁当箱になる + + } + /> + + ) + }, + { + title: ( + <> + や {' '} + と組み合わせた場合は？ + + ), + content: ( + <> + +

            では、ここで疑問なのですが…

            +

            + + 👧🏻 サヤちゃんの弁当箱を、 + {' '} + に変換できる弁当箱と組み合わせて + {' '} + すると、結果はどうなるでしょう？ + +

            + + ) + } + ]} + /> + + に変換できる弁当箱と、 +
            + 👧🏻 サヤちゃんの弁当箱を組み合わせて… +             + + + するとどうなる？ + + +

            うーん、分からないなあ…

            +

            + 先ほどは、 + が {' '} + になったけど、 + + はどうなるだろう？ + +

            + + ) + } + ]} + /> + , + , + + ]} + description={ + <> + 先ほどは、 + が {' '} + になったけど… + + } + /> + , + , + ❓ + ]} + description={ + <> + は何になる？ + + } + /> + +

            では、試してみましょう！

            + + ) + } + ]} + /> + + ) + }, + { + title: ( + <> + は何になる？ + + ), + content: ( + <> + +

            + 今回は、こちらの {' '} + に変換できる弁当箱を使ってみます！ +

            + + + +

            + これを 👧🏻{' '} + サヤちゃんの弁当箱と合体させてみます。 +

            + + ) + } + ]} + /> + + 👧🏻 サヤちゃんの弁当箱と合体 + + +

            + では、 + {' '} + してみましょう！今回は、途中で止まりません。 + +

            + + ) + } + ]} + /> + + +

            + 最後に残ったこちらの弁当箱は、 + に変換できる弁当箱です！ +

            + + ) + } + ]} + /> + + + + +

            ということは…

            +
              + + + に変換できる弁当箱が、 + + + + + {' '} + に変換できる弁当箱になったのか？ + + +
            + + ) + } + ]} + /> + + に変換できる弁当箱と、 +
            + 👧🏻 サヤちゃんの弁当箱を組み合わせて… +             + + + すると、 +
            + に変換できる弁当箱になる +             + +

            + つまり、👧🏻{' '} + サヤちゃんの弁当箱を使うことで、 + が {' '} + になった、というわけですね。 +

            + + ) + } + ]} + /> + , + , + + ]} + description={ + <> + が {' '} + になった + + } + /> + + ) + }, + { + title: <>1を足すことができる, + content: ( + <> + +

            + つまり、👧🏻 サヤちゃんの弁当箱を使うと、 +

            +
              + + + が{' '} + になり、 + + + + + が{' '} + になります。 + + +
            + , + , + + ]} + noBottomMargin + /> + , + , + + ]} + noTopMargin + description={ + <> + が{' '} + に、 + が{' '} + に + + } + /> +

            つまり、どういうことか分かりますか？

            + + ) + }, + { + type: 'saya', + children: ( + <> +

            + もしかして… + + を足すことができるのかな？ + +

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            サヤちゃん、その通りです！

            + + ) + }, + { + type: 'thinking', + children: ( + <> +

            え、どういうこと？

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            + つまり、 + + 仮に 👧🏻 サヤちゃんの弁当箱と{' '} + {' '} + に変換できる弁当箱を合体させて実行すると、 + +

            +

            + + 結果は {' '} + ➕ {' '} + に変換できる弁当箱になる + + 、というわけです！ +

            + + ) + } + ]} + /> + + +

            + が{' '} + ➕{' '} + になるから、「 + 1を足すことができる + 」というわけですね。 +

            + + ) + } + ]} + /> + , + , + , + ➕, + + ]} + description={ + <> + が{' '} + ➕{' '} + になる + + } + /> + + ) + }, + { + type: 'summary', + title: ( + <> + 計算箱の と同じことができる + + ), + content: ( + <> + +

            + ここで思い出してほしいのですが…計算箱にも「 + + 」がありますよね。 +

            +

            + 計算箱ではこれを使うことで、何らかの数字に1を足すことができます。 +

            + + ) + } + ]} + /> + + 計算箱は、「 + + 」を使うことで… + + + 何らかの数字に1を足すことができる + +

            + 今回学んだのは、 + + 「1を足す」という計算は、弁当箱でも行うことができる + + 、ということです。 +

            + + ) + } + ]} + /> + , + 🍱, + + ]} + description={ + <> + 「1を足す」という計算は、 +
            + 弁当箱でも行うことができる + + } + /> + +

            + 弁当箱を使う場合は、 + + の代わりに{' '} + 👧🏻 サヤちゃんの弁当箱を使う + + ことで、1を足す計算を行うことができます。 +

            + + ) + } + ]} + /> + + +

            + つまり、 + + 計算箱の「 + + 」は、弁当箱を使って「再現」できる + + ということなんです。 +

            + + ) + } + ]} + /> + , + , + , + 🍱, + + ]} + description={ + <> + 計算箱の「 + + 」は、 +
            + 弁当箱で「再現 + 」することができる + + } + /> + + ) + }, + { + title: <>もっと複雑な計算箱も再現できる, + content: ( + <> + +

            + もちろん、もっと複雑な計算箱も弁当箱で再現できます。 +

            +

            + たとえば、初級その1に登場したこちらの計算箱をご覧ください。 + すると、結果は{' '} + になります。 +

            + + ) + } + ]} + /> + + +

            + これを弁当箱で「再現 + 」するには、どうすればいいか分かりますか？ +

            + + ) + }, + { + type: 'saya', + children: ( + <> +

            + 分かった！まず、 + に変換できる弁当箱を用意して… +

            + + ) + } + ]} + /> + + + + +

            + そして、先ほどの 👧🏻 サヤの弁当箱と「 + 2回 + 」組み合わせればいいんじゃないかな？ +

            + + ) + } + ]} + /> + + に変換できる弁当箱を、 +
            + 👧🏻 サヤちゃんの弁当箱と +
            「2回 + 」組み合わせることで、 +
            + {' '} + を再現する +             + +

            + 正解です！では、 + を押してみてください。 +

            +

            + ( + + 今回は時間省略のため、途中のステップを見せるのは省略します！ + + ) +

            + + ) + } + ]} + /> + + +

            + 最後に残ったこちらの弁当箱は、 + に変換できる弁当箱です！ +

            + + ) + } + ]} + /> + + + + +

            + つまり、先ほどの計算箱を「再現」できた、というわけですね。 +

            + + ) + } + ]} + /> + こちらの計算箱は… + + +
            + こちらの弁当箱で「再現」できる！ + + +
            +

            + まとめると、 + + 計算箱の「 + + 」は、弁当箱で再現することができる + + のです。このポイントさえ覚えていただければ、細かいことは分からなくても大丈夫です！ +

            + , + , + , + 🍱, + + ]} + description={ + <> + 計算箱の「 + + 」は、 +
            + 弁当箱で「再現 + 」することができる + + } + /> + + ), + footer: { + content: ( + <> + +
            +

            + 👧🏻 サヤちゃんが考えた弁当箱以外にも、 + + 以下の法則に当てはまる弁当箱であれば、どれでも 「 + + 」を再現できます。 + +

            + + この法則に当てはまる弁当箱であれば、 +
            + 「 + 」を再現できる +             +

            + 👧🏻 サヤちゃんが考えた弁当箱の場合、 +

            +
              + + 🅰️ は + + + 🅱️ は + + + は + +
            +

            でした。

            + + 🅰️ は 、 + 🅱️ は 、 + は + +

            他にも、例えば

            +
              + + 🅰️ は + + + 🅱️ は + + + は + +
            +

            + にしても、「 + + 」を再現することができます。 +

            + + 🅰️ は 、 + 🅱️ は 、 + は + 。
            + これも「 + + 」を +
            + 再現できる！ +             +

            + つまり、「 + + 」を再現できる弁当箱は、👧🏻{' '} + サヤちゃんが考えた弁当箱以外にもたくさんあるということですね！ +

            + + } + preview={{ + text: <>続きを読む, + content: ( + <> +

            + ちなみに: 「 + + 」を再現できる弁当箱は、 + + 👧🏻{' '} + サヤちゃんが考えた弁当箱以外にもあります。 + + つまり、正解は他にもあるのです。 +

            +

            + 気になる方は、↓の「続きを読む」を押してみてください。 + (読まなくても先に進めます！) +

            + + ) + }} + /> + + ) + } + }, + { + type: 'challengeProblem', + title: <>他の機能も再現できる？, + content: ( + <> +

            + ここで疑問なのですが、初級で説明した通り、計算箱には「 + + 」以外にも、「 + + 」や、「 + + 」がありましたよね。 +

            + + 「 + 」の例 + + + 「 + 」の例 +
            + ( を {' '} + 回繰り返す) +             +

            + + これらの機能も、弁当箱で再現することができるのでしょうか？ + +

            + , + 🍱, + 🔁 + ]} + description={ + <> + 「 + 」や +
            「 + 」も、 +
            + 弁当箱で「再現」できる？ + + } + /> +

            + + この疑問については、後に答えが明らかになります。 + + 楽しみにしていてください。 +

            + + ) + }, + { + type: 'sideNote', + title: <>考えつかなくても大丈夫！, + content: ( + <> + +

            ミニオン、ひとつ愚痴を聞いてもらえるかい？

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            はい、どうしました？

            + + ) + }, + { + type: 'sad', + children: ( + <> +

            + さっきの問題、難しすぎやしないかい？普通は、サヤちゃんみたいに答えをとっさに思いつかないよ！ +

            +

            + + こういうのがパッと思いつけないと、コンピュータサイエンスを学ぶ資格はないのかな？ + +

            + + ) + } + ]} + /> + + さっきの答えの弁当箱。普通はこんなの、 +
            + とっさに思いつかないよ！😢 +             + +

            + + いえ、そんなことは全くありませんよ。 + + むしろ、こういう答えを思いつけるのはひと握りの天才だけです。 +

            + + ) + }, + { + type: 'sad', + children: ( + <> +

            え、そうなの？

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            はい。先ほどの問題は超難問でしたから。

            +

            + + 答えを思いつけなくても、答えを見て、「なるほど、そういうことだったのか」と理解できれば、コンピュータサイエンスを学ぶ素養は十分すぎるほどあります。 + +

            + + ) + }, + { + type: 'smile', + children: ( + <> +

            そっか…気が楽になったよ。ありがとう！

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            いえいえ。それでは、そろそろ話を戻しましょう！

            + + ) + } + ]} + /> + 話を戻しましょう！} + /> + + ) + }, + { + title: <>話を戻すと…, + content: ( + <> +

            + 悪魔による難しい問題に見事答えられたことで、村人たちは大喜びでした。 +

            + +

            + やった！サヤちゃんのおかげで問題に答えられたぞ！これで計算箱を返してもらえる！ +

            + + ) + } + ]} + /> +

            しかし、当のサヤちゃんには何か腑に落ちない点があるようです。

            + +

            + ミニオンさん、 + + おかしなことに気づいちゃったんだけど… + +

            + + ) + }, + { + type: 'dog', + children: ( + <> +

            はい、「おかしなこと」とは何ですか？

            + + ) + } + ]} + /> +

            + サヤちゃんが気づいた、「 + おかしなこと + 」とは何なのでしょうか？次のページで説明していきます！ +

            + + + + ) + }, { title: <>We’re doomed!, content: ( diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 6813ec2ce..e73f8775a 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -193,7 +193,8 @@ export default () => (

            これを して、 - になればいいんだよな。 + {' '} + に変換できる弁当箱になればいいんだよな。

            ) From b1392c095ba171b0d3fda240f469e08b07448844 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Tue, 22 Oct 2019 23:40:46 -0700 Subject: [PATCH 091/110] Continue rewriting 8 --- src/contents/7.en.tsx | 2 +- src/contents/8.en.tsx | 295 ++++++++++++++++++++++++------------------ src/contents/8.jp.tsx | 11 +- 3 files changed, 173 insertions(+), 135 deletions(-) diff --git a/src/contents/7.en.tsx b/src/contents/7.en.tsx index d7f9f24d8..d76c1c186 100644 --- a/src/contents/7.en.tsx +++ b/src/contents/7.en.tsx @@ -521,7 +521,7 @@ export default () => ( children: ( <>

            Hmm… I don’t know if I understood the problem.

            -

            And I have no clue how to solve it!

            +

            And I have no idea how to solve it!

            ) }, diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index dcbde459c..89fc06079 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -28,17 +28,19 @@ import CardContent from 'src/components/CardContent' export const BlankNumberPlusOne = () => ( <> - 👧🏻 サヤちゃんの弁当箱と、 + Combine 👧🏻 Saya’s lunchbox
            - に変換できる弁当箱を -
            - 合体させて実行すると、 + with a lunchbox that can be converted to{' '} +             - ➕{' '} - に
            - 変換できる弁当箱になる + If you it, +
            + it becomes a lunchobox +
            + that can be converted to {' '} + ➕             ) @@ -64,7 +66,7 @@ export default () => ( type: 'crying', children: ( <> -

            Hmm… I have no clue!

            +

            Hmm… I have no idea!

            ) }, @@ -206,10 +208,17 @@ export default () => ( } ]} /> - We’ll this lunchbox, and… + + We’ll this lunchbox, and… + - If it becomes a lunchbox
            that can be converted to , success. 🎉 + If it becomes a lunchbox +
            + that can be converted to , success. 🎉
            Otherwise, failure 😭             @@ -220,7 +229,7 @@ export default () => ( children: ( <>

            - Let’s first{' '} + Let’s first{' '} it!

            @@ -263,9 +272,7 @@ export default () => ( } ]} /> - - Final Result - + Final Result ( children: ( <>

            - The resulting lunchbox can be converted to{' '} + The resulting lunchbox can be converted to{' '} !

            @@ -341,7 +348,9 @@ export default () => ( type: 'happy', children: ( <> -

            とにかく、これで計算箱を返してもらえるぞ！

            +

            + Anyway, thanks to Saya, we’ll get our mathboxes back! +

            ) }, @@ -350,11 +359,12 @@ export default () => ( children: ( <>

            - そうですね。しかしその前に、 - - ひとつだけ掘り下げたいことがあります - - 。少しの間、辛抱してお聞きください！ + Yes, but: Before we move on,{' '} + let’s dive in a little deeper. +

            +

            + We’ll spend a bit of time to talk about some important + stuff.

            ) @@ -363,7 +373,7 @@ export default () => ( type: 'thinking', children: ( <> -

            掘り下げたいことだって？

            +

            Hmm…?

            ) }, @@ -372,9 +382,10 @@ export default () => ( children: ( <>

            - はい。まず、ここまでをまとめると、下のように{' '} + First: Here’s what we’ve learned so far.{' '} - に変換できる弁当箱は、 + Here’s a lunchbox that can be converted to{' '} + :

            @@ -388,10 +399,9 @@ export default () => (

            - 👧🏻{' '} - サヤちゃんの弁当箱を使って実行すると、 - {' '} - に変換できる弁当箱になります。 + If we combine it with 👧🏻 Saya’s + lunchbox, it will become a lunchbox that can be + converted to .

            @@ -400,11 +410,15 @@ export default () => ( ]} /> - 👧🏻 サヤちゃんの弁当箱を使って実行すると… + If we combined it with +
            + 👧🏻 Saya’s lunchbox…             - に変換できる弁当箱になる + It will become a lunchbox +
            + that can be converted to             ( children: ( <>

            - つまり、👧🏻{' '} - サヤちゃんの弁当箱を使うことで、 + So, by using 👧🏻 Saya’s lunchbox,

              - - に変換できる弁当箱が、 - + + A lunchbox that can be converted to{' '} + … + - - に変換できる弁当箱になる - + + Becomes a lunchbox that can be converted to{' '} + . +
            -

            というわけですね。

            ) } @@ -442,9 +456,11 @@ export default () => ( ]} description={ <> - に変換できる弁当箱が、 + A lunchbox that can be converted to +
            + becomes a lunchbox
            - に変換できる弁当箱になる + that can be converted to } /> @@ -454,8 +470,7 @@ export default () => ( { title: ( <> - や {' '} - と組み合わせた場合は？ + What if we combined it with ? ), content: ( @@ -466,14 +481,17 @@ export default () => ( type: 'dog', children: ( <> -

            では、ここで疑問なのですが…

            + Now, here’s a question:{' '} - 👧🏻 サヤちゃんの弁当箱を、 - {' '} - に変換できる弁当箱と組み合わせて - {' '} - すると、結果はどうなるでしょう？ + Suppose that we combine 👧🏻 Saya’s + lunchbox with a lunchbox that can be converted to{' '} + . + +

            +

            + + What happens when you it?

            @@ -482,13 +500,13 @@ export default () => ( ]} /> - に変換できる弁当箱と、 + Combine 👧🏻 Saya’s lunchbox with
            - 👧🏻 サヤちゃんの弁当箱を組み合わせて… + a lunchbox that can be converted to             - するとどうなる？ + What happens when you it? ( type: 'thinking', children: ( <> -

            うーん、分からないなあ…

            +

            Hmm… I have no idea…

            - 先ほどは、 - が {' '} - になったけど、 - - はどうなるだろう？ - + Last time, became{' '} + . Don’t know what will happen + this time…

            ) @@ -518,9 +533,8 @@ export default () => ( ]} description={ <> - 先ほどは、 - が {' '} - になったけど… + Last time, became{' '} + . } /> @@ -532,7 +546,9 @@ export default () => ( ]} description={ <> - は何になる？ + What about this time? +
            + What will become? } /> @@ -542,7 +558,7 @@ export default () => ( type: 'dog', children: ( <> -

            では、試してみましょう！

            +

            Let’s check it!

            ) } @@ -554,7 +570,7 @@ export default () => ( { title: ( <> - は何になる？ + What will become? ), content: ( @@ -566,8 +582,8 @@ export default () => ( children: ( <>

            - 今回は、こちらの {' '} - に変換できる弁当箱を使ってみます！ + This time, we’ll use this lunchbox that can be converted + to .

            ( />

            - これを 👧🏻{' '} - サヤちゃんの弁当箱と合体させてみます。 + Let’s combine it with 👧🏻 Saya’s lunchbox.

            ) @@ -588,7 +603,7 @@ export default () => ( ]} /> - 👧🏻 サヤちゃんの弁当箱と合体 + Combine with 👧🏻 Saya’s lunchbox ( children: ( <>

            - では、 - {' '} - してみましょう！今回は、途中で止まりません。 + Let’s it! We’ll continue + running until the end.{' '}

            @@ -615,8 +629,8 @@ export default () => ( children: ( <>

            - 最後に残ったこちらの弁当箱は、 - に変換できる弁当箱です！ + The resulting lunchbox can be converted to{' '} + !

            ) @@ -634,17 +648,18 @@ export default () => ( type: 'surprised', children: ( <> -

            ということは…

            +

            That means…

              - に変換できる弁当箱が、 + A lunchbox that can be converted to{' '} + … - {' '} - に変換できる弁当箱になったのか？ + Became a lunchbox that can be converted to{' '} + ?
            @@ -654,15 +669,17 @@ export default () => ( ]} /> - に変換できる弁当箱と、 + Combine 👧🏻 Saya’s lunchbox with
            - 👧🏻 サヤちゃんの弁当箱を組み合わせて… + a lunchbox that can be converted to             - すると、 + If we it,
            - に変換できる弁当箱になる + it becomes a lunchbox +
            + that can be converted to             ( children: ( <>

            - つまり、👧🏻{' '} - サヤちゃんの弁当箱を使うことで、 - が {' '} - になった、というわけですね。 + That means: By using 👧🏻{' '} + Saya’s lunchbox, became{' '} + .

            ) @@ -689,8 +705,7 @@ export default () => ( ]} description={ <> - が {' '} - になった + became } /> @@ -698,7 +713,11 @@ export default () => ( ) }, { - title: <>1を足すことができる, + title: ( + <> + It can add + + ), content: ( <> ( children: ( <>

            - つまり、👧🏻 サヤちゃんの弁当箱を使うと、 + + So, by using 👧🏻 Saya’s lunchbox: +

              - が{' '} - になり、 + becomes{' '} + , and… - が{' '} - になります。 + becomes{' '} + .
            @@ -741,14 +762,15 @@ export default () => ( noTopMargin description={ <> - が{' '} - に、 - が{' '} - に + becomes{' '} + , and +
            + becomes{' '} + . } /> -

            つまり、どういうことか分かりますか？

            +

            Do you see the pattern?

            ) }, @@ -757,10 +779,10 @@ export default () => ( children: ( <>

            - もしかして… - - を足すことができるのかな？ - + Maybe… + + it can add ? +

            ) @@ -769,7 +791,7 @@ export default () => ( type: 'dog', children: ( <> -

            サヤちゃん、その通りです！

            +

            Exactly!

            ) }, @@ -777,7 +799,7 @@ export default () => ( type: 'thinking', children: ( <> -

            え、どういうこと？

            +

            What do you mean?

            ) }, @@ -786,21 +808,28 @@ export default () => ( children: ( <>

            - つまり、 - - 仮に 👧🏻 サヤちゃんの弁当箱と{' '} - {' '} - に変換できる弁当箱を合体させて実行すると、 - -

            -

            - - 結果は {' '} - ➕ {' '} - に変換できる弁当箱になる - - 、というわけです！ + Here’s what I mean:

            +
              + + + If you combine 👧🏻 Saya’s lunchbox… + + + + + …with a lunchbox that can be converted to{' '} + , + + + + + After running it, it becomes a lunchbox that can be + converted to {' '} + ➕ . + + +
            ) } @@ -814,11 +843,19 @@ export default () => ( children: ( <>

            - が{' '} - ➕{' '} - になるから、「 - 1を足すことができる - 」というわけですね。 + In other words:{' '} + + becomes{' '} + ➕{' '} + . + +

            +

            + That’s why{' '} + + “it can add + .” +

            ) @@ -835,9 +872,9 @@ export default () => ( ]} description={ <> - が{' '} + becomes{' '} ➕{' '} - になる + } /> @@ -848,7 +885,7 @@ export default () => ( type: 'summary', title: ( <> - 計算箱の と同じことができる + It can “reproduce” ), content: ( @@ -1530,7 +1567,7 @@ export default () => ( type: 'crying', children: ( <> -

            Hmm… I have no clue!

            +

            Hmm… I have no idea!

            ) }, diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index e73f8775a..606ec3444 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -378,7 +378,7 @@ export default () => (

            👧🏻{' '} - サヤちゃんの弁当箱を使って実行すると、 + サヤちゃんの弁当箱と合体させて実行すると、 {' '} に変換できる弁当箱になります。 @@ -389,7 +389,7 @@ export default () => ( ]} /> - 👧🏻 サヤちゃんの弁当箱を使って実行すると… + 👧🏻 サヤちゃんの弁当箱と合体させて実行すると… @@ -443,8 +443,7 @@ export default () => ( { title: ( <> - や {' '} - と組み合わせた場合は？ + と組み合わせた場合は？ ), content: ( @@ -837,7 +836,9 @@ export default () => ( type: 'summary', title: ( <> - 計算箱の と同じことができる + 計算箱の「 + + 」を「再現」できる ), content: ( From 045f3b4916923e45fca3f1e32a1590064a90d09f Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 00:49:26 -0700 Subject: [PATCH 092/110] Continue rewriting 8 --- src/contents/8.en.tsx | 1550 +++-------------------------------------- src/contents/8.jp.tsx | 14 +- 2 files changed, 114 insertions(+), 1450 deletions(-) diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index 89fc06079..78723fc38 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -745,31 +745,41 @@ export default () => (

          - , - , - - ]} - noBottomMargin - /> - , - , - - ]} - noTopMargin - description={ - <> - becomes{' '} - , and -
          - becomes{' '} - . - - } - /> + + ) + } + ]} + /> + , + , + + ]} + noBottomMargin + /> + , + , + + ]} + noTopMargin + description={ + <> + becomes , + and +
          + becomes . + + } + />{' '} +

          Do you see the pattern?

          ) @@ -897,12 +907,16 @@ export default () => ( children: ( <>

          - ここで思い出してほしいのですが…計算箱にも「 - - 」がありますよね。 + Now, let’s recall that:{' '} + + Mathboxes have{' '} + . +

          - 計算箱ではこれを使うことで、何らかの数字に1を足すことができます。 + Using a mathbox, you can use{' '} + to add{' '} + to any number.

          ) @@ -910,12 +924,12 @@ export default () => ( ]} /> - 計算箱は、「 - - 」を使うことで… + Using a mathbox, you can use +
          + …           - 何らかの数字に1を足すことができる + …to add one to a number. ( children: ( <>

          - 今回学んだのは、 - - 「1を足す」という計算は、弁当箱でも行うことができる - - 、ということです。 + And on this page, we learned that:{' '} + + You can also add to a + number using a lunchbox 🍱. +

          ) @@ -942,9 +956,9 @@ export default () => ( ]} description={ <> - 「1を足す」という計算は、 + You can add to a number
          - 弁当箱でも行うことができる + using a lunchbox } /> @@ -955,12 +969,12 @@ export default () => ( children: ( <>

          - 弁当箱を使う場合は、 + Here’s how:{' '} - の代わりに{' '} - 👧🏻 サヤちゃんの弁当箱を使う - - ことで、1を足す計算を行うことができます。 + Instead of , by using{' '} + 👧🏻 Saya’s lunchbox, + {' '} + you can add to a number.

          ) @@ -975,13 +989,12 @@ export default () => ( children: ( <>

          - つまり、 + Therefore:{' '} - 計算箱の「 - - 」は、弁当箱を使って「再現」できる + A mathbox that uses{' '} + can be{' '} + “reproduced” using a lunchbox. - ということなんです。

          ) @@ -998,12 +1011,10 @@ export default () => ( ]} description={ <> - 計算箱の「 - - 」は、 + A mathbox that uses
          - 弁当箱で「再現 - 」することができる + can be “reproduced” using a + lunchbox. } /> @@ -1011,7 +1022,7 @@ export default () => ( ) }, { - title: <>もっと複雑な計算箱も再現できる, + title: <>You can reproduce more complicated mathboxes, content: ( <> ( children: ( <>

          - もちろん、もっと複雑な計算箱も弁当箱で再現できます。 + Of course, you can also reproduce{' '} + more complicated mathboxes.

          - たとえば、初級その1に登場したこちらの計算箱をご覧ください。 - すると、結果は{' '} - になります。 + + For example, take a look at this mathbox that appeared + on Beginner 1. + {' '} + If you it, + the result will be .

          ) @@ -1041,8 +1056,9 @@ export default () => ( children: ( <>

          - これを弁当箱で「再現 - 」するには、どうすればいいか分かりますか？ + Can you figure out how to{' '} + reproduce this using a + lunchbox?

          ) @@ -1052,8 +1068,8 @@ export default () => ( children: ( <>

          - 分かった！まず、 - に変換できる弁当箱を用意して… + I got it! First, we’ll use this lunchobx that can be + converted to :

          ) @@ -1076,9 +1092,10 @@ export default () => ( children: ( <>

          - そして、先ほどの 👧🏻 サヤの弁当箱と「 - 2回 - 」組み合わせればいいんじゃないかな？ + Then,{' '} + + use my lunchbox twice: +

          ) @@ -1086,14 +1103,10 @@ export default () => ( ]} /> - に変換できる弁当箱を、 -
          - 👧🏻 サヤちゃんの弁当箱と -
          「2回 - 」組み合わせることで、 + Use my lunchbox twice to reproduce
          {' '} - を再現する +           ( children: ( <>

          - 正解です！では、 - を押してみてください。 + Correct! Let’s {' '} + it to check!

          ( - 今回は時間省略のため、途中のステップを見せるのは省略します！ + To save time, we’ll skip right to the end when you run + it. )

          @@ -1125,8 +1139,8 @@ export default () => ( children: ( <>

          - 最後に残ったこちらの弁当箱は、 - に変換できる弁当箱です！ + The resulting lunchbox can be converted to{' '} + !

          ) @@ -1149,29 +1163,31 @@ export default () => ( children: ( <>

          - つまり、先ほどの計算箱を「再現」できた、というわけですね。 + Therefore, we were able to{' '} + reproduce the earlier + mathbox.

          ) } ]} /> - こちらの計算箱は… + This mathbox can be reproduced…
          - こちらの弁当箱で「再現」できる！ + …using this lunchbox!

          - まとめると、 + Summary:{' '} - 計算箱の「 - - 」は、弁当箱で再現することができる - - のです。このポイントさえ覚えていただければ、細かいことは分からなくても大丈夫です！ + A mathbox that uses can + be “reproduced” using a lunchbox. + {' '} + As long as you understood this, you don’t need to understand all + the details!

          ( ]} description={ <> - 計算箱の「 - - 」は、 + A mathbox that uses
          - 弁当箱で「再現 - 」することができる + can be “reproduced” using a + lunchbox. } /> @@ -1297,1358 +1311,6 @@ export default () => ( ) } }, - { - type: 'challengeProblem', - title: <>他の機能も再現できる？, - content: ( - <> -

          - ここで疑問なのですが、初級で説明した通り、計算箱には「 - - 」以外にも、「 - - 」や、「 - - 」がありましたよね。 -

          - - 「 - 」の例 - - - 「 - 」の例 -
          - ( を {' '} - 回繰り返す) -           -

          - - これらの機能も、弁当箱で再現することができるのでしょうか？ - -

          - , - 🍱, - 🔁 - ]} - description={ - <> - 「 - 」や -
          「 - 」も、 -
          - 弁当箱で「再現」できる？ - - } - /> -

          - - この疑問については、後に答えが明らかになります。 - - 楽しみにしていてください。 -

          - - ) - }, - { - type: 'sideNote', - title: <>考えつかなくても大丈夫！, - content: ( - <> - -

          ミニオン、ひとつ愚痴を聞いてもらえるかい？

          - - ) - }, - { - type: 'dog', - children: ( - <> -

          はい、どうしました？

          - - ) - }, - { - type: 'sad', - children: ( - <> -

          - さっきの問題、難しすぎやしないかい？普通は、サヤちゃんみたいに答えをとっさに思いつかないよ！ -

          -

          - - こういうのがパッと思いつけないと、コンピュータサイエンスを学ぶ資格はないのかな？ - -

          - - ) - } - ]} - /> - - さっきの答えの弁当箱。普通はこんなの、 -
          - とっさに思いつかないよ！😢 -           - -

          - - いえ、そんなことは全くありませんよ。 - - むしろ、こういう答えを思いつけるのはひと握りの天才だけです。 -

          - - ) - }, - { - type: 'sad', - children: ( - <> -

          え、そうなの？

          - - ) - }, - { - type: 'dog', - children: ( - <> -

          はい。先ほどの問題は超難問でしたから。

          -

          - - 答えを思いつけなくても、答えを見て、「なるほど、そういうことだったのか」と理解できれば、コンピュータサイエンスを学ぶ素養は十分すぎるほどあります。 - -

          - - ) - }, - { - type: 'smile', - children: ( - <> -

          そっか…気が楽になったよ。ありがとう！

          - - ) - }, - { - type: 'dog', - children: ( - <> -

          いえいえ。それでは、そろそろ話を戻しましょう！

          - - ) - } - ]} - /> - 話を戻しましょう！} - /> - - ) - }, - { - title: <>話を戻すと…, - content: ( - <> -

          - 悪魔による難しい問題に見事答えられたことで、村人たちは大喜びでした。 -

          - -

          - やった！サヤちゃんのおかげで問題に答えられたぞ！これで計算箱を返してもらえる！ -

          - - ) - } - ]} - /> -

          しかし、当のサヤちゃんには何か腑に落ちない点があるようです。

          - -

          - ミニオンさん、 - - おかしなことに気づいちゃったんだけど… - -

          - - ) - }, - { - type: 'dog', - children: ( - <> -

          はい、「おかしなこと」とは何ですか？

          - - ) - } - ]} - /> -

          - サヤちゃんが気づいた、「 - おかしなこと - 」とは何なのでしょうか？次のページで説明していきます！ -

          - - - - ) - }, - { - title: <>We’re doomed!, - content: ( - <> - 😭, - , - 😭 - ]} - /> -

          - The villagers in Lambda Village were struggling with this - difficult problem: -

          - -

          - - You must fill each{' '} - in a way such - that, the resulting lunchbox has{' '} - - - - . - -

          - - ) - } - ]} - /> - - Fill each icon in a way - such that, -
          - The resulting lunchbox has -
          - . -           - -

          Hmm… I have no idea!

          - - ) - }, - { - type: 'sad', - children: ( - <> -

          - But we need to solve this to get our mathboxes{' '} - back! We’re doomed! -

          - - ) - } - ]} - /> - - ) - }, - { - title: <>Saya to the rescue, - content: ( - <> -

          - That’s when Saya 👧🏻, a - little girl who lives in Lambda Village, appeared. -

          - - Saya,
          a little girl who lives in Lambda - Village - - } - /> - -

          Hey guys! What are you doing there?

          - - ) - }, - { - type: 'sad', - children: ( - <> -

          - Oh, hey Saya. Well, we have some bad news. The devil{' '} - 😈 has stolen our mathboxes{' '} - . -

          -

          - To get them back, we need to solve this difficult - question. But it’s too hard for us! -

          - - ) - }, - { - type: 'saya', - children: ( - <> -

          I see. Can you tell me what the question is?

          - - ) - }, - { - type: 'sad', - children: ( - <> -

          - Sure.{' '} - - We must fill each{' '} - in a way such - that, the resulting lunchbox has{' '} - - - - . - -

          - - ) - } - ]} - /> - - Fill each icon in a way - such that, -
          - The resulting lunchbox has -
          - . -           - -

          - Which means, it needs to be able to calculate{' '} - ➕{' '} - . -

          - - ) - } - ]} - /> - - If you combine it with{' '} - and -
          - … -           - - - The result must be {' '} - ➕{' '} - - - -

          I see. I’ll help you then!

          - - ) - }, - { - type: 'roll', - children: ( - <> -

          We appreciate it, but this isn’t for kids.

          -

          - We adults tried hard but couldn’t solve it. So I doubt - you can. -

          - - ) - } - ]} - /> - - ) - }, - { - title: <>Saya’s Lunchbox, - content: ( - <> -

          - Saya spent some time thinking, and came up with the following - lunchbox: -

          - -

          - Hey, I filled each{' '} - icon as follows. - Can you take a look? -

          - - ) - } - ]} - /> - - 👧🏻 Saya’s Lunchbox - - -

          - Hmm… I don’t think it’s going to work, but we’ll try - anyway. -

          -

          - We’ll combine it with a lunchbox that can be converted - to … -

          - - - -

          - Then{' '} - - , and see if it will become . -

          - - ) - } - ]} - /> - - Combine 👧🏻 Saya’s lunchbox with -
          - a lunchbox that can be converted to … -           - - - - - - - - - If it becomes ,{' '} - success. 🎉 -
          - Otherwise, failure 😭 -           - -

          - Let’s first{' '} - it! -

          - - ) - } - ]} - /> - - ) - }, - { - title: <>What happens if you run it?, - content: ( - <> - - - - - - - - - - - - - -

          So this is the final result!

          - - ) - } - ]} - /> - Final result - -

          Wait…! It can’t be…!

          - - ) - } - ]} - /> - - ) - }, - { - title: ( - <> - Can be converted to - - ), - content: ( - <> - -

          - The resulting lunchbox can be converted to{' '} - ! -

          - - ) - } - ]} - /> - - - - - - -

          - That means: Saya’s lunchbox can turn{' '} - into{' '} - . -

          - - ) - } - ]} - /> - - Combine 👧🏻 Saya’s lunchbox with -
          - a lunchbox that can be converted to … -           - - - After -
          - - , - -
          - it became -           - -

          - It calculated {' '} - ➕ , so it’s a - success! 🎉 -

          - - ) - }, - { - type: 'saya', - children: ( - <> -

          Yay!

          - - ) - }, - { - type: 'surprised', - children: ( - <> -

          No way! We tried so hard but couldn’t solve it…

          -

          Can’t believe Saya solved it so easily!

          - - ) - } - ]} - /> - - ) - }, - { - title: ( - <> - Can it calculate ➕{' '} - ? - - ), - content: ( - <> - -

          - Wait, we still don’t know if Saya is right. -

          -

          - Just because it can calculate {' '} - ➕ ,{' '} - it doesn’t necessarily mean that it has{' '} - . -

          - - ) - }, - { - type: 'dog', - children: ( - <> -

          That’s a good point!

          - - ) - }, - { - type: 'roll', - children: ( - <> -

          We need to try other examples to make sure!

          -

          - - For example, let’s try calculating{' '} - ➕{' '} - with Saya’s lunchbox. - -

          - - ) - } - ]} - /> - , - ➕, - - ]} - description={<>Can Saya’s lunchbox calculate this?} - /> - -

          - Ok, so let me combine this lunchbox that can be - converted to … -

          - - - -

          With the lunchbox I came up with earlier!

          - - 👧🏻 Saya’s lunchbox - -

          - We want the result to be , - right? -

          - - ) - } - ]} - /> - - Combine 👧🏻 Saya’s lunchbox with -
          - a lunchbox that can be converted to … -           - - - - - - - - - If it becomes ,{' '} - success. 🎉 -
          - Otherwise, failure 😭 -           - -

          - Let’s run it.{' '} - -

          -

          This time, we won’t stop until the end!

          - - ) - } - ]} - /> - - -

          This is the final result!

          - - ) - } - ]} - /> - The final result - -

          - This lunchbox can be converted to{' '} - ! -

          - - ) - } - ]} - /> - - - - - - -

          - Therefore: It calculated{' '} - ➕{' '} - , so it’s a success!{' '} - 🎉 -

          - - ) - }, - { - type: 'saya', - children: ( - <> -

          Yay again!

          - - ) - }, - { - type: 'surprised', - children: ( - <> -

          Wow…!

          - - ) - } - ]} - /> - - ) - }, - { - title: ( - <> - The pattern for - - ), - content: ( - <> - -

          - Let me tell you this:{' '} - - Saya’s lunchbox does have{' '} - ! - -

          -

          - Therefore,{' '} - - Saya’s answer was correct. - {' '} - Congratulations! 🎉 -

          - - ) - } - ]} - /> - - 👧🏻 Saya’s lunchbox has{' '} - - - -

          Thank you, Minion!

          - - ) - }, - { - type: 'dog', - children: ( - <> -

          - By the way: There are{' '} - other correct answers as well. -

          -

          - - Any lunchboxes that have the following pattern have{' '} - . - -

          - - ) - } - ]} - /> - - Any lunchboxes that have the following pattern -
          - have -           - -

          - I see. So the lunchbox I came up with had the following: -

          -
            - - for{' '} - 🅰️ - - - for{' '} - 🅱️ - - - for{' '} - - -
          - - ) - } - ]} - /> - - for 🅰️, -
          - for 🅱️, and -
          - for{' '} - -           - -

          - Exactly. Saya’s lunchbox actually fits the following - pattern. -

          - - Any lunchboxes that fit the following -
          - pattern have . -
          - 👧🏻 Saya’s lunchbox fits this pattern! -           - - ) - } - ]} - /> - - ) - }, - { - title: <>Let’s try other lunchboxes that have the same pattern, - content: ( - <> - -

          - How about this lunchbox?{' '} - - It is different from Saya’s lunchbox, but has the same - pattern. - -

          -

          - I used for{' '} - 🅰️, for{' '} - 🅱️, and for{' '} - . -

          - - It is different from Saya’s lunchbox, -
          - but has the same pattern. -           -

          - So you’re saying… This one has{' '} - too? -

          - - ) - }, - { - type: 'dog', - children: ( - <> -

          - Yes, it also has . -

          -

          - As a test:{' '} - - Let’s combine it with this lunchbox that can be - converted to and see what - happens! - -

          - - - -

          - If the result is , then that - means it calculated {' '} - ➕ {' '} - successfully. Let’s check! -

          - - ) - } - ]} - /> -

          - -

          - - -

          - The result was a lunchbox that can be converted to{' '} - ! -

          - - - -

          - Therefore: It calculated{' '} - ➕{' '} - . -

          - - ) - }, - { - type: 'thinking', - children: ( - <> -

          - I see, so this one has{' '} - as well. -

          - - Just like 👧🏻 Saya’s lunchbox, -
          - This one also has -           - - ) - } - ]} - /> - - ) - }, - { - type: 'summary', - title: <>Let’s Pause and Look Back, - content: ( - <> - -

          That was a lot of information. Can we take a break?

          - - ) - }, - { - type: 'dog', - children: ( - <> -

          Sure, let’s take a break!

          -

          - By the way:{' '} - - We’re halfway done with the intermediate levels. - {' '} - And we’re also halfway done with the{' '} - entire course. -

          -

          - So: Let’s pause and look back at what we - just did! -

          - - ) - } - ]} - /> -

          - First, take a look at this one. It’s a mathbox that can calculate{' '} - ➕{' '} - using . -

          - - A mathbox that can calculate {' '} - ➕ -
          - using . If you run it, it becomes{' '} - . -           -

          - If we were to summarize what we just did in this page, it’ll be - this: -

          -
            - - - A mathbox that - uses can be{' '} - reproduced by… - - - - - 🍱 A lunchbox that has{' '} - . - - -
          - , - , - , - 🍱, - - ]} - description={ - <> - A mathbox that uses{' '} - can be -
          - reproduced by… -
          A lunchbox that has{' '} - . - - } - /> -

          - What does “reproduced” mean? Let me - explain… -

          -
          -

          - Let’s reproduce the following - mathbox using a lunchbox{' '} - 🍱. -

          - We’ll reproduce this using a lunchbox -

          - Step 1:{' '} - - First, instead of , we use a lunchbox - that can be converted to . - -

          - Instead of this… - - - Use a lunchbox that can be converted to - :
          - -           -

          - Step 2:{' '} - - Next, instead of , use a lunchbox - that has . - -

          - Instead of this… - - - Use a lunchbox that has -
          - -
          (👧🏻 Saya’s lunchbox) -           -

          - Step 3: If you combine them and then{' '} - … -

          -

          - - It will become , - {' '} - as we saw on this page. -

          - Combined lunchboxes… -

          Therefore, this mathbox:

          - -

          - Can be reproduced by this lunchbox. -

          - - Reproduce{' '} - using a - lunchbox - -

          - That’s what we mean by reproducing{' '} - a mathbox using a lunchbox{' '} - 🍱. -

          - - ) - }, - { - type: 'summary', - title: <>You can reproduce more complicated mathboxes, - content: ( - <> -

          - Of course, you can also reproduce{' '} - more complicated mathboxes. -

          -

          - - For example, take a look at this mathbox that appeared on - Beginner 1. - {' '} - If you it, the - result will be . -

          - -

          To reproduce this using a lunchbox, you’ll need:

          -
            - - - A lunchbox that can be converted to - , and… - - - - - Two lunchboxes that have{' '} - . - - -
          - - How to reproduce {' '} - {' '} -
          - using a lunchbox. -
          - The final result will be . -           -

          - Summary:{' '} - - A mathbox that uses {' '} - can be reproduced by a lunchbox that has{' '} - . - -

          - , - , - , - 🍱, - - ]} - description={ - <> - A mathbox that uses{' '} - can be -
          - reproduced by… -
          A lunchbox that has{' '} - . - - } - /> - - ) - }, { type: 'challengeProblem', title: <>Can we reproduce other mathboxes?, diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 606ec3444..254a7afce 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -850,9 +850,12 @@ export default () => ( children: ( <>

          - ここで思い出してほしいのですが…計算箱にも「 - - 」がありますよね。 + ここで思い出してほしいのですが… + + 計算箱にも「 + + 」がありますよね。 +

          計算箱ではこれを使うことで、何らかの数字に1を足すことができます。 @@ -878,7 +881,8 @@ export default () => (

          今回学んだのは、 - 「1を足す」という計算は、弁当箱でも行うことができる + 「1を足す」という計算は、弁当箱 🍱{' '} + でも行うことができる 、ということです。

          @@ -1039,8 +1043,6 @@ export default () => ( ]} /> - に変換できる弁当箱を、 -
          👧🏻 サヤちゃんの弁当箱と
          「2回 」組み合わせることで、 From c657bbd25934b9f2676d2001d605125e477d6763 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 01:00:23 -0700 Subject: [PATCH 093/110] Finish 8 en --- src/contents/8.en.tsx | 106 ++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 51 deletions(-) diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index 78723fc38..48115d049 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -1216,92 +1216,90 @@ export default () => ( <>

          - 👧🏻 サヤちゃんが考えた弁当箱以外にも、 - - 以下の法則に当てはまる弁当箱であれば、どれでも 「 - - 」を再現できます。 - + + Any lunchbox that has the following pattern can be used + to reproduce . +

          - この法則に当てはまる弁当箱であれば、 + If it has this pattern, it can reproduce
          - 「 - 」を再現できる +

          - 👧🏻 サヤちゃんが考えた弁当箱の場合、 + 👧🏻 Saya’s lunchbox had the following:

            - 🅰️ は + for{' '} + 🅰️ - 🅱️ は + for{' '} + 🅱️ - は + for{' '} +
          -

          でした。

          - 🅰️ は 、 - 🅱️ は 、 - は + for{' '} + 🅰️,{' '} + for{' '} + 🅱️, and{' '} + for{' '} + -

          他にも、例えば

          +

          + Here’s another example that can reproduce{' '} + : +

            - 🅰️ は + for{' '} + 🅰️ - 🅱️ は + for{' '} + 🅱️ - は + for{' '} +
          -

          - にしても、「 - - 」を再現することができます。 -

          - 🅰️ は 、 - 🅱️ は 、 - は - 。
          - これも「 - - 」を + for 🅰️, + for 🅱️, and{' '} + for + .
          - 再現できる！ + This can reproduce + !

          - つまり、「 - - 」を再現できる弁当箱は、👧🏻{' '} - サヤちゃんが考えた弁当箱以外にもたくさんあるということですね！ + Therefore: There are many lunchboxes that can + reproduce .

          } preview={{ - text: <>続きを読む, + text: <>Continue reading, content: ( <>

          - ちなみに: 「 - - 」を再現できる弁当箱は、 - - 👧🏻{' '} - サヤちゃんが考えた弁当箱以外にもあります。 - - つまり、正解は他にもあるのです。 + Note:{' '} + + There are other lunchboxes that can reproduce{' '} + . + {' '} + 👧🏻 Saya’s lunchobx is not the only + solution.

          - 気になる方は、↓の「続きを読む」を押してみてください。 - (読まなくても先に進めます！) + If you’re curious, press “Continue reading” below! (It’s + optional.)

          ) @@ -1322,10 +1320,16 @@ export default () => (

            - , and + + + + , and - . + + + + .
          From f666ccf5bed0425388c2b8b1cc710e5469b6a0e9 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 01:00:52 -0700 Subject: [PATCH 094/110] Remove capitalize --- src/contents/8.en.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index 48115d049..12fffeda7 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -1244,12 +1244,9 @@ export default () => (
        - for{' '} - 🅰️,{' '} - for{' '} - 🅱️, and{' '} - for{' '} - + for 🅰️,{' '} + for 🅱️, and{' '} + for

        Here’s another example that can reproduce{' '} From 3ff1befd74be12f04e84fb40a55cb8933ddb908b Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 01:47:56 -0700 Subject: [PATCH 095/110] Remove unused runners --- src/components/ExpressionRunnerControls.tsx | 11 +- .../ExpressionRunnerExplanation.tsx | 6 +- src/components/H.tsx | 38 - .../InlineRunAndConvertToMathboxButton.tsx | 33 - src/components/Runners/Bhpw.tsx | 12 - src/components/Runners/Cjxe.tsx | 12 - src/components/Runners/Dyoq.tsx | 12 - src/components/Runners/Jguj.tsx | 12 - src/components/Runners/Nvqu.tsx | 12 - src/components/Runners/Oqpi.tsx | 12 - src/components/Runners/Qrgc.tsx | 12 - src/components/Runners/Qsoa.tsx | 12 - src/components/Runners/Udxn.tsx | 12 - src/components/Runners/Xhdq.tsx | 12 - src/components/Runners/Zsxo.tsx | 12 - src/components/Runners/index.ts | 11 - src/lib/runners/bhpw.json | 36 - src/lib/runners/cjxe.json | 134 - src/lib/runners/dyoq.json | 220 -- src/lib/runners/jguj.json | 148 - src/lib/runners/nvqu.json | 148 - src/lib/runners/oqpi.json | 3503 ----------------- src/lib/runners/qrgc.json | 171 - src/lib/runners/qsoa.json | 36 - src/lib/runners/udxn.json | 152 - src/lib/runners/xhdq.json | 396 -- src/lib/runners/zsxo.json | 111 - src/types/ExpressionRunnerTypes.ts | 2 +- 28 files changed, 4 insertions(+), 5284 deletions(-) delete mode 100644 src/components/InlineRunAndConvertToMathboxButton.tsx delete mode 100644 src/components/Runners/Bhpw.tsx delete mode 100644 src/components/Runners/Cjxe.tsx delete mode 100644 src/components/Runners/Dyoq.tsx delete mode 100644 src/components/Runners/Jguj.tsx delete mode 100644 src/components/Runners/Nvqu.tsx delete mode 100644 src/components/Runners/Oqpi.tsx delete mode 100644 src/components/Runners/Qrgc.tsx delete mode 100644 src/components/Runners/Qsoa.tsx delete mode 100644 src/components/Runners/Udxn.tsx delete mode 100644 src/components/Runners/Xhdq.tsx delete mode 100644 src/components/Runners/Zsxo.tsx delete mode 100644 src/lib/runners/bhpw.json delete mode 100644 src/lib/runners/cjxe.json delete mode 100644 src/lib/runners/dyoq.json delete mode 100644 src/lib/runners/jguj.json delete mode 100644 src/lib/runners/nvqu.json delete mode 100644 src/lib/runners/oqpi.json delete mode 100644 src/lib/runners/qrgc.json delete mode 100644 src/lib/runners/qsoa.json delete mode 100644 src/lib/runners/udxn.json delete mode 100644 src/lib/runners/xhdq.json delete mode 100644 src/lib/runners/zsxo.json diff --git a/src/components/ExpressionRunnerControls.tsx b/src/components/ExpressionRunnerControls.tsx index 40379df19..1ada5b779 100644 --- a/src/components/ExpressionRunnerControls.tsx +++ b/src/components/ExpressionRunnerControls.tsx @@ -136,21 +136,14 @@ const ExpressionRunnerControls = ({ ) : skipToTheEnd ? ( convert ? ( - convert === 'toMathBoxPlay' ? ( - - ) : ( - - ) + ) : ( ) ) : ( ) - ) : convert && convert !== 'toMathBoxPlay' ? ( + ) : convert ? ( ) : ( diff --git a/src/components/ExpressionRunnerExplanation.tsx b/src/components/ExpressionRunnerExplanation.tsx index 34cf3b5a5..30c885827 100644 --- a/src/components/ExpressionRunnerExplanation.tsx +++ b/src/components/ExpressionRunnerExplanation.tsx @@ -364,11 +364,7 @@ const ExpressionRunnerExplanation = ({ <> {isDone ? ( convert ? ( - convert === 'toMathBoxPlay' ? ( - - ) : ( - - ) + ) : ( ) diff --git a/src/components/H.tsx b/src/components/H.tsx index e5ca8fb5b..74bd7039b 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -134,8 +134,6 @@ interface HProps { } | { name: 'lookAtThisBentoBoxPuzzle' } | { name: 'convertToMathbox'; lowerCase?: true } - | { name: 'runAndConvertToMathbox'; addNewline?: boolean; lowerCase?: true } - | { name: 'doneRunAndConvertToMathbox' } | { name: 'undoConvertToMathbox' } | { name: 'doneConvertToMathbox' } | { name: 'canBeConverted' } @@ -1266,42 +1264,6 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { ) } } - if (args.name === 'runAndConvertToMathbox') { - if (locale === 'en') { - return ( - <> - - {args.lowerCase ? 'r' : 'R'}un ▶️ - {' '} - and{args.addNewline ?
        : ' '} - - - ) - } else { - return ( - - 実行してから - {args.addNewline ?
        : ' '} - -         - ) - } - } - if (args.name === 'doneRunAndConvertToMathbox') { - if (locale === 'en') { - return ( - <> - Ran and converted to a mathbox! 🏁 - - ) - } else { - return ( - - 実行と変換完了! 🏁 - - ) - } - } if (args.name === 'undoConvertToMathbox') { if (locale === 'en') { return ( diff --git a/src/components/InlineRunAndConvertToMathboxButton.tsx b/src/components/InlineRunAndConvertToMathboxButton.tsx deleted file mode 100644 index f74678d2d..000000000 --- a/src/components/InlineRunAndConvertToMathboxButton.tsx +++ /dev/null @@ -1,33 +0,0 @@ -/** @jsx jsx */ -import { css, jsx } from '@emotion/core' -import { colors, spaces } from 'src/lib/theme' -import H from 'src/components/H' -import { P } from 'src/components/ContentTags' -import ExpressionRunnerButton from 'src/components/ExpressionRunnerButton' - -const InlineRunAndConvertToMathboxButton = () => ( -

        - - - -

        -) - -export default InlineRunAndConvertToMathboxButton diff --git a/src/components/Runners/Bhpw.tsx b/src/components/Runners/Bhpw.tsx deleted file mode 100644 index 9455bc37b..000000000 --- a/src/components/Runners/Bhpw.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/bhpw.json' - -const Bhpw = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Bhpw diff --git a/src/components/Runners/Cjxe.tsx b/src/components/Runners/Cjxe.tsx deleted file mode 100644 index 2f3f30792..000000000 --- a/src/components/Runners/Cjxe.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/cjxe.json' - -const Cjxe = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Cjxe diff --git a/src/components/Runners/Dyoq.tsx b/src/components/Runners/Dyoq.tsx deleted file mode 100644 index 8b314ef58..000000000 --- a/src/components/Runners/Dyoq.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/dyoq.json' - -const Dyoq = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Dyoq diff --git a/src/components/Runners/Jguj.tsx b/src/components/Runners/Jguj.tsx deleted file mode 100644 index 0498659e3..000000000 --- a/src/components/Runners/Jguj.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/jguj.json' - -const Jguj = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Jguj diff --git a/src/components/Runners/Nvqu.tsx b/src/components/Runners/Nvqu.tsx deleted file mode 100644 index aa1f2cbdd..000000000 --- a/src/components/Runners/Nvqu.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/nvqu.json' - -const Nvqu = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Nvqu diff --git a/src/components/Runners/Oqpi.tsx b/src/components/Runners/Oqpi.tsx deleted file mode 100644 index 58618a490..000000000 --- a/src/components/Runners/Oqpi.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/oqpi.json' - -const Oqpi = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Oqpi diff --git a/src/components/Runners/Qrgc.tsx b/src/components/Runners/Qrgc.tsx deleted file mode 100644 index 5cdb1e6b3..000000000 --- a/src/components/Runners/Qrgc.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/qrgc.json' - -const Qrgc = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Qrgc diff --git a/src/components/Runners/Qsoa.tsx b/src/components/Runners/Qsoa.tsx deleted file mode 100644 index 0d0f00886..000000000 --- a/src/components/Runners/Qsoa.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/qsoa.json' - -const Qsoa = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Qsoa diff --git a/src/components/Runners/Udxn.tsx b/src/components/Runners/Udxn.tsx deleted file mode 100644 index 20cd014db..000000000 --- a/src/components/Runners/Udxn.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/udxn.json' - -const Udxn = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Udxn diff --git a/src/components/Runners/Xhdq.tsx b/src/components/Runners/Xhdq.tsx deleted file mode 100644 index 0c77513a5..000000000 --- a/src/components/Runners/Xhdq.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/xhdq.json' - -const Xhdq = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Xhdq diff --git a/src/components/Runners/Zsxo.tsx b/src/components/Runners/Zsxo.tsx deleted file mode 100644 index 4f21eeae6..000000000 --- a/src/components/Runners/Zsxo.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/zsxo.json' - -const Zsxo = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Zsxo diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 635f86961..c19e082fe 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -20,7 +20,6 @@ export { default as Thkn } from 'src/components/Runners/Thkn' export { default as Mqvu } from 'src/components/Runners/Mqvu' export { default as Bgfl } from 'src/components/Runners/Bgfl' export { default as Cpkp } from 'src/components/Runners/Cpkp' -export { default as Bhpw } from 'src/components/Runners/Bhpw' export { default as Cvtc } from 'src/components/Runners/Cvtc' export { default as Oork } from 'src/components/Runners/Oork' export { default as Diis } from 'src/components/Runners/Diis' @@ -166,17 +165,14 @@ export { default as Ozxi } from 'src/components/Runners/Ozxi' export { default as Envj } from 'src/components/Runners/Envj' export { default as Stda } from 'src/components/Runners/Stda' export { default as Fzpz } from 'src/components/Runners/Fzpz' -export { default as Jguj } from 'src/components/Runners/Jguj' export { default as Pbop } from 'src/components/Runners/Pbop' export { default as Dvfg } from 'src/components/Runners/Dvfg' export { default as Hkbs } from 'src/components/Runners/Hkbs' export { default as Rbup } from 'src/components/Runners/Rbup' export { default as Ehsw } from 'src/components/Runners/Ehsw' export { default as Cmla } from 'src/components/Runners/Cmla' -export { default as Qsoa } from 'src/components/Runners/Qsoa' export { default as Ymtp } from 'src/components/Runners/Ymtp' export { default as Jfgb } from 'src/components/Runners/Jfgb' -export { default as Qrgc } from 'src/components/Runners/Qrgc' export { default as Jxvy } from 'src/components/Runners/Jxvy' export { default as Olyw } from 'src/components/Runners/Olyw' export { default as Nuco } from 'src/components/Runners/Nuco' @@ -197,22 +193,15 @@ export { default as Rhcv } from 'src/components/Runners/Rhcv' export { default as Rico } from 'src/components/Runners/Rico' export { default as Awwn } from 'src/components/Runners/Awwn' export { default as Nlbn } from 'src/components/Runners/Nlbn' -export { default as Zsxo } from 'src/components/Runners/Zsxo' export { default as Nngz } from 'src/components/Runners/Nngz' export { default as Ifqp } from 'src/components/Runners/Ifqp' -export { default as Nvqu } from 'src/components/Runners/Nvqu' export { default as Blvt } from 'src/components/Runners/Blvt' export { default as Oykb } from 'src/components/Runners/Oykb' export { default as Onyr } from 'src/components/Runners/Onyr' export { default as Dvpl } from 'src/components/Runners/Dvpl' -export { default as Udxn } from 'src/components/Runners/Udxn' -export { default as Cjxe } from 'src/components/Runners/Cjxe' -export { default as Oqpi } from 'src/components/Runners/Oqpi' -export { default as Dyoq } from 'src/components/Runners/Dyoq' export { default as Oifs } from 'src/components/Runners/Oifs' export { default as Caem } from 'src/components/Runners/Caem' export { default as Byaf } from 'src/components/Runners/Byaf' -export { default as Xhdq } from 'src/components/Runners/Xhdq' export { default as Nhqo } from 'src/components/Runners/Nhqo' export { default as Ybne } from 'src/components/Runners/Ybne' export { default as Akik } from 'src/components/Runners/Akik' diff --git a/src/lib/runners/bhpw.json b/src/lib/runners/bhpw.json deleted file mode 100644 index 93ef6c7a1..000000000 --- a/src/lib/runners/bhpw.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "name": "shorthandFunc", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandFunc": "add", - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "done", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": true, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/cjxe.json b/src/lib/runners/cjxe.json deleted file mode 100644 index 667990f1b..000000000 --- a/src/lib/runners/cjxe.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "k", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "initialHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "numLeafNodes": 4, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": { - "l": "🅱️", - "k": "🅰️" - }, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/dyoq.json b/src/lib/runners/dyoq.json deleted file mode 100644 index 1e5638d84..000000000 --- a/src/lib/runners/dyoq.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 5, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - }, - { - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 2, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "done", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": true, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "convert": "toMathBoxPlay", - "showBottomProgressBar": false -} diff --git a/src/lib/runners/jguj.json b/src/lib/runners/jguj.json deleted file mode 100644 index c8a658b86..000000000 --- a/src/lib/runners/jguj.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "meta": "plusOneEffect", - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 4, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/nvqu.json b/src/lib/runners/nvqu.json deleted file mode 100644 index 7d4794063..000000000 --- a/src/lib/runners/nvqu.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "meta": "plusOneEffect", - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 4, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/oqpi.json b/src/lib/runners/oqpi.json deleted file mode 100644 index 6c6d6270a..000000000 --- a/src/lib/runners/oqpi.json +++ /dev/null @@ -1,3503 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "name": "k", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 8, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - }, - { - "expression": { - "arg": { - "arg": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "h", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "h", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "showFuncUnbound", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "showFuncUnbound", - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 8 - }, - { - "expression": { - "arg": { - "arg": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "h", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "h", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "betaReducePreviewBefore", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "betaReducePreviewBefore", - "matchExists": true, - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 8 - }, - { - "expression": { - "arg": { - "arg": { - "name": "k", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "h", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "k", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "type": "function", - "maxNestedFunctionDepth": 5 - }, - "state": "betaReducePreviewAfter", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 5 - }, - "previouslyChangedExpressionState": "betaReducePreviewAfter", - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 11 - }, - { - "expression": { - "arg": { - "arg": { - "name": "k", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "h", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "type": "function", - "maxNestedFunctionDepth": 5 - }, - "state": "betaReducePreviewCrossed", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 5 - }, - "previouslyChangedExpressionState": "betaReducePreviewCrossed", - "activePriority": 1, - "containerState": "stepped", - "numLeafNodes": 11 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "k", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "previouslyChangedExpressionState": "default", - "activePriority": 1, - "containerState": "ready", - "numLeafNodes": 7 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "state": "showFuncUnbound", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "previouslyChangedExpressionState": "showFuncUnbound", - "activePriority": 2, - "containerState": "stepped", - "numLeafNodes": 7 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "k", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "k", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "state": "betaReducePreviewBefore", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "previouslyChangedExpressionState": "betaReducePreviewBefore", - "matchExists": true, - "activePriority": 2, - "containerState": "stepped", - "numLeafNodes": 7 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "k", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcUnbound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "state": "betaReducePreviewAfter", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "previouslyChangedExpressionState": "betaReducePreviewAfter", - "activePriority": 2, - "containerState": "stepped", - "numLeafNodes": 7 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "k", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "state": "betaReducePreviewCrossed", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "previouslyChangedExpressionState": "betaReducePreviewCrossed", - "activePriority": 2, - "containerState": "stepped", - "numLeafNodes": 7 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "l", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 1 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "default", - "activePriority": 2, - "containerState": "ready", - "numLeafNodes": 6 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "state": "showFuncBound", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 1 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "showFuncBound", - "activePriority": 2, - "containerState": "stepped", - "numLeafNodes": 6 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "l", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "l", - "highlightType": "highlighted", - "topLeftBadgeType": "match", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "highlighted", - "topLeftBadgeType": "unmatch", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "state": "betaReducePreviewBefore", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 1 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "betaReducePreviewBefore", - "matchExists": true, - "activePriority": 2, - "containerState": "stepped", - "numLeafNodes": 6 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "betaReduceCallArgHighlighted", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "l", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "j", - "highlightType": "highlighted", - "topLeftBadgeType": "betaReduced", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcBound", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "state": "betaReducePreviewAfter", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 1 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "betaReducePreviewAfter", - "activePriority": 2, - "containerState": "stepped", - "numLeafNodes": 6 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "callArg", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": true, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "l", - "highlightType": "removed", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "funcArg", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": true, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "name": "j", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "active", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "state": "betaReducePreviewCrossed", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 1 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "previouslyChangedExpressionState": "betaReducePreviewCrossed", - "activePriority": 2, - "containerState": "stepped", - "numLeafNodes": 6 - }, - { - "expression": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "arg": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2, - 3, - 4 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 4 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 4, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "previouslyChangedExpressionState": "default", - "activePriority": 2, - "containerState": "done", - "numLeafNodes": 5 - } - ], - "speed": 1.5, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": true, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "skipActive": true, - "showBottomProgressBar": true -} diff --git a/src/lib/runners/qrgc.json b/src/lib/runners/qrgc.json deleted file mode 100644 index 4e9bf49d2..000000000 --- a/src/lib/runners/qrgc.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "blankNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumberAfterConvert": "blank", - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "meta": "plusOneEffect", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/qsoa.json b/src/lib/runners/qsoa.json deleted file mode 100644 index d341ce154..000000000 --- a/src/lib/runners/qsoa.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 3, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "done", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/udxn.json b/src/lib/runners/udxn.json deleted file mode 100644 index f6dec47a2..000000000 --- a/src/lib/runners/udxn.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "j", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "i", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "meta": "plusOneEffect", - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 4, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": { - "i": "🅱️", - "h": "🅰️", - "j": "C" - }, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/xhdq.json b/src/lib/runners/xhdq.json deleted file mode 100644 index 2aa6009f4..000000000 --- a/src/lib/runners/xhdq.json +++ /dev/null @@ -1,396 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 3 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 3 - }, - "numLeafNodes": 11, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - }, - { - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 4, - "maxNestedFunctionDepth": 0 - }, - "numLeafNodes": 1, - "containerState": "done", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": true, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "convert": "toMathBoxPlay", - "showBottomProgressBar": true -} diff --git a/src/lib/runners/zsxo.json b/src/lib/runners/zsxo.json deleted file mode 100644 index e12071039..000000000 --- a/src/lib/runners/zsxo.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "previouslyChangedExpressionState": "default", - "activePriority": 2, - "containerState": "done", - "numLeafNodes": 3 - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/types/ExpressionRunnerTypes.ts b/src/types/ExpressionRunnerTypes.ts index 3611fc2dd..9150c4078 100644 --- a/src/types/ExpressionRunnerTypes.ts +++ b/src/types/ExpressionRunnerTypes.ts @@ -54,7 +54,7 @@ export interface ExpressionRunnerProps { highlightOverrides: ExpressionRunnerContextProps['highlightOverrides'] highlightOverrideActiveAfterStart: boolean highlightFunctions: boolean - convert?: 'toMathBox' | 'toMathBoxPlay' + convert?: 'toMathBox' } export const expressionRunnerContextDefault: ExpressionRunnerContextProps = { From 56019315e093e2f21e00e1f2036ef538711e9a9a Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 01:48:03 -0700 Subject: [PATCH 096/110] Start rewriting 10 --- src/contents/10.en.tsx | 144 +++++++++++++---------------------------- 1 file changed, 46 insertions(+), 98 deletions(-) diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index 470952486..8604875eb 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -349,7 +349,8 @@ export default () => ( { title: ( <> - + A hint for reproducing{' '} + ), content: ( @@ -372,46 +373,32 @@ export default () => ( children: ( <>

        - Yes! . -

        -

        - Just like the last time, each{' '} - icon represents - some food item. + Yes. Let me give you a hint for reproducing{' '} + !

        ) } ]} /> - - Each icon represents some - food item - + + + + + -

        Hmm… it looks really complicated!

        - - ) - }, { type: 'dog', children: ( <>

        - This time,{' '} + To reproduce {' '} + using a lunchbox,{' '} - you must fill each{' '} - in a way such - that, the resulting lunchbox has{' '} - - - - . + you need to fill each{' '} + icon on the + following lunchbox with a specific pattern.

        @@ -419,31 +406,20 @@ export default () => ( } ]} /> - - You must fill each in a - way + + If you fill each icon
        - such that, the resulting lunchbox has + with a specific pattern, you can
        - . -         + reproduce + -

        - - ? -

        -

        - Is that the oppposite of{' '} - we talked about - earlier? -

        +

        Hmm… it looks really complicated!

        ) }, @@ -451,76 +427,45 @@ export default () => ( type: 'dog', children: ( <> -

        Yes!

        -
          - - - If you combine the above lunchbox with a lunchbox - that can be converted to{' '} - , - - - - - The result would be a lunchbox that can be converted - to {' '} - ➖ . - - -
        +

        + Right. If you do it correctly, you can use it to + subtract from a number: +

        ) } ]} /> - Combine a lunchbox that can be converted to{' '} - + Combine with a lunchbox
        - with a lunchbox with + that can be converted to …         - If you it, the - result would be -
        a lunchbox that can be converted to{' '} - ➖{' '} - + If you it, +
        + it will become a lunchbox +
        + that can be converted to {' '} + ➖

        - I see. So this is how you can reproduce{' '} - using a - lunchbox. + Now,{' '} + + try to guess what goes in each{' '} + icon! +

        ) - } - ]} - /> - - A mathbox that uses{' '} - can be reproduced by… - - - - 🍱 A lunchbox that has{' '} - . - - - ) - }, - { - title: <>Saya’s lunchbox, again, - content: ( - <> - ( } ]} /> - - Each icon represents some - food item - + + ) + }, + { + title: <>Saya’s lunchbox, again, + content: ( + <>

        The villagers were struggling, but looks like Saya’s got an idea:

        From 99a88a7cd38a753e477c00d954ed51d5bfab8cc6 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 02:16:44 -0700 Subject: [PATCH 097/110] Rewrite 10 --- src/contents/10.en.tsx | 397 ++++++++++++++++++++++------------------- src/contents/8.en.tsx | 4 +- 2 files changed, 211 insertions(+), 190 deletions(-) diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index 8604875eb..4adda0b7b 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -20,6 +20,7 @@ import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' import EmojiWithText from 'src/components/EmojiWithText' import Emoji from 'src/components/Emoji' import ExpressionRunnerCaptionOnly from 'src/components/ExpressionRunnerCaptionOnly' +import CardContent from 'src/components/CardContent' import TwoColGrid from 'src/components/TwoColGrid' import * as R from 'src/components/Runners' import NextLessonButton from 'src/components/NextLessonButton' @@ -529,47 +530,39 @@ export default () => ( type: 'roll', children: ( <> -

        Hmm… let’s see if this works.

        - We’ll combine it with a lunchbox that can be converted - to . + Hmm… I don’t think Saya’s going to be correct twice in a + row, but let’s try anyway.

        - - - + + ) + }, + { + type: 'saya', + children: ( + <>

        - If it can calculate {' '} - ➖ , then it’s - a success. 🎉 + Ok. Let’s first combine it with a lunchbox that can be + converted to !

        - , - ➖, - - ]} - />

        - That means: We want the final result to be - a lunchbox that can be converted to{' '} - . + + If the result is , that + means it correctly calculates{' '} + ➖{' '} + , right? +

        ) } ]} /> - + Combine 👧🏻 Saya’s lunchbox with
        a lunchbox that can be converted to … -         + If it becomes a lunchbox that can be @@ -579,6 +572,36 @@ export default () => (
        Otherwise, failure 😭         + +

        + Let’s run it with this lunchbox that can be converted to{' '} + ! +

        + + + +

        Here’s what happens if you combine them:

        + + ) + } + ]} + /> + + Combine with a lunchbox +
        + that can be converted to +         ( children: ( <>

        - Let’s it! + Ok, let’s {' '} + it!

        ) @@ -597,7 +621,12 @@ export default () => ( ) }, { - title: <>What happens if you run it?, + title: ( + <> + What happens if you {' '} + it? + + ), content: ( <>

        @@ -735,19 +764,19 @@ export default () => ( children: ( <>

        - That means: and do: + So, by using 👧🏻 Saya’s lunchbox,

          - If you combine Saya’s lunchbox with a lunchbox that - can be converted to , + A lunchbox that can be converted to{' '} + … - The final result is a lunchbox that can be converted - to . + Becomes a lunchbox that can be converted to{' '} + .
        @@ -821,8 +850,8 @@ export default () => ( Well: Just because you were able to calculate ➖{' '} , it doesn’t necessary mean - that your lunchbox has{' '} - . + that your lunchbox has reproduced{' '} + .

        It needs to be able to subtract 1 from{' '} @@ -853,19 +882,20 @@ export default () => ( } ]} /> - , - ➖, - - ]} - description={ - <> - Can it calculate ➖{' '} - ? - - } - /> + + Combine 👧🏻 Saya’s lunchbox with +
        + a lunchbox that can be converted to … +         + + + If it becomes a lunchbox that can be +
        + converted to ,{' '} + success. 🎉 +
        + Otherwise, failure 😭 +         ( }} /> -

        - Let’s combine it with my lunchbox and see if the result - is . -

        +

        Let’s combine it with my lunchbox:

        ) } ]} /> - + Combine 👧🏻 Saya’s lunchbox with
        a lunchbox that can be converted to … -         - - - If it becomes a lunchbox that can be -
        - converted to ,{' '} - success. 🎉 -
        - Otherwise, failure 😭 -         + -

        Let’s run it!

        +

        + Ok, let’s {' '} + it! +

          @@ -965,6 +986,45 @@ export default () => ( args={{ name: 'canBeConvertedCaption', number: 1, letter: 'b' }} /> + +

          + So, by using 👧🏻 Saya’s lunchbox, +

          +
            + + + A lunchbox that can be converted to{' '} + … + + + + + Becomes a lunchbox that can be converted to{' '} + . + + +
          + + ) + } + ]} + /> + + Combine 👧🏻 Saya’s lunchbox with +
          + a lunchbox that can be converted to … +           + + + The result is a lunchbox that can be +
          + converted to +           ( ) }, { + type: 'summary', title: ( <> - + We reproduced{' '} + ! ), content: ( @@ -1017,7 +1079,7 @@ export default () => (

          I didn’t think you’ll get it this easily

          But Saya is correct! Her lunchbox - does have {' '} + does reproduce !{' '} 🎉

          @@ -1025,11 +1087,15 @@ export default () => ( } ]} /> - - 👧🏻 Saya’s lunchbox does have + + can be
          - -           + reproduced… + + + + Using 👧🏻 Saya’s lunchbox! + ( ) }, - { - type: 'devil', - children: ( - <> -

          - By the way: There are{' '} - other correct answers as well. -

          -

          - - Any lunchboxes that have the following pattern have{' '} - . - -

          - - ) - } - ]} - /> - - Any lunchboxes that have the following pattern -
          - have -           - -

          I see. Saya’s lunchbox does fit the above pattern.

          -

          Saya, you’re a genius!

          +

          Wow… Saya, you’re a genius!

          ) }, @@ -1088,118 +1127,47 @@ export default () => ( } ]} /> - - ) - }, - { - type: 'summary', - title: ( - <> - We’ve reproduced - - ), - content: ( - <> -

          - If we were to summarize what we just did in this page, it’ll be - this: -

          -
            - - - A mathbox that - uses can be{' '} - reproduced by… - - - - - 🍱 A lunchbox that has{' '} - . - - -
          , , , 🍱, - + ]} description={ <> - A mathbox that uses{' '} - can be + 計算箱の「 + + 」は、
          - reproduced by… -
          A lunchbox that has{' '} - . + 弁当箱で「再現 + 」することができる } /> -

          - For example, take a look at this mathbox that calculates{' '} - ➖{' '} - {' '} -

          - - A mathbox that calculates {' '} - ➖ - -

          - To reproduce this using a lunchbox, - we just need: -

          -
            - - - A lunchbox that can be converted to - , and… - - - - - A lunchbox with - {' '} - (like the one 👧🏻 Saya came up with). - -
          - - How to reproduce {' '} -
          - using a lunchbox. -           - - -
          -

          - Summary:{' '} - - A mathbox that uses {' '} - can be reproduced by a lunchbox that has{' '} - . - -

          , , , 🍱, - + ]} description={ <> - A mathbox that uses{' '} - can be + A mathbox that uses
          - reproduced by… -
          A lunchbox that has{' '} - . + can be “reproduced” using a + lunchbox. } /> + + Any lunchboxes that have the following pattern +
          + have +           ( children: ( <>

          - Just like the last problem, this problem was very hard. - We didn’t expect you to answer it. + Note: Just like the last problem, this + problem was very hard. We didn’t expect you to answer + it.

          @@ -1222,7 +1191,59 @@ export default () => ( ]} /> - ) + ), + footer: { + content: ( + <> + +

          +

          + + Any lunchbox that has the following pattern can be used + to reproduce . + +

          + + If it has this pattern, it can reproduce +
          + +           +

          + Here’s another example that can reproduce{' '} + : +

          + + This can reproduce{' '} + + + + } + preview={{ + text: <>Continue reading, + content: ( + <> +

          + Note:{' '} + + There are other lunchboxes that can reproduce{' '} + . + {' '} + 👧🏻 Saya’s lunchbox is not the only + solution. +

          +

          + If you’re curious, press “Continue reading” below! (It’s + optional.) +

          + + ) + }} + /> + + ) + } }, { title: <>That’s it for the intermediate levels!, diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index 12fffeda7..0ed99f71c 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -1068,7 +1068,7 @@ export default () => ( children: ( <>

          - I got it! First, we’ll use this lunchobx that can be + I got it! First, we’ll use this lunchbox that can be converted to :

          @@ -1291,7 +1291,7 @@ export default () => ( There are other lunchboxes that can reproduce{' '} .           {' '} - 👧🏻 Saya’s lunchobx is not the only + 👧🏻 Saya’s lunchbox is not the only solution.

          From b7e29d1df9732f0db720ebf8c75b893689182191 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 02:18:07 -0700 Subject: [PATCH 098/110] Clean up 10 --- src/contents/10.en.tsx | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index 4adda0b7b..8fc20690a 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -1127,25 +1127,6 @@ export default () => ( } ]} /> - , - , - , - 🍱, - - ]} - description={ - <> - 計算箱の「 - - 」は、 -
          - 弁当箱で「再現 - 」することができる - - } - /> , @@ -1163,11 +1144,6 @@ export default () => ( } /> - - Any lunchboxes that have the following pattern -
          - have -           Date: Wed, 23 Oct 2019 02:29:13 -0700 Subject: [PATCH 099/110] Remove unused code --- next.config.js | 7 - scripts/lib/buildExpressionFromParams.ts | 6 +- scripts/lib/churchEncodingParams.ts | 10 +- scripts/lib/initialExpressionContainers.ts | 64 ---- scripts/lib/runnerConfigs.ts | 108 ------- src/components/FunctionExpressionBox.tsx | 16 +- src/components/Runners/Fhkl.tsx | 12 - src/components/Runners/Rdae.tsx | 12 - src/components/Runners/Skoo.tsx | 12 - src/components/Runners/Zwvj.tsx | 12 - src/components/Runners/index.ts | 4 - src/images/minusOne.url.svg | 42 --- src/images/plusOne.url.svg | 42 --- src/lib/runners/fhkl.json | 279 ---------------- src/lib/runners/rdae.json | 255 --------------- src/lib/runners/skoo.json | 255 --------------- src/lib/runners/zwvj.json | 351 --------------------- src/types/ExpressionParamTypes.ts | 4 +- src/types/ExpressionTypes.ts | 1 - 19 files changed, 7 insertions(+), 1485 deletions(-) delete mode 100644 src/components/Runners/Fhkl.tsx delete mode 100644 src/components/Runners/Rdae.tsx delete mode 100644 src/components/Runners/Skoo.tsx delete mode 100644 src/components/Runners/Zwvj.tsx delete mode 100644 src/images/minusOne.url.svg delete mode 100644 src/images/plusOne.url.svg delete mode 100644 src/lib/runners/fhkl.json delete mode 100644 src/lib/runners/rdae.json delete mode 100644 src/lib/runners/skoo.json delete mode 100644 src/lib/runners/zwvj.json diff --git a/next.config.js b/next.config.js index 617210ed5..ca74818b6 100644 --- a/next.config.js +++ b/next.config.js @@ -9,13 +9,6 @@ const config = { scripts: path.resolve(__dirname, 'scripts') }) - config.module.rules.push({ - test: /\.url.svg$/, - use: { - loader: 'url-loader' - } - }) - return config }, env: { diff --git a/scripts/lib/buildExpressionFromParams.ts b/scripts/lib/buildExpressionFromParams.ts index d9cbdb1ab..c679bc72f 100644 --- a/scripts/lib/buildExpressionFromParams.ts +++ b/scripts/lib/buildExpressionFromParams.ts @@ -138,15 +138,13 @@ export default function buildExpressionFromParams( 'initialHighlighted' ), body: buildExpressionFromParams(expressionParams.body), - type: 'function', - meta: expressionParams.meta + type: 'function' } } else { return { arg: buildVariableExpression(expressionParams.arg, false, 'default'), body: buildExpressionFromParams(expressionParams.body), - type: 'function', - meta: expressionParams.meta + type: 'function' } } } else if (isVariableShorthandNumberParams(expressionParams)) { diff --git a/scripts/lib/churchEncodingParams.ts b/scripts/lib/churchEncodingParams.ts index 3637b674a..89b39d629 100644 --- a/scripts/lib/churchEncodingParams.ts +++ b/scripts/lib/churchEncodingParams.ts @@ -70,8 +70,7 @@ export const numberParamsHighlightNonNumber = ( export const succParams = ( a: VariableNames | HighlightedVariableExpressionParams, b: VariableNames | HighlightedVariableExpressionParams, - c: VariableNames | HighlightedVariableExpressionParams, - specialEffect?: true + c: VariableNames | HighlightedVariableExpressionParams ): FunctionExpressionParams => { return { arg: a, @@ -81,8 +80,7 @@ export const succParams = ( arg: c, body: [b, [a, b, c]] } - }, - meta: specialEffect ? 'plusOneEffect' : undefined + } } } @@ -113,11 +111,9 @@ export const predParams = ( c: VariableNames | HighlightedVariableExpressionParams, d: VariableNames | HighlightedVariableExpressionParams, e: VariableNames | HighlightedVariableExpressionParams, - f: VariableNames | HighlightedVariableExpressionParams, - specialEffect?: boolean + f: VariableNames | HighlightedVariableExpressionParams ): FunctionExpressionParams => { return { - meta: specialEffect ? 'minusOneEffect' : undefined, arg: a, body: { arg: b, diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 721dec016..c8646352e 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -817,20 +817,6 @@ export const ikrk = initializeExpressionContainer([ numberParams('d', 'e', 0) ]) -export const yrgv = initializeExpressionContainer( - succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true) -) - -export const szos = initializeExpressionContainer([ - succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true), - numberParams('d', 'e', 1) -]) - -export const pxae = initializeExpressionContainer([ - succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true), - numberParams('f', 'g', 2) -]) - export const fyue = initializeExpressionContainer({ shorthandFunc: 'add' }) @@ -846,29 +832,6 @@ export const vemg = initializeExpressionContainer( ) ) -export const glmd = initializeExpressionContainer([ - succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true), - { - shorthandNumber: 1, - shorthandNumberAfterConvert: 'number' - } -]) - -export const kgoi = initializeExpressionContainer([ - succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true), - { - shorthandNumber: 2, - shorthandNumberAfterConvert: 'number' - } -]) - -export const cyhx = initializeExpressionContainer([ - succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey', true), - { - shorthandNumberAfterConvert: 'blank' - } -]) - export const drbs = initializeExpressionContainer([ succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey'), { @@ -1029,9 +992,6 @@ export const disc = initializeExpressionContainer(succParams('a', 'b', 'c')) export const blns = initializeExpressionContainer(succParams('A', 'B', 'C')) export const ojsm = initializeExpressionContainer(succParams('h', 'i', 'j')) -export const zgad = initializeExpressionContainer( - succParams('h', 'i', 'j', true) -) export const lidn = initializeExpressionContainer( numberParamsHighlightNumber('k', 'l', 3) @@ -1091,18 +1051,6 @@ export const kipz = initializeExpressionContainer([ 'd' ]) -export const guql = initializeExpressionContainer( - predParams( - 'questionFoodGrey', - 'questionFoodGrey', - 'questionFoodGrey', - 'questionFoodGrey', - 'questionFoodGrey', - 'questionFoodGrey', - true - ) -) - export const jskq = initializeExpressionContainer({ shorthandNumberAfterConvert: 'blankMinusOne' }) @@ -1167,10 +1115,6 @@ export const myzx = initializeExpressionContainer( numberParamsHighlightNumber('b', 'c', 1) ) -export const wosn = initializeExpressionContainer( - predParams('a', 'b', 'c', 'd', 'e', 'f', true) -) - export const vfwt = initializeExpressionContainer( predParams('A', 'B', 'C', 'D', 'E', 'F') ) @@ -2350,14 +2294,6 @@ export const rjyq = initializeDoneExpressionContainer({ shorthandNumber: 6 }) -export const iius = initializeExpressionContainer([ - predParams('a', 'b', 'c', 'd', 'e', 'f', true), - { - shorthandNumber: 3, - shorthandNumberAfterConvert: 'number' - } -]) - export const ptsa = initializeExpressionContainer([ { count: 10, diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 32bb4ea0e..17b157aad 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1121,28 +1121,6 @@ export const whrn: ExpressionRunnerShorthandConfig = { showPriorities: true } -export const jguj: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.yrgv, - showPriorities: true -} - -export const fljg: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.szos, - showPriorities: true -} - -export const ezmz: ExpressionRunnerShorthandConfig = { - runner: 'predefined', - initialExpressionContainers: [ - initialExpressionContainers.szos, - initialExpressionContainers.hdpc - ], - showPriorities: true, - convert: 'toMathBoxPlay' -} - export const biit: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.fyue, @@ -1208,34 +1186,6 @@ export const spga: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { f: '🅰️', g: '🅱️' } } -export const akug: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.pxae, - showPriorities: true -} - -export const vfdw: ExpressionRunnerShorthandConfig = { - runner: 'predefined', - initialExpressionContainers: [ - initialExpressionContainers.pxae, - initialExpressionContainers.qjcv - ], - showPriorities: true, - convert: 'toMathBoxPlay' -} - -export const jiua: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.glmd, - showPriorities: true -} - -export const aone: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.kgoi, - showPriorities: true -} - export const qsoa: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.qjcv, @@ -1254,12 +1204,6 @@ export const jfgb: ExpressionRunnerShorthandConfig = { showPriorities: true } -export const qrgc: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.cyhx, - showPriorities: true -} - export const jxvy: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.hswh, @@ -1526,13 +1470,6 @@ export const dvpl: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { i: '🅱️', h: '🅰️', j: 'C' } } -export const udxn: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.zgad, - showPriorities: true, - bottomRightBadgeOverrides: { i: '🅱️', h: '🅰️', j: 'C' } -} - export const cjxe: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.lidn, @@ -1549,16 +1486,6 @@ export const oqpi: ExpressionRunnerShorthandConfig = { speed: 1.5 } -export const dyoq: ExpressionRunnerShorthandConfig = { - runner: 'predefined', - initialExpressionContainers: [ - initialExpressionContainers.uqth, - initialExpressionContainers.hdpc - ], - showPriorities: true, - convert: 'toMathBoxPlay' -} - export const oifs: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.sqcx, @@ -1583,16 +1510,6 @@ export const byaf: ExpressionRunnerShorthandConfig = { skipAlphaConvert: true } -export const xhdq: ExpressionRunnerShorthandConfig = { - runner: 'predefined', - initialExpressionContainers: [ - initialExpressionContainers.jxur, - initialExpressionContainers.uarl - ], - showPriorities: true, - convert: 'toMathBoxPlay' -} - export const nhqo: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.orfr, @@ -1826,12 +1743,6 @@ export const fsgq: ExpressionRunnerShorthandConfig = { speed: 1.25 } -export const skoo: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.guql, - showPriorities: true -} - export const gvxz: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.jskq, @@ -1850,13 +1761,6 @@ export const cldb: ExpressionRunnerShorthandConfig = { showPriorities: true } -export const dqdv: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.kgpl, - showPriorities: true, - bottomRightBadgeOverrides: { g: '🅰️', h: '🅱️' } -} - export const ylav: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.udaf, @@ -1960,24 +1864,12 @@ export const joaq: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { b: '🅰️', c: '🅱️' } } -export const rdae: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.wosn, - showPriorities: true -} - export const cbmn: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.vfwt, showPriorities: true } -export const fhkl: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.iius, - showPriorities: true -} - export const eweo: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.yvkr, diff --git a/src/components/FunctionExpressionBox.tsx b/src/components/FunctionExpressionBox.tsx index 7e939b0c2..571f2caf9 100644 --- a/src/components/FunctionExpressionBox.tsx +++ b/src/components/FunctionExpressionBox.tsx @@ -5,8 +5,6 @@ import Flex from 'src/components/Flex' import FlexCenter from 'src/components/FlexCenter' import ExpressionBox from 'src/components/ExpressionBox' import { FunctionExpression } from 'src/types/ExpressionTypes' -import plusOneSvg from 'src/images/plusOne.url.svg' -import minusOneSvg from 'src/images/minusOne.url.svg' interface FunctionExpressionBoxProps { expression: FunctionExpression @@ -18,19 +16,7 @@ const FunctionExpressionBox = ({ expression }: FunctionExpressionBoxProps) => { css={[ css` flex: 1; - `, - expression.meta === 'plusOneEffect' && - css` - background-image: url(${plusOneSvg}); - background-size: 4em; - background-position: center center; - `, - expression.meta === 'minusOneEffect' && - css` - background-image: url(${minusOneSvg}); - background-size: 4em; - background-position: center center; - ` + ` ]} > ( - // @ts-ignore - - {children} - -) - -export default Fhkl diff --git a/src/components/Runners/Rdae.tsx b/src/components/Runners/Rdae.tsx deleted file mode 100644 index 1ebcb816d..000000000 --- a/src/components/Runners/Rdae.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/rdae.json' - -const Rdae = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Rdae diff --git a/src/components/Runners/Skoo.tsx b/src/components/Runners/Skoo.tsx deleted file mode 100644 index 3d5ace41b..000000000 --- a/src/components/Runners/Skoo.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/skoo.json' - -const Skoo = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Skoo diff --git a/src/components/Runners/Zwvj.tsx b/src/components/Runners/Zwvj.tsx deleted file mode 100644 index b9ec836c6..000000000 --- a/src/components/Runners/Zwvj.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/zwvj.json' - -const Zwvj = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Zwvj diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index c19e082fe..ce6c3fae1 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -230,7 +230,6 @@ export { default as Ivol } from 'src/components/Runners/Ivol' export { default as Smdm } from 'src/components/Runners/Smdm' export { default as Niwv } from 'src/components/Runners/Niwv' export { default as Fsgq } from 'src/components/Runners/Fsgq' -export { default as Skoo } from 'src/components/Runners/Skoo' export { default as Gvxz } from 'src/components/Runners/Gvxz' export { default as Xqjd } from 'src/components/Runners/Xqjd' export { default as Cldb } from 'src/components/Runners/Cldb' @@ -245,12 +244,9 @@ export { default as Xusi } from 'src/components/Runners/Xusi' export { default as Lipt } from 'src/components/Runners/Lipt' export { default as Zzhq } from 'src/components/Runners/Zzhq' export { default as Mzys } from 'src/components/Runners/Mzys' -export { default as Zwvj } from 'src/components/Runners/Zwvj' export { default as Ifiq } from 'src/components/Runners/Ifiq' export { default as Joaq } from 'src/components/Runners/Joaq' -export { default as Rdae } from 'src/components/Runners/Rdae' export { default as Cbmn } from 'src/components/Runners/Cbmn' -export { default as Fhkl } from 'src/components/Runners/Fhkl' export { default as Eweo } from 'src/components/Runners/Eweo' export { default as Bgko } from 'src/components/Runners/Bgko' export { default as Jehv } from 'src/components/Runners/Jehv' diff --git a/src/images/minusOne.url.svg b/src/images/minusOne.url.svg deleted file mode 100644 index 846b9ea68..000000000 --- a/src/images/minusOne.url.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - minusOne.url - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/images/plusOne.url.svg b/src/images/plusOne.url.svg deleted file mode 100644 index 5402f618a..000000000 --- a/src/images/plusOne.url.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - plusOne.url - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/lib/runners/fhkl.json b/src/lib/runners/fhkl.json deleted file mode 100644 index 8ab224341..000000000 --- a/src/lib/runners/fhkl.json +++ /dev/null @@ -1,279 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 3, - "shorthandNumberAfterConvert": "number", - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "func": { - "arg": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "func": { - "arg": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1, - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "type": "function", - "meta": "minusOneEffect", - "maxNestedFunctionDepth": 5 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 5 - }, - "numLeafNodes": 8, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/rdae.json b/src/lib/runners/rdae.json deleted file mode 100644 index 223fd0315..000000000 --- a/src/lib/runners/rdae.json +++ /dev/null @@ -1,255 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "func": { - "arg": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "func": { - "arg": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1, - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "type": "function", - "meta": "minusOneEffect", - "maxNestedFunctionDepth": 5 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/skoo.json b/src/lib/runners/skoo.json deleted file mode 100644 index 086212262..000000000 --- a/src/lib/runners/skoo.json +++ /dev/null @@ -1,255 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "func": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "func": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "questionFoodGrey", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1, - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "type": "function", - "meta": "minusOneEffect", - "maxNestedFunctionDepth": 5 - }, - "numLeafNodes": 6, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/lib/runners/zwvj.json b/src/lib/runners/zwvj.json deleted file mode 100644 index 8f90c4aa4..000000000 --- a/src/lib/runners/zwvj.json +++ /dev/null @@ -1,351 +0,0 @@ -{ - "expressionContainers": [ - { - "expression": { - "arg": { - "arg": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "h", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "g", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "arg": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 3 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "func": { - "arg": { - "arg": { - "name": "f", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "func": { - "arg": { - "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": false, - "maxNestedFunctionDepth": 0 - }, - "body": { - "arg": { - "arg": { - "name": "b", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 0 - }, - "func": { - "name": "e", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 0 - }, - "type": "function", - "maxNestedFunctionDepth": 1 - }, - "type": "function", - "maxNestedFunctionDepth": 2 - }, - "func": { - "name": "a", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1, - 2, - 3 - ], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 2, - "maxNestedFunctionDepth": 2 - }, - "state": "default", - "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 2 - }, - "type": "function", - "maxNestedFunctionDepth": 3 - }, - "type": "function", - "maxNestedFunctionDepth": 4 - }, - "type": "function", - "maxNestedFunctionDepth": 5 - }, - "state": "default", - "type": "call", - "priority": 1, - "maxNestedFunctionDepth": 5 - }, - "numLeafNodes": 9, - "containerState": "ready", - "previouslyChangedExpressionState": "default" - } - ], - "speed": 1, - "hideControls": true, - "explanationsVisibility": "hidden", - "hidePriorities": false, - "hideRunButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": false, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "highlightFunctions": false, - "showBottomProgressBar": false -} diff --git a/src/types/ExpressionParamTypes.ts b/src/types/ExpressionParamTypes.ts index 62ea89c78..f60a49d1f 100644 --- a/src/types/ExpressionParamTypes.ts +++ b/src/types/ExpressionParamTypes.ts @@ -3,8 +3,7 @@ import { VariableShorthandNumber, VariableShorthandFunc, ConditionalExpression, - BinaryExpression, - FunctionExpression + BinaryExpression } from 'src/types/ExpressionTypes' export interface HighlightedVariableExpressionParams { @@ -35,7 +34,6 @@ export type VariableExpressionParams = VariableNames export interface FunctionExpressionParams { readonly arg: VariableExpressionParams | HighlightedVariableExpressionParams readonly body: ExpressionParams - readonly meta?: FunctionExpression['meta'] } // https://github.com/Microsoft/TypeScript/issues/3496#issuecomment-128553540 export interface CallExpressionParams extends ReadonlyArray {} diff --git a/src/types/ExpressionTypes.ts b/src/types/ExpressionTypes.ts index 23be04943..6ade75255 100644 --- a/src/types/ExpressionTypes.ts +++ b/src/types/ExpressionTypes.ts @@ -287,7 +287,6 @@ export interface FunctionExpression { readonly type: 'function' readonly arg: VariableExpression readonly body: Expression - readonly meta?: 'plusOneEffect' | 'minusOneEffect' readonly maxNestedFunctionDepth?: number } From 8b04dfb021e17c9fef4b509fbc92ba3a71602506 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 02:34:15 -0700 Subject: [PATCH 100/110] Remove url-loader --- package.json | 3 +-- yarn.lock | 13 ++----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index df820cbd3..1db4e9356 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,6 @@ "module-alias": "^2.2.2", "prettier": "^1.18.2", "ts-jest": "^24.0.2", - "typescript": "^3.7.0-beta", - "url-loader": "^2.2.0" + "typescript": "^3.7.0-beta" } } diff --git a/yarn.lock b/yarn.lock index 44f0e3970..6b5f175ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5796,7 +5796,7 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.4.2, mime@^2.4.4: +mime@^2.4.2: version "2.4.4" resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== @@ -7765,7 +7765,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.4.1: +schema-utils@^2.0.0, schema-utils@^2.0.1: version "2.5.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f" integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ== @@ -8713,15 +8713,6 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -url-loader@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.2.0.tgz#af321aece1fd0d683adc8aaeb27829f29c75b46e" - integrity sha512-G8nk3np8ZAnwhHXas1JxJEwJyQdqFXAKJehfgZ/XrC48volFBRtO+FIKtF2u0Ma3bw+4vnDVjHPAQYlF9p2vsw== - dependencies: - loader-utils "^1.2.3" - mime "^2.4.4" - schema-utils "^2.4.1" - url@0.11.0, url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" From 4fc41a4003e5a19258365e1049abc66c1a9d69ee Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 02:36:30 -0700 Subject: [PATCH 101/110] Remove plusoneeffect/minusoneeffect --- .../CustomEmoji/MinusOnePinkSvg.tsx | 25 ------------- .../CustomEmoji/PlusOneOrangeSvg.tsx | 26 -------------- src/components/CustomEmoji/index.tsx | 4 --- src/components/H.tsx | 36 ------------------- 4 files changed, 91 deletions(-) delete mode 100644 src/components/CustomEmoji/MinusOnePinkSvg.tsx delete mode 100644 src/components/CustomEmoji/PlusOneOrangeSvg.tsx diff --git a/src/components/CustomEmoji/MinusOnePinkSvg.tsx b/src/components/CustomEmoji/MinusOnePinkSvg.tsx deleted file mode 100644 index 3dd2a26d3..000000000 --- a/src/components/CustomEmoji/MinusOnePinkSvg.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import * as React from 'react' - -const MinusOnePinkSvg = (props: React.SVGProps) => ( - - - - - - - - - - - -) - -export default MinusOnePinkSvg diff --git a/src/components/CustomEmoji/PlusOneOrangeSvg.tsx b/src/components/CustomEmoji/PlusOneOrangeSvg.tsx deleted file mode 100644 index 0d7b9db43..000000000 --- a/src/components/CustomEmoji/PlusOneOrangeSvg.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import * as React from 'react' - -const PlusOneOrangeSvg = (props: React.SVGProps) => ( - - - - - - - - - - - -) - -export default PlusOneOrangeSvg diff --git a/src/components/CustomEmoji/index.tsx b/src/components/CustomEmoji/index.tsx index 9e8c5281f..db24ef08f 100644 --- a/src/components/CustomEmoji/index.tsx +++ b/src/components/CustomEmoji/index.tsx @@ -17,9 +17,7 @@ import LetterDSvg from 'src/components/CustomEmoji/LetterDSvg' import LetterESvg from 'src/components/CustomEmoji/LetterESvg' import LetterFSvg from 'src/components/CustomEmoji/LetterFSvg' import MathBoxSvg from 'src/components/CustomEmoji/MathBoxSvg' -import MinusOnePinkSvg from 'src/components/CustomEmoji/MinusOnePinkSvg' import MinusOneSvg from 'src/components/CustomEmoji/MinusOneSvg' -import PlusOneOrangeSvg from 'src/components/CustomEmoji/PlusOneOrangeSvg' import PlusOneSvg from 'src/components/CustomEmoji/PlusOneSvg' import QuestionFoodGreySvg from 'src/components/CustomEmoji/QuestionFoodGreySvg' import SingleArrowSvg from 'src/components/CustomEmoji/SingleArrowSvg' @@ -41,8 +39,6 @@ export const customEmojiToComponent = { questionFoodGrey: QuestionFoodGreySvg, twenty: TwentySvg, twentyFour: TwentyFourSvg, - plusOneOrange: PlusOneOrangeSvg, - minusOnePink: MinusOnePinkSvg, doubleArrow: DoubleArrowSvg, C: LetterCSvg, D: LetterDSvg, diff --git a/src/components/H.tsx b/src/components/H.tsx index 74bd7039b..bca468e52 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -137,7 +137,6 @@ interface HProps { | { name: 'undoConvertToMathbox' } | { name: 'doneConvertToMathbox' } | { name: 'canBeConverted' } - | { name: 'plusOneEffect'; capitalize?: true } | { name: 'plusOneFeature'; capitalize?: true } | { name: 'minusOneFeature'; capitalize?: true; addNewline?: true } | { name: 'repeatFeature'; capitalize?: true; addNewline?: true } @@ -147,7 +146,6 @@ interface HProps { addNewline?: true hideIcon?: true } - | { name: 'minusOneEffect'; capitalize?: true } | { name: 'startWithTwoCaption' } | { name: 'startWithLeftMostOneCaption' } | { name: 'convertiblePatternCaption'; skipFirst?: true } @@ -1307,40 +1305,6 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { return <>に変換できる弁当箱 } } - if (args.name === 'plusOneEffect') { - if (locale === 'en') { - return ( - <> - {args.capitalize ? 'T' : 't'}he “Plus 1” effect{' '} - - - ) - } else { - return ( - <> - 「1を足す効果{' '} - 」 - - ) - } - } - if (args.name === 'minusOneEffect') { - if (locale === 'en') { - return ( - <> - {args.capitalize ? 'T' : 't'}he Minus 1” effect{' '} - - - ) - } else { - return ( - <> - 「1を引く効果{' '} - 」 - - ) - } - } if (args.name === 'startWithTwoCaption') { if (locale === 'en') { return ( From 89cc4a4911cc355376350d72ce14d3214be9fb00 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 02:40:26 -0700 Subject: [PATCH 102/110] Remove from runnerConfigs --- bin/clean_runners | 1 + scripts/lib/runnerConfigs.ts | 150 ----------------------------------- 2 files changed, 1 insertion(+), 150 deletions(-) diff --git a/bin/clean_runners b/bin/clean_runners index faa2ebc13..f5c79bfe2 100755 --- a/bin/clean_runners +++ b/bin/clean_runners @@ -1,5 +1,6 @@ #!/bin/sh +# TODO: Must manually remove from scripts/lib/runnerConfigs.ts for f in src/lib/runners/*.json do RUNNER="$(cut -d'/' -f4 <<<$f)" diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 17b157aad..eab6bae43 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -169,11 +169,6 @@ export const cpkp: ExpressionRunnerShorthandConfig = { isDone: true } -export const bhpw: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.nndd -} - export const cvtc: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.pisd, @@ -797,17 +792,6 @@ export const jzwg: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.dpvy } -export const cqzt: ExpressionRunnerShorthandConfig = { - runner: 'simple', - showPriorities: true, - initialExpressionContainer: initialExpressionContainers.zreh, - highlightOverrides: { - a: 'highlighted', - b: 'highlighted', - c: 'highlighted' - } -} - export const rqer: ExpressionRunnerShorthandConfig = { runner: 'simple', showPriorities: true, @@ -891,11 +875,6 @@ export const lizi: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.vibe } -export const rchd: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.gmzz -} - export const gnwm: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.lbkw @@ -1115,18 +1094,6 @@ export const fzpz: ExpressionRunnerShorthandConfig = { showPriorities: true } -export const whrn: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.kwqc, - showPriorities: true -} - -export const biit: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.fyue, - showPriorities: true -} - export const pbop: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.vemg, @@ -1146,12 +1113,6 @@ export const hkbs: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { d: '🅰️', e: '🅱️' } } -export const fxde: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.okmr, - showPriorities: true -} - export const rbup: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.zdlx, @@ -1173,25 +1134,6 @@ export const cmla: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { d: '🅰️', b: '🅱️' } } -export const ilvq: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.dqgs, - showPriorities: true -} - -export const spga: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.entt, - showPriorities: true, - bottomRightBadgeOverrides: { f: '🅰️', g: '🅱️' } -} - -export const qsoa: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.qjcv, - showPriorities: true -} - export const ymtp: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.tsms, @@ -1210,12 +1152,6 @@ export const jxvy: ExpressionRunnerShorthandConfig = { showPriorities: true } -export const lwoq: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ktus, - showPriorities: true -} - export const olyw: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.ktus, @@ -1223,47 +1159,12 @@ export const olyw: ExpressionRunnerShorthandConfig = { crossed: true } -export const tjaf: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.bjzr, - showPriorities: true -} - -export const avcu: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.wgtz, - showPriorities: true -} - -export const dewi: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.jrur, - showPriorities: true -} - -export const xxan: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.utur, - showPriorities: true -} - export const nuco: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.kwqc, showPriorities: true } -export const ufjx: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.kwqc, - showPriorities: true, - highlightOverrides: { - a: 'highlighted', - b: 'highlighted', - c: 'highlighted' - } -} - export const dhiu: ExpressionRunnerShorthandConfig = { runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.kwqc, @@ -1321,12 +1222,6 @@ export const bgxi: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { b: '🅰️', c: '🅱️' } } -export const qrfw: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.aqvq, - showPriorities: true -} - export const plde: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.uqth, @@ -1409,13 +1304,6 @@ export const nlbn: ExpressionRunnerShorthandConfig = { speed: 1.25 } -export const zsxo: ExpressionRunnerShorthandConfig = { - runner: 'simple', - isDone: true, - initialExpressionContainer: initialExpressionContainers.ngth, - showPriorities: true -} - export const nngz: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.fhyo, @@ -1430,12 +1318,6 @@ export const ifqp: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { c: '🅱️', b: '🅰️' } } -export const nvqu: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.disc, - showPriorities: true -} - export const blvt: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.blns, @@ -1470,22 +1352,6 @@ export const dvpl: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { i: '🅱️', h: '🅰️', j: 'C' } } -export const cjxe: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.lidn, - showPriorities: true, - bottomRightBadgeOverrides: { l: '🅱️', k: '🅰️' } -} - -export const oqpi: ExpressionRunnerShorthandConfig = { - runner: 'runButtonOnly', - initialExpressionContainer: initialExpressionContainers.mtyb, - showPriorities: true, - skipToTheEnd: false, - skipActive: true, - speed: 1.5 -} - export const oifs: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.sqcx, @@ -1842,12 +1708,6 @@ export const mzys: ExpressionRunnerShorthandConfig = { bottomRightBadgeOverrides: { g: '🅰️', h: '🅱️' } } -export const zwvj: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.lwpw, - showPriorities: true -} - export const ifiq: ExpressionRunnerShorthandConfig = { runner: 'runButtonOnly', initialExpressionContainer: initialExpressionContainers.lwpw, @@ -2198,16 +2058,6 @@ export const peiy: ExpressionRunnerShorthandConfig = { showPriorities: true } -export const voeb: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.guxy -} - -export const deay: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.uqte -} - export const mbje: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.uxvq From f296cd062173ea3a36382c60e4ac963f800bcf5d Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 02:46:12 -0700 Subject: [PATCH 103/110] Rewrite 12 en --- src/contents/12.en.tsx | 88 +++++++++++++++++++++++++++--------------- 1 file changed, 56 insertions(+), 32 deletions(-) diff --git a/src/contents/12.en.tsx b/src/contents/12.en.tsx index b98625874..6191ed3c6 100644 --- a/src/contents/12.en.tsx +++ b/src/contents/12.en.tsx @@ -7,7 +7,8 @@ import { Ul, UlLi, Bold, - Italic + Italic, + Hr } from 'src/components/ContentTags' import H from 'src/components/H' import BubbleQuotes from 'src/components/BubbleQuotes' @@ -21,11 +22,11 @@ import Emoji from 'src/components/Emoji' import InlineBorder from 'src/components/InlineBorder' import * as R from 'src/components/Runners' import NextLessonButton from 'src/components/NextLessonButton' +import CardContent from 'src/components/CardContent' import { TrueCaseExplanation, FalseCaseExplanation } from 'src/contents/11.en' export default () => ( ( ) }, - { - type: 'dog', - children: ( - <> -

          - By the way: There are{' '} - other correct answers as well. -

          -

          - - Any lunchboxes that have the following pattern can be - used to reproduce{' '} - . - -

          - - ) - } - ]} - /> - - Any lunchboxes that have the following -
          - pattern can be used to reproduce -
          - . -           - ( } /> - ) + ), + footer: { + content: ( + <> + +
          +

          + + Any lunchbox that has the following pattern can be used + to reproduce . + +

          + + If it has this pattern, it can reproduce +
          + +           +

          + Here’s another example that can reproduce{' '} + : +

          + + This can reproduce{' '} + + + + } + preview={{ + text: <>Continue reading, + content: ( + <> +

          + Note:{' '} + + There are other lunchboxes that can reproduce{' '} + . + {' '} + 👧🏻 Saya’s lunchbox is not the only + solution. +

          +

          + If you’re curious, press “Continue reading” below! (It’s + optional.) +

          + + ) + }} + /> + + ) + } }, { title: ( From e6c711485f9b3b56075df112a421bd0aaa47037d Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 03:24:18 -0700 Subject: [PATCH 104/110] Remove unused containers --- bin/clean_runners | 2 +- bin/unused_containers | 8 + scripts/lib/initialExpressionContainers.ts | 216 --------------------- 3 files changed, 9 insertions(+), 217 deletions(-) create mode 100755 bin/unused_containers diff --git a/bin/clean_runners b/bin/clean_runners index f5c79bfe2..7e59089bb 100755 --- a/bin/clean_runners +++ b/bin/clean_runners @@ -5,7 +5,7 @@ for f in src/lib/runners/*.json do RUNNER="$(cut -d'/' -f4 <<<$f)" RUNNER="$(cut -d'.' -f1 <<<$RUNNER)" - if ! [[ $(rg -i " Date: Wed, 23 Oct 2019 10:52:42 -0700 Subject: [PATCH 105/110] Fix 4 --- src/components/H.tsx | 2 +- src/contents/4.jp.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/H.tsx b/src/components/H.tsx index bca468e52..1cd265768 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -1175,7 +1175,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { return ( <> - 一回ずつ進める場合は、➡️ を押してください。 + 手動で進める場合は、➡️ を押してください。 ) diff --git a/src/contents/4.jp.tsx b/src/contents/4.jp.tsx index 801ef7bea..01fa3d908 100644 --- a/src/contents/4.jp.tsx +++ b/src/contents/4.jp.tsx @@ -1076,8 +1076,8 @@ export default () => (

          復習のために、 と{' '} - - が一致しなかった場合も、最初から最後まで前ステップ見てみましょう。 + {' '} + が一致しなかった場合も、最初から最後まで全てのステップを見てみましょう。

          ( , 🍱 ]} - description={<>前ステップを見てみましょう！} + description={<>全ステップを見てみましょう！} />

          こちらは、上にひとつの料理がある例です。 From 27fbb41eee1401d484a750f144fc617b5e69062f Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 11:04:51 -0700 Subject: [PATCH 106/110] Revise 7 --- scripts/lib/initialExpressionContainers.ts | 13 ++ scripts/lib/runnerConfigs.ts | 13 ++ src/components/Runners/Cawa.tsx | 12 ++ src/components/Runners/index.ts | 1 + src/contents/7.en.tsx | 8 +- src/contents/7.jp.tsx | 12 +- src/lib/runners/cawa.json | 201 +++++++++++++++++++++ 7 files changed, 250 insertions(+), 10 deletions(-) create mode 100644 src/components/Runners/Cawa.tsx create mode 100644 src/lib/runners/cawa.json diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 9918d5ada..72101ba6c 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -739,6 +739,10 @@ export const pcdb = initializeExpressionContainer({ } }) +export const kgpl = initializeExpressionContainer( + numberParamsHighlightNumber('g', 'h', 1) +) + export const epmt = initializeExpressionContainer( succParams('questionFoodGrey', 'questionFoodGrey', 'questionFoodGrey') ) @@ -748,6 +752,15 @@ export const ikrk = initializeExpressionContainer([ numberParams('d', 'e', 0) ]) +export const zxji = initializeExpressionContainer([ + succParams( + highlighted('questionFoodGrey'), + highlighted('questionFoodGrey'), + highlighted('questionFoodGrey') + ), + numberParams('d', 'e', 0) +]) + export const vemg = initializeExpressionContainer( predParams( 'questionFoodGrey', diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index eab6bae43..10f64a88c 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -1088,6 +1088,12 @@ export const stda: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const cawa: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.zxji, + showPriorities: true +} + export const fzpz: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.mzms, @@ -2574,3 +2580,10 @@ export const xbki: ExpressionRunnerShorthandConfig = { speed: 4, showDefaultAndActiveOnly: true } + +export const dqdv: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.kgpl, + showPriorities: true, + bottomRightBadgeOverrides: { g: '🅰️', h: '🅱️' } +} diff --git a/src/components/Runners/Cawa.tsx b/src/components/Runners/Cawa.tsx new file mode 100644 index 000000000..3b037e9c8 --- /dev/null +++ b/src/components/Runners/Cawa.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/cawa.json' + +const Cawa = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Cawa diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index ce6c3fae1..317be9235 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -164,6 +164,7 @@ export { default as Cowm } from 'src/components/Runners/Cowm' export { default as Ozxi } from 'src/components/Runners/Ozxi' export { default as Envj } from 'src/components/Runners/Envj' export { default as Stda } from 'src/components/Runners/Stda' +export { default as Cawa } from 'src/components/Runners/Cawa' export { default as Fzpz } from 'src/components/Runners/Fzpz' export { default as Pbop } from 'src/components/Runners/Pbop' export { default as Dvfg } from 'src/components/Runners/Dvfg' diff --git a/src/contents/7.en.tsx b/src/contents/7.en.tsx index d76c1c186..165a85ea9 100644 --- a/src/contents/7.en.tsx +++ b/src/contents/7.en.tsx @@ -28,14 +28,14 @@ import { Beginner5Rules } from 'src/contents/5.en' export const Problem = () => ( <> - + Challenge:
          Fill each icon in such a way that,           -           + @@ -370,11 +370,11 @@ export default () => ( } ]} /> - + If you fill each icon with
          the correct food item, -           + After running it, it becomes a lunchbox diff --git a/src/contents/7.jp.tsx b/src/contents/7.jp.tsx index 1ec57d71d..4498de503 100644 --- a/src/contents/7.jp.tsx +++ b/src/contents/7.jp.tsx @@ -27,13 +27,13 @@ import CardContent from 'src/components/CardContent' export const Problem = () => ( <> - + 問題: それぞれの に、
          どんな料理を入れると、           -           + @@ -282,7 +282,7 @@ export default () => (

          次に、 - 上の弁当箱と、こちらの弁当箱を合体させます。 + 上の弁当箱と、下の弁当箱を合体させます。

          @@ -364,11 +364,11 @@ export default () => ( } ]} /> - + それぞれの に、
          ある法則に基づいて料理を入れ、 -           + すると、 @@ -737,8 +737,8 @@ export default () => ( だったら、 に変換できていたのになあ。 - あとちょっとだったのに！

          +

          あとちょっとだったのに！

          ) } diff --git a/src/lib/runners/cawa.json b/src/lib/runners/cawa.json new file mode 100644 index 000000000..565f1e845 --- /dev/null +++ b/src/lib/runners/cawa.json @@ -0,0 +1,201 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "questionFoodGrey", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "questionFoodGrey", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "questionFoodGrey", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "questionFoodGrey", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "questionFoodGrey", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "questionFoodGrey", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2, + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "questionFoodGrey", + "highlightType": "initialHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 5, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} From a55eba83eea4d783af4356c53656f3eec02eeed8 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 11:58:06 -0700 Subject: [PATCH 107/110] Revise 8 --- src/contents/8.en.tsx | 99 +++++++++++++++++++++++++++----- src/contents/8.jp.tsx | 128 +++++++++++++++++++++++++++++++++++------- src/contents/9.jp.tsx | 2 +- 3 files changed, 195 insertions(+), 34 deletions(-) diff --git a/src/contents/8.en.tsx b/src/contents/8.en.tsx index 0ed99f71c..958238b3b 100644 --- a/src/contents/8.en.tsx +++ b/src/contents/8.en.tsx @@ -198,9 +198,9 @@ export default () => (

          - We’ll this, and see if - the result is a lunchbox that can be converted to{' '} - . + We’ll {' '} + this, and see if the result is a lunchbox that can be + converted to .

          @@ -213,12 +213,10 @@ export default () => ( - If it becomes a lunchbox + If it becomes a lunchbox that can be
          - that can be converted to , success. 🎉 + converted to ,{' '} + success. 🎉
          Otherwise, failure 😭           @@ -342,8 +340,34 @@ export default () => ( title: <>Let’s dive in a little deeper, content: ( <> +

          + Surprise: Saya just solved the devil’s difficult + problem! +

          + Saya solved the devil’s problem!} + /> +

          + Wow, Saya, you’re awesome! Thank you for solving it! +

          + + ) + }, + { + type: 'saya', + children: ( + <> +

          Hehe, thanks!

          + + ) + }, { type: 'happy', children: ( @@ -612,8 +636,11 @@ export default () => ( children: ( <>

          - Let’s it! We’ll continue - running until the end.{' '} + Let’s it! This time, we’ll + continue running until the end.{' '} +

          +

          + If you can’t wait,{' '}

          @@ -1018,6 +1045,44 @@ export default () => ( } /> + +

          I see…, so:

          +
            + + + In a mathbox, we use , + and… + + + + + In a lunchbox, we use 👧🏻 Saya’s + lunchbox. + + +
          + + ) + } + ]} + /> + + In a mathbox, we use + + + + In a lunchbox, we use +
          + 👧🏻 Saya’s lunchbox to{' '} + reproduce +
          + . +           ) }, @@ -1408,10 +1473,14 @@ export default () => ( } ]} /> + The previous problem: + + 😢 +
          There’s no way we could’ve come up with
          - this answer! + this answer as quickly as 👧🏻 Saya did!           ( children: ( <>

          - Please don’t worry. In fact, only a super + Please don’t worry! In fact, only a super genius would be able to come up with an answer for this question.

          - And you don’t need to be a super genius to learn about - computer science or Y combinator. + + And you don’t need to be a super genius to learn about + computer science or Y combinator. +

          ) diff --git a/src/contents/8.jp.tsx b/src/contents/8.jp.tsx index 254a7afce..3dc60ebf9 100644 --- a/src/contents/8.jp.tsx +++ b/src/contents/8.jp.tsx @@ -269,8 +269,10 @@ export default () => ( children: ( <>

          - この弁当箱は、 - に変換できます！ + + この弁当箱は、 + に変換できます！ +

          ) @@ -324,8 +326,31 @@ export default () => ( title: <>少し掘り下げてみよう, content: ( <> +

          + なんと、悪魔が出した問題を、サヤちゃんがいきなり問いてしまいました！ +

          + サヤちゃんが悪魔の問題を問いた！} + /> +

          サヤちゃん、よく分かったなあ…！すごい！

          + + ) + }, + { + type: 'saya', + children: ( + <> +

          えへへ、ありがとう！

          + + ) + }, { type: 'happy', children: ( @@ -340,9 +365,9 @@ export default () => ( <>

          そうですね。しかしその前に、 - + ひとつだけ掘り下げたいことがあります - + 。少しの間、辛抱してお聞きください！

          @@ -361,7 +386,7 @@ export default () => ( children: ( <>

          - はい。まず、ここまでをまとめると、下のように{' '} + はい。まず復習ですが、下のように{' '} に変換できる弁当箱は、 @@ -389,7 +414,9 @@ export default () => ( ]} /> - 👧🏻 サヤちゃんの弁当箱と合体させて実行すると… + 👧🏻 サヤちゃんの弁当箱と +
          + 合体させて実行すると…           @@ -443,7 +470,7 @@ export default () => ( { title: ( <> - と組み合わせた場合は？ + と合体させた場合は？ ), content: ( @@ -458,8 +485,10 @@ export default () => (

          👧🏻 サヤちゃんの弁当箱を、 - {' '} - に変換できる弁当箱と組み合わせて + + に変換できる弁当箱 + + と合体させて {' '} すると、結果はどうなるでしょう？ @@ -472,7 +501,7 @@ export default () => ( に変換できる弁当箱と、
          - 👧🏻 サヤちゃんの弁当箱を組み合わせて… + 👧🏻 サヤちゃんの弁当箱を合体させて…           @@ -587,7 +616,10 @@ export default () => (

          では、 {' '} - してみましょう！今回は、途中で止まりません。 + してみましょう！今回は、途中で止まらず、最後まで進みます。 +

          +

          + 実行が終わるのを待てない方は、

          @@ -604,7 +636,9 @@ export default () => ( <>

          最後に残ったこちらの弁当箱は、 - に変換できる弁当箱です！ + + に変換できる弁当箱です！ +

          ) @@ -644,7 +678,7 @@ export default () => ( に変換できる弁当箱と、
          - 👧🏻 サヤちゃんの弁当箱を組み合わせて… + 👧🏻 サヤちゃんの弁当箱を合体させて…           @@ -661,8 +695,11 @@ export default () => (

          つまり、👧🏻{' '} サヤちゃんの弁当箱を使うことで、 - が {' '} - になった、というわけですね。 + + が{' '} + になった + + 、というわけですね。

          ) @@ -686,7 +723,11 @@ export default () => ( ) }, { - title: <>1を足すことができる, + title: ( + <> + を足すことができる + + ), content: ( <> ( <> が{' '} ➕{' '} - になる + になるから +
          + 1を足すことができる } /> @@ -866,7 +909,8 @@ export default () => ( ]} /> - 計算箱は、「 + 計算箱は、 +
          「 」を使うことで…           @@ -964,6 +1008,48 @@ export default () => ( } /> + +

          なるほど…

          +
            + + + 計算箱にとっての は、 + + + + + 弁当箱にとっての 👧🏻{' '} + サヤちゃんの弁当箱 + + だということか。 + +
          +

          + これが「 + + 計算箱を弁当箱で再現できる + + 」ということなんだね。 +

          + + ) + } + ]} + /> + + 計算箱にとっての は、 + + + + 弁当箱にとっての +
          + 👧🏻 サヤちゃんの弁当箱 +           ) }, @@ -1348,8 +1434,12 @@ export default () => ( } ]} /> + さっきの問題の… + - さっきの答えの弁当箱。普通はこんなの、 + 答えの弁当箱。👧🏻 サヤちゃんはすぐに +
          + 思いついたけど、普通はこんなの、
          とっさに思いつかないよ！😢           diff --git a/src/contents/9.jp.tsx b/src/contents/9.jp.tsx index ae67e43f7..69e3309e4 100644 --- a/src/contents/9.jp.tsx +++ b/src/contents/9.jp.tsx @@ -1252,7 +1252,7 @@ export default () => ( に変換できる弁当箱 - と組み合わせた場合、 + と合体させた場合、

          Date: Wed, 23 Oct 2019 12:04:18 -0700 Subject: [PATCH 108/110] Revise 9 --- src/contents/9.jp.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/contents/9.jp.tsx b/src/contents/9.jp.tsx index 69e3309e4..90b1f79cb 100644 --- a/src/contents/9.jp.tsx +++ b/src/contents/9.jp.tsx @@ -22,6 +22,7 @@ import TwoColGrid from 'src/components/TwoColGrid' import * as R from 'src/components/Runners' import NextLessonButton from 'src/components/NextLessonButton' import { BlankNumberPlusOne } from 'src/contents/8.jp' +import ExpressionRunnerCaptionOnly from 'src/components/ExpressionRunnerCaptionOnly' export default () => ( ( 」を再現できる
          - 弁当箱と合体させて、 -
          - 実行するとどうなる？ + 弁当箱と合体させて… + + + するとどうなる？ + Date: Wed, 23 Oct 2019 12:16:38 -0700 Subject: [PATCH 109/110] Revise 10 --- src/contents/10.en.tsx | 16 ++++++++++++---- src/contents/10.jp.tsx | 34 +++++++++++++++++----------------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/contents/10.en.tsx b/src/contents/10.en.tsx index 8fc20690a..da997277b 100644 --- a/src/contents/10.en.tsx +++ b/src/contents/10.en.tsx @@ -383,7 +383,9 @@ export default () => ( ]} /> - + How can we reproduce +
          + ?           @@ -429,8 +431,9 @@ export default () => ( children: ( <>

          - Right. If you do it correctly, you can use it to - subtract from a number: + It’s complicated, but if you do it correctly, you can + use it to subtract from a + number:

          ) @@ -521,8 +524,13 @@ export default () => ( } ]} /> + + 👧🏻 I filled each{' '} + icon… + + - 👧🏻 Saya’s lunchbox + 👧🏻 As follows! ( ]} /> - + 「 + 」を +
          + どうやって再現する？           @@ -412,7 +415,7 @@ export default () => ( children: ( <>

          - そうですね。正しく{' '} + 複雑ですが、正しく{' '} {' '} に料理を当てはめることができれば、以下のように1を引く計算を行うことができます。

          @@ -441,8 +444,10 @@ export default () => ( <>

          では、 - {' '} - にそれぞれ何が入るか考えてみてください！ + + {' '} + にそれぞれ何が入るか考えてみてください！ +

          ) @@ -499,8 +504,13 @@ export default () => ( } ]} /> + + 👧🏻 それぞれの{' '} + に… + + - 👧🏻 サヤちゃんの弁当箱 + 👧🏻 次のように料理を入れてみた！ ( children: ( <>

          - では、こちらの + では、こちらの{' '} {' '} に変換できる弁当箱と合体させて、 @@ -903,21 +913,11 @@ export default () => ( -

          - よし、 - してみよう！ -

          - - ) - }, { type: 'saya', children: ( <> +

          では、実行してみよう！

            今回は、 From d0554e6f379938da2eb1a84990edf2b1a463fd62 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Wed, 23 Oct 2019 12:32:26 -0700 Subject: [PATCH 110/110] Revise 13 and 16 --- src/contents/13.jp.tsx | 6 +++--- src/contents/16.jp.tsx | 27 ++++++++++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/contents/13.jp.tsx b/src/contents/13.jp.tsx index c8c838755..599c1a0c9 100644 --- a/src/contents/13.jp.tsx +++ b/src/contents/13.jp.tsx @@ -369,15 +369,15 @@ export default () => (

            これはもしかして… - 中級その3で 👧🏻 サヤちゃんが考えた、 - + 中級その3で 👧🏻 サヤちゃんが考えた、 「 + 」 を再現できる弁当箱かな？

            👧🏻 サヤちゃんが考えた、
            - + 「」 を再現できる弁当箱             diff --git a/src/contents/16.jp.tsx b/src/contents/16.jp.tsx index 00427216c..83bbb4384 100644 --- a/src/contents/16.jp.tsx +++ b/src/contents/16.jp.tsx @@ -533,18 +533,31 @@ export default () => (

            もし 🅰️ に を、 - 🅱️ に{' '} - を当てはめると、以下のようになります。つまり、先ほどのラムダ計算の記述式は + 🅱️ に を当てはめると、 + + 上級編で登場したYコンビネータの弁当箱 + + になります。 +

            + + 🅰️ に を、 +
            + 🅱️ に を当てはめると、 +
            + Yコンビネータの弁当箱になる +             +

            + つまり、先ほどのラムダ計算の記述式は Yコンビネータを表している のです。

            λA.(λB.A(B B))(λB.A(B B)) - - 先ほどのラムダ計算の記述式は、 -
            「Yコンビネータ - 」を表している -             + + 先ほどのラムダ計算の記述式は +
            + Yコンビネータを表している +

            まとめると、本稿では、