Skip to content

Commit dac1a44

Browse files
committed
Fix some filtering errors
1 parent 72a48e9 commit dac1a44

File tree

2 files changed

+7
-53
lines changed

2 files changed

+7
-53
lines changed

deps/rabbit/src/rabbit_jms_selector_lexer.erl

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,8 @@
11
-file("leexinc.hrl", 0).
2-
%%
3-
%% %CopyrightBegin%
4-
%%
5-
%% SPDX-License-Identifier: BSD-2-Clause
6-
%%
7-
%% Copyright (c) 2008,2009 Robert Virding. All rights reserved.
8-
%% Copyright Ericsson AB 2009-2025. All Rights Reserved.
9-
%%
10-
%% Redistribution and use in source and binary forms, with or without
11-
%% modification, are permitted provided that the following conditions
12-
%% are met:
13-
%%
14-
%% 1. Redistributions of source code must retain the above copyright
15-
%% notice, this list of conditions and the following disclaimer.
16-
%% 2. Redistributions in binary form must reproduce the above copyright
17-
%% notice, this list of conditions and the following disclaimer in the
18-
%% documentation and/or other materials provided with the distribution.
19-
%%
20-
%% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21-
%% "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22-
%% LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
23-
%% FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
24-
%% COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
25-
%% INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
26-
%% BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
27-
%% LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
28-
%% CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29-
%% LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
30-
%% ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31-
%% POSSIBILITY OF SUCH DAMAGE.
32-
%%
33-
%% %CopyrightEnd%
34-
%%
35-
362
%% The source of this file is part of leex distribution, as such it
373
%% has the same Copyright as the other files in the leex
38-
%% distribution. However, the resultant scanner generated by leex is the
4+
%% distribution. The Copyright is defined in the accompanying file
5+
%% COPYRIGHT. However, the resultant scanner generated by leex is the
396
%% property of the creator of the scanner and is not covered by that
407
%% Copyright.
418

@@ -79,7 +46,7 @@ process_string(Chars) ->
7946
process_escaped_quotes(Binary) ->
8047
binary:replace(Binary, <<"''">>, <<"'">>, [global]).
8148

82-
-file("leexinc.hrl", 47).
49+
-file("leexinc.hrl", 14).
8350

8451
format_error({illegal,S}) -> ["illegal characters ",io_lib:write_string(S)];
8552
format_error({user,S}) -> S.
@@ -436,7 +403,7 @@ tab_size() -> 8.
436403
%% return signal either an unrecognised character or end of current
437404
%% input.
438405

439-
-file("rabbit_jms_selector_lexer.erl", 404).
406+
-file("rabbit_jms_selector_lexer.erl", 371).
440407
yystate() -> 66.
441408

442409
yystate(69, [101|Ics], Line, Col, Tlen, _, _) ->
@@ -1846,4 +1813,4 @@ yyaction_29(TokenChars, TokenLine) ->
18461813
-file("rabbit_jms_selector_lexer.xrl", 66).
18471814
yyaction_30(TokenChars) ->
18481815
{ error, { illegal_character, TokenChars } } .
1849-
-file("leexinc.hrl", 377).
1816+
-file("leexinc.hrl", 344).

deps/rabbit/src/rabbit_jms_selector_parser.erl

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
-file("rabbit_jms_selector_parser.yrl", 0).
21
-module(rabbit_jms_selector_parser).
3-
-file("rabbit_jms_selector_parser.erl", 3).
42
-export([parse/1, parse_and_scan/1, format_error/1]).
53
-file("rabbit_jms_selector_parser.yrl", 122).
64

@@ -26,9 +24,7 @@ process_escape_char({string, Line, Value}) ->
2624
%%
2725
%% %CopyrightBegin%
2826
%%
29-
%% SPDX-License-Identifier: Apache-2.0
30-
%%
31-
%% Copyright Ericsson AB 1996-2025. All Rights Reserved.
27+
%% Copyright Ericsson AB 1996-2021. All Rights Reserved.
3228
%%
3329
%% Licensed under the Apache License, Version 2.0 (the "License");
3430
%% you may not use this file except in compliance with the License.
@@ -50,16 +46,10 @@ process_escape_char({string, Line, Value}) ->
5046

5147
-type yecc_ret() :: {'error', _} | {'ok', _}.
5248

53-
-ifdef (YECC_PARSE_DOC).
54-
-doc ?YECC_PARSE_DOC.
55-
-endif.
5649
-spec parse(Tokens :: list()) -> yecc_ret().
5750
parse(Tokens) ->
5851
yeccpars0(Tokens, {no_func, no_location}, 0, [], []).
5952

60-
-ifdef (YECC_PARSE_AND_SCAN_DOC).
61-
-doc ?YECC_PARSE_AND_SCAN_DOC.
62-
-endif.
6353
-spec parse_and_scan({function() | {atom(), atom()}, [_]}
6454
| {atom(), atom(), [_]}) -> yecc_ret().
6555
parse_and_scan({F, A}) ->
@@ -68,9 +58,6 @@ parse_and_scan({M, F, A}) ->
6858
Arity = length(A),
6959
yeccpars0([], {{fun M:F/Arity, A}, no_location}, 0, [], []).
7060

71-
-ifdef (YECC_FORMAT_ERROR_DOC).
72-
-doc ?YECC_FORMAT_ERROR_DOC.
73-
-endif.
7461
-spec format_error(any()) -> [char() | list()].
7562
format_error(Message) ->
7663
case io_lib:deep_char_list(Message) of
@@ -212,7 +199,7 @@ yecctoken2string1(Other) ->
212199

213200

214201

215-
-file("rabbit_jms_selector_parser.erl", 215).
202+
-file("rabbit_jms_selector_parser.erl", 202).
216203

217204
-dialyzer({nowarn_function, yeccpars2/7}).
218205
-compile({nowarn_unused_function, yeccpars2/7}).

0 commit comments

Comments
 (0)