From 16ef092d770f78637f336d926865c3f86eafc365 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 14 Nov 2014 19:54:07 +0300 Subject: in validateinterfaces.py tool add support for checking not added functions to initerfaces. --- tools/validateinterfaces.py | 50 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/tools/validateinterfaces.py b/tools/validateinterfaces.py index a4222adb5..a26e30ad2 100755 --- a/tools/validateinterfaces.py +++ b/tools/validateinterfaces.py @@ -26,7 +26,7 @@ def searchStructStart(r, ifname): return True return False -def readCFile(cFile): +def readCFile(tracker, cFile): methods = Set() shortIfName = "" with open(cFile, "r") as r: @@ -38,7 +38,7 @@ def readCFile(cFile): ifname = m.group("name1") if searchDefault(r, ifname) == False: return (None, shortIfName, methods) - lineRe = re.compile("(?P[a-z_]+)->(?P[\w_]+) ") + lineRe = re.compile("(?P[a-z_]+)->(?P[\w_]+)[ ][=][ ](?P[^;]+);") for line in r: # print "cline2: " + line test = line.strip() @@ -55,10 +55,12 @@ def readCFile(cFile): shortIfName = m.group("ifname") # print "{2}: add {0}, from: {1}".format(m.group("method"), line, ifname) methods.add(m.group("method")) + tracker.interfaces.add(ifname); + tracker.fullmethods.add(m.group("fullmethod")); return (ifname, shortIfName, methods) return (None, shortIfName, methods) -def readHFile(hFile, ifname): +def readHFile(tracker, hFile, ifname): methods = Set() with open(hFile, "r") as r: if searchStructStart(r, ifname) == False: @@ -75,15 +77,16 @@ def readHFile(hFile, ifname): if m != None: # print "{2}: add {0}, from: {1}".format(m.group("method"), line, ifname) methods.add(m.group("method")) + tracker.fullmethods.add(ifname + "_" + m.group("method")) return methods def checkIfFile(tracker, cFile, hFile): - data = readCFile(cFile) + data = readCFile(tracker, cFile) cMethods = data[2] ifname = data[0] shortIfName = data[1] if len(cMethods) > 0: - hMethods = readHFile(hFile, ifname) + hMethods = readHFile(tracker, hFile, ifname) for method in hMethods: tracker.arr[ifname + "_" + method] = list() tracker.methods.add(ifname + "_" + method) @@ -116,7 +119,7 @@ def checkChr(ch): return False def checkFile(tracker, cFile): - print "Checking: " + cFile +# print "Checking: " + cFile with open(cFile, "r") as r: for line in r: parts = re.findall(r'[\w_]+', line) @@ -156,10 +159,40 @@ def reportMethods(tracker): print "\n" +def checkLostFile(tracker, cFile): +# print "Checking: " + cFile + methodRe = re.compile("^([\w0-9* _]*)([ ]|[*])(?P[a-z_]+)_(?P[\w_]+)(|[ ])[(]") + with open(cFile, "r") as r: + for line in r: + if line.find("(") < 1 or len(line) < 3 or line[0] == "\t" or line[0] == " " or line.find("_defaults") > 0: + continue + m = methodRe.search(line) + if m != None: + name = "{0}_{1}".format(m.group("ifname"), m.group("method")) + if m.group("ifname") not in tracker.interfaces: + continue + if name not in tracker.fullmethods: +# print "src : " + line + print name + +def processLostDir(tracker, srcDir): + files = os.listdir(srcDir) + for file1 in files: + if file1[0] == '.' or file1 == "..": + continue + cPath = os.path.abspath(srcDir + os.path.sep + file1) + if not os.path.isfile(cPath): + processLostDir(tracker, cPath) + elif file1[-2:] == ".c": + checkLostFile(tracker, cPath) + tracker = Tracker() tracker.arr = dict() tracker.methods = Set() +tracker.fullmethods = Set() +tracker.interfaces = Set() tracker.retCode = 0 + if len(sys.argv) > 1 and sys.argv[1] == "silent": processIfDir(tracker, "../src/char"); processIfDir(tracker, "../src/map"); @@ -171,6 +204,11 @@ else: processIfDir(tracker, "../src/map"); processIfDir(tracker, "../src/login"); processIfDir(tracker, "../src/common"); + print "Checking not added functions to initerfaces" + processLostDir(tracker, "../src/char"); + processLostDir(tracker, "../src/map"); + processLostDir(tracker, "../src/login"); + processLostDir(tracker, "../src/common"); print "Checking interfaces usage" processDir(tracker, "../src/char"); processDir(tracker, "../src/map"); -- cgit v1.2.3-70-g09d2 From 2a4b30ef0802589aa2c646229bd9f83f41c398c8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Nov 2014 14:00:14 +0300 Subject: Add different command line actions to validateinterfaces.py. --- tools/validateinterfaces.py | 52 +++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/tools/validateinterfaces.py b/tools/validateinterfaces.py index a26e30ad2..c9a86979c 100755 --- a/tools/validateinterfaces.py +++ b/tools/validateinterfaces.py @@ -186,33 +186,53 @@ def processLostDir(tracker, srcDir): elif file1[-2:] == ".c": checkLostFile(tracker, cPath) -tracker = Tracker() -tracker.arr = dict() -tracker.methods = Set() -tracker.fullmethods = Set() -tracker.interfaces = Set() -tracker.retCode = 0 - -if len(sys.argv) > 1 and sys.argv[1] == "silent": +def runIf(): processIfDir(tracker, "../src/char"); processIfDir(tracker, "../src/map"); processIfDir(tracker, "../src/login"); processIfDir(tracker, "../src/common"); -else: - print "Checking initerfaces initialisation" - processIfDir(tracker, "../src/char"); - processIfDir(tracker, "../src/map"); - processIfDir(tracker, "../src/login"); - processIfDir(tracker, "../src/common"); - print "Checking not added functions to initerfaces" + +def runLost(): processLostDir(tracker, "../src/char"); processLostDir(tracker, "../src/map"); processLostDir(tracker, "../src/login"); processLostDir(tracker, "../src/common"); - print "Checking interfaces usage" + +def runLong(): processDir(tracker, "../src/char"); processDir(tracker, "../src/map"); processDir(tracker, "../src/login"); processDir(tracker, "../src/common"); reportMethods(tracker) + +tracker = Tracker() +tracker.arr = dict() +tracker.methods = Set() +tracker.fullmethods = Set() +tracker.interfaces = Set() +tracker.retCode = 0 + +if len(sys.argv) > 1: + cmd = sys.argv[1] +else: + cmd = "default" + +if cmd == "silent": + runIf() +elif cmd == "init": + print "Checking interfaces initialisation" + runIf() +elif cmd == "lost": + print "Checking not added functions to interfaces" + runLost(); +elif cmd == "long": + print "Checking interfaces usage" + runLong(); +else: + print "Checking interfaces initialisation" + runIf() + print "Checking not added functions to interfaces" + runLost(); + print "Checking interfaces usage" + runLong(); exit(tracker.retCode) -- cgit v1.2.3-70-g09d2 From 83a452a8fc11e611347b9103ab11f51789a60ebf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Nov 2014 14:13:08 +0300 Subject: Improve a bit checking in validateinterfaces.py. --- tools/validateinterfaces.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/validateinterfaces.py b/tools/validateinterfaces.py index c9a86979c..b34bd6233 100755 --- a/tools/validateinterfaces.py +++ b/tools/validateinterfaces.py @@ -133,8 +133,16 @@ def checkFile(tracker, cFile): continue if checkChr(line[idx - 1]): continue + if line[0:3] == " * ": + continue; if line[-1] == "\n": line = line[:-1] + text = line.strip() + if text[0:2] == "/*" or text[0:2] == "//": + continue + idx2 = line.find("//") + if idx2 > 0 and idx2 < idx: + continue tracker.arr[part].append(line) def processDir(tracker, srcDir): -- cgit v1.2.3-70-g09d2 From 4d47b9b9a36c05744401df58efb76f1bd501a77f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Nov 2014 14:55:38 +0300 Subject: Replace some direct methods usage to interfaces. --- src/map/script.c | 2 +- src/map/unit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/map/script.c b/src/map/script.c index 6037c61fa..e04ba6f32 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -155,7 +155,7 @@ static void script_dump_stack(struct script_state* st) break; case C_NAME: - ShowMessage(" \"%s\" (id=%d ref=%p subtype=%s)\n", reference_getname(data), data->u.num, data->ref, script_op2name(script->str_data[data->u.num].type)); + ShowMessage(" \"%s\" (id=%d ref=%p subtype=%s)\n", reference_getname(data), data->u.num, data->ref, script->op2name(script->str_data[data->u.num].type)); break; case C_RETINFO: diff --git a/src/map/unit.c b/src/map/unit.c index 3962e771e..c78919f52 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -2323,7 +2323,7 @@ int unit_remove_map(struct block_list *bl, clr_type clrtype, const char* file, i //Clear target even if there is no timer if (ud->target || ud->attacktimer != INVALID_TIMER) - unit_stop_attack(bl); + unit->stop_attack(bl); //Clear stepaction even if there is no timer if (ud->stepaction || ud->steptimer != INVALID_TIMER) -- cgit v1.2.3-70-g09d2