Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 02:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Scope: simplify PList access, use pop_back() and back()

Browse source
This commit is contained in:
Max Kellermann 2020-02-25 20:47:54 +01:00
parent cdf4362c7d
commit ee21f29173
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Scope.cc
View file

@ -160,7 +160,7 @@ ID* lookup_ID(const char* name, const char* curr_module, bool no_global,
ID* install_ID(const char* name, const char* module_name, ID* install_ID(const char* name, const char* module_name,
bool is_global, bool is_export) bool is_global, bool is_export)
{ {
if ( scopes.length() == 0 && ! is_global ) if ( scopes.empty() && ! is_global )
reporter->InternalError("local identifier in global scope"); reporter->InternalError("local identifier in global scope");
IDScope scope; IDScope scope;
@ -200,10 +200,9 @@ void push_scope(ID* id, attr_list* attrs)
Scope* pop_scope() Scope* pop_scope()
{ {
int n = scopes.length() - 1; if ( scopes.empty() )
if ( n < 0 )
reporter->InternalError("scope underflow"); reporter->InternalError("scope underflow");
scopes.remove_nth(n); scopes.pop_back();
Scope* old_top = top_scope; Scope* old_top = top_scope;
// Don't delete the scope; keep it around for later name resolution // Don't delete the scope; keep it around for later name resolution
@ -211,7 +210,7 @@ Scope* pop_scope()
// ### SERIOUS MEMORY LEAK!? // ### SERIOUS MEMORY LEAK!?
// delete top_scope; // delete top_scope;
top_scope = n == 0 ? 0 : scopes[n-1]; top_scope = scopes.empty() ? nullptr : scopes.back();
return old_top; return old_top;
} }
@ -223,5 +222,5 @@ Scope* current_scope()
Scope* global_scope() Scope* global_scope()
{ {
return scopes.length() == 0 ? 0 : scopes[0]; return scopes.empty() ? 0 : scopes.front();
} }