fast-xml 1.0.1 → 1.1.0

data/ext/fastxml/xh_x2h.h

@@ -0,0 +1,133 @@
+#ifndef _XH_X2H_H_
+#define _XH_X2H_H_
+
+#include "xh_config.h"
+#include "xh_core.h"
+
+#define XH_X2H_XPATH_MAX_LEN        1023
+
+#define XH_X2H_NORMALIZE_REF        1
+#define XH_X2H_NORMALIZE_LINE_FEED  2
+#define XH_X2H_FILTER_ENABLED       4
+#define XH_X2H_FILTER_MATCHED       8
+#define XH_X2H_ROOT_FOUND           16
+#define XH_X2H_IS_NOT_BLANK         32
+
+#define XH_X2H_NEED_NORMALIZE       (XH_X2H_NORMALIZE_REF |             \
+                                     XH_X2H_NORMALIZE_LINE_FEED)
+#define XH_X2H_FILTER_SEARCH(f)     (((f) & (XH_X2H_FILTER_ENABLED | XH_X2H_FILTER_MATCHED)) ==\
+                                     XH_X2H_FILTER_ENABLED)
+
+#define XH_X2H_PARSER_STATE_LIST                                        \
+    XH_X2H_PROCESS_STATE(CONTENT_START)                                 \
+    XH_X2H_PROCESS_STATE(PARSE_ELEMENT_START)                           \
+    XH_X2H_PROCESS_STATE(XML_COMMENT_NODE_OR_CDATA_START)               \
+    XH_X2H_PROCESS_STATE(COMMENT1_START)                                \
+    XH_X2H_PROCESS_STATE(END_COMMENT1_START)                            \
+    XH_X2H_PROCESS_STATE(END_COMMENT2_START)                            \
+    XH_X2H_PROCESS_STATE(END_COMMENT3_START)                            \
+    XH_X2H_PROCESS_STATE(CDATA_1_1_START)                               \
+    XH_X2H_PROCESS_STATE(CDATA_1_2_START)                               \
+    XH_X2H_PROCESS_STATE(CDATA_1_3_START)                               \
+    XH_X2H_PROCESS_STATE(CDATA_2_1_START)                               \
+    XH_X2H_PROCESS_STATE(CDATA_2_2_START)                               \
+    XH_X2H_PROCESS_STATE(CDATA_2_3_START)                               \
+    XH_X2H_PROCESS_STATE(END_CDATA1_START)                              \
+    XH_X2H_PROCESS_STATE(END_CDATA2_START)                              \
+    XH_X2H_PROCESS_STATE(END_CDATA3_START)                              \
+    XH_X2H_PROCESS_STATE(CDATA_WITH_TRIM_1_1_START)                     \
+    XH_X2H_PROCESS_STATE(CDATA_WITH_TRIM_1_2_START)                     \
+    XH_X2H_PROCESS_STATE(CDATA_WITH_TRIM_1_3_START)                     \
+    XH_X2H_PROCESS_STATE(CDATA_WITH_TRIM_2_1_START)                     \
+    XH_X2H_PROCESS_STATE(CDATA_WITH_TRIM_2_2_START)                     \
+    XH_X2H_PROCESS_STATE(CDATA_WITH_TRIM_2_3_START)                     \
+    XH_X2H_PROCESS_STATE(END_CDATA_WITH_TRIM1_START)                    \
+    XH_X2H_PROCESS_STATE(END_CDATA_WITH_TRIM2_START)                    \
+    XH_X2H_PROCESS_STATE(END_CDATA_WITH_TRIM3_START)                    \
+    XH_X2H_PROCESS_STATE(PARSE_CLOSING_TAG_START)                       \
+    XH_X2H_PROCESS_STATE(SEARCH_CLOSING_END_TAG_START)                  \
+    XH_X2H_PROCESS_STATE(PARSE_OPENING_TAG_START)                       \
+    XH_X2H_PROCESS_STATE(SEARCH_OPENING_END_TAG_START)                  \
+    XH_X2H_PROCESS_STATE(NODE_SEARCH_ATTR_START)                        \
+    XH_X2H_PROCESS_STATE(SEARCH_END_TAG_START)                          \
+    XH_X2H_PROCESS_STATE(NODE_PARSE_ATTR_NAME_START)                    \
+    XH_X2H_PROCESS_STATE(NODE_ATTR_SKIP_BLANK_START)                    \
+    XH_X2H_PROCESS_STATE(NODE_PARSE_ATTR_VALUE_START)                   \
+    XH_X2H_PROCESS_STATE(NODE_1_END_ATTR_VALUE_START)                   \
+    XH_X2H_PROCESS_STATE(NODE_2_END_ATTR_VALUE_START)                   \
+    XH_X2H_PROCESS_STATE(XML_DECL_1_START)                              \
+    XH_X2H_PROCESS_STATE(XML_DECL_2_START)                              \
+    XH_X2H_PROCESS_STATE(XML_DECL_3_START)                              \
+    XH_X2H_PROCESS_STATE(XML_DECL_ATTR_START)                           \
+    XH_X2H_PROCESS_STATE(XML_DECL_ATTR_SEARCH_ATTR_START)               \
+    XH_X2H_PROCESS_STATE(XML_DECL_SEARCH_END_TAG2_START)                \
+    XH_X2H_PROCESS_STATE(XML_DECL_ATTR_PARSE_ATTR_NAME_START)           \
+    XH_X2H_PROCESS_STATE(XML_DECL_ATTR_ATTR_SKIP_BLANK_START)           \
+    XH_X2H_PROCESS_STATE(XML_DECL_ATTR_PARSE_ATTR_VALUE_START)          \
+    XH_X2H_PROCESS_STATE(XML_DECL_ATTR_1_END_ATTR_VALUE_START)          \
+    XH_X2H_PROCESS_STATE(XML_DECL_ATTR_2_END_ATTR_VALUE_START)
+
+#define XH_X2H_PROCESS_STATE(st) st,
+typedef enum {
+    PARSER_ST_NONE = 0,
+    XH_X2H_PARSER_STATE_LIST
+    XML_DECL_FOUND,
+    PARSER_ST_DONE
+} xh_x2h_state_t;
+#undef XH_X2H_PROCESS_STATE
+
+#define XH_X2H_NODE_FLAG_NONE        0
+#define XH_X2H_NODE_FLAG_FORCE_ARRAY 1
+
+typedef struct {
+    VALUE               *lval;
+    unsigned int        flags;
+} xh_x2h_node_t;
+
+typedef struct {
+    xh_opts_t           opts;
+    VALUE               hash;
+    xh_char_t           encoding[XH_PARAM_LEN];
+    xh_char_t          *tmp;
+    size_t              tmp_size;
+    xh_char_t          *node, *end, *content;
+    unsigned int        flags;
+    xh_x2h_node_t      *nodes;
+    VALUE              *lval;
+    unsigned int        depth, real_depth, code;
+    xh_x2h_state_t      state;
+    xh_reader_t         reader;
+    VALUE               result, input;
+    xh_char_t           xpath[XH_X2H_XPATH_MAX_LEN + 1];
+} xh_x2h_ctx_t;
+
+VALUE xh_x2h(xh_x2h_ctx_t *ctx);
+
+XH_INLINE void
+xh_x2h_destroy_ctx(xh_x2h_ctx_t *ctx)
+{
+    if (ctx->nodes != NULL) free(ctx->nodes);
+    if (ctx->tmp   != NULL) free(ctx->tmp);
+
+    xh_destroy_opts(&ctx->opts);
+}
+
+XH_INLINE void
+xh_x2h_init_ctx(xh_x2h_ctx_t *ctx, xh_int_t argc, VALUE *argv)
+{
+    xh_opts_t *opts = NULL;
+    xh_int_t   nparam = 0;
+
+    memset(ctx, 0, sizeof(xh_x2h_ctx_t));
+
+    //opts = (xh_opts_t *) xh_get_obj_param(&nparam, ax, items, "XML::Hash::XS");
+    ctx->input = xh_get_str_param(&nparam, argc, argv);
+    xh_merge_opts(&ctx->opts, opts, &nparam, argc, argv);
+
+    if ((ctx->nodes = malloc(sizeof(xh_x2h_node_t) * ctx->opts.max_depth)) == NULL) {
+        rb_raise(rb_eNoMemError, "Memory allocation error");
+    }
+    memset(ctx->nodes, 0, sizeof(xh_x2h_node_t) * ctx->opts.max_depth);
+}
+
+#endif /* _XH_X2H_H_ */

