daviddoji/example-code-2e
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lis.py: removed 'global_env' as default for 'evaluate(x, env)'

Browse Source
This commit is contained in:
Luciano Ramalho
2021-06-09 19:41:34 -03:00
parent 2338cb9d98
commit 36afc017d4
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
18-context-mngr/lispy/py3.10/lis.py
View File

@@ -139,7 +139,7 @@ def lispstr(exp: object) -> str:
################ eval ################ eval
def evaluate(x: Expression, env: Environment = global_env) -> Any: def evaluate(x: Expression, env: Environment) -> Any:
"Evaluate an expression in an environment." "Evaluate an expression in an environment."
match x: match x:
case str(): # variable reference case str(): # variable reference

21
18-context-mngr/lispy/py3.10/lis_test.py
View File

@@ -4,6 +4,9 @@ from pytest import mark, fixture
from lis import parse, evaluate, Expression, Environment, standard_env from lis import parse, evaluate, Expression, Environment, standard_env
# Norvig's tests are not isolated: they assume the
# same environment from first to last test.
ENV_FOR_FIRST_TEST = standard_env()
@mark.parametrize( 'source, expected', [ @mark.parametrize( 'source, expected', [
("(quote (testing 1 (2.0) -3.14e159))", ['testing', 1, [2.0], -3.14e159]), ("(quote (testing 1 (2.0) -3.14e159))", ['testing', 1, [2.0], -3.14e159]),
@@ -40,7 +43,7 @@ from lis import parse, evaluate, Expression, Environment, standard_env
("(riff-shuffle (riff-shuffle (riff-shuffle (list 1 2 3 4 5 6 7 8))))", [1,2,3,4,5,6,7,8]), ("(riff-shuffle (riff-shuffle (riff-shuffle (list 1 2 3 4 5 6 7 8))))", [1,2,3,4,5,6,7,8]),
]) ])
def test_evaluate(source: str, expected: Optional[Expression]) -> None: def test_evaluate(source: str, expected: Optional[Expression]) -> None:
got = evaluate(parse(source)) got = evaluate(parse(source), ENV_FOR_FIRST_TEST)
assert got == expected assert got == expected
@@ -58,31 +61,31 @@ def test_evaluate_variable() -> None:
assert got == expected assert got == expected
def test_evaluate_literal() -> None: def test_evaluate_literal(std_env: Environment) -> None:
source = '3.3' source = '3.3'
expected = 3.3 expected = 3.3
got = evaluate(parse(source)) got = evaluate(parse(source), std_env)
assert got == expected assert got == expected
def test_evaluate_quote() -> None: def test_evaluate_quote(std_env: Environment) -> None:
source = '(quote (1.1 is not 1))' source = '(quote (1.1 is not 1))'
expected = [1.1, 'is', 'not', 1] expected = [1.1, 'is', 'not', 1]
got = evaluate(parse(source)) got = evaluate(parse(source), std_env)
assert got == expected assert got == expected
def test_evaluate_if_true() -> None: def test_evaluate_if_true(std_env: Environment) -> None:
source = '(if 1 10 no-such-thing)' source = '(if 1 10 no-such-thing)'
expected = 10 expected = 10
got = evaluate(parse(source)) got = evaluate(parse(source), std_env)
assert got == expected assert got == expected
def test_evaluate_if_false() -> None: def test_evaluate_if_false(std_env: Environment) -> None:
source = '(if 0 no-such-thing 20)' source = '(if 0 no-such-thing 20)'
expected = 20 expected = 20
got = evaluate(parse(source)) got = evaluate(parse(source), std_env)
assert got == expected assert got == expected

2
18-context-mngr/lispy/py3.9/lis.py
View File

@@ -138,7 +138,7 @@ def lispstr(exp: object) -> str:
################ eval ################ eval
def evaluate(x: Expression, env: Environment = global_env) -> Any: def evaluate(x: Expression, env: Environment) -> Any:
"Evaluate an expression in an environment." "Evaluate an expression in an environment."
if isinstance(x, str): # variable reference if isinstance(x, str): # variable reference
return env[x] return env[x]

21
18-context-mngr/lispy/py3.9/lis_test.py
View File

@@ -4,6 +4,9 @@ from pytest import mark, fixture
from lis import parse, evaluate, Expression, Environment, standard_env from lis import parse, evaluate, Expression, Environment, standard_env
# Norvig's tests are not isolated: they assume the
# same environment from first to last test.
ENV_FOR_FIRST_TEST = standard_env()
@mark.parametrize( 'source, expected', [ @mark.parametrize( 'source, expected', [
("(quote (testing 1 (2.0) -3.14e159))", ['testing', 1, [2.0], -3.14e159]), ("(quote (testing 1 (2.0) -3.14e159))", ['testing', 1, [2.0], -3.14e159]),
@@ -40,7 +43,7 @@ from lis import parse, evaluate, Expression, Environment, standard_env
("(riff-shuffle (riff-shuffle (riff-shuffle (list 1 2 3 4 5 6 7 8))))", [1,2,3,4,5,6,7,8]), ("(riff-shuffle (riff-shuffle (riff-shuffle (list 1 2 3 4 5 6 7 8))))", [1,2,3,4,5,6,7,8]),
]) ])
def test_evaluate(source: str, expected: Optional[Expression]) -> None: def test_evaluate(source: str, expected: Optional[Expression]) -> None:
got = evaluate(parse(source)) got = evaluate(parse(source), ENV_FOR_FIRST_TEST)
assert got == expected assert got == expected
@@ -58,31 +61,31 @@ def test_evaluate_variable() -> None:
assert got == expected assert got == expected
def test_evaluate_literal() -> None: def test_evaluate_literal(std_env: Environment) -> None:
source = '3.3' source = '3.3'
expected = 3.3 expected = 3.3
got = evaluate(parse(source)) got = evaluate(parse(source), std_env)
assert got == expected assert got == expected
def test_evaluate_quote() -> None: def test_evaluate_quote(std_env: Environment) -> None:
source = '(quote (1.1 is not 1))' source = '(quote (1.1 is not 1))'
expected = [1.1, 'is', 'not', 1] expected = [1.1, 'is', 'not', 1]
got = evaluate(parse(source)) got = evaluate(parse(source), std_env)
assert got == expected assert got == expected
def test_evaluate_if_true() -> None: def test_evaluate_if_true(std_env: Environment) -> None:
source = '(if 1 10 no-such-thing)' source = '(if 1 10 no-such-thing)'
expected = 10 expected = 10
got = evaluate(parse(source)) got = evaluate(parse(source), std_env)
assert got == expected assert got == expected
def test_evaluate_if_false() -> None: def test_evaluate_if_false(std_env: Environment) -> None:
source = '(if 0 no-such-thing 20)' source = '(if 0 no-such-thing 20)'
expected = 20 expected = 20
got = evaluate(parse(source)) got = evaluate(parse(source), std_env)
assert got == expected assert got == expected