ES6 mapping updates

4 files changed, 338 insertions, 215 deletions

diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index c2d0cb9209c..9060ca4cd21 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -48,7 +48,7 @@ u16CodePoint(unsigned short value)
 }
 
 void
-writeU8Buffer(const vector<unsigned char>& u8buffer, ::IceUtilInternal::Output& out)
+writeU8Buffer(const vector<unsigned char>& u8buffer, ostringstream& out)
 {
     vector<unsigned short> u16buffer = toUTF16(u8buffer);
     
@@ -215,15 +215,6 @@ Slice::JsVisitor::writeUnmarshalDataMembers(const DataMemberList& dataMembers, c
 {
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
-        if(isClassType((*q)->type()))
-        {
-            _out << nl << "var self = this;";
-            break;
-        }
-    }
-
-    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
-    {
         if(!(*q)->optional())
         {
             writeMarshalUnmarshalCode(_out, (*q)->type(), "this." + fixId((*q)->name()), false);
@@ -242,32 +233,7 @@ Slice::JsVisitor::writeInitDataMembers(const DataMemberList& dataMembers, const
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         const string m = fixId((*q)->name());
-        if((*q)->optional())
-        {
-            if((*q)->defaultValueType())
-            {
-                _out << nl << "this." << m << " = " << m << " !== undefined ? " << m << " : ";
-                writeConstantValue(scope, (*q)->type(), (*q)->defaultValueType(), (*q)->defaultValue());
-                _out << ';';
-            }
-            else
-            {
-                _out << nl << "this." << m << " = " << m << ';';
-            }
-        }
-        else
-        {
-            _out << nl << "this." << m << " = " << m << " !== undefined ? " << m << " : ";
-            if((*q)->defaultValueType())
-            {
-                writeConstantValue(scope, (*q)->type(), (*q)->defaultValueType(), (*q)->defaultValue());
-            }
-            else
-            {
-                _out << getValue(scope, (*q)->type());
-            }
-            _out << ';';
-        }
+        _out << nl << "this." << m << " = " << m << ';';
     }
 }
 
@@ -476,14 +442,15 @@ Slice::JsVisitor::getValue(const string& scope, const TypePtr& type)
     return "null";
 }
 
-void
+string
 Slice::JsVisitor::writeConstantValue(const string& scope, const TypePtr& type, const SyntaxTreeBasePtr& valueType,
                                      const string& value)
 {
+    ostringstream os;
     ConstPtr constant = ConstPtr::dynamicCast(valueType);
     if(constant)
     {
-        _out << getReference(scope, constant->scoped());
+        os << getReference(scope, constant->scoped());
     }
     else
     {
@@ -501,7 +468,7 @@ Slice::JsVisitor::writeConstantValue(const string& scope, const TypePtr& type, c
                                                    "_{}[]#()<>%:;.?*+-/^&|~!=,\\\"' ";
             static const set<char> charSet(basicSourceChars.begin(), basicSourceChars.end());
 
-            _out << "\"";                                    // Opening "
+            os << "\"";                                      // Opening "
 
             vector<unsigned char> u8buffer;                  // Buffer to convert multibyte characters
 
@@ -514,7 +481,7 @@ Slice::JsVisitor::writeConstantValue(const string& scope, const TypePtr& type, c
                         //
                         // Print as unicode if not in basic source character set
                         //
-                        _out << u16CodePoint(static_cast<unsigned int>(value[i]));
+                        os << u16CodePoint(static_cast<unsigned int>(value[i]));
                     }
                     else
                     {
@@ -528,7 +495,7 @@ Slice::JsVisitor::writeConstantValue(const string& scope, const TypePtr& type, c
                     //
                     if(!u8buffer.empty())
                     {
-                        writeU8Buffer(u8buffer, _out);
+                        writeU8Buffer(u8buffer, os);
                         u8buffer.clear();
                     }
                     switch(value[i])
@@ -555,7 +522,7 @@ Slice::JsVisitor::writeConstantValue(const string& scope, const TypePtr& type, c
                             //
                             if(s.size() % 2 != 0 && value[j] == 'U')
                             {
-                                _out << s.substr(0, s.size() - 1);
+                                os << s.substr(0, s.size() - 1);
                                 i = j + 1;
 
                                 string codepoint = value.substr(j + 1, 8);
@@ -572,30 +539,30 @@ Slice::JsVisitor::writeConstantValue(const string& scope, const TypePtr& type, c
                                 {
                                     unsigned int high = ((static_cast<unsigned int>(v) - 0x10000) / 0x400) + 0xD800;
                                     unsigned int low = ((static_cast<unsigned int>(v) - 0x10000) % 0x400) + 0xDC00;
-                                    _out << u16CodePoint(high);
-                                    _out << u16CodePoint(low);
+                                    os << u16CodePoint(high);
+                                    os << u16CodePoint(low);
                                 }
                                 else
                                 {
-                                    _out << u16CodePoint(static_cast<unsigned int>(v));
+                                    os << u16CodePoint(static_cast<unsigned int>(v));
                                 }
 
                                 i = j + 1 + 8;
                             }
                             else
                             {
-                                _out << s;
+                                os << s;
                                 i = j;
                             }
                             continue;
                         }
                         case '"':
                         {
-                            _out << "\\";
+                            os << "\\";
                             break;
                         }
                     }
-                    _out << value[i];                        // Print normally if in basic source character set
+                    os << value[i];                        // Print normally if in basic source character set
                 }
                 i++;
             }
@@ -605,11 +572,11 @@ Slice::JsVisitor::writeConstantValue(const string& scope, const TypePtr& type, c
             //
             if(!u8buffer.empty())
             {
-                writeU8Buffer(u8buffer, _out);
+                writeU8Buffer(u8buffer, os);
                 u8buffer.clear();
             }
 
-            _out << "\"";                                    // Closing "
+            os << "\"";                                    // Closing "
         }
         else if(bp && bp->kind() == Builtin::KindLong)
         {
@@ -624,9 +591,9 @@ Slice::JsVisitor::writeConstantValue(const string& scope, const TypePtr& type, c
             // output file.
             //
 #ifdef ICE_BIG_ENDIAN
-            _out << "new Ice.Long(" << (l & 0xFFFFFFFF) << ", " << ((l >> 32) & 0xFFFFFFFF)  << ")";
+            os << "new Ice.Long(" << (l & 0xFFFFFFFF) << ", " << ((l >> 32) & 0xFFFFFFFF)  << ")";
 #else
-            _out << "new Ice.Long(" << ((l >> 32) & 0xFFFFFFFF) << ", " << (l & 0xFFFFFFFF)  << ")";
+            os << "new Ice.Long(" << ((l >> 32) & 0xFFFFFFFF) << ", " << (l & 0xFFFFFFFF)  << ")";
 #endif
         }
         else if((ep = EnumPtr::dynamicCast(type)))
@@ -641,13 +608,14 @@ Slice::JsVisitor::writeConstantValue(const string& scope, const TypePtr& type, c
             {
                 enumerator = fixId(value);
             }
-            _out << getReference(scope, ep->scoped()) << '.' << enumerator;
+            os << getReference(scope, ep->scoped()) << '.' << enumerator;
         }
         else
         {
-            _out << value;
+            os << value;
         }
     }
+    return os.str();
 }
 
 StringList
@@ -1049,12 +1017,12 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p)
 
     if(!_icejs)
     {
-        _out << nl << "var Ice = require(\"ice\").Ice;";
-        _out << nl << "var __M = Ice.__M;";
+        _out << nl << "const Ice = require(\"ice\").Ice;";
+        _out << nl << "const __M = Ice.__M;";
     }
     else
     {
-        _out << nl << "var __M = require(\"../Ice/ModuleRegistry\").Ice.__M;";
+        _out << nl << "const __M = require(\"../Ice/ModuleRegistry\").Ice.__M;";
     }
 
     for(map<string, vector<string> >::const_iterator i = requires.begin(); i != requires.end(); ++i)
@@ -1066,7 +1034,7 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p)
 
         if(i->second.size() == 1)
         {
-            _out << nl << "var " << i->first << " = require(\"";
+            _out << nl << "const " << i->first << " = require(\"";
             if(_icejs && iceBuiltinModule(i->first))
             {
                 _out << "../";
@@ -1075,7 +1043,7 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p)
         }
         else
         {
-            _out << nl << "var " << i->first << " = __M.require(module, ";
+            _out << nl << "const " << i->first << " = __M.require(module, ";
             _out << nl << "[";
             _out.inc();
             for(vector<string>::const_iterator j = i->second.begin(); j != i->second.end();)
@@ -1098,7 +1066,7 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p)
         seenModules.push_back(i->first);
     }
 
-    _out << nl << "var Slice = Ice.Slice;";
+    _out << nl << "const Slice = Ice.Slice;";
 
     if(_icejs)
     {
@@ -1122,7 +1090,7 @@ Slice::Gen::TypesVisitor::visitModuleStart(const ModulePtr& p)
     //
     // For a top-level module we write the following:
     //
-    // var Foo = __M.module("Foo");
+    // let Foo = __M.module("Foo");
     //
     // For a nested module we write
     //
@@ -1145,7 +1113,7 @@ Slice::Gen::TypesVisitor::visitModuleStart(const ModulePtr& p)
         _out << nl;
         if(topLevel)
         {
-            _out << "var ";
+            _out << "let ";
         }
         _out << scoped << " = __M.module(\"" << scoped << "\");";
 
@@ -1174,7 +1142,6 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
     const string prxName = p->name() + "Prx";
     const string objectRef = "Ice.Object";
     const string prxRef = "Ice.ObjectPrx";
-    const string defineObject = p->isLocal() ? "Slice.defineLocalObject" : "Slice.defineObject";
 
     ClassList bases = p->bases();
     ClassDefPtr base;
@@ -1215,45 +1182,134 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
             baseParamNames.push_back(fixId((*q)->name()));
         }
     }
