Fix handling of commands in parentheses

Author: lupino3

CHANGELOG.md

@@ -7,7 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project uses [Semantic Versioning](https://semver.org) starting from version
 1.0.0.
 
-## [unreleased]
+## [1.0.2] - 2019-01-09
+
+## Fixed
+
+- Fixed handling of commands enclosed in parentheses (e.g., "if defined foo (exit /b 0)")
 
 ## [1.0.1] - 2019-01-09
 

callgraph/core.py

@@ -23,7 +23,7 @@ def AddCommand(self, command):
         self.commands_counter[command.command] += 1
 
     def __repr__(self):
-        return "[{0} (terminating: {1}, noop: {2})] {3}".format(self.number, self.terminating, self.noop, self.text)
+        return "[{0} (terminating: {1}, noop: {2}, commands: {3})] {4}".format(self.number, self.terminating, self.noop, self.commands, self.text)
 
     def __eq__(self, other):
         return other is not None and self.number == other.number and self.text == other.text and self.terminating == other.terminating
@@ -138,6 +138,10 @@ def _AnnotateNode(self, node):
                 continue
 
             for i, token in enumerate(tokens):
+                # Remove open/close parenthesis from the start/end of the command, to deal with inline commands
+                # enclosed in parentheses.
+                token = token.lstrip("(").rstrip(")")
+
                 # Comment; stop processing the rest of the line.
                 if token.startswith("::") or token == "rem" or token.startswith("@::") or token == "@rem":
                     line.noop = True

tests/test_core.py

@@ -301,6 +301,22 @@ def test_multiple_exit_nodes(self):
         self.assertTrue(foo.is_exit_node)
         self.assertTrue(foo.is_last_node)
 
+    def test_no_nested_with_inline_if(self):
+        code = """
+        call :Filenotempty foo
+        echo %ERRORLEVEL%
+        exit
+        :filenotempty 
+        If %~z1 EQU 0 (Exit /B 1) Else (Exit /B 0)
+        :unused
+        echo Will never run.
+        """.split("\n")
+        call_graph = CallGraph.Build(code, self.devnull)
+        self.assertEqual(3, len(call_graph.nodes))
+
+        file_not_empty = call_graph.nodes["filenotempty"]
+        self.assertEqual(0, len(file_not_empty.connections), file_not_empty.code)
+    
 
 if __name__ == "__main__":
     unittest.main()