Solve merge conflict

christoph2 · Dec 4, 2021 · 7756350 · 7756350
1 parent 3c4febc
commit 7756350
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pya2l/__init__.py b/pya2l/__init__.py
@@ -114,7 +114,9 @@ def import_a2l(
         prepro = Preprocessor()
         prepro_result = prepro.process(self._a2lfn, encoding = detect_encoding(self._a2lfn))
         a2l_parser = ParserWrapper("a2l", "a2lFile", A2LListener, debug = debug, line_map = prepro_result.line_map)
-        #print(prepro_result.a2l_data)
+
+        print(prepro_result.if_data_sections)
+
         self.db = a2l_parser.parseFromString(prepro_result.a2l_data, dbname = str(self._dbfn))
         self.session = self.db.session
         return self.session

diff --git a/pya2l/a2l_listener.py b/pya2l/a2l_listener.py
@@ -255,7 +255,7 @@ def exitGuardRails(self, ctx):
     def exitIfData(self, ctx):
         ctx.value = model.IfData(name="")
         self.db.session.add(ctx.value)
-        #print(":", ctx.start, ctx.stop)
+        #print("IfData:", ctx.start, ctx.stop)
 
     def exitMatrixDim(self, ctx):
         xDim = ctx.xDim.value