+    
+    ClassList allBases = p->allBases();
+    StringList ids;
+    transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
+    StringList other;
+    other.push_back(scoped);
+    other.push_back("::Ice::Object");
+    other.sort();
+    ids.merge(other);
+    ids.unique();
+
+    StringList::const_iterator firstIter = ids.begin();
+    StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), scoped);
+    assert(scopedIter != ids.end());
+    StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
+    
+    if(!p->isLocal())
+    {
+        _out << sp;
+        _out << nl << "let " << getLocalScope(scoped, "_") << "_ids__ = [";
+        _out.inc();
+        
+        for(StringList::const_iterator q = ids.begin(); q != ids.end(); ++q)
+        {
+            if(q != ids.begin())
+            {
+                _out << ',';
+            }
+           _out << nl << '"' << *q << '"';
+        }
+
+        _out.dec();
+        _out << nl << "];";
+    }
 
     _out << sp;
     writeDocComment(p, getDeprecateReason(p, 0, "type"));
-    _out << nl << localScope << '.' << name << " = " << defineObject << "(";
-    _out.inc();
-
+    _out << nl << localScope << '.' << name << " = class";
+    if(!p->isLocal() || hasBaseClass)
+    {
+        _out << " extends " << baseRef;
+    }
+    _out << sb;
     if(!allParamNames.empty())
     {
-        _out << nl << "function" << spar << allParamNames << epar;
-        _out << sb;
+        _out << nl << "constructor" << spar;
+        for(DataMemberList::const_iterator q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q)
+        {
+            _out << fixId((*q)->name());
+        }
+
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        {
+            string value;
+            if((*q)->optional())
+            {
+                if((*q)->defaultValueType())
+                {
+                    value = writeConstantValue(scope, (*q)->type(), (*q)->defaultValueType(), (*q)->defaultValue());
+                }
+                else
+                {
+                    value = "undefined";
+                }
+            }
+            else
+            {
+                if((*q)->defaultValueType())
+                {
+                    value = writeConstantValue(scope, (*q)->type(), (*q)->defaultValueType(), (*q)->defaultValue());
+                }
+                else
+                {
+                    value = getValue(scope, (*q)->type());
+                }
+            }
+            _out << (fixId((*q)->name()) + (value.empty() ? value : (" = " + value)));
+        }
+        
+        _out << epar << sb;
         if(!p->isLocal() || hasBaseClass)
         {
-            _out << nl << baseRef << ".call" << spar << "this" << baseParamNames << epar << ';';
+            _out << nl << "super" << spar << baseParamNames << epar << ';';
         }
         writeInitDataMembers(dataMembers, scope);
         _out << eb;
     }
