Skip to content

Commit eead75c

Browse files
committed
patch 8.1.1195: Vim script debugger functionality needs cleanup
Problem: Vim script debugger functionality needs cleanup. Solution: Move debugger code to a separate file. Add more tests. (Yegappan Lakshmanan, closes #4285)
1 parent 911ead1 commit eead75c

17 files changed

Lines changed: 1063 additions & 1001 deletions

Filelist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ SRC_ALL = \
2323
src/charset.c \
2424
src/crypt.c \
2525
src/crypt_zip.c \
26+
src/debugger.c \
2627
src/dict.c \
2728
src/diff.c \
2829
src/digraph.c \
@@ -156,6 +157,7 @@ SRC_ALL = \
156157
src/proto/charset.pro \
157158
src/proto/crypt.pro \
158159
src/proto/crypt_zip.pro \
160+
src/proto/debugger.pro \
159161
src/proto/dict.pro \
160162
src/proto/diff.pro \
161163
src/proto/digraph.pro \

src/Make_bc5.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,7 @@ vimobj = \
516516
$(OBJDIR)\charset.obj \
517517
$(OBJDIR)\crypt.obj \
518518
$(OBJDIR)\crypt_zip.obj \
519+
$(OBJDIR)\debugger.obj \
519520
$(OBJDIR)\dict.obj \
520521
$(OBJDIR)\diff.obj \
521522
$(OBJDIR)\digraph.obj \

src/Make_cyg_ming.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,7 @@ OBJ = \
703703
$(OUTDIR)/charset.o \
704704
$(OUTDIR)/crypt.o \
705705
$(OUTDIR)/crypt_zip.o \
706+
$(OUTDIR)/debugger.o \
706707
$(OUTDIR)/dict.o \
707708
$(OUTDIR)/diff.o \
708709
$(OUTDIR)/digraph.o \

src/Make_dice.mak

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ SRC = \
3333
charset.c \
3434
crypt.c \
3535
crypt_zip.c \
36+
debugger.c \
3637
dict.c \
3738
diff.c \
3839
digraph.c \
@@ -93,6 +94,7 @@ OBJ = o/arabic.o \
9394
o/charset.o \
9495
o/crypt.o \
9596
o/crypt_zip.o \
97+
o/debugger.o \
9698
o/dict.o \
9799
o/diff.o \
98100
o/digraph.o \
@@ -179,6 +181,8 @@ o/crypt.o: crypt.c $(SYMS)
179181

180182
o/crypt_zip.o: crypt_zip.c $(SYMS)
181183

184+
o/debugger.o: debugger.c $(SYMS)
185+
182186
o/dict.o: dict.c $(SYMS)
183187

184188
o/diff.o: diff.c $(SYMS)

src/Make_ivc.mak

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ LINK32_OBJS= \
217217
"$(INTDIR)/charset.obj" \
218218
"$(INTDIR)/crypt.obj" \
219219
"$(INTDIR)/crypt_zip.obj" \
220+
"$(INTDIR)/debugger.obj" \
220221
"$(INTDIR)/dict.obj" \
221222
"$(INTDIR)/diff.obj" \
222223
"$(INTDIR)/digraph.obj" \
@@ -369,6 +370,10 @@ SOURCE=.\crypt_zip.c
369370
# End Source File
370371
# Begin Source File
371372

373+
SOURCE=.\debugger.c
374+
# End Source File
375+
# Begin Source File
376+
372377
SOURCE=.\dict.c
373378
# End Source File
374379
# Begin Source File

src/Make_manx.mak

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ SRC = arabic.c \
4343
charset.c \
4444
crypt.c \
4545
crypt_zip.c \
46+
debugger.c \
4647
dict.c \
4748
diff.c \
4849
digraph.c \
@@ -105,6 +106,7 @@ OBJ = obj/arabic.o \
105106
obj/charset.o \
106107
obj/crypt.o \
107108
obj/crypt_zip.o \
109+
obj/debugger.o \
108110
obj/dict.o \
109111
obj/diff.o \
110112
obj/digraph.o \
@@ -165,6 +167,7 @@ PRO = proto/arabic.pro \
165167
proto/charset.pro \
166168
proto/crypt.pro \
167169
proto/crypt_zip.pro \
170+
proto/debugger.pro \
168171
proto/dict.pro \
169172
proto/diff.pro \
170173
proto/digraph.pro \
@@ -283,6 +286,9 @@ obj/crypt.o: crypt.c
283286
obj/crypt_zip.o: crypt_zip.c
284287
$(CCSYM) $@ crypt_zip.c
285288

289+
obj/debugger.o: debugger.c
290+
$(CCSYM) $@ debugger.c
291+
286292
obj/dict.o: dict.c
287293
$(CCSYM) $@ dict.c
288294

src/Make_morph.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ SRC = arabic.c \
3131
charset.c \
3232
crypt.c \
3333
crypt_zip.c \
34+
debugger.c \
3435
dict.c \
3536
diff.c \
3637
digraph.c \

src/Make_mvc.mak

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,7 @@ OBJ = \
711711
$(OUTDIR)\charset.obj \
712712
$(OUTDIR)\crypt.obj \
713713
$(OUTDIR)\crypt_zip.obj \
714+
$(OUTDIR)\debugger.obj \
714715
$(OUTDIR)\dict.obj \
715716
$(OUTDIR)\diff.obj \
716717
$(OUTDIR)\digraph.obj \
@@ -1367,6 +1368,8 @@ $(OUTDIR)/crypt.obj: $(OUTDIR) crypt.c $(INCL)
13671368

13681369
$(OUTDIR)/crypt_zip.obj: $(OUTDIR) crypt_zip.c $(INCL)
13691370

1371+
$(OUTDIR)/debugger.obj: $(OUTDIR) debugger.c $(INCL)
1372+
13701373
$(OUTDIR)/dict.obj: $(OUTDIR) dict.c $(INCL)
13711374

13721375
$(OUTDIR)/diff.obj: $(OUTDIR) diff.c $(INCL)
@@ -1638,6 +1641,7 @@ proto.h: \
16381641
proto/charset.pro \
16391642
proto/crypt.pro \
16401643
proto/crypt_zip.pro \
1644+
proto/debugger.pro \
16411645
proto/dict.pro \
16421646
proto/diff.pro \
16431647
proto/digraph.pro \

src/Make_sas.mak

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ SRC = \
9696
charset.c \
9797
crypt.c \
9898
crypt_zip.c \
99+
debugger.c \
99100
dict.c \
100101
diff.c \
101102
digraph.c \
@@ -157,6 +158,7 @@ OBJ = \
157158
charset.o \
158159
crypt.o \
159160
crypt_zip.o \
161+
debugger.o \
160162
dict.o \
161163
diff.o \
162164
digraph.o \
@@ -218,6 +220,7 @@ PRO = \
218220
proto/charset.pro \
219221
proto/crypt.pro \
220222
proto/crypt_zip.pro \
223+
proto/debugger.pro \
221224
proto/dict.pro \
222225
proto/diff.pro \
223226
proto/digraph.pro \
@@ -340,6 +343,8 @@ crypt.o: crypt.c
340343
proto/crypt.pro: crypt.c
341344
crypt_zip.o: crypt_zip.c
342345
proto/crypt_zip.pro: crypt_zip.c
346+
debugger.o: debugger.c
347+
proto/debugger.pro: debugger.c
343348
dict.o: dict.c
344349
proto/dict.pro: dict.c
345350
diff.o: diff.c

src/Make_vms.mms

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -308,30 +308,30 @@ ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) \
308308
$(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(RUBY_LIB)
309309

310310
SRC = arabic.c autocmd.c beval.c blob.c blowfish.c buffer.c charset.c \
311-
crypt.c crypt_zip.c dict.c diff.c digraph.c edit.c eval.c evalfunc.c \
312-
ex_cmds.c ex_cmds2.c ex_docmd.c ex_eval.c ex_getln.c if_cscope.c \
313-
if_xcmdsrv.c fileio.c findfile.c fold.c getchar.c hardcopy.c \
314-
hashtab.c indent.c insexpand.c json.c list.c main.c mark.c menu.c \
315-
mbyte.c memfile.c memline.c message.c misc1.c misc2.c move.c normal.c \
316-
ops.c option.c popupmnu.c quickfix.c regexp.c search.c sha256.c sign.c \
317-
spell.c spellfile.c syntax.c tag.c term.c termlib.c textprop.c ui.c \
318-
undo.c userfunc.c version.c screen.c window.c os_unix.c os_vms.c \
319-
pathdef.c
311+
crypt.c crypt_zip.c debugger.c dict.c diff.c digraph.c edit.c eval.c \
312+
evalfunc.c ex_cmds.c ex_cmds2.c ex_docmd.c ex_eval.c ex_getln.c \
313+
if_cscope.c if_xcmdsrv.c fileio.c findfile.c fold.c getchar.c \
314+
hardcopy.c hashtab.c indent.c insexpand.c json.c list.c main.c mark.c \
315+
menu.c mbyte.c memfile.c memline.c message.c misc1.c misc2.c move.c \
316+
normal.c ops.c option.c popupmnu.c quickfix.c regexp.c search.c \
317+
sha256.c sign.c spell.c spellfile.c syntax.c tag.c term.c termlib.c \
318+
textprop.c ui.c undo.c userfunc.c version.c screen.c window.c \
319+
os_unix.c os_vms.c pathdef.c \
320320
$(GUI_SRC) $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) \
321321
$(RUBY_SRC) $(HANGULIN_SRC) $(MZSCH_SRC) $(XDIFF_SRC)
322322

