From eb1279ff497c773d1dc04a8f81f011e8128b47be Mon Sep 17 00:00:00 2001 From: Lena Olson Date: Tue, 18 Jun 2013 16:58:52 -0500 Subject: ruby: fix slicc compiler to complain about duplicate symbols Previously, .sm files were allowed to use the same name for a type and a variable. This is unnecessarily confusing and has some bad side effects, like not being able to declare later variables in the same scope with the same type. This causes the compiler to complain and die on things like Address Address. Committed by: Nilay Vaish --- src/mem/slicc/symbols/SymbolTable.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/mem/slicc/symbols/SymbolTable.py b/src/mem/slicc/symbols/SymbolTable.py index 43cfe8740..48a7ec8d2 100644 --- a/src/mem/slicc/symbols/SymbolTable.py +++ b/src/mem/slicc/symbols/SymbolTable.py @@ -68,6 +68,11 @@ class SymbolTable(object): if id in self.sym_map_vec[-1]: sym.error("Symbol '%s' redeclared in same scope.", id) + for sym_map in self.sym_map_vec: + if id in sym_map: + if type(self.sym_map_vec[0][id]) != type(sym): + sym.error("Conflicting declaration of Symbol '%s'", id) + # FIXME - warn on masking of a declaration in a previous frame self.sym_map_vec[-1][id] = sym -- cgit v1.2.3