pike.git/
src/
cpp.cmod
Branch:
Tag:
Non-build tags
All tags
No tags
2017-04-08
2017-04-08 20:30:39 by Martin Nilsson <nilsson@fastmail.com>
19961b66b27b847a5397932cbeddf2b5f401fc8a (
71
lines) (+
35
/-
36
)
[
Show
|
Annotate
]
Branch:
8.1
Use Pike_sp instead of sp
30:
#define DEFAULT_CMOD_STORAGE
-
#define sp Pike_sp
-
+
#define CPP_NO_OUTPUT 1 /* Inside false section of #if/#else */ #define CPP_EXPECT_ELSE 2 /* Expect #else/#elif/#elseif. */ #define CPP_EXPECT_ENDIF 4 /* Expect #endif */
247:
low_safe_apply_handler("compile_exception", this->handler, this->compat_handler, 1);
-
if (SAFE_IS_ZERO(sp-1)) {
+
if (SAFE_IS_ZERO(
Pike_
sp-1)) {
struct pike_string *s = format_exception_for_error_msg (&thrown); if (s) { cpp_error_sprintf(this, "%S", s);
511:
push_int(major); push_int(minor); SAFE_APPLY_MASTER("get_compilation_handler",2);
-
if(TYPEOF(sp[-1]) == T_OBJECT)
+
if(TYPEOF(
Pike_
sp[-1]) == T_OBJECT)
{
-
if (SUBTYPEOF(sp[-1])) {
+
if (SUBTYPEOF(
Pike_
sp[-1])) {
cpp_error(this, "#pike: Subtyped compilation handlers are not supported yet."); }
-
this->compat_handler=sp[-1].u.object;
+
this->compat_handler=
Pike_
sp[-1].u.object;
dmalloc_touch_svalue(Pike_sp-1);
-
sp--;
+
Pike_
sp--;
} this->compat_major=major; this->compat_minor=minor;
922:
ref_push_string(s); f_index(2);
-
res=!(UNSAFE_IS_ZERO(sp-1) && SUBTYPEOF(sp[-1]) == NUMBER_UNDEFINED);
+
res=!(UNSAFE_IS_ZERO(
Pike_
sp-1) && SUBTYPEOF(
Pike_
sp[-1]) == NUMBER_UNDEFINED);
} UNSETJMP(recovery); return res;
938:
*/ static void cpp_constant(struct cpp *this, int value) {
-
struct svalue *save_stack=sp;
+
struct svalue *save_stack=
Pike_
sp;
struct array *arr; INT_TYPE res = 0; int n;
1002:
str); } else
-
res = !(SAFE_IS_ZERO(sp-1) && SUBTYPEOF(sp[-1]) == NUMBER_UNDEFINED);
+
res = !(SAFE_IS_ZERO(
Pike_
sp-1) && SUBTYPEOF(
Pike_
sp[-1]) == NUMBER_UNDEFINED);
} else if (TYPEOF(throw_value) == T_STRING && !throw_value.u.string->size_shift) {
1029:
if (safe_apply_handler("handle_import", this->handler, this->compat_handler, 3, BIT_MAPPING|BIT_OBJECT|BIT_PROGRAM))
-
res = !(SAFE_IS_ZERO(sp-1) && SUBTYPEOF(sp[-1]) == NUMBER_UNDEFINED);
+
res = !(SAFE_IS_ZERO(
Pike_
sp-1) && SUBTYPEOF(
Pike_
sp[-1]) == NUMBER_UNDEFINED);
else { cpp_handle_exception (this, "Error importing '.'."); }
1040:
} if (value && res) {
-
if (TYPEOF(sp[-1]) == T_INT)
-
res = sp[-1].u.integer;
+
if (TYPEOF(
Pike_
sp[-1]) == T_INT)
+
res =
Pike_
sp[-1].u.integer;
else res = 0; }
-
pop_n_elems(1 + sp - save_stack);
+
pop_n_elems(1 +
Pike_
sp - save_stack);
push_int(res); }
1716:
/* Note: We lose the extra reference to data here. */ push_string(data); f_unicode_to_string(1);
-
add_ref(data = sp[-1].u.string);
+
add_ref(data =
Pike_
sp[-1].u.string);
pop_stack(); return data; }
1767:
if (safe_apply_handler ("decode_charset", this->handler, this->compat_handler, 2, BIT_STRING)) { /* Various consistency checks. */
-
if ((sp[-1].u.string->size_shift) ||
-
(((size_t)sp[-1].u.string->len) < CONSTANT_STRLEN("#charset")) ||
-
(sp[-1].u.string->str[0] != '#')) {
+
if ((
Pike_
sp[-1].u.string->size_shift) ||
+
(((size_t)
Pike_
sp[-1].u.string->len) < CONSTANT_STRLEN("#charset")) ||
+
(
Pike_
sp[-1].u.string->str[0] != '#')) {
pop_stack(); return data; }
1783:
/* Extract the charset name */
-
p = sp[-1].u.string->str + 1;
+
p =
Pike_
sp[-1].u.string->str + 1;
while (*p && isspace(*((unsigned char *)p))) { p++; }
1847:
/* Accept the new string */ free_string(data);
-
add_ref(data = sp[-1].u.string);
+
add_ref(data =
Pike_
sp[-1].u.string);
pop_stack(); } return data;
3157:
ref_push_string( arg ); if (safe_apply_handler( "evaluate_define", this->handler, this->compat_handler, 2, 0 ) &&
-
TYPEOF(sp[-1]) == T_STRING ) {
-
string_builder_shared_strcat(tmp, sp[-1].u.string);
+
TYPEOF(
Pike_
sp[-1]) == T_STRING ) {
+
string_builder_shared_strcat(tmp,
Pike_
sp[-1].u.string);
if( !this->prefix ){ int min;
-
check_string_range( sp[-1].u.string, 0, &min, 0 );
+
check_string_range(
Pike_
sp[-1].u.string, 0, &min, 0 );
if( min < 32 ) { string_builder_sprintf(tmp, "\n#line %ld ", (long)this->current_line);
3182:
ref_push_string( def->name ); if (safe_apply_handler( "evaluate_define", this->handler, this->compat_handler, 1, 0 ) &&
-
TYPEOF(sp[-1]) == T_STRING )
-
string_builder_shared_strcat(tmp, sp[-1].u.string);
+
TYPEOF(
Pike_
sp[-1]) == T_STRING )
+
string_builder_shared_strcat(tmp,
Pike_
sp[-1].u.string);
if (Pike_sp > save_sp) pop_n_elems(Pike_sp-save_sp); }
3362:
efun; { struct cpp this;
-
struct svalue *save_sp = sp - args;
+
struct svalue *save_sp =
Pike_
sp - args;
struct mapping *predefs = NULL; struct pike_string *prefix = NULL;
3457:
charset); Pike_error("Unknown charset.\n"); }
-
this.data = data = sp[-1].u.string;
-
sp--;
-
dmalloc_touch_svalue(sp);
+
this.data = data =
Pike_
sp[-1].u.string;
+
Pike_
sp--;
+
dmalloc_touch_svalue(
Pike_
sp);
} else if(TYPEOF(*charset_sv) == T_INT) auto_convert = charset_sv->u.integer;
3479:
else { low_unsafe_apply_handler ("get_predefines", this.handler, this.compat_handler, 0);
-
if (!UNSAFE_IS_ZERO (sp - 1)) {
+
if (!UNSAFE_IS_ZERO (
Pike_
sp - 1)) {
struct keypair *k; int e, sprintf_args = 0;
-
if (TYPEOF(sp[-1]) != T_MAPPING) {
+
if (TYPEOF(
Pike_
sp[-1]) != T_MAPPING) {
push_static_text ("Invalid return value from get_predefines, got %O\n");
-
push_svalue (sp - 3);
+
push_svalue (
Pike_
sp - 3);
sprintf_args = 2; } else {
-
predefs = copy_mapping (sp[-1].u.mapping);
+
predefs = copy_mapping (
Pike_
sp[-1].u.mapping);
NEW_MAPPING_LOOP (predefs->data) { if (TYPEOF(k->ind) != T_STRING || !k->ind.u.string->len) { push_static_text ("Expected nonempty string as predefine name, got %O\n");
3515:
if (!predefs) { predef_map_error: f_sprintf (sprintf_args);
-
Pike_error("%S", sp[-1].u.string);
+
Pike_error("%S",
Pike_
sp[-1].u.string);
} } pop_stack();
3662:
else if(this.dependencies_fail) { free_string_builder(&this.buf);
-
pop_n_elems(sp - save_sp);
+
pop_n_elems(
Pike_
sp - save_sp);
push_int(0); } else {
-
pop_n_elems(sp - save_sp);
+
pop_n_elems(
Pike_
sp - save_sp);
push_string(finish_string_builder(&this.buf)); } }