Commit fe5130f

committed

fixed 'return -1' bug #40

1 parent 865d452 commit fe5130fCopy full SHA for fe5130f

File tree

+26

-3

lines changed

+26

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jspython-interpreter",`
`3`		`- "version": "2.1.15",`
	`3`	`+ "version": "2.1.16",`
`4`	`4`	`"description": "JSPython is a javascript implementation of Python language that runs within web browser or NodeJS environment",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"python",`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export class Evaluator {`
`60`	`60`	`}`
`61`	`61`	`if (node.type === 'import') {`
`62`	`62`	`// we can't use it here, because loader has to be promise`
`63`		- throw new Error(`Import is not support with 'eval'. Use method 'evalAsync' instead`);
	`63`	+ throw new Error(`Import is not supported with 'eval'. Use method 'evalAsync' instead`);
`64`	`64`	`}`
`65`	`65`	`try {`
`66`	`66`	`lastResult = this.evalNode(node, blockContext);`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ describe('Interpreter', () => {`
`133`	`133`	`});`
`134`	`134`
`135`	`135`	`it('json ignore last comma', () => {`
`136`		`- expect(JSON.stringify(e.eval('[{a:1,}, {a:2},]'))).toBe(JSON.stringify([{ a: 1, }, { a: 2 },]));`
	`136`	`+ expect(JSON.stringify(e.eval('[{a:1,}, {a:2},]'))).toBe(JSON.stringify([{ a: 1 }, { a: 2 }]));`
`137`	`137`	`});`
`138`	`138`
`139`	`139`	`[{ a: 1 }, { a: 2 }];`
`@@ -995,5 +995,20 @@ describe('Interpreter', () => {`
`995`	`995`	`expect(interpreter.eval(script)).toBe(11);`
`996`	`996`	`});`
`997`	`997`
	`998`	`+ it('return -1', async () => {`
	`999`	`+ const interpreter = Interpreter.create();`
	`1000`	`+`
	`1001`	+ const script = `return -1`;
	`1002`	`+ expect(await interpreter.evalAsync(script)).toBe(-1);`
	`1003`	`+ expect(interpreter.eval(script)).toBe(-1);`
	`1004`	`+ });`
	`1005`	`+`
	`1006`	`+ it('return -3.14', async () => {`
	`1007`	`+ const interpreter = Interpreter.create();`
	`1008`	`+`
	`1009`	+ const script = `return -3.14`;
	`1010`	`+ expect(await interpreter.evalAsync(script)).toBe(-3.14);`
	`1011`	`+ expect(interpreter.eval(script)).toBe(-3.14);`
	`1012`	`+ });`
`998`	`1013`	`//`
`999`	`1014`	`});`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,13 @@ describe('Tokenizer => ', () => {`
`112`	`112`	`expect(tokens[4][0]).toBe('d');`
`113`	`113`	`});`
`114`	`114`
	`115`	`+ it('return -1', async () => {`
	`116`	`+ const tokens = new Tokenizer().tokenize('return -1');`
	`117`	`+ expect(tokens.length).toBe(2);`
	`118`	`+ expect(tokens[0][0]).toBe('return');`
	`119`	`+ expect(tokens[1][0]).toBe(-1);`
	`120`	`+ });`
	`121`	`+`
`115`	`122`	`/*`
`116`	`123`	`it('3 - -2', async () => {`
`117`	`124`	`let tokens = new Tokenizer().tokenize('3 - -2')`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,7 @@ export class Tokenizer {`
`278`	`278`	`const prevToken = currentTokens.length !== 0 ? currentTokens[currentTokens.length - 1] : null;`
`279`	`279`	`return (`
`280`	`280`	`prevToken === null \|\|`
	`281`	`+ getTokenValue(prevToken) === 'return' \|\|`
`281`	`282`	`(getTokenType(prevToken) === TokenTypes.Operator && getTokenValue(prevToken) !== ')')`
`282`	`283`	`);`
`283`	`284`	`} else if (symbol === '.' && this.parseNumberOrNull(this.tokenText) !== null) {`

Comments

(0)