1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
diff --git a/main/parsers.h b/main/parsers.h
index 8000fa0..5332052 100644
--- a/main/parsers.h
+++ b/main/parsers.h
@@ -28,6 +28,7 @@
CsharpParser, \
CobolParser, \
DParser, \
+ DiffParser, \
DosBatchParser, \
EiffelParser, \
ErlangParser, \
diff --git a/parsers/diff.c b/parsers/diff.c
new file mode 100644
index 0000000..a1bf5f3
--- /dev/null
+++ b/parsers/diff.c
@@ -0,0 +1,134 @@
+/*
+*
+* Copyright (c) 2000-2001, Darren Hiebert
+*
+* This source code is released for free distribution under the terms of the
+* GNU General Public License.
+*
+* This module contains functions for generating tags for diff files (based on Sh parser).
+*/
+
+/*
+* INCLUDE FILES
+*/
+#include "general.h" /* must always come first */
+
+#include <ctype.h>
+#include <string.h>
+
+#include "parse.h"
+#include "read.h"
+#include "vstring.h"
+
+/*
+* DATA DEFINITIONS
+*/
+typedef enum {
+ K_FUNCTION
+} diffKind;
+
+static kindOption DiffKinds [] = {
+ { TRUE, 'f', "compared file", "compared files"}
+};
+
+enum {
+ DIFF_DELIM_MINUS = 0,
+ DIFF_DELIM_PLUS
+};
+
+static const char *DiffDelims[2] = {
+ "--- ",
+ "+++ "
+};
+
+/*
+* FUNCTION DEFINITIONS
+*/
+
+static const unsigned char *stripAbsolute (const unsigned char *filename)
+{
+ const unsigned char *tmp;
+
+ /* strip any absolute path */
+ if (*filename == '/' || *filename == '\\')
+ {
+ boolean skipSlash = TRUE;
+
+ tmp = (const unsigned char*) strrchr ((const char*) filename, '/');
+ if (tmp == NULL)
+ { /* if no / is contained try \ in case of a Windows filename */
+ tmp = (const unsigned char*) strrchr ((const char*) filename, '\\');
+ if (tmp == NULL)
+ { /* last fallback, probably the filename doesn't contain a path, so take it */
+ tmp = filename;
+ skipSlash = FALSE;
+ }
+ }
+
+ /* skip the leading slash or backslash */
+ if (skipSlash)
+ tmp++;
+ }
+ else
+ tmp = filename;
+
+ return tmp;
+}
+
+static void findDiffTags (void)
+{
+ vString *filename = vStringNew ();
+ const unsigned char *line, *tmp;
+ int delim = DIFF_DELIM_MINUS;
+
+ while ((line = fileReadLine ()) != NULL)
+ {
+ const unsigned char* cp = line;
+
+ if (strncmp ((const char*) cp, DiffDelims[delim], 4u) == 0)
+ {
+ cp += 4;
+ if (isspace ((int) *cp)) continue;
+ /* when original filename is /dev/null use the new one instead */
+ if (delim == DIFF_DELIM_MINUS &&
+ strncmp ((const char*) cp, "/dev/null", 9u) == 0 &&
+ (cp[9] == 0 || isspace (cp[9])))
+ {
+ delim = DIFF_DELIM_PLUS;
+ continue;
+ }
+
+ tmp = stripAbsolute (cp);
+
+ if (tmp != NULL)
+ {
+ while (! isspace(*tmp) && *tmp != '\0')
+ {
+ vStringPut(filename, *tmp);
+ tmp++;
+ }
+
+ vStringTerminate(filename);
+ makeSimpleTag (filename, DiffKinds, K_FUNCTION);
+ vStringClear (filename);
+ }
+
+ /* restore default delim */
+ delim = DIFF_DELIM_MINUS;
+ }
+ }
+ vStringDelete (filename);
+}
+
+extern parserDefinition* DiffParser (void)
+{
+ static const char *const extensions [] = { "diff", "patch", NULL };
+ parserDefinition* const def = parserNew ("Diff");
+ def->kinds = DiffKinds;
+ def->kindCount = KIND_COUNT (DiffKinds);
+ def->extensions = extensions;
+ def->parser = findDiffTags;
+ return def;
+}
+
+/* vi:set tabstop=8 shiftwidth=4: */
diff --git a/source.mak b/source.mak
index 2550028..eaa9154 100644
--- a/source.mak
+++ b/source.mak
@@ -44,6 +44,7 @@ PARSER_SOURCES = \
$(PARSER_DIR)/clojure.c \
$(PARSER_DIR)/css.c \
$(PARSER_DIR)/cobol.c \
+ $(PARSER_DIR)/diff.c \
$(PARSER_DIR)/dosbatch.c \
$(PARSER_DIR)/eiffel.c \
$(PARSER_DIR)/erlang.c \
--- a/Units/review-needed.r/simple.ksh.t/expected.tags
+++ /dev/null
@@ -1,2 +0,0 @@
-f1 input.ksh /^f1() {$/;" f
-f2 input.ksh /^function f2 {$/;" f
|
