Commit e14b61f

committed

Passing parameters to the function with eval and evalAsync

1 parent 1d31b43 commit e14b61fCopy full SHA for e14b61f

File tree

4 files changed

+25

-10

lines changed

index.html
src

4 files changed

+25

-10

lines changed

`‎index.html`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ <h4>JSPython development console</h4>`
`32`	`32`	`a = 33`
`33`	`33`	`b = 33`
`34`	`34`	`if b > a:`
`35`		`- print("b is greater than a")`
	`35`	`+ return print("b is greater than a")`
`36`	`36`	`elif a == b:`
`37`		`- print("a and b are equal")`
	`37`	`+ return print("a and b are equal")`
`38`	`38`	`</div>`
`39`	`39`
`40`	`40`	`<button onclick="tokenize()">Tokenize</button>`

`‎src/interpreter.spec.ts`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,15 @@ describe('Interpreter', () => {`
`288`	`288`	`expect(e.eval(script)).toBe(5);`
`289`	`289`	`});`
`290`	`290`
	`291`	`+ it('funcCall with params', () => {`
	`292`	+ const script = `
	`293`	`+ def times(a, b):`
	`294`	`+ return a * b`
	`295`	+ `;
	`296`	`+ expect(e.eval(script, {}, ['times', 2, 3])).toBe(6);`
	`297`	`+ });`
	`298`	`+`
	`299`	`+`
`291`	`300`	`it('long comments issue', () => {`
`292`	`301`	const script = `
`293`	`302`	`async def f2():`

`‎src/interpreter.ts`

Lines changed: 12 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export class Interpreter {`
`57`	`57`	`eval(`
`58`	`58`	`codeOrAst: string \| AstBlock,`
`59`	`59`	`scope: Record<string, unknown> = {},`
`60`		`- entryFunctionName = '',`
	`60`	`+ entryFunctionName: string\|[string, ...unknown[]] = '',`
`61`	`61`	`moduleName = 'main.jspy'`
`62`	`62`	`): unknown {`
`63`	`63`	`const ast =`
`@@ -81,18 +81,20 @@ export class Interpreter {`
`81`	`81`	`if (!entryFunctionName \|\| !entryFunctionName.length) {`
`82`	`82`	`return result;`
`83`	`83`	`} else {`
`84`		`- const func = blockContext.blockScope.get(entryFunctionName);`
	`84`	`+ const funcName = Array.isArray(entryFunctionName)? entryFunctionName[0] : entryFunctionName as string`
	`85`	`+ const funcParams = Array.isArray(entryFunctionName)? entryFunctionName.slice(1) : []`
	`86`	`+ const func = blockContext.blockScope.get(funcName);`
`85`	`87`	`if (typeof func !== 'function') {`
`86`	`88`	throw Error(`Function ${entryFunctionName} does not exists or not a function`);
`87`	`89`	`}`
`88`		`- return func();`
	`90`	`+ return func(...funcParams);`
`89`	`91`	`}`
`90`	`92`	`}`
`91`	`93`
`92`	`94`	`async evalAsync(`
`93`	`95`	`codeOrAst: string \| AstBlock,`
`94`	`96`	`scope: Record<string, unknown> = {},`
`95`		`- entryFunctionName = '',`
	`97`	`+ entryFunctionName: string\|[string, ...unknown[]] = '',`
`96`	`98`	`moduleName = 'main.jspy',`
`97`	`99`	`ctxInitialized?: (ctx: BlockContext) => void`
`98`	`100`	`): Promise<unknown> {`
`@@ -146,11 +148,14 @@ export class Interpreter {`
`146`	`148`	`if (!entryFunctionName \|\| !entryFunctionName.length) {`
`147`	`149`	`return result;`
`148`	`150`	`} else {`
`149`		`- const func = blockContext.blockScope.get(entryFunctionName);`
	`151`	`+ const funcName = Array.isArray(entryFunctionName)? entryFunctionName[0] : entryFunctionName as string`
	`152`	`+ const funcParams = Array.isArray(entryFunctionName)? entryFunctionName.slice(1) : []`
	`153`	`+`
	`154`	`+ const func = blockContext.blockScope.get(funcName);`
`150`	`155`	`if (typeof func !== 'function') {`
`151`	`156`	throw Error(`Function ${entryFunctionName} does not exists or not a function`);
`152`	`157`	`}`
`153`		`- return await func();`
	`158`	`+ return await func(...funcParams);`
`154`	`159`	`}`
`155`	`160`	`}`
`156`	`161`
`@@ -160,7 +165,7 @@ export class Interpreter {`
`160`	`165`	`async evaluate(`
`161`	`166`	`script: string,`
`162`	`167`	`context: Record<string, unknown> = {},`
`163`		`- entryFunctionName = '',`
	`168`	`+ entryFunctionName: string\|[string, ...unknown[]] = '',`
`164`	`169`	`moduleName = 'main.jspy',`
`165`	`170`	`ctxInitialized?: (ctx: BlockContext) => void`
`166`	`171`	`): Promise<unknown> {`

`‎src/interpreter.v1.spec.ts`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1376,7 +1376,8 @@ describe('Interpreter', () => {`
`1376`	`1376`	`expect(o[1][1]).toBe('ss22');`
`1377`	`1377`	`expect(o[1][2]).toBe(6);`
`1378`	`1378`
`1379`		`- expect(o[2][1].toISOString()).toBeDefined(); //.toBe(new Date('2020年03月07日').toISOString());`
	`1379`	`+ expect(o[2][1]).toBeInstanceOf(Date);`
	`1380`	`+ expect((o[2][1] as Date).getFullYear()).toBe(2020);`
`1380`	`1381`	`expect(o[3].length).toBe(0);`
`1381`	`1382`	`});`
`1382`	`1383`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e14b61f

File tree

4 files changed

4 files changed

`‎index.html`

`‎src/interpreter.spec.ts`

`‎src/interpreter.ts`

`‎src/interpreter.v1.spec.ts`

0 commit comments