tyler-trie 0.2.3 → 0.3.1

data/ext/trie/trie.h

@@ -0,0 +1,40 @@
+#include "darray.h"
+#include "tail.h"
+
+typedef struct _Trie {
+    DArray     *da;
+    Tail       *tail;
+} Trie;
+
+typedef struct _TrieState {
+    const Trie *trie;       /**< the corresponding trie */
+    TrieIndex   index;      /**< index in double-array/tail structures */
+    short       suffix_idx; /**< suffix character offset, if in suffix */
+    short       is_suffix;  /**< whether it is currently in suffix part */
+} TrieState;
+
+
+#define trie_da_is_separate(da,s)      (da_get_base ((da), (s)) < 0)
+#define trie_da_get_tail_index(da,s)   (-da_get_base ((da), (s)))
+#define trie_da_set_tail_index(da,s,v) (da_set_base ((da), (s), -(v)))
+#define trie_state_is_terminal(s) trie_state_is_walkable((s),TRIE_CHAR_TERM)
+
+
+Trie* trie_new();
+void trie_free(Trie *trie);
+static Bool trie_branch_in_branch (Trie *trie, TrieIndex sep_node, const TrieChar *suffix, TrieData data);
+static Bool trie_branch_in_tail(Trie *trie, TrieIndex sep_node, const TrieChar *suffix, TrieData data);
+Bool trie_store (Trie *trie, const TrieChar *key, TrieData data);
+Bool trie_retrieve (const Trie *trie, const TrieChar *key, TrieData *o_data);
+Bool trie_delete (Trie *trie, const TrieChar *key);
+TrieState * trie_root (const Trie *trie);
+static TrieState * trie_state_new (const Trie *trie, TrieIndex index, short suffix_idx, short is_suffix);
+TrieState * trie_state_clone (const TrieState *s);
+void trie_state_free (TrieState *s);
+void trie_state_rewind (TrieState *s);
+Bool trie_state_walk (TrieState *s, TrieChar c);
+Bool trie_state_is_walkable (const TrieState *s, TrieChar c);
+Bool trie_state_is_leaf (const TrieState *s);
+TrieData trie_state_get_data (const TrieState *s);
+
+

data/ext/trie/triedefs.h

@@ -0,0 +1,73 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * triedefs.h - General typedefs for trie
+ * Created: 2006-08-11
+ * Author:  Theppitak Karoonboonyanan <thep@linux.thai.net>
+ */
+
+#ifndef __TRIEDEFS_H
+#define __TRIEDEFS_H
+
+#include <datrie/typedefs.h>
+
+/**
+ * @file triedefs.h
+ * @brief General typedefs for trie
+ */
+
+/**
+ * @brief Trie IO modes
+ */
+typedef enum {
+    TRIE_IO_READ   = 0x01,
+    TRIE_IO_WRITE  = 0x02,
+    TRIE_IO_CREATE = 0x04
+} TrieIOMode;
+
+/**
+ * @brief Trie character type for alphabet
+ */
+typedef uint32         AlphaChar;
+
+/**
+ * @brief Error value for alphabet character
+ */
+#define ALPHA_CHAR_ERROR   (~(AlphaChar)0)
+
+/**
+ * @brief Trie character type for key
+ */
+typedef unsigned char  TrieChar;
+/**
+ * @brief Trie terminator character
+ */
+#define TRIE_CHAR_TERM    '\0'
+#define TRIE_CHAR_MAX     255
+
+/**
+ * @brief Type of Trie index
+ */
+typedef int32          TrieIndex;
+/**
+ * @brief Trie error index
+ */
+#define TRIE_INDEX_ERROR  0
+/**
+ * @brief Maximum trie index value
+ */
+#define TRIE_INDEX_MAX    0x7fffffff
+
+/**
+ * @brief Type of value associated to trie entries
+ */
+typedef int32          TrieData;
+/**
+ * @brief Trie error data
+ */
+#define TRIE_DATA_ERROR  -1
+
+#endif  /* __TRIEDEFS_H */
+
+/*
+vi:ts=4:ai:expandtab
+*/

data/lib/trie.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../ext/trie/trie'
+require File.dirname(__FILE__) + '/../ext/trie'

data/spec/trie_spec.rb

@@ -1,27 +1,18 @@
-require 'trie'
-
-TRIE_PATH = 'spec/test-trie'
+require File.dirname(__FILE__) + '/../ext/trie'
 
 describe Trie do
   before :each do
