Skip to content

Merge from master #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ikostan merged 6 commits into from
Sep 30, 2025
Merged

Merge from master #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d506c4
Update wordy.py
ikostan Sep 30, 2025
b997eb5
Update lint_test_report.yml
ikostan Sep 30, 2025
15d056c
Update lint_test_report.yml
ikostan Sep 30, 2025
ad2dc23
Update lint_test_report.yml
ikostan Sep 30, 2025
bce70f6
Update lint_test_report.yml
ikostan Sep 30, 2025
ca0dc0d
Update lint_test_report.yml
ikostan Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 4 additions & 36 deletions .github/workflows/lint_test_report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,59 +12,27 @@ permissions:
pull-requests: "read"

jobs:
changed-files:
runs-on: "ubuntu-latest"
outputs:
python_changed: ${{ steps.python-files.outputs.any_changed }}
yaml_changed: ${{ steps.yaml-files.outputs.any_changed }}
steps:
- uses: "actions/checkout@v5"
- name: "Get changed Python files"
id: python-files
uses: "tj-actions/changed-files@v47"
with:
files: |
**/*.py
requirements.txt
.pylintrc
- name: "Get changed YAML files"
id: yaml-files
uses: "tj-actions/changed-files@v47"
with:
files: |
**/*.yml
**/*.yaml

yamllint:
name: "YAML Lint Workflow"
needs:
- "changed-files"
if: needs.changed-files.outputs.yaml_changed == 'true'
uses: "./.github/workflows/yamllint.yml"

ruff:
name: "Ruff Lint and Format"
uses: "./.github/workflows/ruff.yml"
needs:
- "changed-files"
- "yamllint"
if: needs.changed-files.outputs.python_changed == 'true'
uses: "./.github/workflows/ruff.yml"

pylint:
name: "Pylint Workflow"
uses: "./.github/workflows/pylint.yml"
needs:
- "changed-files"
- "yamllint"
if: needs.changed-files.outputs.python_changed == 'true'
uses: "./.github/workflows/pylint.yml"

flake8:
name: "Flake8 Workflow"
needs:
- "changed-files"
- "yamllint"
if: needs.changed-files.outputs.python_changed == 'true'
uses: "./.github/workflows/flake8.yml"
needs:
- "yamllint"

pytest:
name: "Pytest Workflow"
Expand Down
20 changes: 9 additions & 11 deletions wordy/wordy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,22 @@ def answer(question: str) -> int:
:raises ValueError: If the operation is unknown or the syntax is invalid.
"""
_validate_errors(question)
result: int = 0
new_question: list[str] = _reformat(question)
# Reduce iteratively: evaluate the first three-token slice
# and fold the result left-to-right.
result: int = 0
while new_question:
try:
if len(new_question) == 3:
_validate_evaluation_pattern(new_question)
result = _math_operation(new_question)
break
return _math_operation(new_question)
if len(new_question) == 1:
result = int(new_question[0])
break
return int(new_question[0])
_validate_evaluation_pattern(new_question[:3])
result = _math_operation(new_question[:3])
new_question = [str(result)] + new_question[3:]
except Exception as exc:
raise ValueError("syntax error") from exc
return result
raise ValueError("syntax error") # Safety net for empty cases


def _math_operation(question: list[str]) -> int:
Expand All @@ -88,17 +84,19 @@ def _math_operation(question: list[str]) -> int:
result = int(question[0]) // int(question[-1])
elif math_operator == "*":
result = int(question[0]) * int(question[-1])
else:
raise ValueError("syntax error")

return result


def _validate_evaluation_pattern(val: list) -> None:
def _validate_evaluation_pattern(val: list[str]) -> None:
"""
Ensure a token slice matches expected evaluation patterns.

:param val: Token slice to validate, e.g.,
['3', '+', '4'] or ['+', '4'] during reduction.
:type val: list
:type val: list[str]
:raises ValueError: If the pattern is invalid (syntax error).
"""
if len(val) == 3 and val[1] not in STR_TO_OPERATOR.values():
Expand All @@ -108,7 +106,7 @@ def _validate_evaluation_pattern(val: list) -> None:
raise ValueError("syntax error")


def _reformat(question: str) -> list:
def _reformat(question: str) -> list[str]:
"""
Tokenize a natural-language math question into numbers
and operator symbols.
Expand All @@ -126,9 +124,9 @@ def _reformat(question: str) -> list:
for item in question_list:
if not (
item.isdigit()
or item[1:].isdigit()
or item in STR_TO_OPERATOR
or item in STR_TO_OPERATOR.values()
or any(val in item for val in STR_TO_OPERATOR.values())
):
continue

Expand Down