pike.git/
src/
language.yacc
Branch:
Tag:
Non-build tags
All tags
No tags
2014-10-05
2014-10-05 20:45:32 by Martin Nilsson <nilsson@opera.com>
3a30d76ff35f0d5dbeed4df70e4de2337f6b9a06 (
21
lines) (+
4
/-
17
)
[
Show
|
Annotate
]
Branch:
8.1
Remove remaining explicit 7.6 compat.
543:
Pike_compiler->compiler_pass=tmp; }
-
if (
!TEST_COMPAT(7, 6) && (
Pike_compiler->current_modifiers & ID_EXTERN)
)
{
+
if (Pike_compiler->current_modifiers & ID_EXTERN) {
int depth = 0; struct program_state *state = Pike_compiler; node *n = $3;
571:
Pike_compiler->current_modifiers & ~ID_EXTERN); } } else {
-
if (TEST_COMPAT(7, 6) &&
-
(Pike_compiler->current_modifiers & ID_EXTERN) &&
-
(Pike_compiler->compiler_pass == 1)) {
-
yywarning("Extern declared constant.");
-
}
+
if(!is_const($3)) { if (Pike_compiler->compiler_pass == 2) { yyerror("Constant definition is not constant.");
735:
int e; MAKE_CONST_STRING(create_string, "create"); if ($6->u.sval.u.string == create_string) {
-
if (TEST_COMPAT(7, 6)) {
-
yywarning("Having both an implicit and an explicit create() "
-
"was not supported in Pike 7.6 and before.");
-
}
+
/* Prepend the create arguments. */ if (Pike_compiler->num_create_args < 0) { Pike_compiler->varargs = 1;
3533:
implicit_modifiers: {
-
if (TEST_COMPAT(7, 6)) {
-
$$ = Pike_compiler->current_modifiers =
-
(THIS_COMPILATION->lex.pragmas & ID_MODIFIER_MASK);
-
} else {
+
$$ = Pike_compiler->current_modifiers = ID_PROTECTED|ID_INLINE|ID_PRIVATE | (THIS_COMPILATION->lex.pragmas & ID_MODIFIER_MASK); }
-
}
+
; expr4: string