embedaddon/lighttpd/src/configparser.y - diff

Return to configparser.y CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / lighttpd / src

Diff for /embedaddon/lighttpd/src/configparser.y between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2013/10/14 10:32:47	version 1.1.1.2, 2014/06/15 20:20:06
Line 14	Line 14
static void configparser_push(config_t ctx, data_config dc, int isnew) {	static void configparser_push(config_t ctx, data_config dc, int isnew) {
if (isnew) {	if (isnew) {
dc->context_ndx = ctx->all_configs->used;	dc->context_ndx = ctx->all_configs->used;
assert(dc->context_ndx > ctx->current->context_ndx);	force_assert(dc->context_ndx > ctx->current->context_ndx);
array_insert_unique(ctx->all_configs, (data_unset *)dc);	array_insert_unique(ctx->all_configs, (data_unset *)dc);
dc->parent = ctx->current;	dc->parent = ctx->current;
array_insert_unique(dc->parent->childs, (data_unset *)dc);	array_insert_unique(dc->parent->childs, (data_unset *)dc);
Line 96 data_unset configparser_merge_data(data_unset op1, c	Line 96 data_unset configparser_merge_data(data_unset op1, c
}	}
break;	break;
default:	default:
assert(0);	force_assert(0);
break;	break;
}	}
}	}
Line 334 eols ::= .	Line 334 eols ::= .
globalstart ::= GLOBAL. {	globalstart ::= GLOBAL. {
data_config *dc;	data_config *dc;
dc = (data_config *)array_get_element(ctx->srv->config_context, "global");	dc = (data_config *)array_get_element(ctx->srv->config_context, "global");
assert(dc);	force_assert(dc);
configparser_push(ctx, dc, 0);	configparser_push(ctx, dc, 0);
}	}

Line 344 global(A) ::= globalstart LCURLY metalines RCURLY. {	Line 344 global(A) ::= globalstart LCURLY metalines RCURLY. {
cur = ctx->current;	cur = ctx->current;
configparser_pop(ctx);	configparser_pop(ctx);

assert(cur && ctx->current);	force_assert(cur && ctx->current);

A = cur;	A = cur;
}	}
Line 372 condline(A) ::= context LCURLY metalines RCURLY. {	Line 372 condline(A) ::= context LCURLY metalines RCURLY. {
cur = ctx->current;	cur = ctx->current;
configparser_pop(ctx);	configparser_pop(ctx);

assert(cur && ctx->current);	force_assert(cur && ctx->current);

A = cur;	A = cur;
}	}
Line 400 context ::= DOLLAR SRVVARNAME(B) LBRACKET stringop(C)	Line 400 context ::= DOLLAR SRVVARNAME(B) LBRACKET stringop(C)
op = buffer_init_string("=~");	op = buffer_init_string("=~");
break;	break;
default:	default:
assert(0);	force_assert(0);
return;	return;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2