pike.git/
src/
cpp.cmod
Branch:
Tag:
Non-build tags
All tags
No tags
2018-04-15
2018-04-15 11:35:37 by Henrik Grubbström (Grubba) <grubba@grubba.org>
52791dfaa61c4530f5f92ba9584c8c7ac8c02ed8 (
16
lines) (+
11
/-
5
)
[
Show
|
Annotate
]
Branch:
master
Cpp: Fixed some CPP_MACRO_* flag confusion.
535:
} else { /* NB: Evaluate the argument before insertion. */ int save_flags = d->flags;
-
d->flags = CPP_MACRO_IN_USE;
+
d->flags
|
= CPP_MACRO_IN_USE;
ref_push_string(str); push_int(flags & ~(CPP_EXPECT_ENDIF | CPP_EXPECT_ELSE));
3405:
{ #if 1 struct svalue *save_sp = Pike_sp;
+
int save_flags;
/* Keep d around... */ push_svalue(&d->self);
3425:
push_int(flags); apply_lfun(d->self.u.object, LFUN_CALL, 3);
-
d->flags = CPP_MACRO_DISABLED;
+
save_flags =
d->flags
;
+
d->flags |
= CPP_MACRO_DISABLED;
/* NB: We're executing in the CPP context object. */ low_cpp(this, MKPCHARP_STR(Pike_sp[-1].u.string), Pike_sp[-1].u.string->len, flags & ~(CPP_EXPECT_ENDIF | CPP_EXPECT_ELSE), charset);
-
d->flags = flags;
+
d->flags =
save_
flags;
pop_n_elems(Pike_sp - save_sp); #else /* !1 */
3500:
{ string_builder_append( &tmp, a, l ); }else{
+
/* NB: Evaluate the argument before insertion. */
struct string_builder save; INT_TYPE line = this->current_line;
-
+
int save_flags;
/* FIXME: Shouldn't we save current_file too? */ save=this->buf; this->buf=tmp;
-
d->flags = CPP_MACRO_IN_USE;
+
save_flags =
d->flags
;
+
d->flags |
= CPP_MACRO_IN_USE;
low_cpp(this, a, l, flags & ~(CPP_EXPECT_ENDIF | CPP_EXPECT_ELSE), charset);
-
d->flags = flags;
+
d->flags =
save_
flags;
tmp=this->buf; this->buf=save; this->current_line=line;