diff --git a/scripts/lib/buildExpressionFromParams.ts b/scripts/lib/buildExpressionFromParams.ts index 00826c9b3..9c1df9ddd 100644 --- a/scripts/lib/buildExpressionFromParams.ts +++ b/scripts/lib/buildExpressionFromParams.ts @@ -207,8 +207,7 @@ export default function buildExpressionFromParams( } else { return { type: 'repeat', - begin: expressionParams.begin, - end: expressionParams.end, + count: expressionParams.count, child: buildExpressionFromParams(expressionParams.child) } } diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 97af9738b..12fb0a8ec 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -1409,50 +1409,6 @@ export const gxqm = initializeExpressionContainer({ } }) -export const gcie = initializeExpressionContainer([ - { - begin: 2, - end: 3, - child: [ - 'blankNumber', - { - shorthandBinary: 'mult' - } - ] - }, - { - shorthandNumber: 1 - } -]) - -export const xcln = initializeDoneExpressionContainer({ - shorthandNumber: 6 -}) - -export const gwwy = initializeExpressionContainer([ - { - begin: 3, - child: [ - 'blankNumber', - { - shorthandBinary: 'mult' - } - ] - }, - { - begin: 2, - child: [ - 'blankNumber', - { - shorthandBinary: 'mult' - } - ] - }, - { - shorthandNumber: 1 - } -]) - export const ygid = initializeExpressionContainer([ { shorthandNumber: 3 @@ -1477,22 +1433,6 @@ export const ygid = initializeExpressionContainer([ ] ]) -export const gskq = initializeExpressionContainer([ - { - begin: 2, - end: 4, - child: [ - 'blankNumber', - { - shorthandBinary: 'mult' - } - ] - }, - { - shorthandNumber: 1 - } -]) - export const vibe = initializeExpressionContainer([ { shorthandFunc: 'add' diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 3b626675b..2d2549b97 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -2742,45 +2742,6 @@ export const zqum: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.qolg } -export const oklg: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.gcie, - caption: { name: 'repeatingMathBoxCaption' } -} - -export const eqvz: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.gcie -} - -export const emme: ExpressionRunnerShorthandConfig = { - runner: 'predefined', - initialExpressionContainers: [ - initialExpressionContainers.gcie, - initialExpressionContainers.xcln - ] -} - -export const hawd: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.gwwy -} - -export const prfy: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.ygid -} - -export const nxsa: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.xcln -} - -export const yzdy: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.gskq -} - export const lizi: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.vibe diff --git a/src/components/RepeatBorder.tsx b/src/components/RepeatBorder.tsx index 0387f93fb..8a262fec2 100644 --- a/src/components/RepeatBorder.tsx +++ b/src/components/RepeatBorder.tsx @@ -6,9 +6,8 @@ import ExpressionRunnerContext from 'src/components/ExpressionRunnerContext' import { ExpressionRunnerContextProps } from 'src/types/ExpressionRunnerTypes' import EmojiNumber from 'src/components/EmojiNumber' -export interface ConditionalBorderProps { - begin: number - end?: number +export interface RepeatBorderProps { + count: number variableSizeOverrides?: ExpressionRunnerContextProps['variableSize'] } @@ -36,11 +35,7 @@ const width = ( } } -const RepeatBorder = ({ - begin, - end, - variableSizeOverrides -}: ConditionalBorderProps) => { +const RepeatBorder = ({ count, variableSizeOverrides }: RepeatBorderProps) => { const { variableSize } = useContext(ExpressionRunnerContext) return ( <> @@ -66,18 +61,7 @@ const RepeatBorder = ({ font-size: ${fontSize(variableSizeOverrides || variableSize)}; `} > - - {end && - [...Array(end - begin).keys()].map(number => ( - - - - ))} + { position: relative; `} > - + diff --git a/src/components/Runners/Emme.tsx b/src/components/Runners/Emme.tsx deleted file mode 100644 index d051a6f36..000000000 --- a/src/components/Runners/Emme.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/emme.json' - -const Emme = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Emme diff --git a/src/components/Runners/Eqvz.tsx b/src/components/Runners/Eqvz.tsx deleted file mode 100644 index bf3d4988f..000000000 --- a/src/components/Runners/Eqvz.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/eqvz.json' - -const Eqvz = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Eqvz diff --git a/src/components/Runners/Hawd.tsx b/src/components/Runners/Hawd.tsx deleted file mode 100644 index 78ff71ab9..000000000 --- a/src/components/Runners/Hawd.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/hawd.json' - -const Hawd = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Hawd diff --git a/src/components/Runners/Nxsa.tsx b/src/components/Runners/Nxsa.tsx deleted file mode 100644 index e723f8249..000000000 --- a/src/components/Runners/Nxsa.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/nxsa.json' - -const Nxsa = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Nxsa diff --git a/src/components/Runners/Oklg.tsx b/src/components/Runners/Oklg.tsx deleted file mode 100644 index fead4bcb4..000000000 --- a/src/components/Runners/Oklg.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/oklg.json' - -const Oklg = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Oklg diff --git a/src/components/Runners/Prfy.tsx b/src/components/Runners/Prfy.tsx deleted file mode 100644 index b70d945aa..000000000 --- a/src/components/Runners/Prfy.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/prfy.json' - -const Prfy = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Prfy diff --git a/src/components/Runners/Yzdy.tsx b/src/components/Runners/Yzdy.tsx deleted file mode 100644 index 5d97c6a09..000000000 --- a/src/components/Runners/Yzdy.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/yzdy.json' - -const Yzdy = ({ children }: { children?: React.ReactNode }) => ( - // @ts-ignore - - {children} - -) - -export default Yzdy diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 28c03d823..2e922414a 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -342,13 +342,6 @@ export { default as Sgds } from 'src/components/Runners/Sgds' export { default as Voxy } from 'src/components/Runners/Voxy' export { default as Lvau } from 'src/components/Runners/Lvau' export { default as Zqum } from 'src/components/Runners/Zqum' -export { default as Oklg } from 'src/components/Runners/Oklg' -export { default as Eqvz } from 'src/components/Runners/Eqvz' -export { default as Emme } from 'src/components/Runners/Emme' -export { default as Hawd } from 'src/components/Runners/Hawd' -export { default as Prfy } from 'src/components/Runners/Prfy' -export { default as Nxsa } from 'src/components/Runners/Nxsa' -export { default as Yzdy } from 'src/components/Runners/Yzdy' export { default as Lizi } from 'src/components/Runners/Lizi' export { default as Mcug } from 'src/components/Runners/Mcug' export { default as Aovj } from 'src/components/Runners/Aovj' diff --git a/src/lib/runners/emme.json b/src/lib/runners/emme.json deleted file mode 100644 index a7812e15e..000000000 --- a/src/lib/runners/emme.json +++ /dev/null @@ -1,100 +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": 1 - }, - "func": { - "type": "repeat", - "begin": 2, - "end": 3, - "child": { - "arg": { - "name": "shorthandBinary", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandBinary": "mult" - }, - "func": { - "name": "blankNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1, - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - } - }, - "state": "default", - "type": "call", - "priority": 1 - } - }, - { - "containerState": "done", - "previouslyChangedExpressionState": "default", - "expression": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 6 - } - } - ], - "speed": 1, - "showOnlyFocused": false, - "hideControls": false, - "explanationsVisibility": "hiddenInitialPausedOnly", - "hidePriorities": true, - "variableSize": "lg", - "containerSize": "xxs", - "hidePlayButton": false, - "hideBottomRightBadges": false, - "skipToTheEnd": true, - "hideFuncUnboundBadgeOnExplanation": false, - "highlightOverridesCallArgAndFuncUnboundOnly": false, - "bottomRightBadgeOverrides": {}, - "highlightOverrides": {}, - "highlightOverrideActiveAfterStart": false, - "argPriorityAggHighlights": [], - "funcPriorityAggHighlights": [], - "highlightFunctions": false, - "superFastForward": false -} diff --git a/src/lib/runners/eqvz.json b/src/lib/runners/eqvz.json deleted file mode 100644 index d6d372043..000000000 --- a/src/lib/runners/eqvz.json +++ /dev/null @@ -1,84 +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": 1 - }, - "func": { - "type": "repeat", - "begin": 2, - "end": 3, - "child": { - "arg": { - "name": "shorthandBinary", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandBinary": "mult" - }, - "func": { - "name": "blankNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1, - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - } - }, - "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/hawd.json b/src/lib/runners/hawd.json deleted file mode 100644 index 2ad59cd52..000000000 --- a/src/lib/runners/hawd.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "expressionContainers": [ - { - "containerState": "ready", - "previouslyChangedExpressionState": "default", - "expression": { - "arg": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 1 - }, - "func": { - "arg": { - "type": "repeat", - "begin": 2, - "child": { - "arg": { - "name": "shorthandBinary", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1, - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandBinary": "mult" - }, - "func": { - "name": "blankNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - } - }, - "func": { - "type": "repeat", - "begin": 3, - "child": { - "arg": { - "name": "shorthandBinary", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandBinary": "mult" - }, - "func": { - "name": "blankNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1, - 1, - 2 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - } - }, - "state": "default", - "type": "call", - "priority": 1 - }, - "state": "default", - "type": "call", - "priority": 2 - } - } - ], - "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/nxsa.json b/src/lib/runners/nxsa.json deleted file mode 100644 index d0b5508b5..000000000 --- a/src/lib/runners/nxsa.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": 6 - } - } - ], - "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/oklg.json b/src/lib/runners/oklg.json deleted file mode 100644 index a6fb4a4ac..000000000 --- a/src/lib/runners/oklg.json +++ /dev/null @@ -1,87 +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": 1 - }, - "func": { - "type": "repeat", - "begin": 2, - "end": 3, - "child": { - "arg": { - "name": "shorthandBinary", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandBinary": "mult" - }, - "func": { - "name": "blankNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1, - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - } - }, - "state": "default", - "type": "call", - "priority": 1 - } - } - ], - "speed": 1, - "showOnlyFocused": false, - "caption": { - "name": "repeatingMathBoxCaption" - }, - "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/prfy.json b/src/lib/runners/prfy.json deleted file mode 100644 index c701d16a4..000000000 --- a/src/lib/runners/prfy.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "expressionContainers": [ - { - "containerState": "ready", - "previouslyChangedExpressionState": "default", - "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": 1 - }, - "func": { - "name": "shorthandBinary", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 4 - ], - "emphasizePriority": false, - "bound": true, - "shorthandBinary": "mult" - }, - "state": "default", - "type": "call", - "priority": 4 - }, - "func": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 3 - ], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 2 - }, - "state": "default", - "type": "call", - "priority": 3 - }, - "func": { - "name": "shorthandBinary", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 2 - ], - "emphasizePriority": false, - "bound": true, - "shorthandBinary": "mult" - }, - "state": "default", - "type": "call", - "priority": 2 - }, - "func": { - "name": "shorthandNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1 - ], - "emphasizePriority": false, - "bound": true, - "shorthandNumber": 3 - }, - "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/yzdy.json b/src/lib/runners/yzdy.json deleted file mode 100644 index df3ba8a2d..000000000 --- a/src/lib/runners/yzdy.json +++ /dev/null @@ -1,84 +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": 1 - }, - "func": { - "type": "repeat", - "begin": 2, - "end": 4, - "child": { - "arg": { - "name": "shorthandBinary", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "shorthandBinary": "mult" - }, - "func": { - "name": "blankNumber", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [], - "funcPriorityAgg": [ - 1, - 1 - ], - "emphasizePriority": false, - "bound": true - }, - "state": "default", - "type": "call", - "priority": 1 - } - }, - "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/types/ExpressionParamTypes.ts b/src/types/ExpressionParamTypes.ts index deeb9a225..e58f3ca44 100644 --- a/src/types/ExpressionParamTypes.ts +++ b/src/types/ExpressionParamTypes.ts @@ -60,8 +60,7 @@ export interface ConditionalExpressionParams { export interface RepeatExpressionParams { readonly child: ExpressionParams - readonly begin: number - readonly end?: number + readonly count: number } export type ExpressionParams = diff --git a/src/types/ExpressionTypes.ts b/src/types/ExpressionTypes.ts index 5729fe2dd..14d57eb6c 100644 --- a/src/types/ExpressionTypes.ts +++ b/src/types/ExpressionTypes.ts @@ -336,8 +336,7 @@ export interface ConditionalExpression { export interface RepeatExpression { readonly type: 'repeat' readonly child: Expression - readonly begin: number - readonly end?: number + readonly count: number } export type Expression =