fixes to adding default values when desired

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@925 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
dolby-oss 2007-04-04 17:50:12 +00:00
parent 66a83b0e3c
commit 5483465978
1 changed files with 9 additions and 3 deletions

View File

@ -1184,7 +1184,9 @@ public abstract class AstTranslator extends CAstVisitor {
protected Symbol makeSymbol(final String nm, final boolean isFinal, final Object defaultInitValue, int vn, Scope definer) {
final int v = vn == -1 ? getUnderlyingSymtab().newSymbol() : vn;
if (useDefaultInitValues() && defaultInitValue != null) {
getUnderlyingSymtab().setDefaultValue(v, defaultInitValue);
if (getUnderlyingSymtab().getValue(v) == null) {
getUnderlyingSymtab().setDefaultValue(v, defaultInitValue);
}
}
return new AbstractSymbol(definer, isFinal, defaultInitValue) {
public String toString() {
@ -1274,7 +1276,9 @@ public abstract class AstTranslator extends CAstVisitor {
vn = getUnderlyingSymtab().newSymbol();
}
if (useDefaultInitValues() && defaultInitValue != null) {
getUnderlyingSymtab().setDefaultValue(vn, defaultInitValue);
if (getUnderlyingSymtab().getValue(vn) == null) {
getUnderlyingSymtab().setDefaultValue(vn, defaultInitValue);
}
}
}
@ -1319,7 +1323,9 @@ public abstract class AstTranslator extends CAstVisitor {
protected Symbol makeSymbol(final String nm, boolean isFinal, final Object defaultInitValue, int vn, Scope definer) {
final int v = vn == -1 ? getUnderlyingSymtab().newSymbol() : vn;
if (useDefaultInitValues() && defaultInitValue != null) {
getUnderlyingSymtab().setDefaultValue(v, defaultInitValue);
if (getUnderlyingSymtab().getValue(v) == null) {
getUnderlyingSymtab().setDefaultValue(v, defaultInitValue);
}
}
return new AbstractSymbol(definer, isFinal, defaultInitValue) {
public String toString() {