Changeset 18359 for lang/hsp/misc/unused_variable_lister/unused_variable_lister.hsp

Timestamp:

08/28/08 06:55:45 (4 months ago)

Author:

fujidig

Message:

* 変数を参照しているソースのファイル名と行番号を表示するように変更
* dim命令など「パラメータの変数に代入する命令」に指定した引数を拾わないように変更

Files:

• lang/hsp/misc/unused_variable_lister/unused_variable_lister.hsp (modified) (1 diff)

lang/hsp/misc/unused_variable_lister/unused_variable_lister.hsp

@@ -5 +5 @@
 // start.ax ���f�o�b�O�����t��������Ȃ��̂ŁB
 
-// ���ӓ_:
-// �u�����Ă��Ȃ�����sdim �Ƃ� dupptr �ł����ƕϐ�����Ă����悤�ȕϐ�����肵�Ă��܂��܂�
-
 // TODO:
-// - �딻���Ȃ������// - �����Ă��Ȃ����̕ϐ�����ŎQ�Ƃ��Ă������t�@�C�����ƍs�ԍ���͂���
+// - DLL �̖��߂⃆�[�U�[�����߂ŕϐ�����Ă����Ƃ�������悤�ɂ��悤���ȁ[�H
+
+#include "hspcmp.as"
+
 #module
-#defcfunc get_ds var ds, int offset
-    dupptr ret, varptr(ds) + offset, 1, 2
-    return ret
+#defcfunc get_cstr var buf, int offset
+        dupptr ret, varptr(buf) + offset, 1, 2
+        return ret
+#defcfunc get_type_name int type
+        if typenames == 0 {
+                typenames = "TYPE_MARK", "TYPE_VAR", "TYPE_STRING", "TYPE_DNUM", "TYPE_INUM", "TYPE_STRUCT", "TYPE_XLABEL", "TYPE_LABEL", "TYPE_INTCMD", "TYPE_EXTCMD", "TYPE_EXTSYSVAR", "TYPE_CMPCMD", "TYPE_MODCMD", "TYPE_INTFUNC", "TYPE_SYSVAR", "TYPE_PROGCMD", "TYPE_DLLFUNC", "TYPE_DLLCTRL", "TYPE_USERDEF"
+        }
+        return typenames.type + "(" + type + ")"
 #global
 
