meteor 0.9.29 → 0.9.31

data/lib/meteor/ml/xhtml4/parser_impl.rb

@@ -9,44 +9,44 @@ module Meteor
       #
       class ParserImpl < Meteor::Core::Kernel
         # KAIGYO_CODE = "\r?\n|\r"
-        KAIGYO_CODE = ["\r\n", "\n", "\r"]
-        BR = "<br/>"
-        BR_RE = "<br\\/>"
+        KAIGYO_CODE = ["\r\n", "\n", "\r"].freeze
+        BR = '<br/>'
+        BR_RE = '<br\\/>'
 
         # @@match_tag_2 = "textarea|option|pre"
-        #[Array] elements where line breaks do not need to be converted to <br> (改行を<br/>に変換する必要のない要素)
-        @@match_tag_2 = ["textarea", "option", "pre"]
+        # [Array] elements where line breaks do not need to be converted to <br> (改行を<br/>に変換する必要のない要素)
+        @@match_tag_2 = %w[textarea option pre]
 
-        #[Array] boolean attributes (論理値で指定する属性)
-        @@attr_bool = ["disabled", "readonly", "checked", "selected", "multiple"]
+        # [Array] boolean attributes (論理値で指定する属性)
+        @@attr_bool = %w[disabled readonly checked selected multiple]
 
         # DISABLE_ELEMENT = "input|textarea|select|optgroup"
-        #[Array] element with disablled attribute (disabled属性のある要素)
-        DISABLE_ELEMENT = ["input", "textarea", "select", "optgroup"]
+        # [Array] element with disablled attribute (disabled属性のある要素)
+        DISABLE_ELEMENT = %w[input textarea select optgroup].freeze
         # READONLY_TYPE = "text|password"
-        #[Array] the type of an input element with a readonly attribute (readonly属性のあるinput要素のタイプ)
-        READONLY_TYPE = ["text", "password"]
-
-        SELECTED_M = "\\sselected=\"[^\"]*\"\\s|\\sselected=\"[^\"]*\"$"
-        SELECTED_M1 = "\\sselected=\"([^\"]*)\"\\s|\\sselected=\"([^\"]*)\"$"
-        SELECTED_R = "selected=\"[^\"]*\""
-        SELECTED_U = "selected=\"selected\""
-        CHECKED_M = "\\schecked=\"[^\"]*\"\\s|\\schecked=\"[^\"]*\"$"
-        CHECKED_M1 = "\\schecked=\"([^\"]*)\"\\s|\\schecked=\"([^\"]*)\"$"
-        CHECKED_R = "checked=\"[^\"]*\""
-        CHECKED_U = "checked=\"checked\""
-        DISABLED_M = "\\sdisabled=\"[^\"]*\"\\s|\\sdisabled=\"[^\"]*\"$"
-        DISABLED_M1 = "\\sdisabled=\"([^\"]*)\"\\s|\\sdisabled=\"([^\"]*)\"$"
-        DISABLED_R = "disabled=\"[^\"]*\""
-        DISABLED_U = "disabled=\"disabled\""
-        READONLY_M = "\\sreadonly=\"[^\"]*\"\\s|\\sreadonly=\"[^\"]*\"$"
-        READONLY_M1 = "\\sreadonly=\"([^\"]*)\"\\s|\\sreadonly=\"([^\"]*)\"$"
-        READONLY_R = "readonly=\"[^\"]*\""
-        READONLY_U = "readonly=\"readonly\""
-        MULTIPLE_M = "\\smultiple=\"[^\"]*\"\\s|\\smultiple=\"[^\"]*\"$"
-        MULTIPLE_M1 = "\\smultiple=\"([^\"]*)\"\\s|\\smultiple=\"([^\"]*)\"$"
-        MULTIPLE_R = "multiple=\"[^\"]*\""
-        MULTIPLE_U = "multiple=\"multiple\""
+        # [Array] the type of an input element with a readonly attribute (readonly属性のあるinput要素のタイプ)
+        READONLY_TYPE = %w[text password].freeze
+
+        SELECTED_M = '\\sselected="[^"]*"\\s|\\sselected="[^"]*"$'
+        SELECTED_M1 = '\\sselected="([^"]*)"\\s|\\sselected="([^"]*)"$'
+        SELECTED_R = 'selected="[^"]*"'
+        SELECTED_U = 'selected="selected"'
+        CHECKED_M = '\\schecked="[^"]*"\\s|\\schecked="[^"]*"$'
+        CHECKED_M1 = '\\schecked="([^"]*)"\\s|\\schecked="([^"]*)"$'
+        CHECKED_R = 'checked="[^"]*"'
+        CHECKED_U = 'checked="checked"'
+        DISABLED_M = '\\sdisabled="[^"]*"\\s|\\sdisabled="[^"]*"$'
+        DISABLED_M1 = '\\sdisabled="([^"]*)"\\s|\\sdisabled="([^"]*)"$'
+        DISABLED_R = 'disabled="[^"]*"'
+        DISABLED_U = 'disabled="disabled"'
+        READONLY_M = '\\sreadonly="[^"]*"\\s|\\sreadonly="[^"]*"$'
+        READONLY_M1 = '\\sreadonly="([^"]*)"\\s|\\sreadonly="([^"]*)"$'
+        READONLY_R = 'readonly="[^"]*"'
+        READONLY_U = 'readonly="readonly"'
+        MULTIPLE_M = '\\smultiple="[^"]*"\\s|\\smultiple="[^"]*"$'
+        MULTIPLE_M1 = '\\smultiple="([^"]*)"\\s|\\smultiple="([^"]*)"$'
+        MULTIPLE_R = 'multiple="[^"]*"'
+        MULTIPLE_U = 'multiple="multiple"'
 
         @@pattern_selected_m = Regexp.new(SELECTED_M)
         @@pattern_selected_m1 = Regexp.new(SELECTED_M1)
