branch: elpa/vm
commit e4f13c0d36ae209eea0cf02ca11b234b4ee2d017
Author: Mark Diekhans <ma...@ucsc.edu>
Commit: Mark Diekhans <ma...@ucsc.edu>
convert autoload find program to python3
---
dev-tools/autoloads.py | 155 ++++++++++++++++++++++++-------------------------
1 file changed, 75 insertions(+), 80 deletions(-)
diff --git a/dev-tools/autoloads.py b/dev-tools/autoloads.py
index 8c779a0e2d..34a06f28b3 100755
--- a/dev-tools/autoloads.py
+++ b/dev-tools/autoloads.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
# -*- python -*-
##
@@ -8,30 +8,31 @@
import sys
def identifier_start(string, startpos=0):
- #print string, startpos
+ # print string, startpos
while (startpos < len(string) and
- ("() \t\r\n.,".find(string[startpos]) != -1)):
- startpos = startpos + 1
+ ("() \t\r\n.,".find(string[startpos]) != -1)):
+ startpos = startpos + 1
return startpos
def identifier_end(string, startpos=0):
- #print string, startpos
+ # print string, startpos
while (startpos < len(string) and
- ("() \t\r\n.,".find(string[startpos]) == -1)):
- startpos = startpos + 1
+ ("() \t\r\n.,".find(string[startpos]) == -1)):
+ startpos = startpos + 1
return startpos
class Def:
def __init__(self, filename, lineno, autoload, symbol):
- self.filename = filename
- self.lineno = lineno
- self.autoload = autoload
- self.symbol = symbol
+ self.filename = filename
+ self.lineno = lineno
+ self.autoload = autoload
+ self.symbol = symbol
+
def __str__(self):
- return ("%s:%d %s %s" % (self.filename,
- self.lineno,
- self.symbol,
- self.autoload))
+ return ("%s:%d %s %s" % (self.filename,
+ self.lineno,
+ self.symbol,
+ self.autoload))
def find_defs(filename, pattern="(defun", pos=0):
"""Find definitions of pattern in the given file.
@@ -42,87 +43,81 @@ def find_defs(filename, pattern="(defun", pos=0):
lineno = 0
autoload = False
for l in fd:
- lineno = lineno + 1
- if l.startswith(";;;###autoload"):
- autoload = True
- continue
- s = l.find(pattern)
- if s == -1 or s != pos:
- continue
- s = identifier_start(l, s + len(pattern))
- while "() \t\r\n.,".find(l[s]) != -1:
- s = s + 1
- e = identifier_end(l, s)
- if s == e:
- raise "Could not find identifier end in " + repr(l)
- continue
- #print s, e
- #print l[s : e]
- symbols.append(Def(filename, lineno, autoload, l[s : e]))
- autoload = False
+ lineno = lineno + 1
+ if l.startswith(";;;###autoload"):
+ autoload = True
+ continue
+ s = l.find(pattern)
+ if s == -1 or s != pos:
+ continue
+ s = identifier_start(l, s + len(pattern))
+ while "() \t\r\n.,".find(l[s]) != -1:
+ s = s + 1
+ e = identifier_end(l, s)
+ if s == e:
+ raise "Could not find identifier end in " + repr(l)
+ continue
+ symbols.append(Def(filename, lineno, autoload, l[s: e]))
+ autoload = False
fd.close()
return symbols
preloaded = ["vm-version.el", "vm-misc.el", "vm-macro.el", "vm-folder.el",
- "vm-summary.el", "vm-minibuf.el", "vm-motion.el", "vm-page.el",
- "vm-mouse.el", "vm-window.el", "vm-menu.el", "vm-message.el",
- "vm-toolbar.el", "vm.el", "vm-undo.el", "vm-mime.el",
- "vm-vars.el"]
+ "vm-summary.el", "vm-minibuf.el", "vm-motion.el", "vm-page.el",
+ "vm-mouse.el", "vm-window.el", "vm-menu.el", "vm-message.el",
+ "vm-toolbar.el", "vm.el", "vm-undo.el", "vm-mime.el",
+ "vm-vars.el"]
def check_calls(filename, funs, missing):
- #print "-" * 50
- #print filename
fd = open(filename)
required = []
for l in fd:
- s = l.find("(require")
- if s != -1:
- s = identifier_start(l, s + len("(require '" ))
- e = identifier_end(l, s)
- #print l[s:e], "*" * 50
- required.append(l[s:e] + ".el")
- #print required
- continue
+ s = l.find("(require")
+ if s != -1:
+ s = identifier_start(l, s + len("(require '"))
+ e = identifier_end(l, s)
+ required.append(l[s:e] + ".el")
+ continue
- # check for calls to external function without autoloads or require
- for c in l.split("("):
- s = identifier_start(c, 0)
- e = identifier_end(c, s)
+ # check for calls to external function without autoloads or require
+ for c in l.split("("):
+ s = identifier_start(c, 0)
+ e = identifier_end(c, s)
- #print repr(c)
- s = identifier_start(c, 0)
- e = identifier_end(c, s)
- f = c[s:e]
- if f not in funs:
- continue
- d = funs[f]
- if ((d.filename != filename) and (not d.autoload) and
- (d.filename not in preloaded) and
- (d.filename not in required)):
- #print preloaded
- #print "'%s' : '%s' => '%s' %s" % (filename, f, d.filename,
- #d.filename in preloaded)
- #print preloaded
- if not missing.has_key(d.filename):
- missing[d.filename] = []
- if f not in missing[d.filename]:
- missing[d.filename].append(f)
+ # print repr(c)
+ s = identifier_start(c, 0)
+ e = identifier_end(c, s)
+ f = c[s:e]
+ if f not in funs:
+ continue
+ d = funs[f]
+ if ((d.filename != filename) and (not d.autoload) and
+ (d.filename not in preloaded) and
+ (d.filename not in required)):
+ # print preloaded
+ if d.filename not in missing:
+ missing[d.filename] = []
+ if f not in missing[d.filename]:
+ missing[d.filename].append(f)
fd.close()
-# emit cross references with missing autoloads
-if __name__ == '__main__':
+def main():
+ """emit cross references with missing autoloads"""
funs = {}
for filename in sys.argv[3:]:
- for d in find_defs(filename):
- if funs.has_key(d.symbol):
- print "Duplicate %s <> %s" % (d, funs[d.symbol])
- else:
- funs[d.symbol] = d
+ for d in find_defs(filename):
+ if d.symbol in funs:
+ print("Duplicate %s <> %s" % (d, funs[d.symbol]))
+ else:
+ funs[d.symbol] = d
missing = {}
for filename in sys.argv[3:]:
- check_calls(filename, funs, missing)
+ check_calls(filename, funs, missing)
for f in missing.keys():
- print f
- for m in missing[f]:
- print "\t", m
+ print(f)
+ for m in missing[f]:
+ print("\t", m)
+
+if __name__ == '__main__':
+ main()