-#include "hspcmp.as"
-
-#define TYPE_MARK 0
-#define TYPE_VAR 1
-#define TYPE_STRING 2
-#define TYPE_DNUM 3
-#define TYPE_INUM 4
-#define TYPE_STRUCT 5
-#define TYPE_XLABEL 6
-#define TYPE_LABEL 7
-#define TYPE_INTCMD 8
-#define TYPE_EXTCMD 9
-#define TYPE_EXTSYSVAR 10
-#define TYPE_CMPCMD 11
-#define TYPE_MODCMD 12
-#define TYPE_INTFUNC 13
-#define TYPE_SYSVAR 14
-#define TYPE_PROGCMD 15
-#define TYPE_DLLFUNC 16
-#define TYPE_DLLCTRL 17
-#define TYPE_USERDEF 18
-
-    title "Unused Variable Lister"
-    path = ""
-    input path, 540
-    path_input_objid = stat
-    pos 640 - 50 - 50, 0
-    objsize 50
-    button gosub "�Q��..", *open_dialog
-    pos 640 - 50, 0
-    button gosub "��s", *start
-    result = ""
-    pos 0
-    mesbox result, 640, 480 - 24, 0
-    result_mesbox_objid = stat
-    sdim hr, 65
-    hr = "-"
-    repeat 6
-        hr += hr
-    loop
-    stop
+#define global TYPE_MARK 0
+#define global TYPE_VAR 1
+#define global TYPE_STRING 2
+#define global TYPE_DNUM 3
+#define global TYPE_INUM 4
+#define global TYPE_STRUCT 5
+#define global TYPE_XLABEL 6
+#define global TYPE_LABEL 7
+#define global TYPE_INTCMD 8
+#define global TYPE_EXTCMD 9
+#define global TYPE_EXTSYSVAR 10
+#define global TYPE_CMPCMD 11
+#define global TYPE_MODCMD 12
+#define global TYPE_INTFUNC 13
+#define global TYPE_SYSVAR 14
+#define global TYPE_PROGCMD 15
+#define global TYPE_DLLFUNC 16
+#define global TYPE_DLLCTRL 17
+#define global TYPE_USERDEF 18
+
+// �u�p�����[�^�̕ϐ��ɑ����閽�߁v�idim�Ȃǁj������郂�W���[��
+#module mod_var_cmd t
+#modinit
+        dim t
+        return
+#modfunc define_var_cmd0 int sub_id, int prm_no
+        t.sub_id = prm_no
+        return
+#deffunc define_var_cmd int type, int sub_id, int prm_no
+        if varuse(table.type) == 0 {
+                newmod mvars, mod_var_cmd
+                table.type = mvars.mvars_cnt
+                mvars_cnt ++
+        }
+        define_var_cmd0 table.type, sub_id, prm_no
+        return
+#modfunc get_var_cmd_prm_no0 int sub_id
+        if sub_id >= length(t) : return 0
+        return t.sub_id
+#defcfunc get_var_cmd_prm_no int type, int sub_id
+        if varuse(table.type) == 0 : return 0
+        get_var_cmd_prm_no0 table.type, sub_id
+        return stat
+#deffunc init_var_cmd
+#define define define_var_cmd
+        dimtype table, 5, 18
+        // �p�����[�^�̕ϐ��ɑ����閽�߈ꗗ
+        define TYPE_INTCMD,  0x015, 1 // dirlist
+;       define TYPE_INTCMD,  0x016, 2 // bload
+        define TYPE_INTCMD,  0x01a, 1 // poke
+        define TYPE_INTCMD,  0x01b, 1 // wpoke
+        define TYPE_INTCMD,  0x01c, 1 // lpoke
+        define TYPE_INTCMD,  0x01d, 1 // getstr
+;       define TYPE_INTCMD,  0x01f, 1 // memexpand
+;       define TYPE_INTCMD,  0x020, 1 // memcpy
+;       define TYPE_INTCMD,  0x021, 1 // memset
+        define TYPE_INTCMD,  0x022, 1 // notesel
+        define TYPE_INTCMD,  0x029, 1 // noteget
+        define TYPE_EXTCMD,  0x023, 1 // getkey
+        define TYPE_EXTCMD,  0x024, 1 // listbox
+        define TYPE_EXTCMD,  0x025, 2 // chkbox
+        define TYPE_EXTCMD,  0x026, 1 // combox
+        define TYPE_EXTCMD,  0x027, 1 // input
+;       define TYPE_EXTCMD,  0x028, 1 // mesbox
+        define TYPE_EXTCMD,  0x034, 1 // stick
+        define TYPE_PROGCMD, 0x009, 1 // dim
+        define TYPE_PROGCMD, 0x00a, 1 // sdim
+        define TYPE_PROGCMD, 0x00d, 1 // dimtype
+        define TYPE_PROGCMD, 0x00e, 1 // dup
+        define TYPE_PROGCMD, 0x00f, 1 // dupptr
+        define TYPE_PROGCMD, 0x012, 1 // newmod
+        define TYPE_PROGCMD, 0x016, 1 // mref
+        define TYPE_DLLCTRL, 0x000, 1 // newcom
+        define TYPE_DLLCTRL, 0x001, 1 // querycom
+;       define TYPE_DLLCTRL, 0x003, 1 // cnvstow
+        define TYPE_DLLCTRL, 0x004, 1 // comres
+        define TYPE_DLLCTRL, 0x005, 1 // axobj
+        define TYPE_DLLCTRL, 0x008, 1 // comevent
+        define TYPE_DLLCTRL, 0x009, 1 // comevarg
+        define TYPE_DLLCTRL, 0x00a, 1 // sarrayconv
+        return
+#global
+        init_var_cmd
+
+        title "Unused Variable Lister"
+        path = ""
+        input path, 640 - 50 - 50
+        path_input_objid = stat
+        pos 640 - 50 - 50, 0
+        objsize 50
+        button gosub "�Q��..", *open_dialog
+        pos 640 - 50, 0
+        button gosub "��s", *start
+        result = ""
+        pos 0
+        mesbox result, 640, 480 - 24, 0
+        result_mesbox_objid = stat
+        sdim hr, 101
+        memset hr, '-', 100
+        stop
 
 *open_dialog
-    dialog "", 16
-    if stat == 0 : return
-    path = refstr
-    objprm path_input_objid, path
-    gosub *start
-    return
+        dialog "", 16
+        if stat == 0 : return
+        path = refstr
+        objprm path_input_objid, path
+        gosub *start
+        return
 
 *result_mesbox_notify
-    objprm result_mesbox_objid, result
-    return
+        objprm result_mesbox_objid, result
+        return
 
 *start
-    if peek(result) {
-        result += hr + "\n"
-    }
-    gosub *start_
-    gosub *result_mesbox_notify
-    return
+        if peek(result) {
+                result += hr + "\n"
+        }
+        result += "[" + path + "]\n"
+        gosub *start_
+        gosub *result_mesbox_notify
+        return
 
 *start_
