You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2010/10/15 21:12:44 UTC
svn commit: r1023073 -
/incubator/thrift/trunk/compiler/cpp/src/generate/t_js_generator.cc
Author: roger
Date: Fri Oct 15 19:12:44 2010
New Revision: 1023073
URL: http://svn.apache.org/viewvc?rev=1023073&view=rev
Log:
THRIFT-807 JavaScript: Initialization of Base Types with 0 instead of null
Modified:
incubator/thrift/trunk/compiler/cpp/src/generate/t_js_generator.cc
Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_js_generator.cc
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_js_generator.cc?rev=1023073&r1=1023072&r2=1023073&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_js_generator.cc (original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_js_generator.cc Fri Oct 15 19:12:44 2010
@@ -1342,29 +1342,23 @@ string t_js_generator::declare_field(t_f
case t_base_type::TYPE_VOID:
break;
case t_base_type::TYPE_STRING:
- result += " = ''";
- break;
case t_base_type::TYPE_BOOL:
- result += " = false";
- break;
case t_base_type::TYPE_BYTE:
case t_base_type::TYPE_I16:
case t_base_type::TYPE_I32:
case t_base_type::TYPE_I64:
- result += " = 0";
- break;
case t_base_type::TYPE_DOUBLE:
- result += " = 0.0";
+ result += " = null";
break;
default:
throw "compiler error: no JS initializer for base type " + t_base_type::t_base_name(tbase);
}
} else if (type->is_enum()) {
- result += " = 0";
+ result += " = null";
} else if (type->is_map()){
- result += " = {}";
+ result += " = null";
} else if (type->is_container()) {
- result += " = []";
+ result += " = null";
} else if (type->is_struct() || type->is_xception()) {
if (obj) {
result += " = new " +js_namespace(type->get_program()) + type->get_name() + "()";