323323
OBJ = arabic.obj autocmd.obj beval.obj blob.obj blowfish.obj buffer.obj \
324-
charset.obj crypt.obj crypt_zip.obj dict.obj diff.obj digraph.obj \
325-
edit.obj eval.obj evalfunc.obj ex_cmds.obj ex_cmds2.obj ex_docmd.obj \
326-
ex_eval.obj ex_getln.obj if_cscope.obj if_xcmdsrv.obj \
324+
charset.obj crypt.obj crypt_zip.obj debugger.obj dict.obj diff.obj \
325+
digraph.obj edit.obj eval.obj evalfunc.obj ex_cmds.obj ex_cmds2.obj \
326+
ex_docmd.obj ex_eval.obj ex_getln.obj if_cscope.obj if_xcmdsrv.obj \
327327
fileio.obj findfile.obj fold.obj getchar.obj hardcopy.obj hashtab.obj \
328328
indent.obj insexpand.obj json.obj list.obj main.obj mark.obj \
329329
menu.obj memfile.obj memline.obj message.obj misc1.obj misc2.obj \
330330
move.obj mbyte.obj normal.obj ops.obj option.obj popupmnu.obj \
331331
quickfix.obj regexp.obj search.obj sha256.obj sign.obj spell.obj \
332332
spellfile.obj syntax.obj tag.obj term.obj termlib.obj textprop.obj \
333-
ui.obj undo.obj userfunc.obj screen.obj version.obj window.obj \
334-
os_unix.obj os_vms.obj pathdef.obj if_mzsch.obj \
333+
ui.obj undo.obj userfunc.obj screen.obj version.obj \
334+
window.obj os_unix.obj os_vms.obj pathdef.obj if_mzsch.obj \
335335
$(GUI_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(TCL_OBJ) \
336336
$(RUBY_OBJ) $(HANGULIN_OBJ) $(MZSCH_OBJ) $(XDIFF_OBJ)
337337

@@ -522,6 +522,10 @@ crypt_zip.obj : crypt_zip.c vim.h [.auto]config.h feature.h os_unix.h \
522522
ascii.h keymap.h term.h macros.h option.h structs.h \
523523
regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
524524
proto.h globals.h
525+
debugger.obj : debugger.c vim.h [.auto]config.h feature.h os_unix.h \
526+
ascii.h keymap.h term.h macros.h structs.h regexp.h \
527+
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
528+
globals.h
525529
dict.obj : dict.c vim.h [.auto]config.h feature.h os_unix.h \
526530
ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
527531
beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \

0 commit comments

Comments
 (0)