diff options
| author | Mark Spruiell <mes@zeroc.com> | 2002-07-23 17:38:55 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2002-07-23 17:38:55 +0000 |
| commit | 4fb42f0d9e1126b79f256cc4c59425039027002b (patch) | |
| tree | 303475cb1db3c53b6e22de2cc1074a1fc5c1987e /cpp/src/slice2java/Gen.cpp | |
| parent | fixed bugs in getAbsolute when removing scope with escaped keywords (diff) | |
| download | ice-4fb42f0d9e1126b79f256cc4c59425039027002b.tar.bz2 ice-4fb42f0d9e1126b79f256cc4c59425039027002b.tar.xz ice-4fb42f0d9e1126b79f256cc4c59425039027002b.zip | |
bug fixes for constant scoping
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 975719182e5..4e62239e824 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -1755,6 +1755,7 @@ Slice::Gen::TypesVisitor::visitConstDef(const ConstDefPtr& p) { string name = fixKwd(p->name()); string scoped = p->scoped(); + string scope = p->scope(); string absolute = getAbsolute(scoped); TypePtr type = p->type(); @@ -1765,7 +1766,7 @@ Slice::Gen::TypesVisitor::visitConstDef(const ConstDefPtr& p) Output& out = output(); out << sp << nl << "public interface " << name; out << sb; - out << nl << typeToString(type, TypeModeIn, scoped) << " value = "; + out << nl << typeToString(type, TypeModeIn, scope) << " value = "; BuiltinPtr bp; EnumPtr ep; @@ -1846,7 +1847,7 @@ Slice::Gen::TypesVisitor::visitConstDef(const ConstDefPtr& p) } else if(ep = EnumPtr::dynamicCast(type)) { - out << fixKwd(p->value()); + out << getAbsolute(ep->scoped(), scope) << '.' << fixKwd(p->value()); } else { |