Changeset: 121daa24b498 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=121daa24b498 Modified Files: tools/embedded/inline.py Branch: embedded Log Message:
spaces? diffs (52 lines): diff --git a/tools/embedded/inline.py b/tools/embedded/inline.py --- a/tools/embedded/inline.py +++ b/tools/embedded/inline.py @@ -3,27 +3,27 @@ import sys import re def mal_include(filename): - if os.path.isdir(filename): - files = os.listdir(filename) - ret = "" - for f in files: - ret += mal_include(os.path.join(filename, f)) - return ret - elif os.path.isfile(filename): - print filename - content = open(filename).read() - content = re.sub("^#.*$", "", content, flags=re.MULTILINE) - while True: - match = re.search("include (\\w+);", content) - if (match == None): break - modname = match.groups(0)[0] - incfile = mal_include(modname + ".mal" if os.path.isfile(modname + ".mal") else modname) - if (modname == 'sql'): - incfile = "library sql;\n" + incfile - content = content[:match.start()] + incfile + content[match.end():] - return content - else: - return "" + if os.path.isdir(filename): + files = os.listdir(filename) + ret = "" + for f in files: + ret += mal_include(os.path.join(filename, f)) + return ret + elif os.path.isfile(filename): + print filename + content = open(filename).read() + content = re.sub("^#.*$", "", content, flags=re.MULTILINE) + while True: + match = re.search("include (\\w+);", content) + if (match == None): break + modname = match.groups(0)[0] + incfile = mal_include(modname + ".mal" if os.path.isfile(modname + ".mal") else modname) + if (modname == 'sql'): + incfile = "library sql;\n" + incfile + content = content[:match.start()] + incfile + content[match.end():] + return content + else: + return "" wd = os.getcwd() os.chdir(sys.argv[1]) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list