-    ext = getpath(path, 2 + 16)
-    if ext == ".hsp" or ext == ".as" {
-        script_file_name = getpath(path, 8)
-        obj_path = "obj"
-        hsc_ini script_file_name
-        hsc_objname obj_path
-        hsc_comp 1, 0
-        if stat {
-            result += "�R���p�C���Ɏ��s���܂���\n"
-            hsc3_messize size
-            sdim error_message, size + 1
-            hsc_getmes error_message
-            result += error_message
-            return
-        }
-    } else {
-        obj_path = path
-    }
-    exist obj_path
-    if strsize < 0 {
-        result += "�I�u�W�F�N�g�t�@�C�� " + obj_path + " �͑��݂��܂���
-        return
-    }
-    sdim ax, strsize
-    bload obj_path, ax
-    if lpeek(ax) != 0x33505348 { // header magic number check
-        result += "�s���ȃI�u�W�F�N�g�t�@�C���ł�\n"
-        return
-    }
-    gosub *list_unused_variables
-    result += path + "����
-    if unused_variables_count {
-        result += "���g�p�ϐ���+ unused_variables_count + " �Œ��‚��܂���\n"
-    } else {
-        result += "���g�p�ϐ��͌��‚����������\n"
-    }
-    repeat unused_variables_count
-        result += varnames(unused_variables.cnt) + "\n"
-    loop
-    return
+        ext = getpath(path, 2 + 16)
+        if ext == ".hsp" or ext == ".as" {
+                script_file_name = getpath(path, 8)
+                obj_path = "obj"
+                hsc_ini script_file_name
+                hsc_objname obj_path
+                hsc_comp 1, 0
+                if stat {
+                        result += "�R���p�C���Ɏ��s���܂���\n"
+                        hsc3_messize size
+                        sdim error_message, size + 1
+                        hsc_getmes error_message
+                        result += error_message
+                        return
+                }
+        } else {
+                obj_path = path
+        }
+        exist obj_path
+        if strsize < 0 {
+                result += "�I�u�W�F�N�g�t�@�C�������݂��܂���
+                return
+        }
+        sdim ax, strsize
+        bload obj_path, ax
+        if lpeek(ax) != 0x33505348 { // header magic number check
+                result += "�s���ȃI�u�W�F�N�g�t�@�C���ł�\n"
+                return
+        }
+        gosub *list_unused_variables
+        if unused_variables_count {
+                result += "���g�p�ϐ���+ unused_variables_count + " �Œ��‚��܂���\n"
+        } else {
+                result += "���g�p�ϐ��͌��‚����������\n"
+        }
+        repeat unused_variables_count
+                varid = unused_variables.cnt
+                result += var_ref_filename(varid) + "(" + var_ref_lineno(varid) + "): " + varnames(varid) + "\n"
+        loop
+        return
 
 *list_unused_variables
