rhodes 2.0.0.beta6 → 2.0.0.beta7

data/Manifest.txt

@@ -56,7 +56,7 @@ lib/extensions/fcntl/ext/fcntl.c
 lib/extensions/fcntl/ext/Rakefile
 lib/extensions/fcntl/ext.yml
 lib/extensions/json/json/common.rb
-lib/extensions/json/json/pure/parser.rb
+lib/extensions/json/json/pure/generator.rb
 lib/extensions/json/json/pure.rb
 lib/extensions/json/json/version.rb
 lib/extensions/json/json.rb
@@ -212,7 +212,9 @@ lib/framework/rhoframework.rb
 lib/framework/rhofsconnector.rb
 lib/framework/rholang/lang_en.rb
 lib/framework/rholang/localization_simplified.rb
+lib/framework/rholang/rhoerror_de.rb
 lib/framework/rholang/rhoerror_en.rb
+lib/framework/rholang/rhomsg_de.rb
 lib/framework/rholang/rhomsg_en.rb
 lib/framework/rhom/rhom.rb
 lib/framework/rhom/rhom_db_adapter.rb

data/lib/extensions/json/json/common.rb

@@ -44,8 +44,10 @@ module JSON
     # Set the module _generator_ to be used by JSON.
     def generator=(generator) # :nodoc:
       @generator = generator
+
       generator_methods = generator::GeneratorMethods
-      for const in generator_methods.constants
+      #for const in generator_methods.constants
+      generator_methods.constants.each do |const|
         klass = deep_const_get(const)
         modul = generator_methods.const_get(const)
         klass.class_eval do
@@ -117,10 +119,10 @@ module JSON
   # * *create_additions*: If set to false, the Parser doesn't create
   #   additions even if a matchin class and create_id was found. This option
   #   defaults to true.
-  def parse(source, opts = {})
-    JSON.parser.new(source, opts).parse
-  end
-  module_function :parse
+  #def parse(source, opts = {})
+  #  JSON.parser.new(source, opts).parse
+  #end
+  #module_function :parse
   
   # Parse the JSON string _source_ into a Ruby data structure and return it.
   # The bang version of the parse method, defaults to the more dangerous values
@@ -137,13 +139,13 @@ module JSON
   # * *create_additions*: If set to false, the Parser doesn't create
   #   additions even if a matchin class and create_id was found. This option
   #   defaults to true.
-  def parse!(source, opts = {})
-    opts = {
-      :max_nesting => false,
-      :allow_nan => true
-    }.update(opts)
-    JSON.parser.new(source, opts).parse
-  end
+  #def parse!(source, opts = {})
+  #  opts = {
+  #    :max_nesting => false,
+  #    :allow_nan => true
+  #  }.update(opts)
+  #  JSON.parser.new(source, opts).parse
+  #end
 
   # Unparse the Ruby data structure _obj_ into a single line JSON string and
   # return it. _state_ is
@@ -174,6 +176,7 @@ module JSON
   # See also the fast_generate for the fastest creation method with the least
   # amount of sanity checks, and the pretty_generate method for some
   # defaults for a pretty output.
+  module_function
   def generate(obj, state = nil)
     if state
       state = State.from_state(state)
@@ -182,7 +185,8 @@ module JSON
     end
     obj.to_json(state)
   end
-
+  module_function :generate
+  
   # :stopdoc:
   # I want to deprecate these later, so I'll first be silent about them, and
   # later delete them.

data/lib/extensions/json/json/pure/generator.rb

