mirror of
https://github.com/steveicarus/iverilog.git
synced 2026-09-07 11:51:38 +02:00
Lars-Peter Clausen
7752cb8ec1
The LRM requires an identifier to name only one item within a scope. Class
properties are currently stored only in `class_type_t::properties`, outside
the common local symbol table. As a result, declarations such as:
class C;
int value;
function int value;
return 0;
endfunction
endclass
are accepted. A second property in a separate declaration silently replaces
the first property map entry. A repeated name in a comma-separated declaration
such as `int value, value` can crash because both declarators share the same raw
type.
Make `prop_info_t` a named item and register each property in the class local
symbol table. Check the declaration before taking ownership of its type or
initializer, since comma-separated properties share the raw declaration type.
Use `emplace()` for the property map so an accepted property cannot replace an
existing entry.
Properties now take part in the common symbol lookup. Give them a distinct
symbol type so duplicate declaration diagnostics identify them as class
properties, and remove the separate property check from type-identifier
classification.
Signed-off-by: Lars-Peter Clausen <[email protected]>
120 lines
3.1 KiB
C++
120 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2019 Martin Whitaker ([email protected])
|
|
*
|
|
* This source code is free software; you can redistribute it
|
|
* and/or modify it in source code form under the terms of the GNU
|
|
* General Public License as published by the Free Software
|
|
* Foundation; either version 2 of the License, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
# include "PNamedItem.h"
|
|
# include <ostream>
|
|
|
|
PNamedItem::PNamedItem()
|
|
{
|
|
}
|
|
|
|
PNamedItem::~PNamedItem()
|
|
{
|
|
}
|
|
|
|
PNamedItem::SymbolType PNamedItem::symbol_type() const
|
|
{
|
|
return ANY;
|
|
}
|
|
|
|
std::ostream& operator << (std::ostream&o, PNamedItem::SymbolType st)
|
|
{
|
|
switch (st) {
|
|
case PNamedItem::ANY:
|
|
o << "a symbol";
|
|
break;
|
|
case PNamedItem::PARAM:
|
|
o << "a parameter";
|
|
break;
|
|
case PNamedItem::NET:
|
|
o << "a net";
|
|
break;
|
|
case PNamedItem::VAR:
|
|
o << "a variable";
|
|
break;
|
|
case PNamedItem::CLASS_PROPERTY:
|
|
o << "a class property";
|
|
break;
|
|
case PNamedItem::GENVAR:
|
|
o << "a genvar";
|
|
break;
|
|
case PNamedItem::EVENT:
|
|
o << "an event";
|
|
break;
|
|
case PNamedItem::TYPE:
|
|
o << "a type";
|
|
break;
|
|
case PNamedItem::ENUM:
|
|
o << "an enum type or value";
|
|
break;
|
|
case PNamedItem::CLASS:
|
|
o << "a class";
|
|
break;
|
|
case PNamedItem::FUNCTION:
|
|
o << "a function";
|
|
break;
|
|
case PNamedItem::TASK:
|
|
o << "a task";
|
|
break;
|
|
case PNamedItem::BLOCK:
|
|
o << "a named block";
|
|
break;
|
|
case PNamedItem::GENBLOCK:
|
|
o << "a generate block";
|
|
break;
|
|
case PNamedItem::MODPORT:
|
|
o << "a modport";
|
|
break;
|
|
case PNamedItem::PACKAGE:
|
|
o << "a package";
|
|
break;
|
|
case PNamedItem::MODULE:
|
|
o << "a module";
|
|
break;
|
|
case PNamedItem::PROGRAM:
|
|
o << "a program";
|
|
break;
|
|
case PNamedItem::INTERFACE:
|
|
o << "an interface";
|
|
break;
|
|
case PNamedItem::PRIMITIVE:
|
|
o << "a primitive";
|
|
break;
|
|
case PNamedItem::INSTANCE:
|
|
o << "an instance name";
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return o;
|
|
}
|
|
|
|
PGenvar::PGenvar()
|
|
{
|
|
}
|
|
|
|
PGenvar::~PGenvar()
|
|
{
|
|
}
|
|
|
|
PNamedItem::SymbolType PGenvar::symbol_type() const
|
|
{
|
|
return GENVAR;
|
|
}
|