Fix the mismatch of tokens TK_TQOBJECT × TK_QOBJECT and

TK_TQCHAR × TK_QCHAR between lexer and parser.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c1d6f4a527)
r14.0.x
Slávek Banko 2 years ago
parent 9a250b2016
commit 2d49f6c665
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -262,13 +262,13 @@ static int isEnabledFeature(const char *name);
%token TK_PLATFORMS %token TK_PLATFORMS
%token TK_FEATURE %token TK_FEATURE
%token TK_LICENSE %token TK_LICENSE
%token <qchar> TK_QCHAR %token <qchar> TK_TQCHAR
%token TK_TRUE %token TK_TRUE
%token TK_FALSE %token TK_FALSE
%token TK_NULL %token TK_NULL
%token TK_OPERATOR %token TK_OPERATOR
%token TK_THROW %token TK_THROW
%token TK_QOBJECT %token TK_TQOBJECT
%token TK_EXCEPTION %token TK_EXCEPTION
%token TK_RAISECODE %token TK_RAISECODE
%token TK_EXPLICIT %token TK_EXPLICIT
@ -1403,7 +1403,7 @@ simplevalue: scopedname {
$$.vtype = string_value; $$.vtype = string_value;
$$.u.vstr = $1; $$.u.vstr = $1;
} }
| TK_QCHAR { | TK_TQCHAR {
$$.vtype = qchar_value; $$.vtype = qchar_value;
$$.u.vqchar = $1; $$.u.vqchar = $1;
} }
@ -2355,7 +2355,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
currentSpec -> sigslots = TRUE; currentSpec -> sigslots = TRUE;
} }
| TK_QOBJECT optname optflags { | TK_TQOBJECT optname optflags {
$$.atype = qobject_type; $$.atype = qobject_type;
$$.argflags = 0; $$.argflags = 0;
$$.nrderefs = 0; $$.nrderefs = 0;

Loading…
Cancel
Save