Skip to content

Commit 4baa014

Browse files
terryburtonterryburton
committed
Expand implementation limit to allow 3 linters per component
1 parent 4a5ab14 commit 4baa014

File tree

5 files changed

+592
-592
lines changed

5 files changed

+592
-592
lines changed

‎src/c-lib/ai.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -211,25 +211,25 @@ static inline __ATTR_PURE uint8_t valLengthByPrefix(const char* const ai) {
211211
*
212212
*/
213213
static const struct aiEntry unknownAI =
214-
AI_ENTRY( "" , DO_FNC1, XX_DATA_ATTR, X,1,90,MAN,_,_, __, __, __, __, "", "UNKNOWN" );
214+
AI_ENTRY( "" , DO_FNC1, XX_DATA_ATTR, X,1,90,MAN,_,_,_, __, __, __, __, "", "UNKNOWN" );
215215
static const struct aiEntry unknownAI2 =
216-
AI_ENTRY( "XX" , DO_FNC1, XX_DATA_ATTR, X,1,90,MAN,_,_, __, __, __, __, "", "UNKNOWN" );
216+
AI_ENTRY( "XX" , DO_FNC1, XX_DATA_ATTR, X,1,90,MAN,_,_,_, __, __, __, __, "", "UNKNOWN" );
217217
static const struct aiEntry unknownAI3 =
218-
AI_ENTRY( "XXX" , DO_FNC1, XX_DATA_ATTR, X,1,90,MAN,_,_, __, __, __, __, "", "UNKNOWN" );
218+
AI_ENTRY( "XXX" , DO_FNC1, XX_DATA_ATTR, X,1,90,MAN,_,_,_, __, __, __, __, "", "UNKNOWN" );
219219
static const struct aiEntry unknownAI4 =
220-
AI_ENTRY( "XXXX", DO_FNC1, XX_DATA_ATTR, X,1,90,MAN,_,_, __, __, __, __, "", "UNKNOWN" );
220+
AI_ENTRY( "XXXX", DO_FNC1, XX_DATA_ATTR, X,1,90,MAN,_,_,_, __, __, __, __, "", "UNKNOWN" );
221221
static const struct aiEntry unknownAI2fixed2 =
222-
AI_ENTRY( "XX" , NO_FNC1, XX_DATA_ATTR, X,2,2,MAN,_,_, __, __, __, __, "", "UNKNOWN" );
222+
AI_ENTRY( "XX" , NO_FNC1, XX_DATA_ATTR, X,2,2,MAN,_,_,_, __, __, __, __, "", "UNKNOWN" );
223223
static const struct aiEntry unknownAI2fixed14 =
224-
AI_ENTRY( "XX" , NO_FNC1, XX_DATA_ATTR, X,14,14,MAN,_,_, __, __, __, __, "", "UNKNOWN" );
224+
AI_ENTRY( "XX" , NO_FNC1, XX_DATA_ATTR, X,14,14,MAN,_,_,_, __, __, __, __, "", "UNKNOWN" );
225225
static const struct aiEntry unknownAI2fixed16 =
226-
AI_ENTRY( "XX" , NO_FNC1, XX_DATA_ATTR, X,16,16,MAN,_,_, __, __, __, __, "", "UNKNOWN" );
226+
AI_ENTRY( "XX" , NO_FNC1, XX_DATA_ATTR, X,16,16,MAN,_,_,_, __, __, __, __, "", "UNKNOWN" );
227227
static const struct aiEntry unknownAI2fixed18 =
228-
AI_ENTRY( "XX" , NO_FNC1, XX_DATA_ATTR, X,18,18,MAN,_,_, __, __, __, __, "", "UNKNOWN" );
228+
AI_ENTRY( "XX" , NO_FNC1, XX_DATA_ATTR, X,18,18,MAN,_,_,_, __, __, __, __, "", "UNKNOWN" );
229229
static const struct aiEntry unknownAI3fixed13 =
230-
AI_ENTRY( "XXX" , NO_FNC1, XX_DATA_ATTR, X,13,13,MAN,_,_, __, __, __, __, "", "UNKNOWN" );
230+
AI_ENTRY( "XXX" , NO_FNC1, XX_DATA_ATTR, X,13,13,MAN,_,_,_, __, __, __, __, "", "UNKNOWN" );
231231
static const struct aiEntry unknownAI4fixed6 =
232-
AI_ENTRY( "XXXX", NO_FNC1, XX_DATA_ATTR, X,6,6,MAN,_,_, __, __, __, __, "", "UNKNOWN" );
232+
AI_ENTRY( "XXXX", NO_FNC1, XX_DATA_ATTR, X,6,6,MAN,_,_,_, __, __, __, __, "", "UNKNOWN" );
233233

234234

235235
/*

‎src/c-lib/ai.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
* One more that last entry since we NULL terminate.
4242
*
4343
*/
44-
#define MAX_PARTS (5 + 1) /* Currently AI (8001) = N4 N5 N3 N1 N1 */
45-
#define MAX_LINTERS (2 + 1) /* Many AIs have, e.g. csum,key */
44+
#define MAX_PARTS (5 + 1) /* Currently AI (8001) = N4 N5 N3 N1 N1 */
45+
#define MAX_LINTERS (3 + 1) /* Currently AI (8014) = csumalpha,key,hasnondigit */
4646

4747

4848
typedef enum {
@@ -117,26 +117,26 @@ struct validationEntry {
117117
#define OPT true
118118

119119

120-
#define AI_VA(a, f, d, c1,mn1,mx1,o1,l00,l01, c2,mn2,mx2,o2,l10,l11, c3,mn3,mx3,o3,l20,l21, c4,mn4,mx4,o4,l30,l31, c5,mn5,mx5,o5,l40,l41, k, t) { \
121-
.ai = a, \
122-
.fnc1 = f, \
123-
.dlDataAttr = d, \
124-
.parts = { \
125-
{ .cset = cset_##c1, .min = mn1, .max = mx1, .opt = o1, .linters = { gs1_lint_##l00, gs1_lint_##l01, NULL } }, \
126-
{ .cset = cset_##c2, .min = mn2, .max = mx2, .opt = o2, .linters = { gs1_lint_##l10, gs1_lint_##l11, NULL } }, \
127-
{ .cset = cset_##c3, .min = mn3, .max = mx3, .opt = o3, .linters = { gs1_lint_##l20, gs1_lint_##l21, NULL } }, \
128-
{ .cset = cset_##c4, .min = mn4, .max = mx4, .opt = o4, .linters = { gs1_lint_##l30, gs1_lint_##l31, NULL } }, \
129-
{ .cset = cset_##c5, .min = mn5, .max = mx5, .opt = o5, .linters = { gs1_lint_##l40, gs1_lint_##l41, NULL } }, \
130-
{ .cset = 0, .min = 0, .max = 0, .opt = 0, .linters = { NULL, NULL, NULL } }, \
131-
}, \
132-
.attrs = k, \
133-
.title = t, \
120+
#define AI_VA(a, f, d, c1,mn1,mx1,o1,l00,l01,l02, c2,mn2,mx2,o2,l10,l11,l12, c3,mn3,mx3,o3,l20,l21,l22, c4,mn4,mx4,o4,l30,l31,l32, c5,mn5,mx5,o5,l40,l41,l42, k, t) { \
121+
.ai = a, \
122+
.fnc1 = f, \
123+
.dlDataAttr = d, \
124+
.parts = { \
125+
{ .cset = cset_##c1, .min = mn1, .max = mx1, .opt = o1, .linters = { gs1_lint_##l00, gs1_lint_##l01, gs1_lint_##l02, NULL } }, \
126+
{ .cset = cset_##c2, .min = mn2, .max = mx2, .opt = o2, .linters = { gs1_lint_##l10, gs1_lint_##l11, gs1_lint_##l12, NULL } }, \
127+
{ .cset = cset_##c3, .min = mn3, .max = mx3, .opt = o3, .linters = { gs1_lint_##l20, gs1_lint_##l21, gs1_lint_##l22, NULL } }, \
128+
{ .cset = cset_##c4, .min = mn4, .max = mx4, .opt = o4, .linters = { gs1_lint_##l30, gs1_lint_##l31, gs1_lint_##l32, NULL } }, \
129+
{ .cset = cset_##c5, .min = mn5, .max = mx5, .opt = o5, .linters = { gs1_lint_##l40, gs1_lint_##l41, gs1_lint_##l42, NULL } }, \
130+
{ .cset = 0, .min = 0, .max = 0, .opt = 0, .linters = { NULL, NULL, NULL } }, \
131+
}, \
132+
.attrs = k, \
133+
.title = t, \
134134
}
135135
#define PASS_ON(...) __VA_ARGS__
136136
#define AI_ENTRY(...) PASS_ON(AI_VA(__VA_ARGS__))
137137
#define cset_0 0
138138
#define gs1_lint__ NULL
139-
#define __ 0,0,0,0,_,_ /* NULL placeholder instead of e.g. X,1,30,MAN,csum,key */
139+
#define __ 0,0,0,0,_,_,_ /* NULL placeholder instead of e.g. X,1,30,MAN,csum,key */
140140
#define AI_ENTRY_TERMINATOR AI_ENTRY( "", 0, 0, __, __, __, __, __, "", "" )
141141

142142

0 commit comments

Comments
 (0)