@@ -115,6 +115,8 @@ module Meteor
           analyze_ml
         end
 
+        protected :parse
+
         #
         # analyze document (ドキュメントをパースする)
         #
@@ -140,21 +142,19 @@ module Meteor
         def analyze_content_type
           @error_check = false
 
-          element_3("meta", "http-equiv", "Content-Type")
+          element_3('meta', 'http-equiv', 'Content-Type')
 
-          if !@elm_
-            element_3("meta", "http-equiv", "Content-Type")
-          end
+          element_3('meta', 'http-equiv', 'Content-Type') unless @elm_
 
           @error_check = true
 
           if @elm_
-            content = @elm_.attr("content")
-            content_arr = content&.split(";")
-            @root.content_type = content_arr&.at(0) || ""
-            @root.charset = content_arr&.at(1)&.split("=")&.at(1) || ""
+            content = @elm_.attr('content')
+            content_arr = content&.split(';')
+            @root.content_type = content_arr&.at(0) || ''
+            @root.charset = content_arr&.at(1)&.split('=')&.at(1) || ''
           else
-            @root.content_type = ""
+            @root.content_type = ''
           end
         end
 
@@ -164,26 +164,25 @@ module Meteor
         # analyze document , set newline (ドキュメントをパースし、改行コードをセットする)
         #
         def analyze_newline
-          for a in KAIGYO_CODE
-            if @root.document.include?(a)
-              @root.newline = a
-            end
+          KAIGYO_CODE.each do |a|
+            @root.newline = a if @root.document.include?(a)
           end
         end
 
         private :analyze_newline
 
         def edit_attrs_(elm, attr_name, attr_value)
-          if is_match("selected", attr_name) && is_match("option", elm.name)
+          if is_match('selected', attr_name) && is_match('option', elm.name)
             edit_attrs_5(elm, attr_value, @@pattern_selected_m, @@pattern_selected_r, SELECTED_U)
-          elsif is_match("multiple", attr_name) && is_match("select", elm.name)
+          elsif is_match('multiple', attr_name) && is_match('select', elm.name)
             edit_attrs_5(elm, attr_value, @@pattern_multiple_m, @@pattern_multiple_r, MULTIPLE_U)
