Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 04:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rearrange some variables for possibly better alignment. int -> bool

Browse source
This commit is contained in:
ridiculousfish 2013-01-19 13:21:55 -08:00
parent e07de09460
commit 6d61919941
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin.cpp
View file

@ -3619,7 +3619,7 @@ static int builtin_else(parser_t &parser, wchar_t **argv)
if_block->skip = ! run_else;
if_block->else_evaluated = true;
env_pop();
env_push(0);
env_push(false);
}
/*

8
env.cpp
View file

@ -91,8 +91,8 @@ extern char **__environ;
*/
struct var_entry_t
{
bool exportv; /**< Whether the variable should be exported */
wcstring val; /**< The value of the variable */
bool exportv; /**< Whether the variable should be exported */
var_entry_t() : exportv(false) { }
};
@ -118,7 +118,7 @@ struct env_node_t
invisible. If new_scope is set for the global variable node,
the universe will explode.
*/
int new_scope;
bool new_scope;
/**
Does this node contain any variables which are exported to subshells
*/
@ -130,7 +130,7 @@ struct env_node_t
struct env_node_t *next;
env_node_t() : new_scope(0), exportv(false), next(NULL) { }
env_node_t() : new_scope(false), exportv(false), next(NULL) { }
};
class variable_entry_t
@ -1244,7 +1244,7 @@ static int local_scope_exports(env_node_t *n)
return local_scope_exports(n->next);
}
void env_push(int new_scope)
void env_push(bool new_scope)
{
env_node_t *node = new env_node_t;
node->next = top;

2
env.h
View file

@ -167,7 +167,7 @@ int env_remove(const wcstring &key, int mode);
/**
Push the variable stack. Used for implementing local variables for functions and for-loops.
*/
void env_push(int new_scope);
void env_push(bool new_scope);
/**
Pop the variable stack. Used for implementing local variables for functions and for-loops.