-    else
+    
+    _out << sp;
+    _out << nl << "static get __parent()";
+    _out << sb;
+    if(!p->isLocal() || hasBaseClass)
     {
-        if(hasBaseClass || !p->isLocal())
-        {
-            _out << nl << "undefined";
-        }
+        _out << nl << "return " << baseRef << ";";
     }
-    if(!p->isLocal() || hasBaseClass)
+    else
     {
-        _out << ",";
-        _out << nl << baseRef;
+        _out << nl << "return undefined;";
     }
-
+    _out << eb;
+    
     if(!p->isLocal())
     {
-        ClassList allBases = p->allBases();
-        StringList ids;
+        _out << sp;
+        _out << nl << "static get __ids()";
+        _out << sb;
+        _out << nl << "return " << getLocalScope(scoped, "_") << "_ids__;";
+        _out << eb;
+        
+        _out << sp;
+        _out << nl << "static get __id()";
+        _out << sb;
+        _out << nl << "return " << getLocalScope(scoped, "_") << "_ids__[" << scopedPos << "];";
+        _out << eb;
+        
+        _out << sp;
+        _out << nl << "__mostDerivedType()";
+        _out << sb;
+        _out << nl << "return " << localScope << "." << name << ";";
+        _out << eb;
+        
 
         if(!bases.empty())
         {
-            _out << ",";
-            _out << nl << "[";
+            _out << sp;
+            _out << nl << "static get __implements()";
+            _out << sb;
+            _out << nl << "return [";
             _out.inc();
             for(ClassList::const_iterator q = bases.begin(); q != bases.end();)
             {
@@ -1272,72 +1328,58 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
                 }
             }
             _out.dec();
-            _out << nl << "]";
-        }
-        else
-        {
-            _out << ", undefined";
-        }
-
-        transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
-        StringList other;
-        other.push_back(scoped);
-        other.push_back("::Ice::Object");
-        other.sort();
-        ids.merge(other);
-        ids.unique();
-
-        StringList::const_iterator firstIter = ids.begin();
-        StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), scoped);
-        assert(scopedIter != ids.end());
-        StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
-
-        _out << ", " << scopedPos << ",";
-        _out << nl << "[";
-        _out.inc();
-        for(StringList::const_iterator q = ids.begin(); q != ids.end(); ++q)
-        {
-            if(q != ids.begin())
-            {
-                _out << ',';
-            }
-            _out << nl << '"' << *q << '"';
+            _out << nl << "];";
+            _out << eb;
         }
