ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
Kurt Hutten IrevDev
2022-12-04 15:52:27 +11:00
parent 5fa2472e0d
commit b478eaa18d
5 changed files with 85 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/SketchPlane.tsx
View File

@ -56,7 +56,11 @@ export const SketchPlane = () => {
} else if (guiMode.axis === 'yz') {
addLinePoint = [point.z, point.y]
}
const { modifiedAst } = addLine(_ast, guiMode.pathToNode, addLinePoint)
const { modifiedAst } = addLine(
_ast,
guiMode.pathToNode,
addLinePoint
)
updateAst(modifiedAst)
}}
>

1
src/lang/abstractSyntaxTree.ts
View File

@ -1214,7 +1214,6 @@ export function addLine(
}
}
function isCallExpression(tokens: Token[], index: number): number {
const currentToken = tokens[index]
const veryNextToken = tokens[index + 1] // i.e. no whitespace

113
src/lang/executor.ts
View File

@ -1,4 +1,9 @@
import { Program, BinaryPart, BinaryExpression, PipeExpression } from './abstractSyntaxTree'
import {
Program,
BinaryPart,
BinaryExpression,
PipeExpression,
} from './abstractSyntaxTree'
import { Path, Transform, sketchFns } from './sketch'
import { BufferGeometry } from 'three'
@ -108,7 +113,8 @@ export const executor = (
_programMemory.root[variableName] = result.currentPath
} else if ('rx' === fnName || 'ry' === fnName || 'rz' === fnName) {
const sketch = declaration.init.arguments[1]
if(sketch.type !== 'Identifier') throw new Error('rx must be called with an identifier')
if (sketch.type !== 'Identifier')
throw new Error('rx must be called with an identifier')
const sketchVal = _programMemory.root[sketch.name]
const result = sketchFns[fnName](
_programMemory,
@ -198,14 +204,22 @@ function getPipeExpressionResult(
return result
}
function executePipeBody(body: PipeExpression['body'], programMemory: ProgramMemory, expressionIndex = 0, previousResults: any[] = []): any[] {
function executePipeBody(
body: PipeExpression['body'],
programMemory: ProgramMemory,
expressionIndex = 0,
previousResults: any[] = []
): any[] {
if (expressionIndex === body.length) {
return previousResults
}
const expression = body[expressionIndex]
if (expression.type === 'BinaryExpression') {
const result = getBinaryExpressionResult(expression, programMemory)
return executePipeBody(body, programMemory, expressionIndex + 1, [...previousResults, result])
return executePipeBody(body, programMemory, expressionIndex + 1, [
...previousResults,
result,
])
} else if (expression.type === 'CallExpression') {
const fnName = expression.callee.name
const fnArgs = expression.arguments.map((arg) => {
@ -214,7 +228,7 @@ function executePipeBody(body: PipeExpression['body'], programMemory: ProgramMem
} else if (arg.type === 'Identifier') {
return programMemory.root[arg.name]
} else if (arg.type === 'PipeSubstitution') {
return previousResults[expressionIndex-1]
return previousResults[expressionIndex - 1]
}
throw new Error('Invalid argument type')
})
@ -225,10 +239,16 @@ function executePipeBody(body: PipeExpression['body'], programMemory: ProgramMem
fnArgs[0],
fnArgs[1]
)
return executePipeBody(body, programMemory, expressionIndex + 1, [...previousResults, result])
return executePipeBody(body, programMemory, expressionIndex + 1, [
...previousResults,
result,
])
}
const result = programMemory.root[fnName](...fnArgs)
return executePipeBody(body, programMemory, expressionIndex + 1, [...previousResults, result])
return executePipeBody(body, programMemory, expressionIndex + 1, [
...previousResults,
result,
])
} else if (expression.type === 'SketchExpression') {
const sketchBody = expression.body
const fnMemory: ProgramMemory = {
@ -251,13 +271,15 @@ function executePipeBody(body: PipeExpression['body'], programMemory: ProgramMem
_sketch = newProgramMemory._sketch
}
// _programMemory.root[variableName] = _sketch
return executePipeBody(body, programMemory, expressionIndex + 1, [...previousResults, _sketch])
return executePipeBody(body, programMemory, expressionIndex + 1, [
...previousResults,
_sketch,
])
}
throw new Error('Invalid pipe expression')
}
type SourceRange = [number, number]
export type ViewerArtifact =
@ -277,43 +299,42 @@ type PreviousTransforms = {
transform: [number, number, number]
}[]
export const processShownObjects =
(
programMemory: ProgramMemory,
geoMeta: Path[] | Transform,
previousTransforms: PreviousTransforms = []
): ViewerArtifact[] => {
if (Array.isArray(geoMeta)) {
return geoMeta.map(({ geo, sourceRange }) => {
const newGeo = geo.clone()
previousTransforms.forEach(({ rotation, transform }) => {
newGeo.rotateX(rotation[0])
newGeo.rotateY(rotation[1])
newGeo.rotateZ(rotation[2])
newGeo.translate(transform[0], transform[1], transform[2])
})
return {
type: 'geo',
geo: newGeo,
sourceRange,
}
export const processShownObjects = (
programMemory: ProgramMemory,
geoMeta: Path[] | Transform,
previousTransforms: PreviousTransforms = []
): ViewerArtifact[] => {
if (Array.isArray(geoMeta)) {
return geoMeta.map(({ geo, sourceRange }) => {
const newGeo = geo.clone()
previousTransforms.forEach(({ rotation, transform }) => {
newGeo.rotateX(rotation[0])
newGeo.rotateY(rotation[1])
newGeo.rotateZ(rotation[2])
newGeo.translate(transform[0], transform[1], transform[2])
})
} else if (geoMeta.type === 'transform') {
const referencedVar = geoMeta.sketch
const parentArtifact: ViewerArtifact = {
type: 'parent',
sourceRange: geoMeta.sourceRange,
children: processShownObjects(programMemory, referencedVar, [
...previousTransforms,
{
rotation: geoMeta.rotation,
transform: geoMeta.transform,
},
]),
}
return [parentArtifact]
}
throw new Error('Unknown geoMeta type')
return {
type: 'geo',
geo: newGeo,
sourceRange,
}
})
} else if (geoMeta.type === 'transform') {
const referencedVar = geoMeta.sketch
const parentArtifact: ViewerArtifact = {
type: 'parent',
sourceRange: geoMeta.sourceRange,
children: processShownObjects(programMemory, referencedVar, [
...previousTransforms,
{
rotation: geoMeta.rotation,
transform: geoMeta.transform,
},
]),
}
return [parentArtifact]
}
throw new Error('Unknown geoMeta type')
}

22
src/lang/recast.ts
View File

@ -25,14 +25,17 @@ export function recast(
} else if (statement.type === 'VariableDeclaration') {
return statement.declarations
.map((declaration) => {
const isSketchOrFirstPipeExpressionIsSketch =
const isSketchOrFirstPipeExpressionIsSketch =
declaration.init.type === 'SketchExpression' ||
(declaration.init.type === 'PipeExpression' &&
declaration.init.body[0].type === 'SketchExpression')
const assignmentString = isSketchOrFirstPipeExpressionIsSketch ? ' ' : ' = '
return `${indentation}${statement.kind} ${declaration.id.name}${assignmentString}${recastValue(declaration.init)}`
const assignmentString = isSketchOrFirstPipeExpressionIsSketch
? ' '
: ' = '
return `${indentation}${statement.kind} ${
declaration.id.name
}${assignmentString}${recastValue(declaration.init)}`
})
.join('')
} else if (statement.type === 'ReturnStatement') {
@ -104,7 +107,6 @@ ${recast(expression.body, '', indentation + ' ')}
}`
}
function recastValue(node: Value, indentation = ''): string {
if (node.type === 'BinaryExpression') {
return recastBinaryExpression(node)
@ -117,9 +119,9 @@ function recastValue(node: Value, indentation = ''): string {
} else if (node.type === 'SketchExpression') {
return recastSketchExpression(node, indentation)
} else if (node.type === 'PipeExpression') {
return node.body.map((statement): string =>
recastValue(statement, indentation)
).join('\n |> ')
return node.body
.map((statement): string => recastValue(statement, indentation))
.join('\n |> ')
}
return ''
}
}

3
src/lang/tokeniser.test.ts
View File

@ -299,7 +299,6 @@ describe('testing lexer', () => {
"whitespace ' ' from 6 to 7",
"number '2.5' from 7 to 10",
])
})
it('testing piping operator', () => {
const result = stringSummaryLexer(`sketch mySketch {
@ -330,7 +329,7 @@ describe('testing lexer', () => {
"comma ',' from 51 to 52",
"whitespace ' ' from 52 to 53",
"operator '%' from 53 to 54",
"brace ')' from 54 to 55"
"brace ')' from 54 to 55",
])
})
})