[Nice-commit] Nice/src/bossa/syntax OverloadedSymbolExp.java,1.63,1.64
Brought to you by:
bonniot
From: <ar...@us...> - 2004-01-18 18:33:44
|
Update of /cvsroot/nice/Nice/src/bossa/syntax In directory sc8-pr-cvs1:/tmp/cvs-serv26320/F:/nice/src/bossa/syntax Modified Files: OverloadedSymbolExp.java Log Message: Give global vars priority over methods symbols in noOverloading(). Index: OverloadedSymbolExp.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/OverloadedSymbolExp.java,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** OverloadedSymbolExp.java 17 Jan 2004 20:59:51 -0000 1.63 --- OverloadedSymbolExp.java 18 Jan 2004 18:33:41 -0000 1.64 *************** *** 280,283 **** --- 280,294 ---- return res; + LinkedList globalvars = new LinkedList(); + for(Iterator i = symbols.iterator(); i.hasNext();) + { + VarSymbol sym = (VarSymbol) i.next(); + if (sym instanceof GlobalVarDeclaration.GlobalVarSymbol) + globalvars.add(sym); + } + + if (globalvars.size() > 0) + return new OverloadedSymbolExp(globalvars, ident).noOverloading(); + if (symbols.size() != 0) throw new AmbiguityError(); |