-        _out.dec();
-        _out << nl << "],";
-        _out << nl << p->compactId() << ",";
-        if(dataMembers.empty())
+        
+        if(p->compactId() != -1)
         {
-            _out << " undefined, undefined, ";
+            _out << sp;
+            _out << nl << "static get __compactId()";
+            _out << sb;
+            _out << nl << "return " << p->compactId() << ";";
+            _out << eb;
         }
-        else
+        
+        if(!dataMembers.empty())
         {
-            _out << nl << "function(__os)";
+            _out << sp;
+            _out << nl << "__writeMemberImpl(__os)";
             _out << sb;
             writeMarshalDataMembers(dataMembers, optionalMembers);
-            _out << eb << ",";
-            _out << nl << "function(__is)";
+            _out << eb;
+
+            _out << sp;
+            _out << nl << "__readMemberImpl(__is)";
             _out << sb;
             writeUnmarshalDataMembers(dataMembers, optionalMembers);
-            _out << eb << ",";
-            _out << nl;
+            _out << eb;
         }
-        _out << (p->hasMetaData("preserve-slice") && !p->inheritsMetaData("preserve-slice") ? "true" : "false");
     }
-    _out.dec();
-    _out << ");";
+    _out << eb << ";";
+
 
     if(!p->isLocal())
     {
-        const string staticId = localScope + "." + name + ".ice_staticId";
         const string baseProxy =
             !p->isInterface() && base ? (getLocalScope(base->scope()) + "." + base->name() + "Prx") : "Ice.ObjectPrx";
 
         _out << sp;
-        _out << nl << localScope << '.' << prxName << " = " << "Slice.defineProxy(" << baseProxy << ", " << staticId;
+        _out << nl << localScope << '.' << prxName << " = class extends " << baseProxy;
+        _out << sb;
+        
+        _out << sp;
+        _out << nl << "static ice_staticId()";
+        _out << sb;
+        _out << nl << "return " << localScope << "." << name << ".__id;";
+        _out << eb;
+        
+        _out << sp;
+        _out << nl << "static get __implements()";
+        _out << sb;
+        _out << nl << "return [";
         if(!bases.empty())
         {
-            _out << ", [";
             _out.inc();
             for(ClassList::const_iterator q = bases.begin(); q != bases.end();)
             {
@@ -1356,13 +1398,17 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
                 }
             }
             _out.dec();
-            _out << "]";
         }
