diff --git a/functions.py b/functions.py new file mode 100644 index 0000000..069ebd2 --- /dev/null +++ b/functions.py @@ -0,0 +1,35 @@ + + + +# L4: Function. + +def memory_generateConstPlayfield( + n: int +) -> dict[int, int]: + idGroups: dict[int, int] = { } + id = 0 + for gid in range(0, n): + idGroups[id] = gid + id += 1 + idGroups[id] = gid + id += 1 + #} + return idGroups +#} + +# L20: Test. + +def test_memory_generateConstPlayfield( +) -> str: + idGroups = memory_generateConstPlayfield(2) + if ( + len(idGroups) == 4 and + idGroups[0] == 0 and + idGroups[1] == 0 and + idGroups[2] == 1 and + idGroups[3] == 1 + ): + return "OK: memory_generateConstPlayfield" + #} + return "ERR: memory_generateConstPlayfield" +#} diff --git a/main.py b/main.py index 80e386a..f5989e6 100644 --- a/main.py +++ b/main.py @@ -1,39 +1,3 @@ - - - -# L4: Function. - -def memory_generateConstPlayfield( - n: int -) -> dict[int, int]: - idGroups: dict[int, int] = { } - id = 0 - for gid in range(0, n): - idGroups[id] = gid - id += 1 - idGroups[id] = gid - id += 1 - #} - return idGroups -#} - -# L20: Test. - -def test_memory_generateConstPlayfield( -) -> str: - idGroups = memory_generateConstPlayfield(2) - if ( - len(idGroups) == 4 and - idGroups[0] == 0 and - idGroups[1] == 0 and - idGroups[2] == 1 and - idGroups[3] == 1 - ): - return "OK: memory_generateConstPlayfield" - #} - return "ERR: memory_generateConstPlayfield" -#} - -# L36: Run. +from functions import * print(test_memory_generateConstPlayfield()) diff --git a/tr-Python-C++/CPP.py b/tr-Python-C++/CPP.py index dfbd595..6778c58 100644 --- a/tr-Python-C++/CPP.py +++ b/tr-Python-C++/CPP.py @@ -3,6 +3,9 @@ from Function import * def replaceAnd(s): return s.replace("and", "&&") +def replaceComment(s): + return s.replace("#", "//") + def replaceLen(s): posLen = s.find("len(") posEnd = s.find(")") diff --git a/tr-Python-C++/process.py b/tr-Python-C++/process.py index ad626b8..a2e496e 100755 --- a/tr-Python-C++/process.py +++ b/tr-Python-C++/process.py @@ -9,16 +9,29 @@ def process(FILE_IN): lines_in.append(line.rstrip()) f = Function() + out = "" # Parse. for ln in lines_in: ln = ln.rstrip() - f.parseLine(ln) + + # Empty line. + if ln == "": + out += "\n" + # Comment. + elif ( + ln.startswith("#") and + not f.isBody + ): + out += replaceComment(ln) + "\n" + # Function. + else: + f.parseLine(ln) + if f.isComplete: - print("Function ready! Here it is in C++:") cpp = CPP(f) - print(cpp.translate()) + out += cpp.translate() # Create new function instance. f = Function() - + return out