From 37e4f9588a6d5e8ca3b3b62d127b5103d04dec90 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Sun, 8 Sep 2019 14:39:29 -0700 Subject: [PATCH] Remove trueCaseActive/falseCaseActive --- scripts/lib/runnerConfigs.ts | 16 +- scripts/lib/stepExpressionContainer.ts | 15 +- scripts/lib/steps/index.ts | 1 - scripts/lib/steps/stepToCaseOnly.ts | 25 - src/components/ConditionalExpressionBox.tsx | 91 ++- src/components/ExpressionPrioritiesLabel.tsx | 8 +- .../ExpressionRunnerExplanation.tsx | 2 - src/components/Runners/Wjwu.tsx | 12 + src/components/Runners/index.ts | 1 + src/components/VariableExpressionBox.tsx | 8 - src/contents/14.jp.tsx | 9 +- src/lib/runners/fkqu.json | 4 +- src/lib/runners/ifiq.json | 2 +- src/lib/runners/msrk.json | 8 +- src/lib/runners/snlf.json | 555 ------------------ src/lib/runners/uiwl.json | 71 --- src/lib/runners/uwyn.json | 515 ---------------- src/lib/runners/wjwu.json | 96 +++ src/types/ExpressionTypes.ts | 2 - 19 files changed, 180 insertions(+), 1261 deletions(-) delete mode 100644 scripts/lib/steps/stepToCaseOnly.ts create mode 100644 src/components/Runners/Wjwu.tsx create mode 100644 src/lib/runners/wjwu.json diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 41ede70e9..3eb3be127 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -2304,10 +2304,19 @@ export const fkqu: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.reak, showPriorities: true, variableSize: 'sm', - initialState: 'falseCaseOnly', + initialState: 'falseCaseActive', explanationsVisibility: 'visible' } +export const wjwu: ExpressionRunnerShorthandConfig = { + runner: 'simple', + skipActive: true, + initialExpressionContainer: initialExpressionContainers.reak, + showPriorities: true, + variableSize: 'sm', + nextIterations: 1 +} + export const ngxc: ExpressionRunnerShorthandConfig = { runner: 'simple', skipActive: true, @@ -2496,9 +2505,8 @@ export const msrk: ExpressionRunnerShorthandConfig = { skipActive: true, initialExpressionContainer: initialExpressionContainers.ihdu, showPriorities: true, - variableSize: 'md', - initialState: 'trueCaseOnly', - explanationsVisibility: 'visible' + variableSize: 'xs', + initialState: 'trueCaseActive' } export const jwce: ExpressionRunnerShorthandConfig = { diff --git a/scripts/lib/stepExpressionContainer.ts b/scripts/lib/stepExpressionContainer.ts index f7e2001a5..95f747b38 100644 --- a/scripts/lib/stepExpressionContainer.ts +++ b/scripts/lib/stepExpressionContainer.ts @@ -22,7 +22,6 @@ import { stepToCaseActive, stepToConditionActive, stepToCaseProcessed, - stepToCaseOnly, stepToShorthandComputed, stepToAlphaConvertCallArg } from 'scripts/lib/steps' @@ -86,24 +85,12 @@ const stepConditional = ( } } case 'trueCaseActive': { - return { - nextExpression: stepToCaseOnly(e, true), - previouslyChangedExpressionState: 'trueCaseOnly' - } - } - case 'falseCaseActive': { - return { - nextExpression: stepToCaseOnly(e, false), - previouslyChangedExpressionState: 'falseCaseOnly' - } - } - case 'trueCaseOnly': { return { nextExpression: stepToCaseProcessed(e, true), previouslyChangedExpressionState: 'default' } } - case 'falseCaseOnly': { + case 'falseCaseActive': { return { nextExpression: stepToCaseProcessed(e, false), previouslyChangedExpressionState: 'default' diff --git a/scripts/lib/steps/index.ts b/scripts/lib/steps/index.ts index 3904850ca..d57a1309b 100644 --- a/scripts/lib/steps/index.ts +++ b/scripts/lib/steps/index.ts @@ -37,7 +37,6 @@ export { default as stepToCaseActive } from 'scripts/lib/steps/stepToCaseActive' export { default as stepToCaseProcessed } from 'scripts/lib/steps/stepToCaseProcessed' -export { default as stepToCaseOnly } from 'scripts/lib/steps/stepToCaseOnly' export { default as stepToDefault } from 'scripts/lib/steps/stepToDefault' export { default as stepToShorthandComputed diff --git a/scripts/lib/steps/stepToCaseOnly.ts b/scripts/lib/steps/stepToCaseOnly.ts deleted file mode 100644 index d6bbd3441..000000000 --- a/scripts/lib/steps/stepToCaseOnly.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { - ExecutableConditionalStatesDistributed, - ExecutableConditional -} from 'src/types/ExpressionTypes' - -const stepToCaseOnly = ( - e: ExecutableConditionalStatesDistributed, - isTrue: boolean -): - | ExecutableConditional<'trueCaseOnly'> - | ExecutableConditional<'falseCaseOnly'> => { - if (isTrue) { - return { - ...e, - state: 'trueCaseOnly' - } - } else { - return { - ...e, - state: 'falseCaseOnly' - } - } -} - -export default stepToCaseOnly diff --git a/src/components/ConditionalExpressionBox.tsx b/src/components/ConditionalExpressionBox.tsx index a1135a57b..2ecd613ca 100644 --- a/src/components/ConditionalExpressionBox.tsx +++ b/src/components/ConditionalExpressionBox.tsx @@ -37,55 +37,48 @@ const ConditionalExpressionBox = ({ position: relative; `} > - {expression.state !== 'trueCaseOnly' && ( - - - - - )} - {expression.state !== 'falseCaseOnly' && - expression.state !== 'trueCaseOnly' && ( - - - - - )} - {expression.state !== 'falseCaseOnly' && ( - - - - - )} + + + + + + + + + + + + diff --git a/src/components/ExpressionPrioritiesLabel.tsx b/src/components/ExpressionPrioritiesLabel.tsx index 0cfe0769f..b3bd8b948 100644 --- a/src/components/ExpressionPrioritiesLabel.tsx +++ b/src/components/ExpressionPrioritiesLabel.tsx @@ -12,7 +12,6 @@ interface ExpressionPrioritiesLabelProps { emphasize: boolean priorities: number[] position: 'topleft' | 'bottomleft' - hideActive: boolean } interface ExpressionPrioritiesLabelBoxProps { @@ -109,15 +108,10 @@ const ExpressionPrioritiesLabelBox = ({ const ExpressionPrioritiesLabel = ({ priorities, position, - emphasize, - hideActive + emphasize }: ExpressionPrioritiesLabelProps) => { const { variableSize } = useContext(ExpressionRunnerContext) - const { activePriority } = useContext(ExpressionPriorityContext) - if (hideActive) { - priorities = priorities.filter(x => x !== activePriority) - } return (
? @@ -297,7 +296,6 @@ const Explanation = ({ ) } } - case 'falseCaseOnly': case 'falseCaseActive': { if (locale === 'en') { return <>? diff --git a/src/components/Runners/Wjwu.tsx b/src/components/Runners/Wjwu.tsx new file mode 100644 index 000000000..f600ab63d --- /dev/null +++ b/src/components/Runners/Wjwu.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/wjwu.json' + +const Wjwu = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Wjwu diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 09f443459..3c6e2d218 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -309,6 +309,7 @@ export { default as Yyfi } from 'src/components/Runners/Yyfi' export { default as Amjx } from 'src/components/Runners/Amjx' export { default as Avsl } from 'src/components/Runners/Avsl' export { default as Fkqu } from 'src/components/Runners/Fkqu' +export { default as Wjwu } from 'src/components/Runners/Wjwu' export { default as Ngxc } from 'src/components/Runners/Ngxc' export { default as Fkvy } from 'src/components/Runners/Fkvy' export { default as Dwmc } from 'src/components/Runners/Dwmc' diff --git a/src/components/VariableExpressionBox.tsx b/src/components/VariableExpressionBox.tsx index 5db831b6c..b81c8a3d7 100644 --- a/src/components/VariableExpressionBox.tsx +++ b/src/components/VariableExpressionBox.tsx @@ -320,10 +320,6 @@ const VariableExpressionBox = ({ expression }: VariableExpressionBoxProps) => { <> {!hidePriorities && ( { {!hidePriorities && ( ( + + ) }, @@ -699,7 +701,12 @@ export default () => ( /> - + + に入っている{' '} + が残る + + + = C extends 'default'