-        else
+        _out << "];";
+        _out << eb;
+
+        _out << eb << ";";
+        
+        if(p->hasMetaData("preserve-slice") && !p->inheritsMetaData("preserve-slice"))
         {
-            _out << ", undefined";
+            _out << sp;
+            _out << nl << "Slice.PreservedObject(" << localScope << "." << name << ");";
         }
-        _out << ");";
 
         //
         // Register the compact id
@@ -1378,6 +1424,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
 
         _out << sp << nl << "Slice.defineOperations(" << localScope << '.' << name << ", " << localScope << '.'
              << prxName;
+
         const OperationList ops = p->operations();
         if(!ops.empty())
         {
@@ -1590,7 +1637,6 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
         }
         _out << ");";
     }
-
     return false;
 }
 
@@ -1608,6 +1654,7 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p)
     const string propertyName = name + "Helper";
     const bool fixed = !type->isVariableLength();
 
+    _out << sp;
     _out << nl << "Slice.defineSequence(" << scope << ", \"" << propertyName << "\", "
          << "\"" << getHelper(type) << "\"" << ", " << (fixed ? "true" : "false");
     if(isClassType(type))
@@ -1625,7 +1672,6 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
     const string name = fixId(p->name());
     const ExceptionPtr base = p->base();
     string baseRef;
-    string defineException = p->isLocal() ? "Slice.defineLocalException" : "Slice.defineUserException";
     if(base)
     {
         baseRef = getReference(scope, base->scoped());
@@ -1659,55 +1705,114 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
 
     _out << sp;
     writeDocComment(p, getDeprecateReason(p, 0, "type"));
-    _out << nl << localScope << '.' << name << " = " << defineException << "(";
-    _out.inc();
+    _out << nl << localScope << '.' << name << " = class extends " << baseRef;
+    _out << sb;
 
-    _out << nl << "function" << spar << allParamNames << "_cause" << epar;
+    _out << nl << "constructor" << spar;
+    
+    for(DataMemberList::const_iterator q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q)
+    {
+        _out << fixId((*q)->name());
+    }
+
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        string value;
+        if((*q)->optional())
+        {
+            if((*q)->defaultValueType())
+            {
+                value = writeConstantValue(scope, (*q)->type(), (*q)->defaultValueType(), (*q)->defaultValue());
+            }
+            else
+            {
+                value = "undefined";
+            }
+        }
+        else
+        {
+            if((*q)->defaultValueType())
+            {
+                value = writeConstantValue(scope, (*q)->type(), (*q)->defaultValueType(), (*q)->defaultValue());
+            }
+            else
+            {
+                value = getValue(scope, (*q)->type());
+            }
+        }
+        _out << (fixId((*q)->name()) + (value.empty() ? value : (" = " + value)));
+    }
+    
+    _out << "_cause = \"\"" << epar;
     _out << sb;
