[master] d4180b6a3 Make the VMOD.file_id depend only on the $... lines, so people can freely update comments and documentation.

[Poul-Henning Kamp]

commit d4180b6a39adedd90fb2c58d8e394f987237e15d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Feb 4 09:14:20 2019 +0000

    Make the VMOD.file_id depend only on the $... lines, so people can
    freely update comments and documentation.

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 1e92145e4..1f02696d2 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -850,13 +850,14 @@ class vcc(object):
         global inputline
         b = open(self.inputfile, "rb").read()
         a = "\n" + b.decode("utf-8")
-        self.file_id = hashlib.sha256(b).hexdigest()
+        h = hashlib.sha256()
         s = a.split("\n$")
         self.copyright = s.pop(0).strip()
         while s:
             ss = re.split('\n([^\t ])', s.pop(0), maxsplit=1)
             toks = self.tokenize(ss[0])
             inputline = '$' + ' '.join(toks)
+            h.update((inputline + '\n').encode('utf-8'))
             docstr = "".join(ss[1:])
             stanzaclass = DISPATCH.get(toks[0])
             if stanzaclass is None:
@@ -864,6 +865,7 @@ class vcc(object):
             stanzaclass(self, toks, docstr)
             inputline = None
         self.csn = "Vmod_%s%s_Func" % (self.sympfx, self.modname)
+        self.file_id = h.hexdigest()
 
     def tokenize(self, txt, seps=None, quotes=None):
         if seps is None: