From f542c6f0598b1a70e38e05b42bf0bb76dbf7fdfe Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 15:39:06 -0700
Subject: [PATCH 01/13] Remove hidePrioritiesOnSecond
---
src/components/ExpressionRunnerShorthand.tsx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/components/ExpressionRunnerShorthand.tsx b/src/components/ExpressionRunnerShorthand.tsx
index e10ab0415..739352542 100644
--- a/src/components/ExpressionRunnerShorthand.tsx
+++ b/src/components/ExpressionRunnerShorthand.tsx
@@ -351,7 +351,6 @@ export const ExpressionRunnerPairSimpleDeprecated = ({
finalIsDone,
finalState,
showPriorities,
- hidePrioritiesOnSecond,
firstInitializeInstructions,
secondInitializeInstructions,
highlightOverrides,
@@ -364,7 +363,6 @@ export const ExpressionRunnerPairSimpleDeprecated = ({
finalIsDone: boolean
finalState?: ExpressionContainer['previouslyChangedExpressionState']
showPriorities: boolean
- hidePrioritiesOnSecond: boolean
skipAlphaConvert: boolean
firstInitializeInstructions?: ExpressionRunnerProps['initializeInstructions']
secondInitializeInstructions?: ExpressionRunnerProps['initializeInstructions']
@@ -414,7 +412,7 @@ export const ExpressionRunnerPairSimpleDeprecated = ({
Date: Wed, 19 Jun 2019 15:56:43 -0700
Subject: [PATCH 02/13] Remove uqwm
---
src/components/AER.tsx | 5 -----
src/contents/1.jp.tsx | 5 ++++-
src/contents/2.jp.tsx | 5 ++++-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index 78c7bdd48..b55ba33d0 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -21,11 +21,6 @@ export default {
expressionContainer={lessonExpressions.e1E1}
/>
),
- uqwm: (
-
- ),
zwpj: (
(
(
例その1:
- {AER.uqwm}
+ {AER.ilpo}
+
+ {AER.osqo}
実はこれ、
diff --git a/src/contents/2.jp.tsx b/src/contents/2.jp.tsx
index e632d271c..fc1f04b8d 100644
--- a/src/contents/2.jp.tsx
+++ b/src/contents/2.jp.tsx
@@ -10,6 +10,7 @@ import YesNoButtons from 'src/components/YesNoButtons'
import EpisodeCardList from 'src/components/EpisodeCardList'
import H from 'src/components/H'
import episodeEmojis from 'src/lib/episodeEmojis'
+import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator'
export const BasicRules = ({
includeFuncUnbound
@@ -73,7 +74,9 @@ export default () => (
ここでは、前回のはじめに登場した弁当箱(例その1
)を使って説明します:
- {AER.uqwm}
+ {AER.ilpo}
+
+ {AER.osqo}
>
)
},
From 61d9587b3617c4ffe7c5b490c29ae109eefb453d Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 16:02:08 -0700
Subject: [PATCH 03/13] Remove bgfl
---
src/components/AER.tsx | 3 ++-
src/contents/1.jp.tsx | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index b55ba33d0..705f770e0 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -37,8 +37,9 @@ export default {
/>
),
bgfl: (
-
),
tuqr: (
diff --git a/src/contents/1.jp.tsx b/src/contents/1.jp.tsx
index 734bd688d..2bcf15a35 100644
--- a/src/contents/1.jp.tsx
+++ b/src/contents/1.jp.tsx
@@ -259,6 +259,8 @@ export default () => (
例その2:
+ {AER.imyd}
+
{AER.bgfl}
例その3:
From 29efe3f96741f38d896d6d9e6dc554a427c4a382 Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 16:04:01 -0700
Subject: [PATCH 04/13] Remove tuqr
---
src/components/AER.tsx | 3 ++-
src/contents/1.jp.tsx | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index 705f770e0..9cb8593cf 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -43,8 +43,9 @@ export default {
/>
),
tuqr: (
-
),
cpkp: (
diff --git a/src/contents/1.jp.tsx b/src/contents/1.jp.tsx
index 2bcf15a35..24ed12c0c 100644
--- a/src/contents/1.jp.tsx
+++ b/src/contents/1.jp.tsx
@@ -265,6 +265,8 @@ export default () => (
例その3:
+ {AER.emmb}
+
{AER.tuqr}
例その4:
From 5dec3a1d3fd4aff894db09465db74c86fc862ef9 Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 16:07:13 -0700
Subject: [PATCH 05/13] Remove cpkp
---
src/components/AER.tsx | 3 ++-
src/contents/1.jp.tsx | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index 9cb8593cf..0b9084fc1 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -49,8 +49,9 @@ export default {
/>
),
cpkp: (
-
),
loai: ,
diff --git a/src/contents/1.jp.tsx b/src/contents/1.jp.tsx
index 24ed12c0c..596cf205d 100644
--- a/src/contents/1.jp.tsx
+++ b/src/contents/1.jp.tsx
@@ -271,6 +271,8 @@ export default () => (
例その4:
+ {AER.jozw}
+
{AER.cpkp}
>
),
From 4c73a35b4d0af410c216b9eb3aeec5547833d6a7 Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 16:14:25 -0700
Subject: [PATCH 06/13] Remove mhgm
---
src/components/AER.tsx | 3 +--
src/contents/2.jp.tsx | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index 0b9084fc1..52c538373 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -124,10 +124,9 @@ export default {
/>
),
mhgm: (
-
),
osqo: (
diff --git a/src/contents/2.jp.tsx b/src/contents/2.jp.tsx
index fc1f04b8d..ec1708463 100644
--- a/src/contents/2.jp.tsx
+++ b/src/contents/2.jp.tsx
@@ -50,6 +50,8 @@ export const BasicRules = ({
{AER.mhgm}
+
+ {AER.osqo}
>
)
From 2c72c61c7de6d100ff21c390a06e59515d6e1711 Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 16:17:56 -0700
Subject: [PATCH 07/13] Remove zxfv
---
src/components/AER.tsx | 11 ++++++++---
src/contents/2.jp.tsx | 4 +++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index 52c538373..1b77efbc3 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -151,11 +151,16 @@ export default {
finalState="betaReducePreviewCrossed"
/>
),
- zxfv: (
-
+ ),
+ knhw: (
+
),
ahsd: (
diff --git a/src/contents/2.jp.tsx b/src/contents/2.jp.tsx
index ec1708463..28d442286 100644
--- a/src/contents/2.jp.tsx
+++ b/src/contents/2.jp.tsx
@@ -320,7 +320,9 @@ export default () => (
。
- {AER.zxfv}
+ {AER.jwzh}
+
+ {AER.knhw}
>
)
},
From f7a221e23ad5b87a26c34d31d78fb7af2cae70f9 Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 16:22:06 -0700
Subject: [PATCH 08/13] Remove iped
---
src/components/AER.tsx | 5 -----
src/contents/3.jp.tsx | 5 ++++-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index 1b77efbc3..81e890846 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -215,11 +215,6 @@ export default {
initialState="showFuncUnbound"
/>
),
- iped: (
-
- ),
cvtc: (
(
(
には、最後まで何も起きません。
というわけで、実行結果はこうなります。
- {AER.iped}
+ {AER.xwim}
+
+ {AER.awxz}
>
)
},
From aced06c069cc391aaecc6d4175732c21022587e7 Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 17:50:51 -0700
Subject: [PATCH 09/13] Remove jrxw
---
src/components/AER.tsx | 19 ++++++++-----------
src/contents/4.jp.tsx | 5 ++++-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index 81e890846..4ff0a5274 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -281,20 +281,17 @@ export default {
skipToTheEnd={false}
/>
),
- jrxw: (
-
+ ),
+ xzqu: (
+
),
esyi: (
diff --git a/src/contents/4.jp.tsx b/src/contents/4.jp.tsx
index aee4aba90..ae8d58233 100644
--- a/src/contents/4.jp.tsx
+++ b/src/contents/4.jp.tsx
@@ -10,6 +10,7 @@ import AER from 'src/components/AER'
import H from 'src/components/H'
import EmojiWithText from 'src/components/EmojiWithText'
import YesNoButtons from 'src/components/YesNoButtons'
+import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator'
export default () => (
(
1になる
- {AER.jrxw}
+ {AER.udic}
+
+ {AER.xzqu}
3.{' '}
From 6f13636ce0032c3ad793c36b4a12a893b1263fa7 Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 17:59:41 -0700
Subject: [PATCH 10/13] Remove esyi
---
src/components/AER.tsx | 24 ++++++++++++------------
src/contents/4.jp.tsx | 4 +++-
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index 4ff0a5274..60d4dc798 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -291,23 +291,23 @@ export default {
xzqu: (
),
- esyi: (
-
+ ),
+ nric: (
+
),
hdxc: (
diff --git a/src/contents/4.jp.tsx b/src/contents/4.jp.tsx
index ae8d58233..56ea2f895 100644
--- a/src/contents/4.jp.tsx
+++ b/src/contents/4.jp.tsx
@@ -210,7 +210,9 @@ export default () => (
同じことを繰り返して最後まで終わらせる
- {AER.esyi}
+ {AER.dnvw}
+
+ {AER.nric}
>
),
footer: {
From 3c63e6667323b5479360e86fecc2ef23fa8c4a54 Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 18:14:10 -0700
Subject: [PATCH 11/13] Remove wepe
---
src/components/AER.tsx | 20 +++++++++-----------
src/contents/4.jp.tsx | 4 +++-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index 60d4dc798..a6a10dbe1 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -317,20 +317,18 @@ export default {
skipToTheEnd={false}
/>
),
- wepe: (
-
+ ),
+ iwkx: (
+
),
bwop: (
diff --git a/src/contents/4.jp.tsx b/src/contents/4.jp.tsx
index 56ea2f895..26d8d2b04 100644
--- a/src/contents/4.jp.tsx
+++ b/src/contents/4.jp.tsx
@@ -286,7 +286,9 @@ export default () => (
1周目はこうなり…
- {AER.wepe}
+ {AER.eial}
+
+ {AER.iwkx}
最終的には
From 6445b661d85fa8efdb483d4f51e2ec989e4f1466 Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 18:16:50 -0700
Subject: [PATCH 12/13] Remove bwop
---
src/components/AER.tsx | 23 +++++++++++------------
src/contents/4.jp.tsx | 4 +++-
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index a6a10dbe1..38c7d990a 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -331,20 +331,19 @@ export default {
showPriorities
/>
),
- bwop: (
-
+ ),
+ iifq: (
+
),
laea: (
diff --git a/src/contents/4.jp.tsx b/src/contents/4.jp.tsx
index 26d8d2b04..511e24fea 100644
--- a/src/contents/4.jp.tsx
+++ b/src/contents/4.jp.tsx
@@ -296,7 +296,9 @@ export default () => (
が残ります:
- {AER.bwop}
+ {AER.vjaa}
+
+ {AER.iifq}
>
)
},
From 756a73fbb5ea65875aa45d57f6a2f4656e766d24 Mon Sep 17 00:00:00 2001
From: Shu Uesugi
Date: Wed, 19 Jun 2019 18:26:01 -0700
Subject: [PATCH 13/13] Remove ExpressionRunnerPairSimpleDeprecated
---
src/components/AER.tsx | 1 -
src/components/ExpressionRunnerShorthand.tsx | 91 --------------------
2 files changed, 92 deletions(-)
diff --git a/src/components/AER.tsx b/src/components/AER.tsx
index 38c7d990a..cee26c632 100644
--- a/src/components/AER.tsx
+++ b/src/components/AER.tsx
@@ -2,7 +2,6 @@ import React from 'react'
import {
ExpressionRunnerSimple,
ExpressionRunnerPlayButtonOnly,
- ExpressionRunnerPairSimpleDeprecated,
ExpressionRunnerSingleStep,
ExpressionRunnerPairSimple
} from 'src/components/ExpressionRunnerShorthand'
diff --git a/src/components/ExpressionRunnerShorthand.tsx b/src/components/ExpressionRunnerShorthand.tsx
index 739352542..98905f8c9 100644
--- a/src/components/ExpressionRunnerShorthand.tsx
+++ b/src/components/ExpressionRunnerShorthand.tsx
@@ -345,97 +345,6 @@ ExpressionRunnerPairSimple.defaultProps = {
...ExpressionRunnerSimple.defaultProps
}
-export const ExpressionRunnerPairSimpleDeprecated = ({
- expressionContainer,
- initialState,
- finalIsDone,
- finalState,
- showPriorities,
- firstInitializeInstructions,
- secondInitializeInstructions,
- highlightOverrides,
- highlightOverrideActiveAfterStart,
- skipAlphaConvert,
- variableSize
-}: {
- expressionContainer: SteppedExpressionContainer
- initialState: ExpressionContainer['previouslyChangedExpressionState']
- finalIsDone: boolean
- finalState?: ExpressionContainer['previouslyChangedExpressionState']
- showPriorities: boolean
- skipAlphaConvert: boolean
- firstInitializeInstructions?: ExpressionRunnerProps['initializeInstructions']
- secondInitializeInstructions?: ExpressionRunnerProps['initializeInstructions']
- highlightOverrides?: ExpressionRunnerProps['highlightOverrides']
- highlightOverrideActiveAfterStart?: ExpressionRunnerProps['highlightOverrideActiveAfterStart']
- variableSize: ExpressionRunnerProps['variableSize']
-}) => (
- <>
-
-
- {finalState || finalIsDone || secondInitializeInstructions ? (
- <>
- ⬇️
- >
- ) : (
- <>
- 🔽{' '}
- {' '}
- 🔽
- >
- )}
-
-
- >
-)
-
ExpressionRunnerPairSimpleDeprecated.defaultProps = {
initialState: 'default',
finalIsDone: false,