From d00e178cd2040f612aeebfd9971b05e250c65d8c Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 11 Dec 2014 05:13:45 +0100 Subject: mds-kbdc: compile-layout: do not warn about non-shadowing after a for-loop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/mds-kbdc/variables.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) (limited to 'src/mds-kbdc/variables.c') diff --git a/src/mds-kbdc/variables.c b/src/mds-kbdc/variables.c index 155edd7..4d4f941 100644 --- a/src/mds-kbdc/variables.c +++ b/src/mds-kbdc/variables.c @@ -41,11 +41,18 @@ typedef struct variable struct variable* restrict previous; /** - * The original scope the current shadow - * of the variable was created in + * The original scope in which the current + * shadow of the variable was created */ size_t scope; + /** + * The latest scope the in which the + * variable has been used in a for-loop, + * `~0' if never, or below `scope` + */ + size_t used_in_for; + } variable_t; @@ -173,6 +180,7 @@ int variables_let(size_t variable, mds_kbdc_tree_t* restrict value) variables[variable]->value = value; variables[variable]->previous = previous; variables[variable]->scope = current_scope; + variables[variable]->used_in_for = (size_t)(~0LL); } return 0; @@ -197,3 +205,49 @@ mds_kbdc_tree_t* variables_get(size_t variable) return variables[variable]->value; } + +/** + * Mark a variable as having been unsed in a for-loop in the current scope + * + * @param variable The variable index, must already be defined + * @return Zero on success, -1 on error + */ +int variables_was_used_in_for(size_t variable) +{ + variable_t* previous; + + /* Already marked. */ + if (variables[variable]->used_in_for == current_scope) + return 0; + + /* Not marked. */ + if (variables[variable]->used_in_for == (size_t)(~0LL)) + return variables[variable]->used_in_for = current_scope, 0; + + /* Marked for another scope. */ + previous = variables[variable]; + if (xmalloc(variables[variable], 1, variable_t)) + fail_if (variables[variable] = previous, 1); + variables[variable]->value = mds_kbdc_tree_dup(previous->value); + fail_if (variables[variable]->value == NULL); + variables[variable]->previous = previous; + variables[variable]->scope = current_scope; + variables[variable]->used_in_for = current_scope; + + return 0; + fail: + return -1; +} + + +/** + * Check whether a variable has been used in a for-loop in the current scope + * + * @param variable The variable index, must already be defined + * @return Whether `variables_was_used_in_for` has been unused on the variable + */ +int variables_has_been_used_in_for(size_t variable) +{ + return variables[variable]->used_in_for == current_scope; +} + -- cgit v1.2.3-70-g09d2