Skip to content

Thoroughly refactor the cases generator #107151

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
merged 7 commits into from
Jul 24, 2023
Merged

Thoroughly refactor the cases generator #107151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
361dd47
Extract Formatter etc. into formatting.py; mv pars{er,ing}.py
gvanrossum Jul 22, 2023
4bc2c5c
Extract InstructionFlags etc. into flags.py
gvanrossum Jul 23, 2023
1710508
Extract Instruction etc. into instructions.py
gvanrossum Jul 23, 2023
4bf48d4
Extract Analyzer (but not Generator) into analysis.py
gvanrossum Jul 23, 2023
095d37f
Blackify what's left of generate_cases.py
gvanrossum Jul 23, 2023
2376916
Remove output filenames from Generator state
gvanrossum Jul 23, 2023
258bb41
Fix test_generated_cases.py
gvanrossum Jul 23, 2023
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
42 changes: 19 additions & 23 deletions Lib/test/test_generated_cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@

test_tools.skip_if_missing('cases_generator')
with test_tools.imports_under_tool('cases_generator'):
import analysis
import formatting
import generate_cases
from parser import StackEffect
from parsing import StackEffect


class TestEffects(unittest.TestCase):
Expand All @@ -27,37 +29,37 @@ def test_effect_sizes(self):
StackEffect("q", "", "", ""),
StackEffect("r", "", "", ""),
]
self.assertEqual(generate_cases.effect_size(x), (1, ""))
self.assertEqual(generate_cases.effect_size(y), (0, "oparg"))
self.assertEqual(generate_cases.effect_size(z), (0, "oparg*2"))
self.assertEqual(formatting.effect_size(x), (1, ""))
self.assertEqual(formatting.effect_size(y), (0, "oparg"))
self.assertEqual(formatting.effect_size(z), (0, "oparg*2"))

self.assertEqual(
generate_cases.list_effect_size(input_effects),
formatting.list_effect_size(input_effects),
(1, "oparg + oparg*2"),
)
self.assertEqual(
generate_cases.list_effect_size(output_effects),
formatting.list_effect_size(output_effects),
(2, "oparg*4"),
)
self.assertEqual(
generate_cases.list_effect_size(other_effects),
formatting.list_effect_size(other_effects),
(2, "(oparg<<1)"),
)

self.assertEqual(
generate_cases.string_effect_size(
generate_cases.list_effect_size(input_effects),
formatting.string_effect_size(
formatting.list_effect_size(input_effects),
), "1 + oparg + oparg*2",
)
self.assertEqual(
generate_cases.string_effect_size(
generate_cases.list_effect_size(output_effects),
formatting.string_effect_size(
formatting.list_effect_size(output_effects),
),
"2 + oparg*4",
)
self.assertEqual(
generate_cases.string_effect_size(
generate_cases.list_effect_size(other_effects),
formatting.string_effect_size(
formatting.list_effect_size(other_effects),
),
"2 + (oparg<<1)",
)
Expand Down Expand Up @@ -90,23 +92,17 @@ def tearDown(self) -> None:

def run_cases_test(self, input: str, expected: str):
with open(self.temp_input_filename, "w+") as temp_input:
temp_input.write(generate_cases.BEGIN_MARKER)
temp_input.write(analysis.BEGIN_MARKER)
temp_input.write(input)
temp_input.write(generate_cases.END_MARKER)
temp_input.write(analysis.END_MARKER)
temp_input.flush()

a = generate_cases.Analyzer(
[self.temp_input_filename],
self.temp_output_filename,
self.temp_metadata_filename,
self.temp_pymetadata_filename,
self.temp_executor_filename,
)
a = generate_cases.Generator([self.temp_input_filename])
a.parse()
a.analyze()
if a.errors:
raise RuntimeError(f"Found {a.errors} errors")
a.write_instructions()
a.write_instructions(self.temp_output_filename, False)

with open(self.temp_output_filename) as temp_output:
lines = temp_output.readlines()
Expand Down
Loading