Resolves #6 implement asm translator with documentation #7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k1b24
changed the title
ryukzak
requested changes
Feb 12, 2024
python/README_asm.md
Outdated
| | "jmp" arg | ||
| | "jz" arg | ||
|
|
||
| arg ::= integer |
There was a problem hiding this comment.
Do we really need integer here? label_name should be enough.
python/README_asm.md
Outdated
Comment on lines
16
to
23
| instr ::= "increment" | ||
| | "decrement" | ||
| | "right" | ||
| | "left" | ||
| | "print" | ||
| | "input" | ||
| | "jmp" arg | ||
| | "jz" arg |
There was a problem hiding this comment.
Suggested change
| instr ::= "increment" | |
| | "decrement" | |
| | "right" | |
| | "left" | |
| | "print" | |
| | "input" | |
| | "jmp" arg | |
| | "jz" arg | |
| instr ::= op0 | |
| | op1 arg | |
| op0 ::= "increment" | |
| | "decrement" | |
| | "right" | |
| | "left" | |
| | "print" | |
| | "input" | |
| op1 ::= "jmp" | |
| | "jz" |
python/README_asm.md
Outdated
| ``` ebnf | ||
| program ::= { line } | ||
|
|
||
| line ::= [ label ] [ instr ] [ comment ] "\n" |
There was a problem hiding this comment.
To be more simple:
Suggested change
| line ::= [ label ] [ instr ] [ comment ] "\n" | |
| line ::= label: [ comment ] "\n" | |
| | instr [ comment ] "\n" | |
| | [ comment ] "\n" |
| Реализован в модуле [translator_asm](./translator_asm.py) | ||
|
|
||
| Ассемблерные мнемоники один в один транслируются в машинные команды. | ||
| Метки из программы исчезают, а на место обращений к ним подставляются конкретные адреса. |
There was a problem hiding this comment.
We need golden tests for the translator.
| Реализован в модуле [translator_asm](./translator_asm.py) | ||
|
|
||
| Ассемблерные мнемоники один в один транслируются в машинные команды. | ||
| Метки из программы исчезают, а на место обращений к ним подставляются конкретные адреса. |
python/translator_asm.py
Outdated
| """Разбор текста на словарь с определением меток и список машинных инструкций.""" | ||
| pc = 0 | ||
| labels = {} | ||
| instrs = [] |
There was a problem hiding this comment.
Rename to code, as in translator.py
|
@ryukzak may you take a look, please |
ryukzak
requested changes
Feb 17, 2024
| @@ -60,8 +62,12 @@ def test_translator_and_machine(golden, caplog): | |||
|
|
|||
| # Создаём временную папку для тестирования приложения. | |||
| with tempfile.TemporaryDirectory() as tmpdirname: | |||
| # Определяем язык golden теста. По умолчанию предполагается язык Brainfuck | |||
| lang = golden.get("lang", "bf") | |||
| assert lang == "bf" or lang == "asm" | |||
There was a problem hiding this comment.
It can be a little bit more simple. Just pass: in_source xor in_source_asm.
If both or none -- just fail the test.
There was a problem hiding this comment.
It seems like this code will be a little bigger, if I get you right
lang = None
source = None
if "in_source_asm" in golden:
lang = "asm"
source = golden["in_source_asm"]
if "in_source" in golden:
assert lang is None, "both in_source and in_source_asm are present"
lang = "bf"
source = golden["in_source"]
assert lang is not None, "either in_source xor in_source_asm must be set"
And in this case we also need to add some logic about referencing the in_source param on this line below:
file.write(golden["in_source"])
Rewrite translator_asm.py
|
Merged PR and fixed some typos in the documentation |
ryukzak
requested changes
Feb 17, 2024
Comment on lines
+66
to
+67
| lang = golden.get("lang", "bf") | ||
| assert lang == "bf" or lang == "asm" |
There was a problem hiding this comment.
Suggested change
| lang = golden.get("lang", "bf") | |
| assert lang == "bf" or lang == "asm" | |
| assert "in_source" in golden != "in_source_asm" in golden |
| # Готовим имена файлов для входных и выходных данных. | ||
| source = os.path.join(tmpdirname, "source.bf") | ||
| source = os.path.join(tmpdirname, "source." + lang) |
There was a problem hiding this comment.
Suggested change
| source = os.path.join(tmpdirname, "source." + lang) | |
| source = os.path.join(tmpdirname, "source") |
No body see this files...
Comment on lines
+83
to
+86
| if lang == "bf": | ||
| translator.main(source, target) | ||
| elif lang == "asm": | ||
| translator_asm.main(source, target) |
There was a problem hiding this comment.
Suggested change
| if lang == "bf": | |
| translator.main(source, target) | |
| elif lang == "asm": | |
| translator_asm.main(source, target) | |
| if "in_source" in golden: | |
| with open(source, "w", encoding="utf-8") as file: | |
| file.write(golden["in_source"]) | |
| translator.main(source, target) | |
| elif ... |
| @@ -60,8 +62,12 @@ def test_translator_and_machine(golden, caplog): | |||
|
|
|||
| # Создаём временную папку для тестирования приложения. | |||
| with tempfile.TemporaryDirectory() as tmpdirname: | |||
| # Определяем язык golden теста. По умолчанию предполагается язык Brainfuck | |||
| lang = golden.get("lang", "bf") | |||
| assert lang == "bf" or lang == "asm" | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Реализация транслятора asm
Лазеев Сергей P33131