-    _out << nl << baseRef << ".call" << spar << "this" << baseParamNames << "_cause" << epar << ';';
+    _out << nl << "super" << spar << baseParamNames << "_cause" << epar << ';';
     writeInitDataMembers(dataMembers, scope);
-    _out << eb << ",";
-    _out << nl << baseRef << ",";
-    _out << nl << "\"" << p->scoped().substr(2) << "\"";
+    _out << eb;
+
+    _out << sp;
+    _out << nl << "static get __parent()";
+    _out << sb;
+    _out << nl << "return " << baseRef << ";";
+    _out << eb;
+
+    _out << sp;
+    _out << nl << "static get __id()";
+    _out << sb;
+    _out << nl << "return \"" << p->scoped() << "\";";
+    _out << eb;
+    
+    _out << sp;
+    _out << nl << "ice_name()";
+    _out << sb;
+    _out << nl << "return \"" << p->scoped().substr(2) << "\";";
+    _out << eb;
 
     // TODO: equals?
 
     if(!p->isLocal())
     {
-        _out << ",";
+        _out << sp;
+        _out << nl << "__mostDerivedType()";
+        _out << sb;
+        _out << nl << "return " << localScope << '.' << name << ";";
+        _out << eb;
+        
         if(!dataMembers.empty())
         {
-            _out << nl << "function(__os)";
+            _out << sp;
+            _out << nl << "__writeMemberImpl(__os)";
             _out << sb;
             writeMarshalDataMembers(dataMembers, optionalMembers);
-            _out << eb << ",";
-            _out << nl << "function(__is)";
+            _out << eb;
+
+            _out << sp;
+            _out << nl << "__readMemberImpl(__is)";
             _out << sb;
             writeUnmarshalDataMembers(dataMembers, optionalMembers);
             _out << eb;
         }
-        else
-        {
-            _out << nl << "undefined, undefined";
-        }
-        bool basePreserved = p->inheritsMetaData("preserve-slice");
-        bool preserved = p->hasMetaData("preserve-slice");
 
-        _out << ",";
-        if(preserved && !basePreserved)
+        if(p->usesClasses(false) && (!base || (base && !base->usesClasses(false))))
         {
-            _out << nl << "true";
-        }
-        else
-        {
-            _out << nl << "false";
+            _out << sp;
+            _out << nl << "__usesClasses()";
+            _out << sb;
+            _out << nl << "return true;";
+            _out << eb;
         }
+    }
+    
+    _out << eb << ";";
+    
+    bool basePreserved = p->inheritsMetaData("preserve-slice");
+    bool preserved = p->hasMetaData("preserve-slice");
 
-        const bool usesClasses = p->usesClasses(false) && (!base || (base && !base->usesClasses(false)));
-        _out << "," << nl << (usesClasses ? "true" : "false");
+    if(!p->isLocal() && preserved && !basePreserved)
+    {
+        _out << sp;
+        _out << nl << "Slice.PreservedUserException(" << localScope << '.' << name << ");";
     }
-    _out << ");";
-    _out.dec();
+
     return false;
 }
 
@@ -1726,42 +1831,79 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
         paramNames.push_back(fixId((*q)->name()));
     }
 