-          elsif is_match("disabled", attr_name) && is_match(DISABLE_ELEMENT, elm.name)
+          elsif is_match('disabled', attr_name) && is_match(DISABLE_ELEMENT, elm.name)
             edit_attrs_5(elm, attr_value, @@pattern_disabled_m, @@pattern_disabled_r, DISABLED_U)
-          elsif is_match("checked", attr_name) && is_match("input", elm.name) && is_match("radio", get_type(elm))
+          elsif is_match('checked', attr_name) && is_match('input', elm.name) && is_match('radio', get_type(elm))
             edit_attrs_5(elm, attr_value, @@pattern_checked_m, @@pattern_checked_r, CHECKED_U)
-          elsif is_match("readonly", attr_name) &&
-              (is_match("textarea", elm.name) || (is_match("input", elm.name) && is_match(READONLY_TYPE, get_type(elm))))
+          elsif is_match('readonly', attr_name) &&
+                (is_match('textarea',
+                          elm.name) || (is_match('input', elm.name) && is_match(READONLY_TYPE, get_type(elm))))
             edit_attrs_5(elm, attr_value, @@pattern_readonly_m, @@pattern_readonly_r, READONLY_U)
           else
             super(elm, attr_name, attr_value)
@@ -195,41 +194,42 @@ module Meteor
         def edit_attrs_5(elm, attr_value, match_p, replace_regex, replace_update)
           # attr_value = escape(attr_value)
 
-          if true.equal?(attr_value) || is_match("true", attr_value)
+          if true.equal?(attr_value) || is_match('true', attr_value)
             @res = match_p.match(elm.attributes)
 
             if !@res
               # add an attribute to attributes (属性文字列の最後に新規の属性を追加する)
-              if elm.attributes != ""
-                elm.attributes = String.new("") << " " << elm.attributes.strip
+              if elm.attributes != ''
+                elm.attributes = String.new('') << ' ' << elm.attributes.strip
                 # else
               end
 
-              elm.attributes << " " << replace_update
+              elm.attributes << ' ' << replace_update
             else
               # replace attribute (属性の置換)
               elm.attributes.gsub!(replace_regex, replace_update)
             end
-          elsif false.equal?(attr_value) || is_match("false", attr_value)
+          elsif false.equal?(attr_value) || is_match('false', attr_value)
             # delete if attribute_name attrubute exeists (attr_name属性が存在するなら削除)
             # replace attribute (属性の置換)
-            elm.attributes.gsub!(replace_regex, "")
+            elm.attributes.gsub!(replace_regex, '')
           end
         end
 
         private :edit_attrs_5
 
         def get_attr_value_(elm, attr_name)
-          if is_match("selected", attr_name) && is_match("option", elm.name)
+          if is_match('selected', attr_name) && is_match('option', elm.name)
             get_attr_value_r(elm, attr_name, @@pattern_selected_m1)
-          elsif is_match("multiple", attr_name) && is_match("select", elm.name)
+          elsif is_match('multiple', attr_name) && is_match('select', elm.name)
             get_attr_value_r(elm, attr_name, @@pattern_multiple_m1)
-          elsif is_match("diabled", attr_name) && is_match(DISABLE_ELEMENT, elm.name)
+          elsif is_match('diabled', attr_name) && is_match(DISABLE_ELEMENT, elm.name)
             get_attr_value_r(elm, attr_name, @@pattern_disabled_m1)
-          elsif is_match("checked", attr_name) && is_match("input", elm.name) && is_match("radio", get_type(elm))
+          elsif is_match('checked', attr_name) && is_match('input', elm.name) && is_match('radio', get_type(elm))
             get_attr_value_r(elm, attr_name, @@pattern_checked_m1)
-          elsif is_match("readonly", attr_name) &&
-              (is_match("textarea", elm.name) || (is_match("input", elm.name) && is_match(READONLY_TYPE, get_type(elm))))
+          elsif is_match('readonly', attr_name) &&
+                (is_match('textarea',
+                          elm.name) || (is_match('input', elm.name) && is_match(READONLY_TYPE, get_type(elm))))
             get_attr_value_r(elm, attr_name, @@pattern_readonly_m1)
           else
             super(elm, attr_name)
