pike.git/
src/
language.yacc
Branch:
Tag:
Non-build tags
All tags
No tags
2014-10-05
2014-10-05 18:53:51 by Martin Nilsson <nilsson@opera.com>
0085e4f1da2f6af1d62d9dd359c19ff0094d4e87 (
17
lines) (+
3
/-
14
)
[
Show
|
Annotate
]
Branch:
8.1
nomask is deprecated. Release the reserved token.
76:
%token TOK_MIXED_ID %token TOK_MOD_EQ %token TOK_MULT_EQ
-
%token TOK_NO_MASK
+
%token TOK_OBJECT_ID %token TOK_OR_EQ %token TOK_PRIVATE
234:
%type <number> TOK_MAPPING_ID %type <number> TOK_MIXED_ID %type <number> TOK_MULTISET_ID
-
%type <number> TOK_NO_MASK
+
%type <number> TOK_OBJECT_ID %type <number> TOK_PREDEF %type <number> TOK_PRIVATE
1083:
; modifier:
-
TOK_
NO_MASK
-
{
-
$$ = ID_
FINAL
| ID
_
INLINE;
-
if( !(THIS_COMPILATION->lex.pragmas &
ID
_NO_DEPRECATION_WARNINGS)
&&
-
!TEST_COMPAT(7, 6) && Pike_compiler->compiler_pass==1 )
-
yywarning("Keyword nomask is deprecated in favor for 'final'.");
-
}
-
| TOK_FINAL_ID
{ $$ = ID_FINAL | ID_INLINE; }
+
TOK_FINAL_ID { $$ = ID_FINAL | ID_INLINE; }
| TOK_STATIC { $$ = ID_PROTECTED; if( !(THIS_COMPILATION->lex.pragmas & ID_NO_DEPRECATION_WARNINGS) &&
1108:
; magic_identifiers1:
-
TOK_
NO_MASK { $$ = "nomask"; }
-
| TOK_
FINAL_ID { $$ = "final"; }
+
TOK_FINAL_ID { $$ = "final"; }
| TOK_STATIC { $$ = "static"; } | TOK_EXTERN { $$ = "extern"; } | TOK_PRIVATE { $$ = "private"; }
4545:
{ yyerror_reserved("inline"); } | TOK_LOCAL_ID { yyerror_reserved("local"); }
-
| TOK_NO_MASK
-
{ yyerror_reserved("nomask"); }
+
| TOK_PREDEF { yyerror_reserved("predef"); } | TOK_PRIVATE