diff --git a/cobra/__version__.py b/cobra/__version__.py index bab3d0c6..70ae6e63 100644 --- a/cobra/__version__.py +++ b/cobra/__version__.py @@ -7,7 +7,7 @@ __issue_page__ = 'https://github.com/LoRexxar/Cobra-W/issues/new' __python_version__ = sys.version.split()[0] __platform__ = platform.platform() -__version__ = '1.1.1' +__version__ = '1.2.0' __author__ = 'LoRexxar' __author_email__ = 'LoRexxar@gmail.com' __license__ = 'MIT License' diff --git a/cobra/pretreatment.py b/cobra/pretreatment.py index 18a29c1d..541a608f 100644 --- a/cobra/pretreatment.py +++ b/cobra/pretreatment.py @@ -41,7 +41,7 @@ def pre_ast(self): # 下面是对于php文件的处理逻辑 for filepath in fileext[1]['list']: - filepath = os.path.normpath(self.target_directory + filepath) + filepath = os.path.join(self.target_directory, filepath) self.pre_result[filepath] = {} self.pre_result[filepath]['language'] = 'php' diff --git a/docs/changelog.md b/docs/changelog.md index 1aa4e83d..ccec9243 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -80,4 +80,8 @@ - 2018-08-31 - Cobra-W 1.1.0 - 更新了新的regex-return-regex模式 - \ No newline at end of file +- 2019-04-16 + - Cobra-W 1.2.0 + - 修复了include节点中出现变量,无法正确回溯的问题 + - 花大代价尝试重构关于ast处理部分,把ast处理整体提出 + - 解决了之前无法检索define全局变量的问题 \ No newline at end of file