Jasinta Changeset - 18037ac0f6b4

Changeset - 18037ac0f6b4

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Laman - 2 years ago 2023-01-01 21:04:50

wrapped numbers in an object

3 files changed with 23 insertions and 12 deletions:

src/jasinta.py

src/std.py

tests/test_jasinta.py

0 comments (0 inline, 0 general)

src/jasinta.py

➞

Show inline comments

 from std import lib as stdlib
+from std import lib as stdlib, Number
 class Undefined:
 	pass
 def evaluate(node, context):
 	if node is None:
 		return None
 	node_type = node["type"]
 	# retrieve an already existing object from the context
 	if node_type == "Identifier":
 		for ctx in reversed(context):
 			if node["name"] in ctx:
 				return ctx[node["name"]]
 		return Undefined
 	# create a new object
 	cls = node_index[node_type]
 	obj = cls(node)
 	return obj.eval(context)
 class Program:
@@ @@ -66,13 +68,13 @@ class BinaryExpression: @@
 	def eval(self, context):
 		left = evaluate(self.node["left"], context)
 		right = evaluate(self.node["right"], context)
 		# in fact this doesn't follow JavaScript "+" semantics
 		if self.node["operator"] == "+":
 			return left+right
+			return Number(left.val+right.val)
 		else:
 			raise NotImplementedError
 class EmptyStatement:
 	def __init__(self, node):
@@ @@ -107,13 +109,21 @@ class VariableDeclarator: @@
 class Literal:
 	def __init__(self, node):
 		self.node = node
 	def eval(self, context):
 		return self.node["value"]
 		val = self.node["value"]
 		if isinstance(val, float):
 			if int(val) == val:
 				return Number(int(val))
 			else:
 				return Number(val)
 		else:
 			raise NotImplementedError
 node_index = {cls.__name__: cls for cls in [
 	Program, ExpressionStatement, CallExpression, MemberExpression, EmptyStatement, BinaryExpression,
 	VariableDeclaration, VariableDeclarator, Literal
 ]}

src/std.py

➞

Show inline comments

 class Number:
 	def __init__(self, x):
 		self.val = x
 lib = {
 	"document": {"write": print}
+	"document": {"write": lambda x: print(x.val)}
+}

tests/test_jasinta.py

➞

Show inline comments

 from unittest import TestCase
-from unittest.mock import MagicMock
+from unittest.mock import patch
 from pyjsparser import parse
 from jasinta import interpret
 import std as jasinta_std
 class TestBasicAddition(TestCase):
 	def setUp(self):
 		self.mock_print = MagicMock()
 		jasinta_std.lib["document"]["write"] = self.mock_print
 	def test_interpret(self):
 	@patch("builtins.print")
 	def test_interpret(self, mock_print):
 		s = """var a=3;
 var b=1;
 var c=a+b;
 document.write(c);"""
 		interpret(parse(s))
-		self.mock_print.assert_called_with(4.0)
 		mock_print.assert_called_with(4)

0 comments (0 inline, 0 general)