feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Fix incorrect line order when converting from INO to CPP and pointer is used

Browse Source
This commit is contained in:
Ivan Kravets
2016-09-09 18:49:58 +03:00
parent 39a787b0d1
commit a42cf4ebdd
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformio/builder/tools/piomisc.py
View File

@@ -146,6 +146,8 @@ class InoToCPPConverter(object):
def _get_total_lines(self, contents):
total = 0
if contents.endswith("\n"):
contents = contents[:-1]
for line in contents.split("\n")[::-1]:
linenum = self._parse_preproc_line_num(line)
if linenum is not None:
@@ -164,7 +166,7 @@ class InoToCPPConverter(object):
("|".join(prototype_names)),
contents[:split_pos], re.M)
if match_ptrs:
split_pos = contents.rfind("\n", 0, match_ptrs.start())
split_pos = contents.rfind("\n", 0, match_ptrs.start()) + 1
result = []
result.append(contents[:split_pos].strip())