[Nice-commit] Nice/src/bossa/syntax OverloadedSymbolExp.java,1.65,1.66
Brought to you by:
bonniot
From: <bo...@us...> - 2004-02-03 10:23:06
|
Update of /cvsroot/nice/Nice/src/bossa/syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20990/src/bossa/syntax Modified Files: OverloadedSymbolExp.java Log Message: Avoid infinite recursion when dealing with ambiguity between several global variables. Index: OverloadedSymbolExp.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/OverloadedSymbolExp.java,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** OverloadedSymbolExp.java 18 Jan 2004 20:38:40 -0000 1.65 --- OverloadedSymbolExp.java 3 Feb 2004 10:20:48 -0000 1.66 *************** *** 316,320 **** } ! if (globalvars.size() > 0) return new OverloadedSymbolExp(globalvars, ident).noOverloading(); --- 316,322 ---- } ! // If there are global variables, give them the priority ! // (but not when there are *only* global variables, or it would loop). ! if (globalvars.size() > 0 && globalvars.size() < symbols.size()) return new OverloadedSymbolExp(globalvars, ident).noOverloading(); |