luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not search up for a symbol if a hierarchical path was given. 

When searching for a symbol we do not want to search up the
hierarchical stack if the symbol we are searching for was
prefixed with a hierarchical path.
This commit is contained in:
Cary R 2010-04-11 16:28:11 -07:00 committed by Stephen Williams
parent 4c87d89370
commit 3aaacd4c79
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
symbol_search.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003 Stephen Williams (steve@icarus.com) * Copyright (c) 2003-2010 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -33,6 +33,7 @@ NetScope*symbol_search(const LineInfo*li, Design*des, NetScope*scope,
const NetExpr*&ex1, const NetExpr*&ex2) const NetExpr*&ex1, const NetExpr*&ex2)
{ {
assert(scope); assert(scope);
bool hier_path = false;
/* Get the tail name of the object we are looking for. */ /* Get the tail name of the object we are looking for. */
perm_string key = peek_tail_name(path); perm_string key = peek_tail_name(path);
@ -62,6 +63,8 @@ NetScope*symbol_search(const LineInfo*li, Design*des, NetScope*scope,
"`" << key << "' in path `" << path << "'" << endl; "`" << key << "' in path `" << path << "'" << endl;
des->errors += 1; des->errors += 1;
} }
hier_path = true;
} }
while (scope) { while (scope) {
@ -74,7 +77,9 @@ NetScope*symbol_search(const LineInfo*li, Design*des, NetScope*scope,
if ( (par = scope->get_parameter(key, ex1, ex2)) ) if ( (par = scope->get_parameter(key, ex1, ex2)) )
return scope; return scope;
if (scope->type() == NetScope::MODULE) /* We can't look up if we are at the enclosing module scope
* or if a hierarchical path was given. */
if ((scope->type() == NetScope::MODULE) || hier_path)
scope = 0; scope = 0;
else else
scope = scope->parent(); scope = scope->parent();