@@ -0,0 +1,431 @@
+
+module JSON
+=begin
+  MAP = {
+    "\x0" => '\u0000',
+    "\x1" => '\u0001',
+    "\x2" => '\u0002',
+    "\x3" => '\u0003',
+    "\x4" => '\u0004',
+    "\x5" => '\u0005',
+    "\x6" => '\u0006',
+    "\x7" => '\u0007',
+    "\b"  =>  '\b',
+    "\t"  =>  '\t',
+    "\n"  =>  '\n',
+    "\xb" => '\u000b',
+    "\f"  =>  '\f',
+    "\r"  =>  '\r',
+    "\xe" => '\u000e',
+    "\xf" => '\u000f',
+    "\x10" => '\u0010',
+    "\x11" => '\u0011',
+    "\x12" => '\u0012',
+    "\x13" => '\u0013',
+    "\x14" => '\u0014',
+    "\x15" => '\u0015',
+    "\x16" => '\u0016',
+    "\x17" => '\u0017',
+    "\x18" => '\u0018',
+    "\x19" => '\u0019',
+    "\x1a" => '\u001a',
+    "\x1b" => '\u001b',
+    "\x1c" => '\u001c',
+    "\x1d" => '\u001d',
+    "\x1e" => '\u001e',
+    "\x1f" => '\u001f',
+    '"'   =>  '\"',
+    '\\'  =>  '\\\\',
+  } # :nodoc:
+
+  # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
+  # UTF16 big endian characters as \u????, and return it.
+  if String.method_defined?(:force_encoding)
+    def utf8_to_json(string) # :nodoc:
+      string = string.dup
+      string << '' # XXX workaround: avoid buffer sharing
+      string.force_encoding(Encoding::ASCII_8BIT)
+      string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
+      string.gsub!(/(
+                      (?:
+                        [\xc2-\xdf][\x80-\xbf]    |
+                        [\xe0-\xef][\x80-\xbf]{2} |
+                        [\xf0-\xf4][\x80-\xbf]{3}
+                      )+ |
+                      [\x80-\xc1\xf5-\xff]       # invalid
+                    )/nx) { |c|
+                      c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
+                      s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
+                      s.gsub!(/.{4}/n, '\\\\u\&')
+                    }
+      string.force_encoding(Encoding::UTF_8)
+      string
+    rescue Iconv::Failure => e
+      raise GeneratorError, "Caught #{e.class}: #{e}"
+    end
+  else
+    def utf8_to_json(string) # :nodoc:
+      string = string.gsub(/["\\\x0-\x1f]/) { MAP[$&] }
+      string.gsub!(/(
+                      (?:
+                        [\xc2-\xdf][\x80-\xbf]    |
+                        [\xe0-\xef][\x80-\xbf]{2} |
+                        [\xf0-\xf4][\x80-\xbf]{3}
+                      )+ |
+                      [\x80-\xc1\xf5-\xff]       # invalid
+                    )/nx) { |c|
+        c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
+        s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
+        s.gsub!(/.{4}/n, '\\\\u\&')
+      }
+      string
+    rescue Iconv::Failure => e
+      raise GeneratorError, "Caught #{e.class}: #{e}"
+    end
+  end
+  module_function :utf8_to_json
+=end
+  module Pure
+    module Generator
+      # This class is used to create State instances, that are use to hold data
+      # while generating a JSON text from a a Ruby data structure.
+      class State
+        # Creates a State object from _opts_, which ought to be Hash to create
+        # a new State instance configured by _opts_, something else to create
+        # an unconfigured instance. If _opts_ is a State object, it is just
+        # returned.
+        def self.from_state(opts)
+          case opts
+          when self
+            opts
+          when Hash
+            new(opts)
+          else
+            new
+          end
+        end
+
+        # Instantiates a new State object, configured by _opts_.
+        #
+        # _opts_ can have the following keys:
+        #
+        # * *indent*: a string used to indent levels (default: ''),
+        # * *space*: a string that is put after, a : or , delimiter (default: ''),
+        # * *space_before*: a string that is put before a : pair delimiter (default: ''),
+        # * *object_nl*: a string that is put at the end of a JSON object (default: ''), 
+        # * *array_nl*: a string that is put at the end of a JSON array (default: ''),
+        # * *check_circular*: true if checking for circular data structures
+        #   should be done (the default), false otherwise.
+        # * *check_circular*: true if checking for circular data structures
+        #   should be done, false (the default) otherwise.
+        # * *allow_nan*: true if NaN, Infinity, and -Infinity should be
+        #   generated, otherwise an exception is thrown, if these values are
+        #   encountered. This options defaults to false.
+        def initialize(opts = {})
+          @seen = {}
+          @indent         = ''
+          @space          = ''
+          @space_before   = ''
+          @object_nl      = ''
+          @array_nl       = ''
+          @check_circular = true
+          @allow_nan      = false
+          configure opts
+        end
+
+        # This string is used to indent levels in the JSON text.
+        attr_accessor :indent
+
+        # This string is used to insert a space between the tokens in a JSON
+        # string.
+        attr_accessor :space
+
+        # This string is used to insert a space before the ':' in JSON objects.
+        attr_accessor :space_before
+
+        # This string is put at the end of a line that holds a JSON object (or
+        # Hash).
+        attr_accessor :object_nl
+
+        # This string is put at the end of a line that holds a JSON array.
+        attr_accessor :array_nl
+
+        # This integer returns the maximum level of data structure nesting in
+        # the generated JSON, max_nesting = 0 if no maximum is checked.
+        attr_accessor :max_nesting
+
+        def check_max_nesting(depth) # :nodoc:
+          return if @max_nesting.zero?
+          current_nesting = depth + 1
+          current_nesting > @max_nesting and
+            raise NestingError, "nesting of #{current_nesting} is too deep"
+        end
+
+        # Returns true, if circular data structures should be checked,
+        # otherwise returns false.
+        def check_circular?
+          @check_circular
+        end
+
+        # Returns true if NaN, Infinity, and -Infinity should be considered as
+        # valid JSON and output.
+        def allow_nan?
+          @allow_nan
+        end
+
+        # Returns _true_, if _object_ was already seen during this generating
+        # run. 
+        def seen?(object)
+          @seen.key?(object.__id__)
+        end
+
+        # Remember _object_, to find out if it was already encountered (if a
+        # cyclic data structure is if a cyclic data structure is rendered). 
+        def remember(object)
+          @seen[object.__id__] = true
+        end
+
+        # Forget _object_ for this generating run.
+        def forget(object)
+          @seen.delete object.__id__
+        end
+
+        # Configure this State instance with the Hash _opts_, and return
+        # itself.
+        def configure(opts)
+          @indent         = opts[:indent] if opts.key?(:indent)
+          @space          = opts[:space] if opts.key?(:space)
+          @space_before   = opts[:space_before] if opts.key?(:space_before)
+          @object_nl      = opts[:object_nl] if opts.key?(:object_nl)
+          @array_nl       = opts[:array_nl] if opts.key?(:array_nl)
+          @check_circular = !!opts[:check_circular] if opts.key?(:check_circular)
+          @allow_nan      = !!opts[:allow_nan] if opts.key?(:allow_nan)
+          if !opts.key?(:max_nesting) # defaults to 19
+            @max_nesting = 19
+          elsif opts[:max_nesting]
+            @max_nesting = opts[:max_nesting]
+          else
+            @max_nesting = 0
+          end
+          self
+        end
+
+        # Returns the configuration instance variables as a hash, that can be
+        # passed to the configure method.
+        def to_h
+          result = {}
+          for iv in %w[indent space space_before object_nl array_nl check_circular allow_nan max_nesting]
+            result[iv.intern] = instance_variable_get("@#{iv}")
+          end
+          result
+        end
+      end
+
+      module GeneratorMethods
+        module Object
+          # Converts this object to a string (calling #to_s), converts
+          # it to a JSON string, and returns the result. This is a fallback, if no
+          # special method #to_json was defined for some object.
+          def to_json(*) to_s.to_json end
+        end
+
+        module Hash
+          # Returns a JSON string containing a JSON object, that is unparsed from
+          # this Hash instance.
+          # _state_ is a JSON::State object, that can also be used to configure the
+          # produced JSON string output further.
+          # _depth_ is used to find out nesting depth, to indent accordingly.
+          def to_json(state = nil, depth = 0, *)
+            if state
+              state = JSON.state.from_state(state)
+              state.check_max_nesting(depth)
+              json_check_circular(state) { json_transform(state, depth) }
+            else
+              json_transform(state, depth)
+            end
+          end
+
+          private
+
+          def json_check_circular(state)
+            if state and state.check_circular?
+              state.seen?(self) and raise JSON::CircularDatastructure,
+                  "circular data structures not supported!"
+              state.remember self
+            end
+            yield
+          ensure
+            state and state.forget self
+          end
+
+          def json_shift(state, depth)
+            state and not state.object_nl.empty? or return ''
+            state.indent * depth
+          end
+
+          def json_transform(state, depth)
+            delim = ','
+            if state
+              delim << state.object_nl
+              result = '{'
+              result << state.object_nl
+              result << map { |key,value|
+                s = json_shift(state, depth + 1)
+                s << key.to_s.to_json(state, depth + 1)
+                s << state.space_before
+                s << ':'
+                s << state.space
+                s << value.to_json(state, depth + 1)
+              }.join(delim)
+              result << state.object_nl
+              result << json_shift(state, depth)
+              result << '}'
+            else
+              result = '{'
+              result << map { |key,value|
+                key.to_s.to_json << ':' << value.to_json
+              }.join(delim)
+              result << '}'
+            end
+            result
+          end
+        end
+
+        module Array
+          # Returns a JSON string containing a JSON array, that is unparsed from
+          # this Array instance.
+          # _state_ is a JSON::State object, that can also be used to configure the
+          # produced JSON string output further.
+          # _depth_ is used to find out nesting depth, to indent accordingly.
+          def to_json(state = nil, depth = 0, *)
+            if state
+              state = JSON.state.from_state(state)
+              state.check_max_nesting(depth)
+              json_check_circular(state) { json_transform(state, depth) }
+            else
+              json_transform(state, depth)
+            end
+          end
+
+          private
+
+          def json_check_circular(state)
+            if state and state.check_circular?
+              state.seen?(self) and raise JSON::CircularDatastructure,
+                "circular data structures not supported!"
+              state.remember self
+            end
+            yield
+          ensure
+            state and state.forget self
+          end
+
+          def json_shift(state, depth)
+            state and not state.array_nl.empty? or return ''
+            state.indent * depth
+          end
+
+          def json_transform(state, depth)
+            delim = ','
+            if state
+              delim << state.array_nl
+              result = '['
+              result << state.array_nl
+              result << map { |value|
+                json_shift(state, depth + 1) << value.to_json(state, depth + 1)
+              }.join(delim)
+              result << state.array_nl
+              result << json_shift(state, depth) 
+              result << ']'
+            else
+              '[' << map { |value| value.to_json }.join(delim) << ']'
+            end
+          end
+        end
+
+        module Integer
+          # Returns a JSON string representation for this Integer number.
+          def to_json(*) to_s end
+        end
+
+        module Float
+          # Returns a JSON string representation for this Float number.
+          def to_json(state = nil, *)
+            case
+            when infinite?
+              if !state || state.allow_nan?
+                to_s
+              else
+                raise GeneratorError, "#{self} not allowed in JSON"
+              end
+            when nan?
+              if !state || state.allow_nan?
+                to_s
+              else
+                raise GeneratorError, "#{self} not allowed in JSON"
+              end
+            else
+              to_s
+            end
+          end
+        end
+
+        module String
+          # This string should be encoded with UTF-8 A call to this method
+          # returns a JSON string encoded with UTF16 big endian characters as
+          # \u????.
+          def to_json(*)
+            '"' << self << '"' #JSON.utf8_to_json(self) << '"'
+          end
+
+          # Module that holds the extinding methods if, the String module is
+          # included.
+          module Extend
+            # Raw Strings are JSON Objects (the raw bytes are stored in an array for the
+            # key "raw"). The Ruby String can be created by this module method.
+            def json_create(o)
+              o['raw'].pack('C*')
+            end
+          end
+
+          # Extends _modul_ with the String::Extend module.
+          def self.included(modul)
+            modul.extend Extend
+          end
+
+          # This method creates a raw object hash, that can be nested into
+          # other data structures and will be unparsed as a raw string. This
+          # method should be used, if you want to convert raw strings to JSON
+          # instead of UTF-8 strings, e. g. binary data.
+          def to_json_raw_object
+            {
+              JSON.create_id  => self.class.name,
+              'raw'           => self.unpack('C*'),
+            }
+          end
+
+          # This method creates a JSON text from the result of
+          # a call to to_json_raw_object of this String.
+          def to_json_raw(*args)
+            to_json_raw_object.to_json(*args)
+          end
+        end
+
+        module TrueClass
+          # Returns a JSON string for true: 'true'.
+          def to_json(*) 'true' end
+        end
+
+        module FalseClass
+          # Returns a JSON string for false: 'false'.
+          def to_json(*) 'false' end
+        end
+
+        module NilClass
+          # Returns a JSON string for nil: 'null'.
+          def to_json(*) 'null' end
+        end
+      end
+    end
+  end
+end

data/lib/extensions/json/json/pure.rb

@@ -1,6 +1,6 @@
 require 'json/common'
-require 'json/pure/parser'
-#require 'json/pure/generator'
+#require 'json/pure/parser'
+require 'json/pure/generator'
 
 module JSON
   begin
@@ -69,8 +69,8 @@ module JSON
   # functionality in pure ruby.
   module Pure
     $DEBUG and warn "Using pure library for JSON."
-    JSON.parser = Parser
-    #JSON.generator = Generator
+    #JSON.parser = Parser
+    JSON.generator = Generator
   end
 
   JSON_LOADED = true

data/lib/framework/rholang/rhoerror_de.rb

@@ -0,0 +1,36 @@
+module Rho
+  class RhoError < Exception
+    def self.err_message(code)
+        if code == ERR_NETWORK
+            return "Netzwerkverbindung konnte nicht hergestellt werden."
+        elsif code == ERR_REMOTESERVER
+            return "Server gab Fehler zurück."
+        elsif code ==  ERR_RUNTIME
+            return "Die Applikation hat einen Fehler verursacht und muss beendet werden."
+        elsif code ==  ERR_UNEXPECTEDSERVERRESPONSE
+            return "Synchronisationsserver antwortete unerwartet."
+        elsif code ==  ERR_DIFFDOMAINSINSYNCSRC
+            return "Alle Synchronisationsquellen sollten von der gleichen Domain stammen.Installiere die Applikation erneut."
+        elsif code ==  ERR_NOSERVERRESPONSE
+            return "Verbindung zum Synchronisationsserver konnte nicht hergestellt werden."
+        elsif code ==  ERR_CLIENTISNOTLOGGEDIN
+            return "Client ist nicht eingeloggt. Keine Synchronisation wird durchgeführt."
+        elsif code ==  ERR_CUSTOMSYNCSERVER
+            return "Verbindung zum Datenserver konnte nicht hergestellt werden."
+        elsif code ==  ERR_UNATHORIZED
+            return "Eingabe eines falschen Benutzernamens/Passwortes, bitte versuchen Sie es erneut."
+        elsif code ==  ERR_CANCELBYUSER
+            return "Operation wurde durch den User abgebrochen."
+        elsif code ==  ERR_SYNCVERSION
+            return "Verbindung durch Server beendet. Ihr mobile Applikation muss aktualisiert werden. Bitte kontaktieren sie Ihren Administrator."
+        elsif code ==  ERR_GEOLOCATION
+            return "Ortsangabe konnte nicht bestimmt werden."
+        elsif code ==  ERR_NONE
+            return ""
+        end
+        
+        return "Unbekannter Fehler"
+    end
+    
+  end # RhoError
+end # Rho

data/lib/framework/rholang/rhomsg_de.rb

@@ -0,0 +1,28 @@
+module Rho
+  class RhoMessages
+    LocalMessages = {
+      'sync_failed_for' => "Synchronisation fehlgeschlagen für ",
+      'details'         => " Details: ",
+      'sync_completed'  => "Synchronisation abgeschlossen.",
+      'syncronizing'    => "Synchronisiere ",
+      'syncronizing_data' => "Synchronisiere Daten...",
+      
+	  'home_menu' => "Home",
+	  'refresh_menu' => "Refresh",
+	  'back_menu' => "Back",
+	  'sync_menu' => "Sync",
+	  'options_menu' => "Options",
+	  'log_menu' => "Log",
+	  'close_menu' => "Close",
+      'get_link_menu' => "Link abrufen",
+      'open_link_menu' => "Open Link",
+      'email_menu' => "Email",
+      'call_menu' => "Call",
+      'sms_menu' => "SMS",
+      'add_contacts_menu' => "Add to Contacts",
+      
+      'hide' => 'Hide'
+    }
+    
+  end # RhoMessages
+end # Rho

data/platform/android/build/android.rake

@@ -7,7 +7,7 @@ USE_TRACES = false
 
 ANDROID_API_LEVEL_TO_MARKET_VERSION = {}
 ANDROID_MARKET_VERSION_TO_API_LEVEL = {}
-{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1"}.each do |k,v|
+{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1", 8 => "2.2"}.each do |k,v|
   ANDROID_API_LEVEL_TO_MARKET_VERSION[k] = v
   ANDROID_MARKET_VERSION_TO_API_LEVEL[v] = k
 end
@@ -337,11 +337,11 @@ namespace "config" do
     $objdir = {}
     $libname = {}
     $native_libs.each do |x|
-      $objdir[x] = File.join($rhobindir, $confdir, "lib" + x)
-      $libname[x] = File.join($rhobindir, $confdir, "lib" + x + ".a")
+      $objdir[x] = File.join($rhobindir, $confdir, $ndkgccver, "lib" + x)
+      $libname[x] = File.join($rhobindir, $confdir, $ndkgccver, "lib" + x + ".a")
     end
 
-    $extensionsdir = $bindir + "/libs/" + $confdir + "/extensions"
+    $extensionsdir = $bindir + "/libs/" + $confdir + "/" + $ndkgccver + "/extensions"
 
     $app_config["extensions"] = [] if $app_config["extensions"].nil?
     $app_config["extensions"] = [] unless $app_config["extensions"].is_a? Array
@@ -724,8 +724,8 @@ namespace "build" do
 
     task :librhodes => [:libs, :gensources] do
       srcdir = File.join $androidpath, "Rhodes", "jni", "src"
-      objdir = File.join $bindir, "libs", $confdir, "librhodes"
-      libname = File.join $bindir, "libs", $confdir, "librhodes.so"
+      objdir = File.join $bindir, "libs", $confdir, $ndkgccver, "librhodes"
+      libname = File.join $bindir, "libs", $confdir, $ndkgccver, "librhodes.so"
 
       args = []
       args << "-I#{$appincdir}"
@@ -749,8 +749,8 @@ namespace "build" do
       end
 
       args = []
-      args << "-L#{$rhobindir}/#{$confdir}"
-      args << "-L#{$bindir}/libs/#{$confdir}"
+      args << "-L#{$rhobindir}/#{$confdir}/#{$ndkgccver}"
+      args << "-L#{$bindir}/libs/#{$confdir}/#{$ndkgccver}"
       args << "-L#{$extensionsdir}"
 
       rlibs = []
@@ -926,8 +926,8 @@ namespace "package" do
       next unless File.basename(f) =~ /^_/
       relpath = Pathname.new(f).relative_path_from(Pathname.new($tmpdir)).to_s
       puts "Add #{relpath} to #{resourcepkg}..."
-      args = ["add", resourcepkg, relpath]
-      puts Jake.run($aapt, args, $tmpdir)
+      args = ["uf", resourcepkg, relpath]
+      puts Jake.run($jarbin, args, $tmpdir)
       unless $? == 0
         puts "Error running AAPT (2)"
         exit 1
@@ -937,18 +937,18 @@ namespace "package" do
     # Add native librhodes.so
     rm_rf File.join($tmpdir, "lib")
     mkdir_p File.join($tmpdir, "lib/armeabi")
-    cp_r File.join($bindir, "libs", $confdir, "librhodes.so"), File.join($tmpdir, "lib/armeabi")
+    cp_r File.join($bindir, "libs", $confdir, $ndkgccver, "librhodes.so"), File.join($tmpdir, "lib/armeabi")
     # Add extensions .so libraries
     Dir.glob($extensionsdir + "/lib*.so").each do |lib|
       cp_r lib, File.join($tmpdir, "lib/armeabi")
     end
-    args = ["add", resourcepkg]
+    args = ["uf", resourcepkg]
     # Strip them all to decrease size
     Dir.glob($tmpdir + "/lib/armeabi/lib*.so").each do |lib|
       cc_run($stripbin, [lib])
       args << "lib/armeabi/#{File.basename(lib)}"
     end
-    puts Jake.run($aapt, args, $tmpdir)
+    puts Jake.run($jarbin, args, $tmpdir)
     err = $?
     rm_rf $tmpdir + "/lib"
     unless err == 0
@@ -1229,8 +1229,8 @@ namespace "clean" do
     end
   end
   task :librhodes => "config:android" do
-    rm_rf $rhobindir + "/" + $confdir + "/librhodes"
-    rm_rf $bindir + "/libs/" + $confdir + "/librhodes.so"
+    rm_rf $rhobindir + "/" + $confdir + "/" + $ndkgccver + "/librhodes"
+    rm_rf $bindir + "/libs/" + $confdir + "/" + $ndkgccver + "/librhodes.so"
   end
 #  desc "clean android"
   task :all => [:assets,:librhodes,:libs,:files]

data/platform/android/build/androidcommon.rb

@@ -30,6 +30,22 @@ def setup_ndk(ndkpath,apilevel)
     name = tool.gsub('+', 'p')
     eval "$#{name}bin = $ndktools + '/bin/arm-eabi-#{tool}' + $exe_ext"
   end
+  
+  # Detect rlim_t
+  if $have_rlim_t.nil?
+    $have_rlim_t = false
+    resource_h = File.join(ndkpath, 'build', 'platforms', "android-#{apilevel}", "arch-arm", "usr", "include", "sys", "resource.h")
+    if File.exists? resource_h
+      File.open(resource_h, 'r') do |f|
+        while line = f.gets
+          if line =~ /^\s*typedef\b.*\brlim_t\s*;\s*$/
+            $have_rlim_t = true;
+            break;
+          end
+        end
+      end
+    end
+  end
 end
 
 def cc_def_args
@@ -43,6 +59,7 @@ def cc_def_args
     args << "-DANDROID"
     args << "-DOS_ANDROID"
     args << "-DRHO_DEBUG"
+    args << "-DHAVE_RLIM_T" if $have_rlim_t
     args << "-g"
     if $build_release
       args << "-O2"
@@ -161,7 +178,6 @@ def cc_link(outname, objects, additional = nil, deps = nil)
   args << "-Wl,--no-whole-archive"
   args << "-Wl,--no-undefined"
   args << "-Wl,-z,defs"
-  args << "-shared"
   args << "-fPIC"
   args << "-Wl,-soname,#{File.basename(outname)}"
   args << "-o"
@@ -170,14 +186,21 @@ def cc_link(outname, objects, additional = nil, deps = nil)
   args += additional if additional.is_a? Array and not additional.empty?
   args << "-L#{$ndksysroot}/usr/lib"
   args << "-Wl,-rpath-link=#{$ndksysroot}/usr/lib"
-  args << "#{$ndksysroot}/usr/lib/libstdc++.so"
-  args << "#{$ndksysroot}/usr/lib/libsupc++.so" unless USE_STLPORT
-  libgccdir = File.join($ndktools, "lib/gcc/arm-eabi", $ndkgccver)
-  libgccdir = File.join(libgccdir, "interwork") if $ndkgccver == "4.2.1"
-  args << "#{libgccdir}/libgcc.a" if $ndkgccver != "4.2.1"
+  if $cxxlibs.nil?
+    $cxxlibs = []
+    if USE_STLPORT
+      $cxxlibs << File.join($ndksysroot, "usr/lib/libstdc++.so")
+    else
+      $cxxlibs << `#{$gccbin} -mthumb-interwork -print-file-name=libstdc++.a`.gsub("\n", "")
+      $cxxlibs << `#{$gccbin} -mthumb-interwork -print-file-name=libsupc++.a`.gsub("\n", "")
+    end
+  end
+  args += $cxxlibs
+  $libgcc = `#{$gccbin} -mthumb-interwork -print-file-name=libgcc.a`.gsub("\n", "") if $libgcc.nil?
+  args << $libgcc
   args << "#{$ndksysroot}/usr/lib/libc.so"
   args << "#{$ndksysroot}/usr/lib/libm.so"
-  args << "#{libgccdir}/libgcc.a" if $ndkgccver == "4.2.1"
+  args << $libgcc
   cc_run($gccbin, args)
 end
 

data/platform/bb/build/bb.rake

@@ -1,4 +1,26 @@
 #
+require "fileutils"
+
+def fixWin7SimBug (rhoconfig) 
+	file = rhoconfig
+	tmpfile = file + ".tmp"
+	no_deviceside_postfix_isFound = 0
+	File.open(file, 'r') do |f|
+	  File.open(tmpfile, 'w') do |newf|
+	    while line = f.gets
+	      if line =~ /^\s*no_deviceside_postfix\s*=/
+		no_deviceside_postfix_isFound = 1
+	      end
+	      newf.puts line
+	    end
+	    if no_deviceside_postfix_isFound == 0
+	      newf.puts "no_deviceside_postfix = 1"
+	    end
+	  end
+	end
+	FileUtils.move(tmpfile, file)
+end
+
 
 def freplace( fname, pattern, str )
   f = File.open( fname )
@@ -132,6 +154,7 @@ namespace "config" do
     $excludeextlib = ['rexml/parsers/baseparser.rb', 'rexml/set.rb']
     $compileERB = $app_path + "/build/compileERB.rb"
     $tmpdir =  $bindir +"/tmp"
+    $tmpdir_sim =  $bindir +"/tmp_sim"
 
     $assetfolder = $app_path + "/public-" + "bb-" + $bbver
 
@@ -154,7 +177,9 @@ namespace "config" do
     
     mkdir_p $bindir unless File.exists? $bindir
     rm_rf $tmpdir
+    rm_rf $tmpdir_sim
     mkdir_p $tmpdir unless File.exists? $tmpdir
+    mkdir_p $tmpdir_sim unless File.exists? $tmpdir_sim
     mkdir_p  $targetdir if not FileTest.exists?  $targetdir
 
     File.open("#{$bindir}/lastver", "w") {|f| f.write($bbver)}
@@ -172,7 +197,7 @@ namespace "build" do
     def runPreverify(args)  
       jdehome = $config["env"]["paths"][$bbver]["jde"]
     
-      startdir = pwd      
+      startdir = pwd
       chdir $tmpdir
       puts Jake.run(jdehome + "/bin/preverify.exe",args)
       chdir startdir
@@ -529,6 +554,70 @@ namespace "package" do
       create_alx_file('rhodesApp', $outfilebase)
     end
 
+#    desc "Package all production (all parts in one package) for simulator"
+    task :production_sim => ["build:bb:rhodes"] do
+      jdehome = $config["env"]["paths"][$bbver]["jde"]
+      rm_rf $tmpdir_sim
+      mkdir_p $tmpdir_sim
+
+      rm_rf $targetdir
+      mkdir_p $targetdir
+
+      Jake.unjar($preverified + "/RubyVM.jar", $tmpdir_sim)
+      Jake.unjar($preverified + "/RhoBundle.jar", $tmpdir_sim)
+      Jake.unjar($preverified + "/rhodes.jar", $tmpdir_sim)
+
+      #Changing rhoconfig.txt to work on Windows 7
+      if RUBY_PLATFORM =~ /(win|w)32$/
+	require  'win32/registry'
+
+	def getWindowsProductNameString
+	    Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Microsoft\Windows NT\CurrentVersion') do |reg|
+	        reg_typ, reg_val = reg.read('ProductName')
+	        return reg_val
+	    end
+	end
+
+      	if getWindowsProductNameString =~ /Windows 7/
+	    fixWin7SimBug($tmpdir_sim + "/apps/rhoconfig.txt")	
+	end
+      end
+
+      if $bbver =~ /^4\.[012](\..*)$/
+        max_size = 65536
+        Dir.glob( $tmpdir_sim + "/**/*" ).each do |f|
+          if File.size( f ) > max_size
+            puts "File size of " + f + " is more than " + max_size.to_s + " bytes"
+            puts "There is no ability to pack this file into .cod file for BB " + $bbver
+            puts "Please reduce its size and try again"
+            $stdout.flush
+            Process.exit
+          end
+        end
+      end
+
+      Jake.jar($bindir + "/" + $outfilebase + ".jar",$builddir + "/manifest.mf",$tmpdir_sim,true)
+
+      Jake.rapc($outfilebase,
+        $targetdir,
+        jdehome + "/lib/net_rim_api.jar",
+        $bindir + "/" + $outfilebase + ".jar",
+        $appname,
+        $app_config["vendor"],
+        $app_config["version"],
+        "resources/icon.png",
+        false,
+        true
+      )
+      unless $? == 0
+        puts "Error in RAPC"
+        exit 1
+      end
+      $stdout.flush
+      
+      create_alx_file('rhodesApp', $outfilebase)
+    end
+
     task :set_dev_build do
         $dev_build = true
     end
@@ -626,6 +715,11 @@ namespace "clean" do
       rm_rf $tmpdir
     end
 
+#    desc "Clean temp simulator dir"
+    task :tempdir_sim => "config:bb" do
+      rm_rf $tmpdir_sim
+    end
+
 #    desc "Clean all"
     task :all => [:preverified,:packaged,:tempdir] do
       rm_rf $bindir
@@ -650,7 +744,7 @@ namespace "run" do
   end
   
   desc "Builds everything, loads and starts bb sim and mds"
-  task :bb => ["run:bb:stopmdsandsim", "package:bb:production"] do
+  task :bb => ["run:bb:stopmdsandsim", "package:bb:production_sim"] do
     jde = $config["env"]["paths"][$bbver]["jde"]
     
     cp_r File.join($targetdir,"/."), jde + "/simulator"
@@ -677,8 +771,8 @@ namespace "config" do
   desc "Check local blackberry configuration"
   task :checkbb => ["config:bb"] do
     javahome = $config["env"]["paths"]["java"]
-    jdehome = $config["env"]["paths"][$bbver]["jde"]
-    mdshome = $config["env"]["paths"][$bbver]["mds"]
+    jdehome  = $config["env"]["paths"][$bbver]["jde"]
+    mdshome  = $config["env"]["paths"][$bbver]["mds"]
 
     puts "BBVER: " + $bbver
     puts "JAVAHOME: " + javahome

data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java

@@ -43,8 +43,13 @@ public class NetworkAccess implements INetworkAccess {
 			strDeviceside = "";
 
 		if (DeviceInfo.isSimulator()) {
-			URLsuffix = ";deviceside=true";
-			WIFIsuffix = ";interface=wifi;deviceside=true";
+			if (com.rho.RhoConf.getInstance().getInt("no_deviceside_postfix") == 1) {
+				URLsuffix = "";
+				WIFIsuffix = ";interface=wifi";
+			} else {
+				URLsuffix = ";deviceside=true";
+				WIFIsuffix = ";interface=wifi;deviceside=true";
+			}
 			networkConfigured = true;
 		}else{
 			ServiceBook sb = ServiceBook.getSB();

data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java

@@ -41,6 +41,7 @@ import com.rho.*;
 import com.rho.rubyext.GeoLocation;
 import com.rho.net.NetResponse;
 import com.rho.net.RhoConnection;
+import com.rho.net.URI;
 import com.rho.sync.ClientRegister;
 import com.rho.sync.SyncThread;
 import com.rho.sync.ISyncStatusListener;
@@ -995,14 +996,18 @@ final public class RhodesApplication extends UiApplication implements SystemList
     private Hashtable cookies = new Hashtable();
     
     public String getCookie(String url) {
-    	Object c = cookies.get(url);
+    	URI uri = new URI(url);
+    	String baseUrl = uri.getScheme() + "://" + uri.getHost() + "/" + uri.getPath();
+    	Object c = cookies.get(baseUrl);
     	if (c instanceof String)
     		return (String)c;
     	return null;
     }
     
     public void setCookie(String url, String cookie) {
-    	cookies.put(url, cookie);
+    	URI uri = new URI(url);
+    	String baseUrl = uri.getScheme() + "://" + uri.getHost() + "/" + uri.getPath();
+    	cookies.put(baseUrl, cookie);
     }
     
     private void createBrowserControl()

data/platform/shared/ruby/linux/ruby/config.h

@@ -260,7 +260,9 @@
 #  include <asm/page.h>
 
 typedef long int fd_mask;
-typedef unsigned long long rlim_t;
+#ifndef HAVE_RLIM_T
+typedef unsigned long rlim_t;
+#endif
 
 #  ifndef howmany
 #    define howmany(x, y)  (((x) + ((y) - 1)) / (y))

data/platform/shared/rubyJVM/src/com/rho/net/NetRequest.java

@@ -657,7 +657,17 @@ public class NetRequest
 	{
 		String strRes = "";
 		byte[]  byteBuffer = new byte[1024*4];
-		boolean bUTF8 = strContType != null && strContType.indexOf("UTF-8")>=0;
+		boolean bUTF8 = false;
+		
+		if ( strContType != null )
+		{
+			int nCharsetPos = strContType.lastIndexOf('=');
+			if ( nCharsetPos > 0 )
+			{
+				String strEnc = strContType.substring(nCharsetPos+1);
+				bUTF8 = strEnc.equalsIgnoreCase("UTF-8");
+			}
+		}			
 
 		int nRead = 0;
 		do{

data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyModule.java

@@ -893,6 +893,19 @@ public class RubyModule extends RubyObject {
         return RubyAPI.isConstantDefined(this, s.toString());
     }
 
+    public RubyValue getConstants() 
+    {
+        RubyArray arRes = new RubyArray();
+        j2me.util.Set keys = constants_.keySet();
+        Iterator iter = keys.iterator(); 
+        while( iter.hasNext() )
+        {
+        	arRes.add( ObjectFactory.createSymbol((String)iter.next()));
+        }
+        
+        return arRes;
+    }
+    
     //@RubyLevelMethod(name="method_defined?")
     public RubyValue isMethodDefined(RubyValue arg) {
         RubySymbol s = RubyTypesUtil.convertToSymbol(arg);

data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyModule_Methods.java

@@ -13,6 +13,10 @@ klass.defineMethod( "const_defined?", new RubyOneArgMethod(){
 	protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){
 		return ((RubyModule)receiver).isConstDefined(arg);}
 });
+klass.defineMethod( "constants", new RubyNoArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyBlock block ){
+		return ((RubyModule)receiver).getConstants();}
+});
 klass.defineMethod( "method_defined?", new RubyOneArgMethod(){ 
 	protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){
 		return ((RubyModule)receiver).isMethodDefined(arg);}

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = '2.0.0.beta6'
+  s.version = '2.0.0.beta7'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - beta6
-  version: 2.0.0.beta6
+  - beta7
+  version: 2.0.0.beta7
 platform: ruby
 authors: 
 - Rhomobile
@@ -159,7 +159,7 @@ files:
 - lib/extensions/fcntl/ext/Rakefile
 - lib/extensions/fcntl/ext.yml
 - lib/extensions/json/json/common.rb
-- lib/extensions/json/json/pure/parser.rb
+- lib/extensions/json/json/pure/generator.rb
 - lib/extensions/json/json/pure.rb
 - lib/extensions/json/json/version.rb
 - lib/extensions/json/json.rb
@@ -315,7 +315,9 @@ files:
 - lib/framework/rhofsconnector.rb
 - lib/framework/rholang/lang_en.rb
 - lib/framework/rholang/localization_simplified.rb
+- lib/framework/rholang/rhoerror_de.rb
 - lib/framework/rholang/rhoerror_en.rb
+- lib/framework/rholang/rhomsg_de.rb
 - lib/framework/rholang/rhomsg_en.rb
 - lib/framework/rhom/rhom.rb
 - lib/framework/rhom/rhom_db_adapter.rb

data/lib/extensions/json/json/pure/parser.rb

@@ -1,267 +0,0 @@
-require 'strscan'
-
-module JSON
-  module Pure
-    # This class implements the JSON parser that is used to parse a JSON string
-    # into a Ruby data structure.
-    class Parser < StringScanner
-      STRING                = /" ((?:[^\x0-\x1f"\\] |
-                                  \\["\\\/bfnrt] |
-                                  \\u[0-9a-fA-F]{4} |
-                                  \\[\x20-\xff])*)
-                              "/nx
-      INTEGER               = /(-?0|-?[1-9]\d*)/
-      FLOAT                 = /(-?
-                                (?:0|[1-9]\d*)
-                                (?:
-                                  \.\d+(?i:e[+-]?\d+) |
-                                  \.\d+ |
-                                  (?i:e[+-]?\d+)
-                                )
-                                )/x
-      NAN                   = /NaN/
-      INFINITY              = /Infinity/
-      MINUS_INFINITY        = /-Infinity/
-      OBJECT_OPEN           = /\{/
-      OBJECT_CLOSE          = /\}/
-      ARRAY_OPEN            = /\[/
-      ARRAY_CLOSE           = /\]/
-      PAIR_DELIMITER        = /:/
-      COLLECTION_DELIMITER  = /,/
-      TRUE                  = /true/
-      FALSE                 = /false/
-      NULL                  = /null/
-      IGNORE                = %r(
-        (?:
-         //[^\n\r]*[\n\r]| # line comments
-         /\*               # c-style comments
-         (?:
-          [^*/]|        # normal chars
-          /[^*]|        # slashes that do not start a nested comment
-          \*[^/]|       # asterisks that do not end this comment
-          /(?=\*/)      # single slash before this comment's end 
-         )*
-           \*/               # the End of this comment
-           |[ \t\r\n]+       # whitespaces: space, horicontal tab, lf, cr
-        )+
-      )mx
-
-      UNPARSED = Object.new
-
-      #for debug  
-      #alias_method :old_scan, :scan
-      #def scan(arg)
-      # res = old_scan(arg)
-      #  puts "scan : arg - #{arg}; res - #{res};"
-      #  res
-      #end
-
-      # Creates a new JSON::Pure::Parser instance for the string _source_.
-      #
-      # It will be configured by the _opts_ hash. _opts_ can have the following
-      # keys:
-      # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
-      #   structures. Disable depth checking with :max_nesting => false|nil|0,
-      #   it defaults to 19.
-      # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
-      #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
-      #   to false.
-      # * *create_additions*: If set to false, the Parser doesn't create
-      #   additions even if a matchin class and create_id was found. This option
-      #   defaults to true.
-      def initialize(source, opts = {})
-        super
-        if !opts.key?(:max_nesting) # defaults to 19
-          @max_nesting = 19
-        elsif opts[:max_nesting]
-          @max_nesting = opts[:max_nesting]
-        else
-          @max_nesting = 0
-        end
-        @allow_nan = !!opts[:allow_nan]
-        ca = true
-        ca = opts[:create_additions] if opts.key?(:create_additions)
-        @create_id = ca ? JSON.create_id : nil
-      end
-
-      alias source string
-
-      # Parses the current JSON string _source_ and returns the complete data
-      # structure as a result.
-      def parse
-        reset
-        obj = nil
-        until eos?
-          case
-          when scan(OBJECT_OPEN)
-            obj and raise ParserError, "source '#{peek(20)}' not in JSON!"
-            @current_nesting = 1
-            obj = parse_object
-          when scan(ARRAY_OPEN)
-            obj and raise ParserError, "source '#{peek(20)}' not in JSON!"
-            @current_nesting = 1
-            obj = parse_array
-          when skip(IGNORE)
-            ;
-          else
-            raise ParserError, "source '#{peek(20)}' not in JSON!"
-          end
-        end
-        obj or raise ParserError, "source did not contain any JSON!"
-        obj
-      end
-
-      private
-
-      # Unescape characters in strings.
-      UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
-      UNESCAPE_MAP.update({
-        ?"  => '"',
-        ?\\ => '\\',
-        ?/  => '/',
-        ?b  => "\b",
-        ?f  => "\f",
-        ?n  => "\n",
-        ?r  => "\r",
-        ?t  => "\t",
-        ?u  => nil, 
-      })
-
-      def parse_string
-        if scan(STRING)
-          return '' if self[1].empty?
-          self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
-            if u = UNESCAPE_MAP[$&[1]]
-              u
-            else # \uXXXX
-              bytes = ''
-              i = 0
-              while c[6 * i] == ?\\ && c[6 * i + 1] == ?u 
-                bytes << c[6 * i + 2, 2].to_i(16) << c[6 * i + 4, 2].to_i(16)
-                i += 1
-              end
-              JSON::UTF16toUTF8.iconv(bytes)
-            end
-          end
-        else
-          UNPARSED
-        end
-      rescue Iconv::Failure => e
-        raise GeneratorError, "Caught #{e.class}: #{e}"
-      end
-
-      def parse_value
-        case
-        when scan(FLOAT)
-          Float(self[1])
-        when scan(INTEGER)
-          Integer(self[1])
-        when scan(TRUE)
-          true
-        when scan(FALSE)
-          false
-        when scan(NULL)
-          nil
-        when (string = parse_string) != UNPARSED
-          string
-        when scan(ARRAY_OPEN)
-          @current_nesting += 1
-          ary = parse_array
-          @current_nesting -= 1
-          ary
-        when scan(OBJECT_OPEN)
-          @current_nesting += 1
-          obj = parse_object
-          @current_nesting -= 1
-          obj
-        when @allow_nan && scan(NAN)
-          NaN
-        when @allow_nan && scan(INFINITY)
-          Infinity
-        when @allow_nan && scan(MINUS_INFINITY)
-          MinusInfinity
-        else
-          UNPARSED
-        end
-      end
-
-      def parse_array
-        raise NestingError, "nesting of #@current_nesting is to deep" if
-          @max_nesting.nonzero? && @current_nesting > @max_nesting
-        result = []
-        delim = false
-        until eos?
-          case
-          when (value = parse_value) != UNPARSED
-            delim = false
-            result << value
-            skip(IGNORE)
-            if scan(COLLECTION_DELIMITER)
-              delim = true
-            elsif match?(ARRAY_CLOSE)
-              ;
-            else
-              raise ParserError, "expected ',' or ']' in array at '#{peek(20)}'!"
-            end
-          when scan(ARRAY_CLOSE)
-            if delim
-              raise ParserError, "expected next element in array at '#{peek(20)}'!"
-            end
-            break
-          when skip(IGNORE)
-            ;
-          else
-            raise ParserError, "unexpected token in array at '#{peek(20)}'!"
-          end
-        end
-        result
-      end
-
-      def parse_object
-        raise NestingError, "nesting of #@current_nesting is to deep" if
-          @max_nesting.nonzero? && @current_nesting > @max_nesting
-        result = {}
-        delim = false
-        until eos?
-          case
-          when (string = parse_string) != UNPARSED
-            skip(IGNORE)
-            unless scan(PAIR_DELIMITER)
-              raise ParserError, "expected ':' in object at '#{peek(20)}'!"
-            end
-            skip(IGNORE)
-            unless (value = parse_value).equal? UNPARSED
-              result[string] = value
-              delim = false
-              skip(IGNORE)
-              if scan(COLLECTION_DELIMITER)
-                delim = true
-              elsif match?(OBJECT_CLOSE)
-                ;
-              else
-                raise ParserError, "expected ',' or '}' in object at '#{peek(20)}'!"
-              end
-            else
-              raise ParserError, "expected value in object at '#{peek(20)}'!"
-            end
-          when scan(OBJECT_CLOSE)
-            if delim
-              raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!"
-            end
-            if @create_id and klassname = result[@create_id]
-              klass = JSON.deep_const_get klassname
-              break unless klass and klass.json_creatable?
-              result = klass.json_create(result)
-            end
-            break
-          when skip(IGNORE)
-            ;
-          else
-            raise ParserError, "unexpected token in object at '#{peek(20)}'!"
-          end
-        end
-        result
-      end
-    end
-  end
-end