@@ -239,11 +239,9 @@ module Meteor
         private :get_attr_value_
 
         def get_type(elm)
-          if !elm.type_value
-            elm.type_value = get_attr_value(elm, "type")
-            if !elm.type_value
-              elm.type_value = get_attr_value(elm, "TYPE")
-            end
+          unless elm.type_value
+            elm.type_value = get_attr_value(elm, 'type')
+            elm.type_value = get_attr_value(elm, 'TYPE') unless elm.type_value
           end
 
           elm.type_value
@@ -257,31 +255,31 @@ module Meteor
           if @res
             if @res[1]
               if attr_name == @res[1]
-                "true"
+                'true'
               else
                 @res[1]
               end
             elsif @res[2]
               if attr_name == @res[2]
-                "true"
+                'true'
               else
                 @res[2]
               end
             elsif @res[3]
               if attr_name == @res[3]
-                "true"
+                'true'
               else
                 @res[3]
               end
             elsif @res[4]
               if attr_name == @res[4]
-                "true"
+                'true'
               else
                 @res[4]
               end
             end
           else
-            "false"
+            'false'
           end
         end
 
@@ -297,7 +295,7 @@ module Meteor
 
           elm.attributes.scan(@@pattern_get_attrs_map) do |a, b|
             if is_match(@@attr_bool, a) && a == b
-              attrs.store(a, "true")
+              attrs.store(a, 'true')
             else
               attrs.store(a, unescape(b))
             end

data/lib/meteor/ml/xml/parser_impl.rb

@@ -9,20 +9,20 @@ module Meteor
       #
       class ParserImpl < Meteor::Core::Kernel
         # KAIGYO_CODE = "\r?\n|\r"
-        KAIGYO_CODE = ["\r\n", "\n", "\r"]
+        KAIGYO_CODE = ["\r\n", "\n", "\r"].freeze
 
         TABLE_FOR_ESCAPE_ = {
-          "&" => "&amp;",
-          "\"" => "&quot;",
-          "'" => "&apos;",
-          "<" => "&lt;",
-          ">" => "&gt;"
-        }
+          '&' => '&amp;',
+          '"' => '&quot;',
+          "'" => '&apos;',
+          '<' => '&lt;',
+          '>' => '&gt;'
+        }.freeze
 
         PATTERN_ESCAPE = "[&\\\"'<>]"
         @@pattern_escape = Regexp.new(PATTERN_ESCAPE)
 
-        PATTERN_UNESCAPE = "&(amp|quot|apos|gt|lt);"
+        PATTERN_UNESCAPE = '&(amp|quot|apos|gt|lt);'
         @@pattern_unescape = Regexp.new(PATTERN_UNESCAPE)
 
         #
@@ -72,6 +72,8 @@ module Meteor
           analyze_ml
         end
 
+        protected :parse
+
         #
         # analyze document (ドキュメントをパースする)
         #
@@ -96,7 +98,7 @@ module Meteor
         # analuze document , set newline (ドキュメントをパースし、改行コードをセットする)
         #
         def analyze_newline
-          for a in KAIGYO_CODE
+          KAIGYO_CODE.each do |a|
             if @root.document.include?(a)
               @root.newline = a
               # puts "kaigyo:" << @root.newline
@@ -110,16 +112,14 @@ module Meteor
         # analyze document , set content type (ドキュメントをパースし、コンテントタイプをセットする)
         #
         def analyze_content_type
-          @root.content_type = "text/xml"
+          @root.content_type = 'text/xml'
         end
 
         private :analyze_content_type
 
         def escape(content)
           # replace special character (特殊文字の置換)
-          content = content.gsub(@@pattern_escape, TABLE_FOR_ESCAPE_)
-
-          content
+          content.gsub(@@pattern_escape, TABLE_FOR_ESCAPE_)
         end
 
         private :escape
@@ -138,17 +138,17 @@ module Meteor
           # 「'」<-「&apos;」
           # 「&」<-「&amp;」
           content.gsub(@@pattern_unescape) do
