From 2682e8db8adbbdefba83aeb3123e92e3eac87a0d Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 26 Apr 2016 18:11:03 +0300 Subject: [PATCH] Optimise converter from ini to cpp // Issue #610 --- platformio/builder/tools/piomisc.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py index fdbc9f7e..915a9cd0 100644 --- a/platformio/builder/tools/piomisc.py +++ b/platformio/builder/tools/piomisc.py @@ -53,7 +53,7 @@ class InoToCPPConverter(object): prototypes.append((file_path, match.start(), match.group(1))) return prototypes - def append_prototypes(self, file_path, contents, prototypes): + def append_prototypes(self, contents, prototypes): result = [] if not prototypes: return result @@ -63,7 +63,7 @@ class InoToCPPConverter(object): result.append("%s;" % ";\n".join([p[2] for p in prototypes])) result.append('#line %d "%s"' % ( contents.count("\n", 0, first_pos + len(prototypes[0][2])) + 1, - file_path)) + prototypes[0][0])) result.append(contents[first_pos:].strip()) return result @@ -90,8 +90,7 @@ class InoToCPPConverter(object): result.append('#line 1 "%s"' % file_path) if is_first and prototypes: - result += self.append_prototypes( - file_path, contents, prototypes) + result += self.append_prototypes(contents, prototypes) else: result.append(contents) is_first = False