diff options
author | ipkn <ipknhama@gmail.com> | 2015-09-03 23:39:23 +0900 |
---|---|---|
committer | ipkn <ipknhama@gmail.com> | 2015-09-03 23:39:23 +0900 |
commit | 21372f173c2964a51ab19590c7eabf4cd3203671 (patch) | |
tree | a5d1a0bebc33992fd77b2180cda7e56aaad7c87c /amalgamate/merge_all.py | |
parent | 0e20822c726aaa9c6496a4eb029dafdf31104ead (diff) | |
parent | 7a3cb4347393ae08151dcb15074f44783fe86dcf (diff) | |
download | crow-21372f173c2964a51ab19590c7eabf4cd3203671.tar.gz crow-21372f173c2964a51ab19590c7eabf4cd3203671.zip |
Merge pull request #83 from MartiUK/py3
Update merge_all to run with python 3.
Diffstat (limited to 'amalgamate/merge_all.py')
-rw-r--r-- | amalgamate/merge_all.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/amalgamate/merge_all.py b/amalgamate/merge_all.py index fe7b50f..273ea87 100644 --- a/amalgamate/merge_all.py +++ b/amalgamate/merge_all.py @@ -1,5 +1,6 @@ -import glob -import os +"""Merges all the header files.""" +from glob import glob +from os import path as pt import re from collections import defaultdict import sys @@ -10,11 +11,11 @@ if len(sys.argv) > 1: OUTPUT = 'crow_all.h' re_depends = re.compile('^#include "(.*)"', re.MULTILINE) -headers = [x.rsplit('/',1)[-1] for x in glob.glob(os.path.join(header_path,'*.h'))] -print headers +headers = [x.rsplit('/', 1)[-1] for x in glob(pt.join(header_path, '*.h'))] +print(headers) edges = defaultdict(list) for header in headers: - d = open(os.path.join(header_path, header)).read().decode('utf8') + d = open(pt.join(header_path, header)).read() match = re_depends.findall(d) for m in match: # m should included before header @@ -22,30 +23,32 @@ for header in headers: visited = defaultdict(bool) order = [] + + def dfs(x): + """Ensure all header files are visited.""" visited[x] = True for y in edges[x]: if not visited[y]: dfs(y) order.append(x) - + for header in headers: if not visited[header]: dfs(header) order = order[::-1] for x in edges: - print x, edges[x] + print(x, edges[x]) for x in edges: for y in edges[x]: assert order.index(x) < order.index(y), 'cyclic include detected' -print order +print(order) build = [] for header in order: - d = open(os.path.join(header_path, header)).read().decode('utf8') - build.append(re_depends.sub(lambda x:'\n', d)) + d = open(pt.join(header_path, header)).read() + build.append(re_depends.sub(lambda x: '\n', d)) build.append('\n') -open(OUTPUT,'w').write('\n'.join(build)) - +open(OUTPUT, 'w').write('\n'.join(build)) |