-            case $1
-            when "amp"
-              "&"
-            when "quot"
-              "\""
-            when "apos"
+            case ::Regexp.last_match(1)
+            when 'amp'
+              '&'
+            when 'quot'
+              '"'
+            when 'apos'
               "'"
-            when "gt"
-              ">"
-            when "lt"
-              "<"
+            when 'gt'
+              '>'
+            when 'lt'
+              '<'
             end
           end
 

data/lib/meteor/parsers.rb

@@ -13,19 +13,17 @@ module Meteor
   #  @return [String] default character encoding (デフォルトエンコーディング)
   #
   class Parsers
-    attr_accessor :type
-    attr_accessor :root
-    attr_accessor :enc
+    attr_accessor :type, :root, :enc
 
-    alias_method :base_type, :type
-    alias_method :base_type=, :type=
-    alias_method :base_dir, :root
-    alias_method :base_dir=, :root=
-    alias_method :base_enc, :enc
-    alias_method :base_enc=, :enc=
+    alias base_type type
+    alias base_type= type=
+    alias base_dir root
+    alias base_dir= root=
+    alias base_enc enc
+    alias base_enc= enc=
 
-    alias_method :base_encoding, :enc
-    alias_method :base_encoding=, :enc=
+    alias base_encoding enc
+    alias base_encoding= enc=
 
     #
     # initializer (イニシャライザ)
@@ -79,8 +77,8 @@ module Meteor
     # @param [String] root root directory (基準ディレクトリ)
     # @param [String] enc default character encoding (デフォルト文字エンコーディング)
     #
-    def initialize_2(root = ".", enc = "UTF-8")
-      @cache = Hash.new
+    def initialize_2(root = '.', enc = 'UTF-8')
+      @cache = {}
       @root = root
       @enc = enc
     end
@@ -93,8 +91,8 @@ module Meteor
     # @param [String] root root directory (基準ディレクトリ)
     # @param [String] enc default character encoding (デフォルト文字エンコーディング)
     #
-    def initialize_3(type, root=".", enc = "UTF-8")
-      @cache = Hash.new
+    def initialize_3(type, root = '.', enc = 'UTF-8')
+      @cache = {}
       @type = type
       @root = root
       @enc = enc
@@ -113,46 +111,44 @@ module Meteor
     # @option @deprecated opts [Integer | Symbol] :base_type default type of parser (デフォルトのパーサ・タイプ)
     #
     def options=(opts)
-      if opts.kind_of?(Hash)
-        if opts.include?(:root)
-          @root = opts[:root]
-        elsif opts.include?(:base_dir)
-          @root = opts[:base_dir]
-        end
+      raise ArgumentError unless opts.is_a?(Hash)
 
-        if opts.include?(:enc)
-          @enc = opts[:enc]
-        elsif opts.include?(:base_enc)
-          @enc = opts[:base_enc]
-        end
+      if opts.include?(:root)
+        @root = opts[:root]
+      elsif opts.include?(:base_dir)
+        @root = opts[:base_dir]
+      end
 
-        if opts.include?(:type)
-          @type = opts[:type]
-        elsif opts.include?(:base_type)
-          @type = opts[:base_type]
-        end
-      else
-        raise ArgumentError
+      if opts.include?(:enc)
+        @enc = opts[:enc]
+      elsif opts.include?(:base_enc)
+        @enc = opts[:base_enc]
+      end
+
+      if opts.include?(:type)
+        @type = opts[:type]
+      elsif opts.include?(:base_type)
+        @type = opts[:base_type]
       end
     end
 
     #
-    #@overload add(relative_path,enc)
+    # @overload add(relative_path,enc)
     # add parser (パーサを追加する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload add(relative_path)
+    # @overload add(relative_path)
     # add parser (パーサを追加する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload add(type,relative_path,enc)
+    # @overload add(type,relative_path,enc)
     # add parser (パーサを追加する)
     # @param [Integer,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload add(type,relative_path)
+    # @overload add(type,relative_path)
     # add parser (パーサを追加する)
     # @param [Integer,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
@@ -163,9 +159,9 @@ module Meteor
       when 1
         add_file_1(args[0])
       when 2