-    //
-    // Only generate hashCode if this structure type is a legal dictionary key type.
-    //
-    bool containsSequence = false;
-    bool legalKeyType = Dictionary::legalKeyType(p, containsSequence);
-
     _out << sp;
     writeDocComment(p, getDeprecateReason(p, 0, "type"));
-    _out << nl << localScope << '.' << name << " = Slice.defineStruct(";
-    _out.inc();
-    _out << nl << "function" << spar << paramNames << epar;
+    _out << nl << localScope << '.' << name << " = class";
     _out << sb;
-    writeInitDataMembers(dataMembers, scope);
-    _out << eb << ",";
 
-    _out << nl << (legalKeyType ? "true" : "false");
+    _out << nl << "constructor" << spar;
+    
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        string value;
+        if((*q)->optional())
+        {
+            if((*q)->defaultValueType())
+            {
+                value = writeConstantValue(scope, (*q)->type(), (*q)->defaultValueType(), (*q)->defaultValue());
+            }
+            else
+            {
+                value = "undefined";
+            }
+        }
+        else
+        {
+            if((*q)->defaultValueType())
+            {
+                value = writeConstantValue(scope, (*q)->type(), (*q)->defaultValueType(), (*q)->defaultValue());
+            }
+            else
+            {
+                value = getValue(scope, (*q)->type());
+            }
+        }
+        _out << (fixId((*q)->name()) + (value.empty() ? value : (" = " + value)));
+    }
+    
+    _out << epar;
+    _out << sb;
+    writeInitDataMembers(dataMembers, scope);
+    _out << eb;
 
     if(!p->isLocal())
     {
-        _out << ",";
-        _out << nl << "function(__os)";
+        _out << sp;
+        _out << nl << "__write(__os)";
         _out << sb;
         writeMarshalDataMembers(dataMembers, DataMemberList());
-        _out << eb << ",";
-        _out << nl << "function(__is)";
+        _out << eb;
+        
+        _out << sp;
+        _out << nl << "__read(__is)";
         _out << sb;
         writeUnmarshalDataMembers(dataMembers, DataMemberList());
-        _out << eb << "," << nl << p->minWireSize() << ", " << nl << (p->isVariableLength() ? "false" : "true");
-        _out.dec();
-        _out << ");";
-    }
-    else
-    {
-        _out.dec();
-        _out << ");";
+        _out << eb;
+        
+        _out << sp;
+        _out << nl << "static get minWireSize()";
+        _out << sb;
+        _out << nl << "return  " << p->minWireSize() << ";";
+        _out << eb;
     }
+    
+    _out << eb << ";";
+
+    //
+    // Only generate hashCode if this structure type is a legal dictionary key type.
+    //
+    bool containsSequence = false;
+    bool legalKeyType = Dictionary::legalKeyType(p, containsSequence);
+
+    _out << sp;
+    _out << nl << "Slice.defineStruct(" << localScope << '.' << name << ", "
+         << (legalKeyType ? "true" : "false") << ", "
+         << (p->isVariableLength() ? "true" : "false") << ");";
     return false;
 }
 
@@ -1782,9 +1924,6 @@ Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr& p)
         keyUseEquals = true;
     }
 
-    b = BuiltinPtr::dynamicCast(valueType);
-    bool valueUseEquals = !b || (b->kind() == Builtin::KindLong);
-
     //
     // Stream helpers for dictionaries of objects are lazy initialized
     // as the required object type might not be available until later.
@@ -1794,6 +1933,7 @@ Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr& p)
     const string propertyName = name + "Helper";
     bool fixed = !keyType->isVariableLength() && !valueType->isVariableLength();
 
+    _out << sp;
     _out << nl << "Slice.defineDictionary(" << scope << ", \"" << name << "\", \"" << propertyName << "\", "
          << "\"" << getHelper(keyType) << "\", "
          << "\"" << getHelper(valueType) << "\", "
@@ -1813,10 +1953,6 @@ Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr& p)
     {
         _out << ", Ice.ArrayUtil.equals";
     }
-    else if(valueUseEquals)
-    {
-        _out << ", Ice.HashMap.compareEquals";
-    }
     _out << ");";
 }
 