-    @trie = Trie.new(TRIE_PATH);
+    @trie = Trie.new;
     @trie.add('rocket')
     @trie.add('rock')
     @trie.add('frederico')
   end
   
-  after :each do
-    @trie.close
-    File.delete('spec/test-trie/trie.br')
-    File.delete('spec/test-trie/trie.tl')
-    File.delete('spec/test-trie/trie.sbm')
-  end
-
-  describe :path do
-    it 'returns the correct path' do
-      @trie.path.should == TRIE_PATH
-    end
-  end
+  #describe :path do
+  #  it 'returns the correct path' do
+  #    @trie.path.should == TRIE_PATH
+  #  end
+  #end
 
   describe :has_key? do
     it 'returns true for words in the trie' do
@@ -120,23 +111,23 @@ describe Trie do
     end
   end
 
-  describe :walk_to_terminal do
-    it 'returns the first word found along a path' do
-      @trie.add 'anderson'
-      @trie.add 'andreas'
-      @trie.add 'and'
+  #describe :walk_to_terminal do
+  #  it 'returns the first word found along a path' do
+  #    @trie.add 'anderson'
+  #    @trie.add 'andreas'
+  #    @trie.add 'and'
 
-      @trie.walk_to_terminal('anderson').should == 'and'
-    end
+  #    @trie.walk_to_terminal('anderson').should == 'and'
+  #  end
 
-    it 'returns the first word and value along a path' do
-      @trie.add 'anderson'
-      @trie.add 'andreas'
-      @trie.add 'and', 15
+  #  it 'returns the first word and value along a path' do
+  #    @trie.add 'anderson'
+  #    @trie.add 'andreas'
+  #    @trie.add 'and', 15
 
-      @trie.walk_to_terminal('anderson',true).should == ['and', 15]
-    end
-  end
+  #    @trie.walk_to_terminal('anderson',true).should == ['and', 15]
+  #  end
+  #end
 
   describe :root do
     it 'returns a TrieNode' do
@@ -148,33 +139,26 @@ describe Trie do
     end
   end
 
-  describe :save do
-    it 'saves the trie to disk such that another trie can be spawned which will read succesfully' do
-      @trie.add('omgwtf',123)
-      @trie.save
-
-      trie2 = Trie.new(TRIE_PATH)
-      trie2.get('omgwtf').should == 123
-    end
-  end
+  #describe :save do
+  #  it 'saves the trie to disk such that another trie can be spawned which will read succesfully' do
+  #    @trie.add('omgwtf',123)
+  #    @trie.save
+  #
+  #    trie2 = Trie.new(TRIE_PATH)
+  #    trie2.get('omgwtf').should == 123
+  #  end
+  #end
 end
 
 describe TrieNode do
   before :each do
-    @trie = Trie.new(TRIE_PATH);
+    @trie = Trie.new;
     @trie.add('rocket',1)
     @trie.add('rock',2)
     @trie.add('frederico',3)
     @node = @trie.root
   end
   
-  after :each do
-    @trie.close
-    File.delete('spec/test-trie/trie.br')
-    File.delete('spec/test-trie/trie.tl')
-    File.delete('spec/test-trie/trie.sbm')
-  end
-
   describe :state do
     it 'returns the most recent state character' do
       @node.walk!('r')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyler-trie
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors: 
 - Tyler McMullen
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-14 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: TODO
+description: Ruby Trie based on libdatrie.
 email: tyler@scribd.com
 executables: []
 
@@ -25,22 +25,29 @@ files:
 - README.textile
 - VERSION.yml
 - lib/trie.rb
-- spec/test-trie
-- spec/test-trie/README
 - spec/trie_spec.rb
-- ext/Makefile
 - ext/trie
+- ext/trie/darray.c
+- ext/trie/darray.h
 - ext/trie/extconf.rb
+- ext/trie/fileutils.c
+- ext/trie/fileutils.h
 - ext/trie/Makefile
+- ext/trie/tail.c
+- ext/trie/tail.h
+- ext/trie/trie-private.c
+- ext/trie/trie-private.h
 - ext/trie/trie.c
+- ext/trie/trie.h
+- ext/trie/triedefs.h
 has_rdoc: false
 homepage: http://github.com/tyler/trie
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
-- lib
 - ext
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="

data/spec/test-trie/README

@@ -1 +0,0 @@
-This directory is used to store Trie files while running the specs.  Don't delete it.