diff options
Diffstat (limited to 'rb/src/IceRuby/Properties.cpp')
| -rw-r--r-- | rb/src/IceRuby/Properties.cpp | 228 |
1 files changed, 114 insertions, 114 deletions
diff --git a/rb/src/IceRuby/Properties.cpp b/rb/src/IceRuby/Properties.cpp index c597a09d79f..2a8be6e708c 100644 --- a/rb/src/IceRuby/Properties.cpp +++ b/rb/src/IceRuby/Properties.cpp @@ -31,49 +31,49 @@ IceRuby_createProperties(int argc, VALUE* argv, VALUE self) { ICE_RUBY_TRY { - Ice::StringSeq seq; - if(argc >= 1 && !NIL_P(argv[0]) && !arrayToStringSeq(argv[0], seq)) - { - throw RubyException(rb_eTypeError, "invalid array argument to Ice::createProperties"); - } + Ice::StringSeq seq; + if(argc >= 1 && !NIL_P(argv[0]) && !arrayToStringSeq(argv[0], seq)) + { + throw RubyException(rb_eTypeError, "invalid array argument to Ice::createProperties"); + } - Ice::PropertiesPtr defaults; - if(argc == 2) - { - if(!NIL_P(argv[1]) && callRuby(rb_obj_is_instance_of, argv[1], _propertiesClass) == Qfalse) - { - throw RubyException(rb_eTypeError, "invalid properties argument to Ice::createProperties"); - } - defaults = getProperties(argv[1]); - } + Ice::PropertiesPtr defaults; + if(argc == 2) + { + if(!NIL_P(argv[1]) && callRuby(rb_obj_is_instance_of, argv[1], _propertiesClass) == Qfalse) + { + throw RubyException(rb_eTypeError, "invalid properties argument to Ice::createProperties"); + } + defaults = getProperties(argv[1]); + } - // - // Insert the program name (stored in the Ruby global variable $0) as the first - // element of the sequence. - // - volatile VALUE progName = callRuby(rb_gv_get, "$0"); - seq.insert(seq.begin(), getString(progName)); + // + // Insert the program name (stored in the Ruby global variable $0) as the first + // element of the sequence. + // + volatile VALUE progName = callRuby(rb_gv_get, "$0"); + seq.insert(seq.begin(), getString(progName)); - Ice::PropertiesPtr obj = Ice::createProperties(seq, defaults); + Ice::PropertiesPtr obj = Ice::createProperties(seq, defaults); - // - // Replace the contents of the given argument list with the filtered arguments. - // - if(argc > 0 && !NIL_P(argv[0])) - { - callRuby(rb_ary_clear, argv[0]); + // + // Replace the contents of the given argument list with the filtered arguments. + // + if(argc > 0 && !NIL_P(argv[0])) + { + callRuby(rb_ary_clear, argv[0]); - // - // We start at index 1 in order to skip the element that we inserted earlier. - // - for(Ice::StringSeq::size_type i = 1; i < seq.size(); ++i) - { - volatile VALUE str = createString(seq[i]); - callRuby(rb_ary_push, argv[0], str); - } - } + // + // We start at index 1 in order to skip the element that we inserted earlier. + // + for(Ice::StringSeq::size_type i = 1; i < seq.size(); ++i) + { + volatile VALUE str = createString(seq[i]); + callRuby(rb_ary_push, argv[0], str); + } + } - return createProperties(obj); + return createProperties(obj); } ICE_RUBY_CATCH return Qnil; @@ -85,10 +85,10 @@ IceRuby_Properties_getProperty(VALUE self, VALUE key) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - string k = getString(key); - string v = p->getProperty(k); - return createString(v); + Ice::PropertiesPtr p = getProperties(self); + string k = getString(key); + string v = p->getProperty(k); + return createString(v); } ICE_RUBY_CATCH return Qnil; @@ -100,11 +100,11 @@ IceRuby_Properties_getPropertyWithDefault(VALUE self, VALUE key, VALUE def) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - string k = getString(key); - string d = getString(def); - string v = p->getPropertyWithDefault(k, d); - return createString(v); + Ice::PropertiesPtr p = getProperties(self); + string k = getString(key); + string d = getString(def); + string v = p->getPropertyWithDefault(k, d); + return createString(v); } ICE_RUBY_CATCH return Qnil; @@ -116,10 +116,10 @@ IceRuby_Properties_getPropertyAsInt(VALUE self, VALUE key) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - string k = getString(key); - Ice::Int v = p->getPropertyAsInt(k); - return INT2FIX(v); + Ice::PropertiesPtr p = getProperties(self); + string k = getString(key); + Ice::Int v = p->getPropertyAsInt(k); + return INT2FIX(v); } ICE_RUBY_CATCH return Qnil; @@ -131,11 +131,11 @@ IceRuby_Properties_getPropertyAsIntWithDefault(VALUE self, VALUE key, VALUE def) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - string k = getString(key); - Ice::Int d = getInteger(def); - Ice::Int v = p->getPropertyAsIntWithDefault(k, d); - return INT2FIX(v); + Ice::PropertiesPtr p = getProperties(self); + string k = getString(key); + Ice::Int d = getInteger(def); + Ice::Int v = p->getPropertyAsIntWithDefault(k, d); + return INT2FIX(v); } ICE_RUBY_CATCH return Qnil; @@ -147,17 +147,17 @@ IceRuby_Properties_getPropertiesForPrefix(VALUE self, VALUE prefix) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - string pfx = getString(prefix); - Ice::PropertyDict dict = p->getPropertiesForPrefix(pfx); - volatile VALUE result = callRuby(rb_hash_new); - for(Ice::PropertyDict::const_iterator q = dict.begin(); q != dict.end(); ++q) - { - volatile VALUE key = createString(q->first); - volatile VALUE value = createString(q->second); - callRuby(rb_hash_aset, result, key, value); - } - return result; + Ice::PropertiesPtr p = getProperties(self); + string pfx = getString(prefix); + Ice::PropertyDict dict = p->getPropertiesForPrefix(pfx); + volatile VALUE result = callRuby(rb_hash_new); + for(Ice::PropertyDict::const_iterator q = dict.begin(); q != dict.end(); ++q) + { + volatile VALUE key = createString(q->first); + volatile VALUE value = createString(q->second); + callRuby(rb_hash_aset, result, key, value); + } + return result; } ICE_RUBY_CATCH return Qnil; @@ -169,10 +169,10 @@ IceRuby_Properties_setProperty(VALUE self, VALUE key, VALUE value) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - string k = getString(key); - string v = getString(value); - p->setProperty(k, v); + Ice::PropertiesPtr p = getProperties(self); + string k = getString(key); + string v = getString(value); + p->setProperty(k, v); } ICE_RUBY_CATCH return Qnil; @@ -184,9 +184,9 @@ IceRuby_Properties_getCommandLineOptions(VALUE self) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - Ice::StringSeq options = p->getCommandLineOptions(); - return stringSeqToArray(options); + Ice::PropertiesPtr p = getProperties(self); + Ice::StringSeq options = p->getCommandLineOptions(); + return stringSeqToArray(options); } ICE_RUBY_CATCH return Qnil; @@ -198,15 +198,15 @@ IceRuby_Properties_parseCommandLineOptions(VALUE self, VALUE prefix, VALUE optio { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - string pfx = getString(prefix); - Ice::StringSeq seq; - if(!arrayToStringSeq(options, seq)) - { - throw RubyException(rb_eTypeError, "invalid array argument to Ice::parseCommandLineOptions"); - } - Ice::StringSeq filtered = p->parseCommandLineOptions(pfx, seq); - return stringSeqToArray(filtered); + Ice::PropertiesPtr p = getProperties(self); + string pfx = getString(prefix); + Ice::StringSeq seq; + if(!arrayToStringSeq(options, seq)) + { + throw RubyException(rb_eTypeError, "invalid array argument to Ice::parseCommandLineOptions"); + } + Ice::StringSeq filtered = p->parseCommandLineOptions(pfx, seq); + return stringSeqToArray(filtered); } ICE_RUBY_CATCH return Qnil; @@ -218,14 +218,14 @@ IceRuby_Properties_parseIceCommandLineOptions(VALUE self, VALUE options) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - Ice::StringSeq seq; - if(!arrayToStringSeq(options, seq)) - { - throw RubyException(rb_eTypeError, "invalid array argument to Ice::parseIceCommandLineOptions"); - } - Ice::StringSeq filtered = p->parseIceCommandLineOptions(seq); - return stringSeqToArray(filtered); + Ice::PropertiesPtr p = getProperties(self); + Ice::StringSeq seq; + if(!arrayToStringSeq(options, seq)) + { + throw RubyException(rb_eTypeError, "invalid array argument to Ice::parseIceCommandLineOptions"); + } + Ice::StringSeq filtered = p->parseIceCommandLineOptions(seq); + return stringSeqToArray(filtered); } ICE_RUBY_CATCH return Qnil; @@ -237,9 +237,9 @@ IceRuby_Properties_load(VALUE self, VALUE file) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - string f = getString(file); - p->load(f); + Ice::PropertiesPtr p = getProperties(self); + string f = getString(file); + p->load(f); } ICE_RUBY_CATCH return Qnil; @@ -251,9 +251,9 @@ IceRuby_Properties_clone(VALUE self) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - Ice::PropertiesPtr props = p->clone(); - return createProperties(props); + Ice::PropertiesPtr p = getProperties(self); + Ice::PropertiesPtr props = p->clone(); + return createProperties(props); } ICE_RUBY_CATCH return Qnil; @@ -265,18 +265,18 @@ IceRuby_Properties_to_s(VALUE self) { ICE_RUBY_TRY { - Ice::PropertiesPtr p = getProperties(self); - Ice::PropertyDict dict = p->getPropertiesForPrefix(""); - string str; - for(Ice::PropertyDict::const_iterator q = dict.begin(); q != dict.end(); ++q) - { - if(q != dict.begin()) - { - str.append("\n"); - } - str.append(q->first + "=" + q->second); - } - return createString(str); + Ice::PropertiesPtr p = getProperties(self); + Ice::PropertyDict dict = p->getPropertiesForPrefix(""); + string str; + for(Ice::PropertyDict::const_iterator q = dict.begin(); q != dict.end(); ++q) + { + if(q != dict.begin()) + { + str.append("\n"); + } + str.append(q->first + "=" + q->second); + } + return createString(str); } ICE_RUBY_CATCH return Qnil; @@ -290,19 +290,19 @@ IceRuby::initProperties(VALUE iceModule) _propertiesClass = rb_define_class_under(iceModule, "PropertiesI", rb_cObject); rb_define_method(_propertiesClass, "getProperty", CAST_METHOD(IceRuby_Properties_getProperty), 1); rb_define_method(_propertiesClass, "getPropertyWithDefault", - CAST_METHOD(IceRuby_Properties_getPropertyWithDefault), 2); + CAST_METHOD(IceRuby_Properties_getPropertyWithDefault), 2); rb_define_method(_propertiesClass, "getPropertyAsInt", CAST_METHOD(IceRuby_Properties_getPropertyAsInt), 1); rb_define_method(_propertiesClass, "getPropertyAsIntWithDefault", - CAST_METHOD(IceRuby_Properties_getPropertyAsIntWithDefault), 2); + CAST_METHOD(IceRuby_Properties_getPropertyAsIntWithDefault), 2); rb_define_method(_propertiesClass, "getPropertiesForPrefix", - CAST_METHOD(IceRuby_Properties_getPropertiesForPrefix), 1); + CAST_METHOD(IceRuby_Properties_getPropertiesForPrefix), 1); rb_define_method(_propertiesClass, "setProperty", CAST_METHOD(IceRuby_Properties_setProperty), 2); rb_define_method(_propertiesClass, "getCommandLineOptions", CAST_METHOD(IceRuby_Properties_getCommandLineOptions), - 0); + 0); rb_define_method(_propertiesClass, "parseCommandLineOptions", - CAST_METHOD(IceRuby_Properties_parseCommandLineOptions), 2); + CAST_METHOD(IceRuby_Properties_parseCommandLineOptions), 2); rb_define_method(_propertiesClass, "parseIceCommandLineOptions", - CAST_METHOD(IceRuby_Properties_parseIceCommandLineOptions), 1); + CAST_METHOD(IceRuby_Properties_parseIceCommandLineOptions), 1); rb_define_method(_propertiesClass, "load", CAST_METHOD(IceRuby_Properties_load), 1); rb_define_method(_propertiesClass, "clone", CAST_METHOD(IceRuby_Properties_clone), 0); rb_define_method(_propertiesClass, "to_s", CAST_METHOD(IceRuby_Properties_to_s), 0); |