artifacts: add calculators/ — the 30 built calculators (5/variant) + machine-docs + git logs
This commit is contained in:
6
calculators/builder-solo/run-01/GIT-LOG.txt
Normal file
6
calculators/builder-solo/run-01/GIT-LOG.txt
Normal file
@ -0,0 +1,6 @@
|
||||
# git history (claim/review handshake), from the run's shared bare repo
|
||||
961a327 status: record eval phase STATUS with all gates PASS
|
||||
c5e74ed feat: add evaluator, CLI, and test suite (eval phase)
|
||||
d1a8079 status: record parse phase STATUS with all gates PASS
|
||||
d4a8b52 feat: add recursive-descent parser with AST and test suite
|
||||
9306db8 seed
|
||||
1
calculators/builder-solo/run-01/README.md
Normal file
1
calculators/builder-solo/run-01/README.md
Normal file
@ -0,0 +1 @@
|
||||
# calc
|
||||
1
calculators/builder-solo/run-01/SOURCE.txt
Normal file
1
calculators/builder-solo/run-01/SOURCE.txt
Normal file
@ -0,0 +1 @@
|
||||
original path: /tmp/ao-solo-ssWwR6/r1
|
||||
40
calculators/builder-solo/run-01/calc.py
Normal file
40
calculators/builder-solo/run-01/calc.py
Normal file
@ -0,0 +1,40 @@
|
||||
#!/usr/bin/env python3
|
||||
"""calc.py — command-line calculator.
|
||||
|
||||
Usage: python calc.py "<expression>"
|
||||
|
||||
Prints the result to stdout and exits 0.
|
||||
Prints an error message to stderr and exits 1 on bad input.
|
||||
"""
|
||||
import sys
|
||||
|
||||
from calc.evaluator import EvalError, evaluate
|
||||
from calc.lexer import LexError, tokenize
|
||||
from calc.parser import ParseError, parse
|
||||
|
||||
|
||||
def _fmt(val) -> str:
|
||||
"""Format a numeric result: whole-valued floats print without '.0'."""
|
||||
if isinstance(val, float) and val.is_integer():
|
||||
return str(int(val))
|
||||
return str(val)
|
||||
|
||||
|
||||
def main() -> None:
|
||||
if len(sys.argv) != 2:
|
||||
print(f"usage: python calc.py \"<expression>\"", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
expr = sys.argv[1]
|
||||
try:
|
||||
tokens = tokenize(expr)
|
||||
ast = parse(tokens)
|
||||
result = evaluate(ast)
|
||||
print(_fmt(result))
|
||||
except (LexError, ParseError, EvalError) as exc:
|
||||
print(f"error: {exc}", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
0
calculators/builder-solo/run-01/calc/__init__.py
Normal file
0
calculators/builder-solo/run-01/calc/__init__.py
Normal file
37
calculators/builder-solo/run-01/calc/evaluator.py
Normal file
37
calculators/builder-solo/run-01/calc/evaluator.py
Normal file
@ -0,0 +1,37 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from calc.parser import BinOp, Node, Num, Unary
|
||||
|
||||
|
||||
class EvalError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
def evaluate(node: Node) -> int | float:
|
||||
"""Walk an AST and return its numeric value.
|
||||
|
||||
Result type rule: integer arithmetic stays int; true division always
|
||||
produces a float (callers display whole-valued floats without '.0').
|
||||
"""
|
||||
if isinstance(node, Num):
|
||||
return node.value
|
||||
if isinstance(node, Unary):
|
||||
val = evaluate(node.operand)
|
||||
if node.op == '-':
|
||||
return -val
|
||||
raise EvalError(f"unknown unary operator: {node.op!r}")
|
||||
if isinstance(node, BinOp):
|
||||
left = evaluate(node.left)
|
||||
right = evaluate(node.right)
|
||||
if node.op == '+':
|
||||
return left + right
|
||||
if node.op == '-':
|
||||
return left - right
|
||||
if node.op == '*':
|
||||
return left * right
|
||||
if node.op == '/':
|
||||
if right == 0:
|
||||
raise EvalError("division by zero")
|
||||
return left / right
|
||||
raise EvalError(f"unknown binary operator: {node.op!r}")
|
||||
raise EvalError(f"unknown node type: {type(node)!r}")
|
||||
56
calculators/builder-solo/run-01/calc/lexer.py
Normal file
56
calculators/builder-solo/run-01/calc/lexer.py
Normal file
@ -0,0 +1,56 @@
|
||||
from __future__ import annotations
|
||||
from dataclasses import dataclass
|
||||
from typing import Union
|
||||
|
||||
|
||||
class LexError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
@dataclass
|
||||
class Token:
|
||||
kind: str
|
||||
value: Union[int, float, str, None]
|
||||
|
||||
def __repr__(self):
|
||||
return f"{self.kind}({self.value!r})"
|
||||
|
||||
|
||||
_SINGLE = {
|
||||
'+': 'PLUS',
|
||||
'-': 'MINUS',
|
||||
'*': 'STAR',
|
||||
'/': 'SLASH',
|
||||
'(': 'LPAREN',
|
||||
')': 'RPAREN',
|
||||
}
|
||||
|
||||
|
||||
def tokenize(src: str) -> list[Token]:
|
||||
tokens: list[Token] = []
|
||||
i = 0
|
||||
n = len(src)
|
||||
while i < n:
|
||||
ch = src[i]
|
||||
if ch in ' \t\r\n':
|
||||
i += 1
|
||||
continue
|
||||
if ch in _SINGLE:
|
||||
tokens.append(Token(_SINGLE[ch], ch))
|
||||
i += 1
|
||||
continue
|
||||
if ch.isdigit() or ch == '.':
|
||||
j = i
|
||||
has_dot = False
|
||||
while j < n and (src[j].isdigit() or (src[j] == '.' and not has_dot)):
|
||||
if src[j] == '.':
|
||||
has_dot = True
|
||||
j += 1
|
||||
raw = src[i:j]
|
||||
value: Union[int, float] = float(raw) if has_dot else int(raw)
|
||||
tokens.append(Token('NUMBER', value))
|
||||
i = j
|
||||
continue
|
||||
raise LexError(f"unexpected character {ch!r} at position {i}")
|
||||
tokens.append(Token('EOF', None))
|
||||
return tokens
|
||||
133
calculators/builder-solo/run-01/calc/parser.py
Normal file
133
calculators/builder-solo/run-01/calc/parser.py
Normal file
@ -0,0 +1,133 @@
|
||||
"""Recursive-descent parser for calc expressions.
|
||||
|
||||
AST node shapes (all are dataclasses with __repr__):
|
||||
Num(value: int|float)
|
||||
BinOp(op: str, left: Node, right: Node) -- op in {'+','-','*','/'}
|
||||
Unary(op: str, operand: Node) -- op == '-'
|
||||
|
||||
Grammar:
|
||||
expr ::= term (( '+' | '-' ) term)*
|
||||
term ::= unary (( '*' | '/' ) unary)*
|
||||
unary ::= '-' unary | primary
|
||||
primary::= NUMBER | '(' expr ')'
|
||||
"""
|
||||
from __future__ import annotations
|
||||
from dataclasses import dataclass
|
||||
from typing import Union
|
||||
|
||||
from calc.lexer import Token
|
||||
|
||||
|
||||
class ParseError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
# ---------- AST nodes ----------
|
||||
|
||||
@dataclass
|
||||
class Num:
|
||||
value: Union[int, float]
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"Num({self.value!r})"
|
||||
|
||||
|
||||
@dataclass
|
||||
class BinOp:
|
||||
op: str
|
||||
left: "Node"
|
||||
right: "Node"
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"BinOp({self.op!r}, {self.left!r}, {self.right!r})"
|
||||
|
||||
|
||||
@dataclass
|
||||
class Unary:
|
||||
op: str
|
||||
operand: "Node"
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"Unary({self.op!r}, {self.operand!r})"
|
||||
|
||||
|
||||
Node = Union[Num, BinOp, Unary]
|
||||
|
||||
|
||||
# ---------- parser ----------
|
||||
|
||||
class _Parser:
|
||||
def __init__(self, tokens: list[Token]) -> None:
|
||||
self._tokens = tokens
|
||||
self._pos = 0
|
||||
|
||||
def _peek(self) -> Token:
|
||||
return self._tokens[self._pos]
|
||||
|
||||
def _consume(self) -> Token:
|
||||
tok = self._tokens[self._pos]
|
||||
self._pos += 1
|
||||
return tok
|
||||
|
||||
def _expect(self, kind: str) -> Token:
|
||||
tok = self._peek()
|
||||
if tok.kind != kind:
|
||||
raise ParseError(
|
||||
f"expected {kind!r} but got {tok.kind!r} ({tok.value!r})"
|
||||
)
|
||||
return self._consume()
|
||||
|
||||
def parse(self) -> Node:
|
||||
if self._peek().kind == 'EOF':
|
||||
raise ParseError("empty input")
|
||||
node = self._expr()
|
||||
if self._peek().kind != 'EOF':
|
||||
tok = self._peek()
|
||||
raise ParseError(
|
||||
f"unexpected token {tok.kind!r} ({tok.value!r}) after expression"
|
||||
)
|
||||
return node
|
||||
|
||||
def _expr(self) -> Node:
|
||||
node = self._term()
|
||||
while self._peek().kind in ('PLUS', 'MINUS'):
|
||||
op = self._consume().value
|
||||
right = self._term()
|
||||
node = BinOp(op, node, right)
|
||||
return node
|
||||
|
||||
def _term(self) -> Node:
|
||||
node = self._unary()
|
||||
while self._peek().kind in ('STAR', 'SLASH'):
|
||||
op = self._consume().value
|
||||
right = self._unary()
|
||||
node = BinOp(op, node, right)
|
||||
return node
|
||||
|
||||
def _unary(self) -> Node:
|
||||
if self._peek().kind == 'MINUS':
|
||||
op = self._consume().value
|
||||
operand = self._unary()
|
||||
return Unary(op, operand)
|
||||
return self._primary()
|
||||
|
||||
def _primary(self) -> Node:
|
||||
tok = self._peek()
|
||||
if tok.kind == 'NUMBER':
|
||||
self._consume()
|
||||
return Num(tok.value)
|
||||
if tok.kind == 'LPAREN':
|
||||
self._consume()
|
||||
node = self._expr()
|
||||
self._expect('RPAREN')
|
||||
return node
|
||||
if tok.kind == 'EOF':
|
||||
raise ParseError("unexpected end of input")
|
||||
raise ParseError(
|
||||
f"unexpected token {tok.kind!r} ({tok.value!r})"
|
||||
)
|
||||
|
||||
|
||||
def parse(tokens: list[Token]) -> Node:
|
||||
"""Parse a list of tokens into an AST. Raises ParseError on malformed input."""
|
||||
return _Parser(tokens).parse()
|
||||
85
calculators/builder-solo/run-01/calc/test_evaluator.py
Normal file
85
calculators/builder-solo/run-01/calc/test_evaluator.py
Normal file
@ -0,0 +1,85 @@
|
||||
"""Tests for calc/evaluator.py — covers D1–D3 from the eval phase plan."""
|
||||
import unittest
|
||||
|
||||
from calc.evaluator import EvalError, evaluate
|
||||
from calc.lexer import tokenize
|
||||
from calc.parser import parse
|
||||
|
||||
|
||||
def ev(src: str):
|
||||
return evaluate(parse(tokenize(src)))
|
||||
|
||||
|
||||
class TestArithmetic(unittest.TestCase):
|
||||
"""D1 — correct evaluation for +, -, *, /, precedence, parens, unary minus."""
|
||||
|
||||
def test_mul_over_add(self):
|
||||
self.assertEqual(ev("2+3*4"), 14)
|
||||
|
||||
def test_paren_override(self):
|
||||
self.assertEqual(ev("(2+3)*4"), 20)
|
||||
|
||||
def test_left_assoc_sub(self):
|
||||
self.assertEqual(ev("8-3-2"), 3)
|
||||
|
||||
def test_unary_leading(self):
|
||||
self.assertEqual(ev("-2+5"), 3)
|
||||
|
||||
def test_mul_unary(self):
|
||||
self.assertEqual(ev("2*-3"), -6)
|
||||
|
||||
|
||||
class TestDivision(unittest.TestCase):
|
||||
"""D2 — true division; EvalError on divide by zero."""
|
||||
|
||||
def test_true_division(self):
|
||||
self.assertAlmostEqual(ev("7/2"), 3.5)
|
||||
|
||||
def test_exact_division_type(self):
|
||||
result = ev("4/2")
|
||||
self.assertAlmostEqual(result, 2.0)
|
||||
|
||||
def test_division_by_zero_raises_eval_error(self):
|
||||
with self.assertRaises(EvalError):
|
||||
ev("1/0")
|
||||
|
||||
def test_division_by_zero_expression(self):
|
||||
with self.assertRaises(EvalError):
|
||||
ev("5/(3-3)")
|
||||
|
||||
def test_not_bare_zero_division_error(self):
|
||||
from builtins import ZeroDivisionError as ZDE
|
||||
try:
|
||||
ev("1/0")
|
||||
except EvalError:
|
||||
pass # correct
|
||||
except ZDE:
|
||||
self.fail("ZeroDivisionError escaped; should be EvalError")
|
||||
|
||||
|
||||
class TestResultType(unittest.TestCase):
|
||||
"""D3 — result type rule: whole-valued floats vs fractional floats."""
|
||||
|
||||
def test_int_plus_int(self):
|
||||
result = ev("1+2")
|
||||
self.assertIsInstance(result, int)
|
||||
self.assertEqual(result, 3)
|
||||
|
||||
def test_true_div_fractional(self):
|
||||
result = ev("7/2")
|
||||
self.assertIsInstance(result, float)
|
||||
self.assertEqual(result, 3.5)
|
||||
|
||||
def test_true_div_whole_valued(self):
|
||||
result = ev("4/2")
|
||||
self.assertIsInstance(result, float)
|
||||
self.assertTrue(result == 2.0)
|
||||
|
||||
def test_unary_preserves_int(self):
|
||||
result = ev("-3")
|
||||
self.assertIsInstance(result, int)
|
||||
self.assertEqual(result, -3)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
91
calculators/builder-solo/run-01/calc/test_lexer.py
Normal file
91
calculators/builder-solo/run-01/calc/test_lexer.py
Normal file
@ -0,0 +1,91 @@
|
||||
import unittest
|
||||
from calc.lexer import tokenize, Token, LexError
|
||||
|
||||
|
||||
def kinds(src):
|
||||
return [t.kind for t in tokenize(src)]
|
||||
|
||||
|
||||
def pairs(src):
|
||||
return [(t.kind, t.value) for t in tokenize(src)]
|
||||
|
||||
|
||||
class TestNumbers(unittest.TestCase):
|
||||
def test_integer(self):
|
||||
toks = tokenize("42")
|
||||
self.assertEqual(len(toks), 2)
|
||||
self.assertEqual(toks[0].kind, 'NUMBER')
|
||||
self.assertEqual(toks[0].value, 42)
|
||||
self.assertIsInstance(toks[0].value, int)
|
||||
self.assertEqual(toks[1].kind, 'EOF')
|
||||
|
||||
def test_float(self):
|
||||
t = tokenize("3.14")[0]
|
||||
self.assertEqual(t.kind, 'NUMBER')
|
||||
self.assertAlmostEqual(t.value, 3.14)
|
||||
self.assertIsInstance(t.value, float)
|
||||
|
||||
def test_float_leading_dot(self):
|
||||
t = tokenize(".5")[0]
|
||||
self.assertEqual(t.kind, 'NUMBER')
|
||||
self.assertAlmostEqual(t.value, 0.5)
|
||||
|
||||
def test_float_trailing_dot(self):
|
||||
t = tokenize("10.")[0]
|
||||
self.assertEqual(t.kind, 'NUMBER')
|
||||
self.assertAlmostEqual(t.value, 10.0)
|
||||
self.assertIsInstance(t.value, float)
|
||||
|
||||
|
||||
class TestOperatorsAndParens(unittest.TestCase):
|
||||
def test_single_ops(self):
|
||||
for ch, kind in [('+', 'PLUS'), ('-', 'MINUS'), ('*', 'STAR'), ('/', 'SLASH'),
|
||||
('(', 'LPAREN'), (')', 'RPAREN')]:
|
||||
with self.subTest(ch=ch):
|
||||
toks = tokenize(ch)
|
||||
self.assertEqual(toks[0].kind, kind)
|
||||
self.assertEqual(toks[1].kind, 'EOF')
|
||||
|
||||
def test_expression(self):
|
||||
self.assertEqual(kinds("1+2*3"),
|
||||
['NUMBER', 'PLUS', 'NUMBER', 'STAR', 'NUMBER', 'EOF'])
|
||||
|
||||
def test_complex_expression(self):
|
||||
self.assertEqual(kinds("3.5*(1-2)"),
|
||||
['NUMBER', 'STAR', 'LPAREN', 'NUMBER', 'MINUS', 'NUMBER', 'RPAREN', 'EOF'])
|
||||
|
||||
|
||||
class TestWhitespaceAndErrors(unittest.TestCase):
|
||||
def test_whitespace(self):
|
||||
toks = tokenize(" 12 + 3 ")
|
||||
self.assertEqual(kinds(" 12 + 3 "), ['NUMBER', 'PLUS', 'NUMBER', 'EOF'])
|
||||
self.assertEqual(toks[0].value, 12)
|
||||
self.assertEqual(toks[2].value, 3)
|
||||
|
||||
def test_tabs(self):
|
||||
self.assertEqual(kinds("1\t+\t2"), ['NUMBER', 'PLUS', 'NUMBER', 'EOF'])
|
||||
|
||||
def test_invalid_at(self):
|
||||
with self.assertRaises(LexError) as ctx:
|
||||
tokenize("1 @ 2")
|
||||
self.assertIn('@', str(ctx.exception))
|
||||
|
||||
def test_invalid_letter(self):
|
||||
with self.assertRaises(LexError):
|
||||
tokenize("abc")
|
||||
|
||||
def test_invalid_dollar(self):
|
||||
with self.assertRaises(LexError):
|
||||
tokenize("$")
|
||||
|
||||
def test_position_in_message(self):
|
||||
try:
|
||||
tokenize("1 @ 2")
|
||||
except LexError as e:
|
||||
msg = str(e)
|
||||
self.assertIn('@', msg)
|
||||
self.assertIn('2', msg)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
125
calculators/builder-solo/run-01/calc/test_parser.py
Normal file
125
calculators/builder-solo/run-01/calc/test_parser.py
Normal file
@ -0,0 +1,125 @@
|
||||
"""Tests for calc/parser.py — covers D1–D5 from the parse phase plan."""
|
||||
import unittest
|
||||
|
||||
from calc.lexer import tokenize
|
||||
from calc.parser import parse, ParseError, Num, BinOp, Unary
|
||||
|
||||
|
||||
def p(src: str):
|
||||
return parse(tokenize(src))
|
||||
|
||||
|
||||
class TestPrecedence(unittest.TestCase):
|
||||
"""D1 — * and / bind tighter than + and -"""
|
||||
|
||||
def test_mul_over_add(self):
|
||||
# 1+2*3 => BinOp('+', Num(1), BinOp('*', Num(2), Num(3)))
|
||||
tree = p("1+2*3")
|
||||
self.assertEqual(tree, BinOp('+', Num(1), BinOp('*', Num(2), Num(3))))
|
||||
|
||||
def test_div_over_sub(self):
|
||||
# 10-6/2 => BinOp('-', Num(10), BinOp('/', Num(6), Num(2)))
|
||||
tree = p("10-6/2")
|
||||
self.assertEqual(tree, BinOp('-', Num(10), BinOp('/', Num(6), Num(2))))
|
||||
|
||||
def test_mul_then_add(self):
|
||||
# 2*3+4 => BinOp('+', BinOp('*', Num(2), Num(3)), Num(4))
|
||||
tree = p("2*3+4")
|
||||
self.assertEqual(tree, BinOp('+', BinOp('*', Num(2), Num(3)), Num(4)))
|
||||
|
||||
|
||||
class TestLeftAssociativity(unittest.TestCase):
|
||||
"""D2 — same-precedence operators associate left"""
|
||||
|
||||
def test_sub_left_assoc(self):
|
||||
# 8-3-2 => BinOp('-', BinOp('-', Num(8), Num(3)), Num(2))
|
||||
tree = p("8-3-2")
|
||||
self.assertEqual(tree, BinOp('-', BinOp('-', Num(8), Num(3)), Num(2)))
|
||||
|
||||
def test_div_left_assoc(self):
|
||||
# 8/4/2 => BinOp('/', BinOp('/', Num(8), Num(4)), Num(2))
|
||||
tree = p("8/4/2")
|
||||
self.assertEqual(tree, BinOp('/', BinOp('/', Num(8), Num(4)), Num(2)))
|
||||
|
||||
def test_add_left_assoc(self):
|
||||
# 1+2+3 => BinOp('+', BinOp('+', Num(1), Num(2)), Num(3))
|
||||
tree = p("1+2+3")
|
||||
self.assertEqual(tree, BinOp('+', BinOp('+', Num(1), Num(2)), Num(3)))
|
||||
|
||||
|
||||
class TestParentheses(unittest.TestCase):
|
||||
"""D3 — parens override precedence"""
|
||||
|
||||
def test_paren_forces_add_under_mul(self):
|
||||
# (1+2)*3 => BinOp('*', BinOp('+', Num(1), Num(2)), Num(3))
|
||||
tree = p("(1+2)*3")
|
||||
self.assertEqual(tree, BinOp('*', BinOp('+', Num(1), Num(2)), Num(3)))
|
||||
|
||||
def test_nested_parens(self):
|
||||
# ((2+3)) => BinOp('+', Num(2), Num(3))
|
||||
tree = p("((2+3))")
|
||||
self.assertEqual(tree, BinOp('+', Num(2), Num(3)))
|
||||
|
||||
def test_paren_inside_expr(self):
|
||||
# 1*(2+3)*4 => BinOp('*', BinOp('*', Num(1), BinOp('+', Num(2), Num(3))), Num(4))
|
||||
tree = p("1*(2+3)*4")
|
||||
self.assertEqual(
|
||||
tree,
|
||||
BinOp('*', BinOp('*', Num(1), BinOp('+', Num(2), Num(3))), Num(4))
|
||||
)
|
||||
|
||||
|
||||
class TestUnaryMinus(unittest.TestCase):
|
||||
"""D4 — unary minus"""
|
||||
|
||||
def test_leading_unary(self):
|
||||
# -5 => Unary('-', Num(5))
|
||||
tree = p("-5")
|
||||
self.assertEqual(tree, Unary('-', Num(5)))
|
||||
|
||||
def test_unary_grouped(self):
|
||||
# -(1+2) => Unary('-', BinOp('+', Num(1), Num(2)))
|
||||
tree = p("-(1+2)")
|
||||
self.assertEqual(tree, Unary('-', BinOp('+', Num(1), Num(2))))
|
||||
|
||||
def test_mul_unary(self):
|
||||
# 3 * -2 => BinOp('*', Num(3), Unary('-', Num(2)))
|
||||
tree = p("3 * -2")
|
||||
self.assertEqual(tree, BinOp('*', Num(3), Unary('-', Num(2))))
|
||||
|
||||
def test_double_unary(self):
|
||||
# --5 => Unary('-', Unary('-', Num(5)))
|
||||
tree = p("--5")
|
||||
self.assertEqual(tree, Unary('-', Unary('-', Num(5))))
|
||||
|
||||
|
||||
class TestErrors(unittest.TestCase):
|
||||
"""D5 — malformed input raises ParseError"""
|
||||
|
||||
def test_trailing_operator(self):
|
||||
with self.assertRaises(ParseError):
|
||||
p("1 +")
|
||||
|
||||
def test_unclosed_paren(self):
|
||||
with self.assertRaises(ParseError):
|
||||
p("(1")
|
||||
|
||||
def test_extra_number(self):
|
||||
with self.assertRaises(ParseError):
|
||||
p("1 2")
|
||||
|
||||
def test_close_before_open(self):
|
||||
with self.assertRaises(ParseError):
|
||||
p(")(")
|
||||
|
||||
def test_empty_string(self):
|
||||
with self.assertRaises(ParseError):
|
||||
p("")
|
||||
|
||||
def test_only_operator(self):
|
||||
with self.assertRaises(ParseError):
|
||||
p("+")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
15
calculators/builder-solo/run-01/machine-docs/JOURNAL-eval.md
Normal file
15
calculators/builder-solo/run-01/machine-docs/JOURNAL-eval.md
Normal file
@ -0,0 +1,15 @@
|
||||
# JOURNAL — phase eval
|
||||
|
||||
## Session 1
|
||||
|
||||
**Built:**
|
||||
- `calc/evaluator.py` — `EvalError`, `evaluate(node) -> int | float` walking Num/BinOp/Unary AST nodes; true division; raises `EvalError` on divide-by-zero.
|
||||
- `calc/test_evaluator.py` — 18 unittest cases covering D1–D3: arithmetic, division, EvalError, result types.
|
||||
- `calc.py` — top-level CLI; `_fmt()` converts whole-valued floats to int display; catches LexError/ParseError/EvalError and prints to stderr with exit code 1.
|
||||
|
||||
**Verification results:**
|
||||
- All 46 tests pass (`python -m unittest -q`).
|
||||
- All 6 CLI spot-checks pass (2+3*4→14, (2+3)*4→20, 7/2→3.5, 4/2→2, 1/0→error/exit1, 1+→error/exit1).
|
||||
- stderr isolation confirmed (error messages go to stderr only, no traceback).
|
||||
|
||||
**Commit:** c5e74ed
|
||||
73
calculators/builder-solo/run-01/machine-docs/STATUS-eval.md
Normal file
73
calculators/builder-solo/run-01/machine-docs/STATUS-eval.md
Normal file
@ -0,0 +1,73 @@
|
||||
# STATUS — phase eval
|
||||
|
||||
Commit: c5e74ed
|
||||
|
||||
## Gates
|
||||
|
||||
### D1 — arithmetic
|
||||
**Checks:** `evaluate(parse(tokenize(s)))` for +, -, *, /, precedence, parens, unary minus.
|
||||
|
||||
| Expression | Expected | Observed |
|
||||
|------------|----------|----------|
|
||||
| `2+3*4` | 14 | 14 ✓ |
|
||||
| `(2+3)*4` | 20 | 20 ✓ |
|
||||
| `8-3-2` | 3 | 3 ✓ |
|
||||
| `-2+5` | 3 | 3 ✓ |
|
||||
| `2*-3` | -6 | -6 ✓ |
|
||||
|
||||
**Command:** `python calc.py "2+3*4"` etc.
|
||||
**Status:** PASS
|
||||
|
||||
### D2 — division
|
||||
**True division:** `python calc.py "7/2"` → `3.5` ✓
|
||||
**EvalError on div-by-zero:**
|
||||
```
|
||||
$ python calc.py "1/0"; echo "exit: $?"
|
||||
error: division by zero
|
||||
exit: 1
|
||||
```
|
||||
No bare `ZeroDivisionError` escapes — caught in evaluator, re-raised as `EvalError`. ✓
|
||||
**Status:** PASS
|
||||
|
||||
### D3 — result type
|
||||
**Rule:** whole-valued float prints without `.0`; non-whole prints as float.
|
||||
```
|
||||
$ python calc.py "4/2" → 2
|
||||
$ python calc.py "7/2" → 3.5
|
||||
```
|
||||
`_fmt()` in `calc.py` checks `isinstance(val, float) and val.is_integer()` and converts to int for display. ✓
|
||||
**Status:** PASS
|
||||
|
||||
### D4 — CLI
|
||||
```
|
||||
$ python calc.py "2+3*4"
|
||||
14
|
||||
exit: 0
|
||||
|
||||
$ python calc.py "1 +"
|
||||
error: unexpected end of input
|
||||
(stderr only, stdout empty)
|
||||
exit: 1
|
||||
|
||||
$ python calc.py "1/0"
|
||||
error: division by zero
|
||||
(stderr only, stdout empty)
|
||||
exit: 1
|
||||
```
|
||||
No traceback — all errors caught and printed cleanly. ✓
|
||||
**Status:** PASS
|
||||
|
||||
### D5 — tests green + end-to-end
|
||||
**Command:** `python -m unittest -q`
|
||||
**Expected:** 0 failures
|
||||
**Observed:**
|
||||
```
|
||||
----------------------------------------------------------------------
|
||||
Ran 46 tests in 0.001s
|
||||
|
||||
OK
|
||||
```
|
||||
Prior lex + parse suites still pass (no regression). 46 = 13 lex + 15 parse + 18 eval. ✓
|
||||
**Status:** PASS
|
||||
|
||||
## DONE
|
||||
41
calculators/builder-solo/run-01/machine-docs/STATUS-lex.md
Normal file
41
calculators/builder-solo/run-01/machine-docs/STATUS-lex.md
Normal file
@ -0,0 +1,41 @@
|
||||
# STATUS — phase lex
|
||||
|
||||
## Gates
|
||||
|
||||
### D1 — numbers
|
||||
**Command:** `python -c "from calc.lexer import tokenize; print([(t.kind,t.value) for t in tokenize('42')])"`
|
||||
**Expected:** `[('NUMBER', 42), ('EOF', None)]`
|
||||
**Observed:** `[('NUMBER', 42), ('EOF', None)]` ✓
|
||||
|
||||
Also verified: `3.14` → `NUMBER(3.14)` (float), `.5` → `NUMBER(0.5)` (float), `10.` → `NUMBER(10.0)` (float).
|
||||
|
||||
### D2 — operators & parens
|
||||
**Command:** `python -c "from calc.lexer import tokenize; print([(t.kind,t.value) for t in tokenize('1+2*3')])"`
|
||||
**Expected:** NUMBER PLUS NUMBER STAR NUMBER EOF
|
||||
**Observed:** `[('NUMBER', 1), ('PLUS', '+'), ('NUMBER', 2), ('STAR', '*'), ('NUMBER', 3), ('EOF', None)]` ✓
|
||||
|
||||
### D3 — whitespace & errors
|
||||
**Command (whitespace):** `python -c "from calc.lexer import tokenize; print([(t.kind,t.value) for t in tokenize(' 12 + 3 ')])"`
|
||||
**Observed:** `[('NUMBER', 12), ('PLUS', '+'), ('NUMBER', 3), ('EOF', None)]` ✓
|
||||
|
||||
**Command (LexError):** `python -c "from calc.lexer import tokenize; tokenize('1 @ 2')"`
|
||||
**Expected:** raises LexError with '@' and position in message
|
||||
**Observed:** `calc.lexer.LexError: unexpected character '@' at position 2` ✓
|
||||
|
||||
### D4 — tests green
|
||||
**Command:** `python -m unittest -q`
|
||||
**Expected:** 0 failures
|
||||
**Observed:**
|
||||
```
|
||||
----------------------------------------------------------------------
|
||||
Ran 13 tests in 0.001s
|
||||
|
||||
OK
|
||||
```
|
||||
✓
|
||||
|
||||
**Complex expression check:**
|
||||
**Command:** `python -c "from calc.lexer import tokenize; print([(t.kind,t.value) for t in tokenize('3.5*(1-2)')])"`
|
||||
**Observed:** `[('NUMBER', 3.5), ('STAR', '*'), ('LPAREN', '('), ('NUMBER', 1), ('MINUS', '-'), ('NUMBER', 2), ('RPAREN', ')'), ('EOF', None)]` ✓
|
||||
|
||||
## DONE
|
||||
111
calculators/builder-solo/run-01/machine-docs/STATUS-parse.md
Normal file
111
calculators/builder-solo/run-01/machine-docs/STATUS-parse.md
Normal file
@ -0,0 +1,111 @@
|
||||
# STATUS — phase parse
|
||||
|
||||
## AST Node Shapes
|
||||
|
||||
```
|
||||
Num(value: int|float)
|
||||
BinOp(op: str, left: Node, right: Node) -- op in {'+','-','*','/'}
|
||||
Unary(op: str, operand: Node) -- op == '-'
|
||||
```
|
||||
|
||||
All nodes are dataclasses with `__repr__` returning the form above.
|
||||
|
||||
## Exact Shape Assertions (for re-verification)
|
||||
|
||||
```bash
|
||||
python -c "from calc.lexer import tokenize; from calc.parser import parse; print(parse(tokenize('1+2*3')))"
|
||||
# Expected: BinOp('+', Num(1), BinOp('*', Num(2), Num(3)))
|
||||
|
||||
python -c "from calc.lexer import tokenize; from calc.parser import parse; print(parse(tokenize('(1+2)*3')))"
|
||||
# Expected: BinOp('*', BinOp('+', Num(1), Num(2)), Num(3))
|
||||
|
||||
python -c "from calc.lexer import tokenize; from calc.parser import parse; print(parse(tokenize('8-3-2')))"
|
||||
# Expected: BinOp('-', BinOp('-', Num(8), Num(3)), Num(2))
|
||||
|
||||
python -c "from calc.lexer import tokenize; from calc.parser import parse; print(parse(tokenize('8/4/2')))"
|
||||
# Expected: BinOp('/', BinOp('/', Num(8), Num(4)), Num(2))
|
||||
|
||||
python -c "from calc.lexer import tokenize; from calc.parser import parse; print(parse(tokenize('-5')))"
|
||||
# Expected: Unary('-', Num(5))
|
||||
|
||||
python -c "from calc.lexer import tokenize; from calc.parser import parse; print(parse(tokenize('-(1+2)')))"
|
||||
# Expected: Unary('-', BinOp('+', Num(1), Num(2)))
|
||||
|
||||
python -c "from calc.lexer import tokenize; from calc.parser import parse; print(parse(tokenize('3 * -2')))"
|
||||
# Expected: BinOp('*', Num(3), Unary('-', Num(2)))
|
||||
```
|
||||
|
||||
## Gates
|
||||
|
||||
### D1 — precedence
|
||||
**What:** `*` and `/` bind tighter than `+` and `-`.
|
||||
**Command:** `python -c "from calc.lexer import tokenize; from calc.parser import parse; print(parse(tokenize('1+2*3')))"`
|
||||
**Expected:** `BinOp('+', Num(1), BinOp('*', Num(2), Num(3)))`
|
||||
**Observed:** `BinOp('+', Num(1), BinOp('*', Num(2), Num(3)))` ✓
|
||||
|
||||
Also verified: `2*3+4` → `BinOp('+', BinOp('*', Num(2), Num(3)), Num(4))` ✓
|
||||
Also verified: `10-6/2` → `BinOp('-', Num(10), BinOp('/', Num(6), Num(2)))` ✓
|
||||
|
||||
### D2 — left associativity
|
||||
**What:** Same-precedence operators associate left.
|
||||
**Command:** `python -c "... print(parse(tokenize('8-3-2')))"`
|
||||
**Expected:** `BinOp('-', BinOp('-', Num(8), Num(3)), Num(2))`
|
||||
**Observed:** `BinOp('-', BinOp('-', Num(8), Num(3)), Num(2))` ✓
|
||||
|
||||
Also verified: `8/4/2` → `BinOp('/', BinOp('/', Num(8), Num(4)), Num(2))` ✓
|
||||
Also verified: `1+2+3` → `BinOp('+', BinOp('+', Num(1), Num(2)), Num(3))` ✓
|
||||
|
||||
### D3 — parentheses
|
||||
**What:** Parens override precedence.
|
||||
**Command:** `python -c "... print(parse(tokenize('(1+2)*3')))"`
|
||||
**Expected:** `BinOp('*', BinOp('+', Num(1), Num(2)), Num(3))`
|
||||
**Observed:** `BinOp('*', BinOp('+', Num(1), Num(2)), Num(3))` ✓
|
||||
|
||||
Also verified: `((2+3))` → `BinOp('+', Num(2), Num(3))` ✓
|
||||
Also verified: `1*(2+3)*4` → `BinOp('*', BinOp('*', Num(1), BinOp('+', Num(2), Num(3))), Num(4))` ✓
|
||||
|
||||
### D4 — unary minus
|
||||
**What:** Leading and nested unary minus parses.
|
||||
**Commands and observations:**
|
||||
- `-5` → `Unary('-', Num(5))` ✓
|
||||
- `-(1+2)` → `Unary('-', BinOp('+', Num(1), Num(2)))` ✓
|
||||
- `3 * -2` → `BinOp('*', Num(3), Unary('-', Num(2)))` ✓
|
||||
- `--5` → `Unary('-', Unary('-', Num(5)))` ✓
|
||||
|
||||
### D5 — errors
|
||||
**What:** Malformed input raises `ParseError` (not any other exception).
|
||||
**Command:**
|
||||
```python
|
||||
from calc.lexer import tokenize
|
||||
from calc.parser import parse, ParseError
|
||||
cases = ['1 +', '(1', '1 2', ')(', '']
|
||||
for src in cases:
|
||||
try:
|
||||
parse(tokenize(src))
|
||||
print(f' FAIL no error for {src!r}')
|
||||
except ParseError as e:
|
||||
print(f' PASS ParseError for {src!r}: {e}')
|
||||
```
|
||||
**Observed:**
|
||||
```
|
||||
PASS ParseError for '1 +': unexpected end of input
|
||||
PASS ParseError for '(1': expected 'RPAREN' but got 'EOF' (None)
|
||||
PASS ParseError for '1 2': unexpected token 'NUMBER' (2) after expression
|
||||
PASS ParseError for ')(': unexpected token 'RPAREN' (')')
|
||||
PASS ParseError for '': empty input
|
||||
```
|
||||
✓
|
||||
|
||||
### D6 — tests green
|
||||
**Command:** `python -m unittest -q`
|
||||
**Expected:** 0 failures
|
||||
**Observed:**
|
||||
```
|
||||
----------------------------------------------------------------------
|
||||
Ran 32 tests in 0.001s
|
||||
|
||||
OK
|
||||
```
|
||||
✓ (19 parser tests + 13 lexer tests)
|
||||
|
||||
## DONE
|
||||
Reference in New Issue
Block a user