@@ -1869,7 +2005,7 @@ Slice::Gen::TypesVisitor::visitConst(const ConstPtr& p)
     _out << nl << "Object.defineProperty(" << localScope << ", '" << name << "', {";
     _out.inc();
     _out << nl << "value: ";
-    writeConstantValue(scope, p->type(), p->valueType(), p->value());
+    _out << writeConstantValue(scope, p->type(), p->valueType(), p->value());
     _out.dec();
     _out << nl << "});";
 }
diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h
index 6b552e83320..566099347ff 100644
--- a/cpp/src/slice2js/Gen.h
+++ b/cpp/src/slice2js/Gen.h
@@ -39,7 +39,7 @@ protected:
 
     std::string getValue(const std::string&, const TypePtr&);
 
-    void writeConstantValue(const std::string&, const TypePtr&, const SyntaxTreeBasePtr&, const std::string&);
+    std::string writeConstantValue(const std::string&, const TypePtr&, const SyntaxTreeBasePtr&, const std::string&);
 
     static StringList splitComment(const ContainedPtr&);
     void writeDocComment(const ContainedPtr&, const std::string&, const std::string& = "");
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp
index 31648566a64..787c47d981f 100644
--- a/cpp/src/slice2js/JsUtil.cpp
+++ b/cpp/src/slice2js/JsUtil.cpp
@@ -102,18 +102,6 @@ fixIds(const StringList& ids)
     return newIds;
 }
 
-static string
-fixSuffix(const string& param)
-{
-    const string thisSuffix = "this.";
-    string p = param;
-    if(p.find(thisSuffix) == 0)
-    {
-        p = "self." + p.substr(thisSuffix.size());
-    }
-    return p;
-}
-
 bool
 Slice::JsGenerator::isClassType(const TypePtr& type)
 {
@@ -323,7 +311,7 @@ Slice::JsGenerator::typeToString(const TypePtr& type, bool optional)
 }
 
 string
-Slice::JsGenerator::getLocalScope(const string& scope)
+Slice::JsGenerator::getLocalScope(const string& scope, const string& separator)
 {
     assert(!scope.empty());
 
@@ -354,7 +342,7 @@ Slice::JsGenerator::getLocalScope(const string& scope)
     {
         if(i != ids.begin())
         {
-            result << '.';
+            result << separator;
         }
         result << *i;
     }
@@ -563,8 +551,7 @@ Slice::JsGenerator::writeMarshalUnmarshalCode(Output &out,
         }
         else
         {
-            out << nl << stream << ".readValue(function(__o){ " << fixSuffix(param) << " = __o; }, "
-                << typeToString(type) << ");";
+            out << nl << stream << ".readValue(__o => " << param << " = __o, " << typeToString(type) << ");";
         }
         return;
     }
@@ -602,8 +589,8 @@ Slice::JsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
         }
         else
         {
-            out << nl << stream << ".readOptionalValue(" << tag << ", function(__o){ " << fixSuffix(param)
-                << " = __o; }, " << typeToString(type) << ");";
+            out << nl << stream << ".readOptionalValue(" << tag << ", __o => " << param << " = __o, "
+                << typeToString(type) << ");";
         }
         return;
     }
diff --git a/cpp/src/slice2js/JsUtil.h b/cpp/src/slice2js/JsUtil.h
index 1913759b50e..b379a4c7977 100644
--- a/cpp/src/slice2js/JsUtil.h
+++ b/cpp/src/slice2js/JsUtil.h
@@ -31,7 +31,7 @@ protected:
     static std::string getOptionalFormat(const TypePtr&);
     static std::string getStaticId(const TypePtr&);
     static std::string typeToString(const TypePtr&, bool = false);
-    static std::string getLocalScope(const std::string&);
+    static std::string getLocalScope(const std::string&, const std::string& separator = ".");
     static std::string getReference(const std::string&, const std::string&);
 
     static std::string getHelper(const TypePtr&);