[4.1] 1cd0955 Be more clear wrt function vs method

Lasse Karstensen lkarsten at varnish-software.com
Wed May 25 13:30:13 CEST 2016


commit 1cd09553dc6932e7c6c9e64b7427b6fe1a7db05f
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Thu Mar 31 12:11:41 2016 +0100

    Be more clear wrt function vs method

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 748f89b..95bf2d6 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -685,10 +685,12 @@ def parse_func(tl, rt_type=None, pobj=None):
 	fname = t.str
 	if pobj != None and fname[0] == "." and is_c_name(fname[1:]):
 		fname = pobj + fname
-	elif not is_c_name(fname):
-		raise ParseError("Function name '%s' is illegal" % fname)
 	elif pobj != None and fname[0] != ".":
 		raise ParseError("Method name '%s' must start with ." % fname)
+	elif pobj != None and not is_c_name(fname[1:]):
+		raise ParseError("Method name '%s' is illegal" % fname[1:])
+	elif not is_c_name(fname):
+		raise ParseError("Function name '%s' is illegal" % fname)
 
 	t = tl.get_token()
 	if t.str != "(":



More information about the varnish-commit mailing list