Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfce573a

Browse files
committed
I haven't seen any objections, so here is a patch. It removes "#define
YYERROR_VERBOSE" from contrib/cube and contrib/seg, and adjusts the expectedoutput accordingly. Hopefully this will consistently pass across multiplebison versions.Joe Conway
1 parent0b620e3 commitfce573a

File tree

4 files changed

+21
-23
lines changed

4 files changed

+21
-23
lines changed

‎contrib/cube/cubeparse.y

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
/* NdBox = [(lowerleft),(upperright)]*/
33
/* [(xLL(1)...xLL(N)),(xUR(1)...xUR(n))]*/
44

5-
#defineYYERROR_VERBOSE
65
#defineYYPARSE_PARAM result/* need this to pass a pointer (void *) to yyparse*/
76
#defineYYSTYPEchar *
87
#defineYYDEBUG1

‎contrib/cube/expected/cube.out

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -258,46 +258,46 @@ SELECT '[(0,0,0,0),(1,0,0,0)]'::cube AS cube;
258258
SELECT ''::cube AS cube;
259259
ERROR: cube_in: can't parse an empty string
260260
SELECT 'ABC'::cube AS cube;
261-
ERROR: parse error, expecting `FLOAT' or `O_PAREN' or `O_BRACKET' at or before position 1, character ('A', \101), input: 'ABC'
261+
ERROR: parse error at or before position 1, character ('A', \101), input: 'ABC'
262262

263263
SELECT '()'::cube AS cube;
264-
ERROR: parse error, expecting `FLOAT' at or before position 2, character (')', \051), input: '()'
264+
ERROR: parse error at or before position 2, character (')', \051), input: '()'
265265

266266
SELECT '[]'::cube AS cube;
267-
ERROR: parse error, expecting `O_PAREN' at or before position 2, character (']', \135), input: '[]'
267+
ERROR: parse error at or before position 2, character (']', \135), input: '[]'
268268

269269
SELECT '[()]'::cube AS cube;
270-
ERROR: parse error, expecting `FLOAT' at or before position 3, character (')', \051), input: '[()]'
270+
ERROR: parse error at or before position 3, character (')', \051), input: '[()]'
271271

272272
SELECT '[(1)]'::cube AS cube;
273-
ERROR: parse error, expecting `COMMA' at or before position 5, character (']', \135), input: '[(1)]'
273+
ERROR: parse error at or before position 5, character (']', \135), input: '[(1)]'
274274

275275
SELECT '[(1),]'::cube AS cube;
276-
ERROR: parse error, expecting `O_PAREN' at or before position 6, character (']', \135), input: '[(1),]'
276+
ERROR: parse error at or before position 6, character (']', \135), input: '[(1),]'
277277

278278
SELECT '[(1),2]'::cube AS cube;
279-
ERROR: parse error, expecting `O_PAREN' at or before position 7, character (']', \135), input: '[(1),2]'
279+
ERROR: parse error at or before position 7, character (']', \135), input: '[(1),2]'
280280

281281
SELECT '[(1),(2),(3)]'::cube AS cube;
282-
ERROR: parse error, expecting `C_BRACKET' at or before position 9, character (',', \054), input: '[(1),(2),(3)]'
282+
ERROR: parse error at or before position 9, character (',', \054), input: '[(1),(2),(3)]'
283283

284284
SELECT '1,'::cube AS cube;
285-
ERROR: parse error, expecting `FLOAT' at or before position 2, character (',', \054), input: '1,'
285+
ERROR: parse error at or before position 2, character (',', \054), input: '1,'
286286

287287
SELECT '1,2,'::cube AS cube;
288-
ERROR: parse error, expecting `FLOAT' at or before position 4, character (',', \054), input: '1,2,'
288+
ERROR: parse error at or before position 4, character (',', \054), input: '1,2,'
289289

290290
SELECT '1,,2'::cube AS cube;
291-
ERROR: parse error, expecting `FLOAT' at or before position 3, character (',', \054), input: '1,,2'
291+
ERROR: parse error at or before position 3, character (',', \054), input: '1,,2'
292292

293293
SELECT '(1,)'::cube AS cube;
294-
ERROR: parse error, expecting `FLOAT' at or before position 4, character (')', \051), input: '(1,)'
294+
ERROR: parse error at or before position 4, character (')', \051), input: '(1,)'
295295

296296
SELECT '(1,2,)'::cube AS cube;
297-
ERROR: parse error, expecting `FLOAT' at or before position 6, character (')', \051), input: '(1,2,)'
297+
ERROR: parse error at or before position 6, character (')', \051), input: '(1,2,)'
298298

299299
SELECT '(1,,2)'::cube AS cube;
300-
ERROR: parse error, expecting `FLOAT' at or before position 4, character (',', \054), input: '(1,,2)'
300+
ERROR: parse error at or before position 4, character (',', \054), input: '(1,,2)'
301301

302302
-- invalid input: semantic errors and trailing garbage
303303
SELECT '[(1),(2)],'::cube AS cube; -- 0

‎contrib/seg/expected/seg.out

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -395,25 +395,25 @@ SELECT '100(+-)1'::seg AS seg;
395395
SELECT ''::seg AS seg;
396396
ERROR: seg_in: can't parse an empty string
397397
SELECT 'ABC'::seg AS seg;
398-
ERROR: parse error, expecting `FLOAT' or `RANGE' or `EXTENSION' at or near position 1, character ('A', \101), input: 'ABC'
398+
ERROR: parse error at or near position 1, character ('A', \101), input: 'ABC'
399399

400400
SELECT '1ABC'::seg AS seg;
401-
ERROR:expecting end of input at or near position 2, character ('A', \101), input: '1ABC'
401+
ERROR:parse error at or near position 2, character ('A', \101), input: '1ABC'
402402

403403
SELECT '1.'::seg AS seg;
404-
ERROR:expecting end of input at or near position 2, character ('.', \056), input: '1.'
404+
ERROR:parse error at or near position 2, character ('.', \056), input: '1.'
405405

406406
SELECT '1.....'::seg AS seg;
407-
ERROR:expecting end of input at or near position 6, character ('.', \056), input: '1.....'
407+
ERROR:parse error at or near position 6, character ('.', \056), input: '1.....'
408408

409409
SELECT '.1'::seg AS seg;
410-
ERROR: parse error, expecting `FLOAT' or `RANGE' or `EXTENSION' at or near position 2, character ('1', \061), input: '.1'
410+
ERROR: parse error at or near position 2, character ('1', \061), input: '.1'
411411

412412
SELECT '1..2.'::seg AS seg;
413-
ERROR:expecting end of input at or near position 5, character ('.', \056), input: '1..2.'
413+
ERROR:parse error at or near position 5, character ('.', \056), input: '1..2.'
414414

415415
SELECT '1 e7'::seg AS seg;
416-
ERROR:expecting end of input at or near position 3, character ('e', \145), input: '1 e7'
416+
ERROR:parse error at or near position 3, character ('e', \145), input: '1 e7'
417417

418418
SELECT '1e700'::seg AS seg;
419419
ERROR: numeric value 1e700 unrepresentable

‎contrib/seg/segparse.y

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
%{
2-
#defineYYERROR_VERBOSE
32
#defineYYPARSE_PARAM result/* need this to pass a pointer (void *) to yyparse*/
43

54
#include"postgres.h"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp