edn_turbo 0.3.1 → 0.3.2

data/ext/edn_turbo/edn_parser.h

@@ -4,6 +4,7 @@
 #include <string>
 #include <sstream>
 #include <vector>
+#include <stack>
 
 #include <ruby/ruby.h>
 
@@ -11,20 +12,28 @@
 namespace edn
 {
     extern VALUE rb_mEDNT;
-    extern VALUE EDNT_MAKE_EDN_SYMBOL;
+    extern VALUE EDNT_MAKE_SYMBOL_METHOD;
+    extern VALUE EDNT_MAKE_LIST_METHOD;
     extern VALUE EDNT_MAKE_SET_METHOD;
-    extern VALUE EDNT_TAGGED_ELEM;
-    extern VALUE EDNT_BIND_META_TO_VALUE;
-    extern VALUE EDNT_STR_INT_TO_BIGNUM;
-    extern VALUE EDNT_STR_DBL_TO_BIGNUM;
-    extern VALUE EDNT_EOF;
+    extern VALUE EDNT_MAKE_BIG_DECIMAL_METHOD;
+    extern VALUE EDNT_TAGGED_ELEM_METHOD;
+    extern VALUE EDNT_EXTENDED_VALUE_METHOD;
+
+    extern VALUE EDNT_STRING_TO_I_METHOD;
+    extern VALUE EDNT_STRING_TO_F_METHOD;
+
+    extern VALUE EDNT_EOF_CONST;
+
 
     //
     // C-extension EDN Parser class representation
     class Parser
     {
     public:
-        Parser() : p(NULL), pe(NULL), eof(NULL), line_number(1) { }
+        Parser() : p(NULL), pe(NULL), eof(NULL), line_number(1) {
+            new_meta_list();
+        }
+        ~Parser() { reset_state(); del_top_meta_list(); }
 
         // change input source
         void set_source(const char* src, std::size_t len);
@@ -46,7 +55,7 @@ namespace edn
         const char* eof;
         std::size_t line_number;
         std::vector<VALUE> discard;
-        std::vector<VALUE> metadata;
+        std::stack<std::vector<VALUE>* > metadata;
 
         void reset_state();
 
@@ -67,7 +76,9 @@ namespace edn
         const char* parse_tagged  (const char *p, const char *pe, VALUE& v);
         const char* parse_meta    (const char *p, const char *pe);
 
-        bool parse_next(VALUE& value);
+        enum eTokenState { TOKEN_OK, TOKEN_ERROR, TOKEN_IS_DISCARD, TOKEN_IS_META };
+
+        eTokenState parse_next(VALUE& value);
 
         // defined in edn_parser_unicode.cc
         static bool to_utf8(const char *s, std::size_t len, std::string& rslt);
@@ -79,13 +90,16 @@ namespace edn
         static bool parse_byte_stream (const char *p, const char *pe, VALUE& rslt, bool encode);
         static bool parse_escaped_char(const char *p, const char *pe, VALUE& rslt);
 
-        static VALUE make_edn_symbol(VALUE sym);
-        static VALUE make_ruby_set(VALUE elems);
-        static VALUE tagged_element(VALUE name, VALUE data);
+        static VALUE make_edn_type(ID method, VALUE value);
+        static VALUE make_edn_type(ID method, VALUE value1, VALUE value2);
 
         // metadata
         VALUE ruby_meta();
-        VALUE bind_meta_to_value(VALUE value);
+        void  new_meta_list() { metadata.push( new std::vector<VALUE>() ); }
+        void  del_top_meta_list() { delete metadata.top(); metadata.pop(); }
+        void  append_to_meta(VALUE m) { metadata.top()->push_back(m); }
+        bool  meta_empty() const { return metadata.top()->empty(); }
+        std::size_t meta_size() const { return metadata.top()->size(); }
 
         // utility method to convert a primitive in string form to a
         // ruby type