data/lib/fastxml/version.rb

@@ -1,3 +1,3 @@
 module FastXML
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast-xml
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Yuriy Ustushenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -77,6 +77,11 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- ext/fastxml/ccan/build_assert/build_assert.h
+- ext/fastxml/ccan/check_type/check_type.h
+- ext/fastxml/ccan/container_of/container_of.h
+- ext/fastxml/ccan/list/list.h
+- ext/fastxml/ccan/str/str.h
 - ext/fastxml/extconf.rb
 - ext/fastxml/fastxml.c
 - ext/fastxml/fastxml.h
@@ -97,8 +102,11 @@ files:
 - ext/fastxml/xh_log.h
 - ext/fastxml/xh_param.c
 - ext/fastxml/xh_param.h
+- ext/fastxml/xh_reader.c
+- ext/fastxml/xh_reader.h
 - ext/fastxml/xh_ruby_buffer.c
 - ext/fastxml/xh_ruby_buffer.h
+- ext/fastxml/xh_ruby_hash.h
 - ext/fastxml/xh_sort.c
 - ext/fastxml/xh_sort.h
 - ext/fastxml/xh_stack.c
@@ -106,6 +114,8 @@ files:
 - ext/fastxml/xh_string.h
 - ext/fastxml/xh_writer.c
 - ext/fastxml/xh_writer.h
+- ext/fastxml/xh_x2h.c
+- ext/fastxml/xh_x2h.h
 - ext/fastxml/xh_xml.h
 - lib/fastxml.rb
 - lib/fastxml/error.rb
@@ -132,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Fast Ruby Hash to XML and XML to Ruby Hash converter