Skip to content

Commit

Permalink
Allow toggling of idempotent/shift behavior via env var AUGEAS_NO_SHIFT
Browse files Browse the repository at this point in the history
  • Loading branch information
@lutter
lutter committed Mar 8, 2018
1 parent 8070e69 commit 131fc06
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 91 deletions.
82 changes: 18 additions & 64 deletions src/get.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,7 @@ static struct tree *get_subtree(struct lens *lens, struct state *state) {
tree = make_tree(state->key, state->value, NULL, children);
ERR_NOMEM(tree == NULL, state->info);
tree->span = move(state->span);
tree->pos = REG_START(state) + 1;

if (tree->span != NULL) {
update_span(span, tree->span->span_start, tree->span->span_end);
Expand All @@ -937,43 +938,12 @@ static struct skel *parse_subtree(struct lens *lens, struct state *state,

state->key = NULL;
skel = parse_lens(lens->child, state, &di);
*dict = make_dict(state->key, skel, di);
state->key = key;
return make_skel(lens);
}

static struct tree *get_region(struct lens *lens, struct state *state) {
struct span *span = state->span;

struct tree *tree;

if (state->info->flags & AUG_ENABLE_SPAN) {
state->span = make_span(state->info);
ERR_NOMEM(state->span == NULL, state->info);
}

tree = get_lens(lens->child, state);

tree->span = state->span;
tree->pos = REG_START(state) + 1;

if (state->span != NULL) {
update_span(span, state->span->span_start, state->span->span_end);
if (getenv("AUGEAS_NO_SHIFT") == NULL) {
*dict = make_dict(state->key, skel, di);
} else {
*dict = make_dictz(REG_START(state) + 1, skel, di);
}

state->span = span;
return tree;
error:
return NULL;
}

static struct skel *parse_region(struct lens *lens, struct state *state,
struct dict **dict) {
struct skel *skel;
struct dict *di = NULL;

skel = parse_lens(lens->child, state, &di);
*dict = make_dictz(REG_START(state) + 1, skel, di);
state->key = key;
return make_skel(lens);
}

Expand Down Expand Up @@ -1310,14 +1280,19 @@ static void parse_combine(struct rec_state *rec_state,

static void visit_exit_put_subtree(struct lens *lens,
struct rec_state *rec_state,
struct frame *top) {
struct frame *top,
size_t start) {
struct state *state = rec_state->state;
struct skel *skel = NULL;
struct dict *dict = NULL;

skel = make_skel(lens);
ERR_NOMEM(skel == NULL, lens->info);
dict = make_dict(top->key, top->skel, top->dict);
if (getenv("AUGEAS_NO_SHIFT") == NULL) {
dict = make_dict(top->key, top->skel, top->dict);
} else {
dict = make_dictz(start, top->skel, top->dict);
}
ERR_NOMEM(dict == NULL, lens->info);

top = pop_frame(rec_state);
Expand All @@ -1334,7 +1309,7 @@ static void visit_exit_put_subtree(struct lens *lens,
}

static void visit_exit(struct lens *lens,
ATTRIBUTE_UNUSED size_t start,
size_t start,
ATTRIBUTE_UNUSED size_t end,
void *data) {
struct rec_state *rec_state = data;
Expand All @@ -1350,7 +1325,7 @@ static void visit_exit(struct lens *lens,

ERR_BAIL(lens->info);

if (lens->tag == L_SUBTREE) {
if (lens->tag == L_SUBTREE || lens->tag == L_REGION) {
/* Get the result of parsing lens->child */
struct frame *top = pop_frame(rec_state);
ERR_BAIL(state->info);
Expand All @@ -1371,24 +1346,7 @@ static void visit_exit(struct lens *lens,
ERR_BAIL(state->info);
top->tree = move(tree);
} else {
visit_exit_put_subtree(lens, rec_state, top);
}
} else if (lens->tag == L_REGION) {
if (rec_state->mode == M_PARSE) {
struct frame *top = top_frame(rec_state);
struct skel *skel;
struct dict *dict;
skel = make_skel(lens);
ERR_NOMEM(skel == NULL, lens->info);
dict = make_dictz(start, top->skel, top->dict);
ERR_NOMEM(dict == NULL, lens->info);
top = pop_frame(rec_state);
ensure(lens == top->lens, state->info);
state->key = top->key;
pop_frame(rec_state);
top = push_frame(rec_state, lens);
top->skel = skel;
top->dict = dict;
visit_exit_put_subtree(lens, rec_state, top, start);
}
} else if (lens->tag == L_CONCAT) {
ensure(rec_state->fused >= lens->nchildren, state->info);
Expand Down Expand Up @@ -1609,10 +1567,8 @@ static struct tree *get_lens(struct lens *lens, struct state *state) {
tree = get_union(lens, state);
break;
case L_SUBTREE:
tree = get_subtree(lens, state);
break;
case L_REGION:
tree = get_region(lens, state);
tree = get_subtree(lens, state);
break;
case L_STAR:
tree = get_quant_star(lens, state);
Expand Down Expand Up @@ -1753,10 +1709,8 @@ static struct skel *parse_lens(struct lens *lens, struct state *state,
skel = parse_union(lens, state, dict);
break;
case L_SUBTREE:
skel = parse_subtree(lens, state, dict);
break;
case L_REGION:
skel = parse_region(lens, state,dict);
skel = parse_subtree(lens, state, dict);
break;
case L_STAR:
skel = parse_quant_star(lens, state, dict);
Expand Down
34 changes: 7 additions & 27 deletions src/put.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,11 @@ static void put_subtree(struct lens *lens, struct state *state) {
split = make_split(tree->children);
set_split(state, split);

dict_lookup(tree->label, state->dict, &state->skel, &state->dict);
if (getenv("AUGEAS_NO_SHIFT") == NULL) {
dict_lookup(tree->label, state->dict, &state->skel, &state->dict);
} else {
dict_lookupz(tree->pos, state->dict, &state->skel, &state->dict);
}
if (state->with_span) {
if (tree->span == NULL) {
tree->span = make_span(state->info);
Expand All @@ -459,22 +463,6 @@ static void put_subtree(struct lens *lens, struct state *state) {
state->path = oldpath;
}

static void put_region(struct lens *lens, struct state *state) {
assert(lens->tag == L_REGION);
struct skel *oldskel = state->skel;
struct dict *olddict = state->dict;
struct tree *tree = state->split->tree;

dict_lookupz(tree->pos, state->dict, &state->skel, &state->dict);
if (state->skel == NULL || ! skel_instance_of(lens->child, state->skel)) {
create_lens(lens->child, state);
} else {
put_lens(lens->child, state);
}
state->skel = oldskel;
state->dict = olddict;
}

static void put_del(ATTRIBUTE_UNUSED struct lens *lens, struct state *state) {
assert(lens->tag == L_DEL);
assert(state->skel != NULL);
Expand Down Expand Up @@ -684,10 +672,8 @@ static void put_lens(struct lens *lens, struct state *state) {
put_union(lens, state);
break;
case L_SUBTREE:
put_subtree(lens, state);
break;
case L_REGION:
put_region(lens, state);
put_subtree(lens, state);
break;
case L_STAR:
put_quant_star(lens, state);
Expand All @@ -711,10 +697,6 @@ static void create_subtree(struct lens *lens, struct state *state) {
put_subtree(lens, state);
}

static void create_region(struct lens *lens, struct state *state) {
put_region(lens, state);
}

static void create_del(struct lens *lens, struct state *state) {
assert(lens->tag == L_DEL);
if (state->override != NULL) {
Expand Down Expand Up @@ -845,10 +827,8 @@ static void create_lens(struct lens *lens, struct state *state) {
create_union(lens, state);
break;
case L_SUBTREE:
create_subtree(lens, state);
break;
case L_REGION:
create_region(lens, state);
create_subtree(lens, state);
break;
case L_STAR:
create_quant_star(lens, state);
Expand Down

0 comments on commit 131fc06

Please sign in to comment.