Skip to content
This repository was archived by the owner on Sep 3, 2025. It is now read-only.

Remove unabbreviated (episode 15) #61

Merged
merged 1 commit into from
Jun 14, 2019
Merged

Remove unabbreviated (episode 15) #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions src/components/AER.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2487,26 +2487,5 @@ export default {
variableSize="md"
caption={<H args={{ name: 'thisIsYCombinatorCaption', too: true }} />}
/>
),
ycvc: (
<ExpressionRunnerSimple
expressionContainer={lessonExpressions.e15E18}
showPriorities
containerSize="xs"
variableSize="xxs"
caption={
<>
<H args={{ name: 'secretCodeCaption', number: 3, letter: 'c' }} />
</>
}
/>
),
muwt: (
<ExpressionRunnerSimple
expressionContainer={lessonExpressions.e15E19}
showPriorities
containerSize="xs"
variableSize="xxs"
/>
)
}
67 changes: 0 additions & 67 deletions src/contents/15.jp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,73 +758,6 @@ export default () => (
</>
)
}
},
{
title: <>最後に: 省略表記を使わない</>,
content: (
<>
<P>
最後に、
<Strong>省略表記を一切使わないバージョン</Strong>
を試して終わりにしましょう。どういうことか、これから説明します！
</P>
<P>
まず、先ほどの
<H args={{ name: 'inlineFactorial', start: 3 }} />
を計算する弁当箱の、一番上の
<EmojiNumber number={3} />
に注目します。
</P>
{AER.hzlj}
<P>
一番上の
<EmojiNumber number={3} />
を省略表記を使わずに表すと、こうなります:
</P>
{AER.ycvc}
<P>
同じように、
<Em>以下のすべての省略表記を使わないようにします</Em>。
</P>
<Ul>
<UlLi>
<Strong>
<EmojiWithText letter={magicalVariableName} />
から1を引く
</Strong>
省略表記:
<TopRightBadge topRightBadgeType="pred" inline />
</UlLi>
<UlLi>
<Strong>掛け算</Strong>の省略表記: <Emoji>✖️</Emoji>
</UlLi>
<UlLi>
<Strong>
<EmojiNumber number={1} />
の暗号
</Strong>
の省略表記
</UlLi>
<UlLi>
<Strong>条件分岐の省略表記</Strong>:{' '}
<InlineEmojiBoxesForCondition type="condition" />{' '}
<InlineEmojiBoxesForCondition type="trueCase" />{' '}
<InlineEmojiBoxesForCondition type="falseCase" />
</UlLi>
</Ul>
<P>
すべての省略表記をやめると、最終的にこのような弁当箱になります。
<Em>黄色の部分</Em>
が、省略表記をやめた部分です。すごい数の料理がありますよね。そして一番下の
<Strong>
<H args={{ name: 'yCombinator' }} />
はそのまま
</Strong>
ですね。
</P>
{AER.muwt}
</>
)
}
]}
/>
Expand Down
110 changes: 0 additions & 110 deletions src/lib/lessonExpressions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,113 +955,3 @@ export const e15E17 = initializeExpressionContainer({
}
]
})

export const e15E18 = initializeExpressionContainer([
[
yCombinator,
{
arg: 's',
body: updatedMagicalParams
}
],
numberParams(
{
highlighted: true,
name: 'c'
},
{
highlighted: true,
name: 'd'
},
3
)
])

const predMagicalUnabbreviated: CallExpressionParams = [
predParams(
{
name: 'l',
highlighted: true
},
{ name: 'm', highlighted: true },
{ name: 'n', highlighted: true },
{ name: 'o', highlighted: true },
{ name: 'p', highlighted: true },
{ name: 'q', highlighted: true }
),
{
name: magicalVariableName,
highlighted: true
}
]

const multUnabbreviated: CallExpressionParams = [
[
multParams(
{ name: 'r', highlighted: true },
{ name: 's', highlighted: true },
{ name: 't', highlighted: true },
{ name: 'u', highlighted: true }
),
{ name: magicalVariableName, highlighted: true }
],
[{ name: 's', highlighted: true }, predMagicalUnabbreviated]
]

export const e15E19 = initializeExpressionContainer([
[
yCombinator,
{
arg: 's',
body: {
arg: magicalVariableName,
body: isZeroParams(
{
name: 'e',
highlighted: true
},
{
name: 'f',
highlighted: true
},
{
name: 'g',
highlighted: true
},
{
name: 'h',
highlighted: true
},
{
name: 'i',
highlighted: true
},
numberParams(
{
name: 'j',
highlighted: true
},
{
name: 'k',
highlighted: true
},
1
),
multUnabbreviated,
predMagicalUnabbreviated
)
}
}
],
numberParams(
{
highlighted: true,
name: 'c'
},
{
highlighted: true,
name: 'd'
},
3
)
])