-    max_val   = lpeek(ax,  8)
-
-    pt_cs     = lpeek(ax, 16)
-    max_cs    = lpeek(ax, 20)
-    pt_ds     = lpeek(ax, 24)
-    max_ds    = lpeek(ax, 28)
-    pt_ot     = lpeek(ax, 32)
-    max_ot    = lpeek(ax, 36)
-    pt_dinfo  = lpeek(ax, 40)
-    max_dinfo = lpeek(ax, 44)
-
-    sdim cs,    max_cs
-    sdim ds,    max_ds
-    sdim ot,    max_ot
-    sdim dinfo, max_dinfo
-    memcpy cs,    ax, max_cs,    0, pt_cs
-    memcpy ds,    ax, max_ds,    0, pt_ds
-    memcpy ot,    ax, max_ot,    0, pt_ot
-    memcpy dinfo, ax, max_dinfo, 0, pt_dinfo
-
-    sdim varnames,, max_val
-    i = 0
-    repeat max_dinfo
-        ofs = peek(dinfo,cnt)
-        if ofs == 255 : break
-        if ofs == 254 {
-            continue cnt + 1 + 3 + 2
-        }
-        if ofs == 253 {
-            varnames.i = get_ds(ds, lpeek(dinfo, cnt + 1) & 0x00ffffff)
-            i ++
-            continue cnt + 1 + 3 + 2
-        }
-        if ofs == 252 {
-            continue cnt + 1 + 2
-        }
-    loop
-
-    dim var_used_flags, max_val
-    repeat max_cs
-        c = wpeek(cs, cnt)
-        sz = 2
-        type = c & 0x1fff
-        ex1 = (c & 0x2000) != 0
-        ex2 = (c & 0x4000) != 0
-        if c & 0x8000 {
-            code = lpeek(cs, cnt + sz)
-            sz += 4
-        } else {
-            code = wpeek(cs, cnt + sz)
-            sz += 2
-        }
-        if type == TYPE_CMPCMD {
-            sz += 2
-        }
-        if ex1 and type == TYPE_VAR {
-            var_used_flags.code = 1
-        }
-        continue cnt + sz
-    loop
-
-    unused_variables_count = 0
-    unused_variables = 0
-    repeat max_val
-        if var_used_flags.cnt : continue
-        unused_variables.unused_variables_count = cnt
-        unused_variables_count ++
-    loop
-    return
+        max_val   = lpeek(ax,  8)
+
+        pt_cs     = lpeek(ax, 16)
+        max_cs    = lpeek(ax, 20)
+        pt_ds     = lpeek(ax, 24)
+        max_ds    = lpeek(ax, 28)
+        pt_ot     = lpeek(ax, 32)
+        max_ot    = lpeek(ax, 36)
+        pt_dinfo  = lpeek(ax, 40)
+        max_dinfo = lpeek(ax, 44)
+
+        dupptr cs,    varptr(ax) + pt_cs,    max_cs,    2
+        dupptr ds,    varptr(ax) + pt_ds,    max_ds,    2
+        dupptr ot,    varptr(ax) + pt_ot,    max_ot,    2
+        dupptr dinfo, varptr(ax) + pt_dinfo, max_dinfo, 2
+
+        sdim varnames,, max_val
+        i = 0
+        repeat max_dinfo
+                ofs = peek(dinfo, cnt)
+                if ofs == 255 : break
+                if ofs == 254 {
+                        continue cnt + 1 + 3 + 2
+                }
+                if ofs == 253 {
+                        varnames.i = get_cstr(ds, lpeek(dinfo, cnt + 1) & 0x00ffffff)
+                        i ++
+                        continue cnt + 1 + 3 + 2
+                }
+                if ofs == 252 {
+                        continue cnt + 1 + 2
+                }
+        loop
+
+        dim var_used_flags, max_val
+        sdim var_ref_filename,, max_val // �ϐ���Ƃ��Ă����@�C����
+        dim var_ref_lineno, max_val     // �ϐ���Ƃ��Ă����ԍ�
+
+        dinfo_pos = 0
+        filename = ""
+        lineno = 0
+        line_size = 0
+
+        var_prm_no = 0 : prm_no = 0
+        repeat max_cs
+                c = wpeek(cs, cnt)
+                sz = 2
+                type = c & 0x1fff
+                ex1 = (c & 0x2000) != 0
+                ex2 = (c & 0x4000) != 0
+                if c & 0x8000 {
+                        code = lpeek(cs, cnt + sz)
+                        sz += 4
+                } else {
+                        code = wpeek(cs, cnt + sz)
+                        sz += 2
+                }
+                if type == TYPE_CMPCMD {
+                        sz += 2
+                }
+                gosub *line_next
+                ;logmes filename+"("+lineno+")"+get_type_name(type)+", ex1:"+ex1+", ex2:"+ex2+", code:"+code
+                if ex2 and paren_level == 0 {
+                        prm_no ++
+                }
+                if type == TYPE_MARK and code == '(' {
+                        paren_level ++
+                }
+                if type == TYPE_MARK and code == ')' {
+                        paren_level --
+                }
+                if type == TYPE_VAR {
+                        if ex1 {
+                                var_used_flags.code = 1
+                        } else : if var_prm_no != 0 and prm_no == var_prm_no and paren_level == 0 {
+                                var_used_flags.code = 1
+                                var_prm_no = 0
+                        } else : if var_ref_lineno.code == 0 {
+                                var_ref_filename.code = filename
+                                var_ref_lineno.code = lineno
+                        }
+                }
+                if ex1 {
+                        var_prm_no = get_var_cmd_prm_no(type, code)
+                        paren_level = 0
+                        prm_no = 1
+                }
+                continue cnt + sz
+        loop
+
+        unused_variables_count = 0
+        unused_variables = 0
+        repeat max_val
+                if var_used_flags.cnt : continue
+                unused_variables.unused_variables_count = cnt
+                unused_variables_count ++
+        loop
+        return
+
+*line_next
+        repeat
+                dpos = dinfo_pos
+                if dpos >= max_dinfo : break
+                ofs = peek(dinfo, dpos)
+                dpos ++
+                if ofs == 255 : break
+                if ofs == 254 {
+                        ds_offset = lpeek(dinfo, dpos) & 0xffffff
+                        dpos += 3
+                        if ds_offset {
+                                filename = get_cstr(ds, ds_offset)
+                                ;logmes "set filename to "+filename
+                        }
+                        lineno = wpeek(dinfo, dpos)
+                        ;logmes "set lineno to "+lineno
+                        dinfo_pos = dpos + 2
+                        continue
+                }
+                if ofs == 253 {
+                        dinfo_pos = dpos + 3 + 2
+                        continue
+                }
+                if ofs == 252 {
+                        ofs = wpeek(dinfo, dpos)
+                        dpos += 2
+                }
+                if line_size < ofs : break
+                line_size = 0
+                lineno ++
+                ;logmes "increment lineno to "+lineno
+                dinfo_pos = dpos
+        loop
+        line_size += sz / 2
+        return