-        if args[0].kind_of?(Integer) || args[0].kind_of?(Symbol)
+        if args[0].is_a?(Integer) || args[0].is_a?(Symbol)
           add_file_2_n(args[0], args[1])
-        elsif args[0].kind_of?(String)
+        elsif args[0].is_a?(String)
           add_file_2_s(args[0], args[1])
         else
           raise ArgumentError
@@ -177,7 +173,7 @@ module Meteor
       end
     end
 
-    alias_method :link, :add
+    alias link add
 
     #
     # change relative path to relative url (相対パスを相対URLにする)
@@ -188,16 +184,14 @@ module Meteor
       paths = File.split(path)
 
       if paths.length == 1
-        return File.basename(paths[0], ".*")
+        File.basename(paths[0], '.*')
+      elsif paths[0] == '.'
+        paths.delete_at(0)
+        paths[paths.length - 1] = File.basename(paths[paths.length - 1], '.*')
+        String.new('') << '/' << paths.join('/')
       else
-        if paths[0] == "."
-          paths.delete_at(0)
-          paths[paths.length - 1] = File.basename(paths[paths.length - 1], ".*")
-          return String.new("") << "/" << paths.join("/")
-        else
-          paths[paths.length - 1] = File.basename(paths[paths.length - 1], ".*")
-          return String.new("") << "/" << paths.join("/")
-        end
+        paths[paths.length - 1] = File.basename(paths[paths.length - 1], '.*')
+        String.new('') << '/' << paths.join('/')
       end
     end
 
@@ -210,12 +204,11 @@ module Meteor
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser(パーサ)
     #
-    def add_file_3(type, relative_path, enc = "UTF-8")
-      ps = new_parser(type)
-      ps.read(File.expand_path(relative_path, @root), enc)
-
+    def add_file_3(type, relative_path, enc = 'UTF-8')
       relative_url = path_to_url(relative_path)
-      @cache[relative_url] = ps
+
+      add_template_3(type, relative_url,
+                     Meteor::Core::Util::FileReader.read(File.expand_path(relative_path, @root), enc))
     end
 
     private :add_file_3
@@ -289,7 +282,6 @@ module Meteor
     def add_template_3(type, relative_url, doc)
       ps = new_parser(type)
       ps.document = doc
-      ps.parse
 
       @cache[relative_url] = ps
     end
@@ -308,23 +300,23 @@ module Meteor
 
     private :add_template_2
 
-    alias_method :link_str, :add_template
-    alias_method :add_str, :add_template
-    alias_method :parser_str, :add_template
+    alias link_str add_template
+    alias add_str add_template
+    alias parser_str add_template
 
     #
-    #@overload parser(key)
+    # @overload parser(key)
     # get parser (パーサを取得する)
     # @param [String,Symbol] key identifier (キー)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload parser(type,relative_path,enc)
+    # @overload parser(type,relative_path,enc)
     # add parser (パーサを追加する)
     # @param [Integer] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
     # @deprecated
-    #@overload parser(type,relative_path)
+    # @overload parser(type,relative_path)
     # add parser (パーサを追加する)
     # @param [Integer] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
@@ -406,7 +398,7 @@ module Meteor
     # @return [Meteor::Parser] parser (パーサ)
     #
     def [](key)
-      self.parser(key)
+      parser(key)
     end
   end
 

data/lib/meteor/root_element.rb

@@ -15,16 +15,13 @@ module Meteor
   #  @return [String] character encoding (文字エンコーディング)
   #
   class RootElement < Element
-    attr_accessor :content_type
-    attr_accessor :newline
-    attr_accessor :charset
-    attr_accessor :enc
+    attr_accessor :content_type, :newline, :charset, :enc
     # attr_accessor :document #[String] document (ドキュメント)
 
-    alias_method :character_encoding, :enc
-    alias_method :character_encoding=, :enc=
+    alias character_encoding enc
+    alias character_encoding= enc=
 
-    alias_method :kaigyo_code, :newline
-    alias_method :kaigyo_code=, :newline=
+    alias kaigyo_code newline
+    alias kaigyo_code= newline=
   end
 end