Merge branch 'master' of git@github.com:mlj/ruby-sfst

mlj · Nov 6, 2008 · 53a0e34 · 53a0e34
2 parents de9e510 + f7e05e2
commit 53a0e34
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/ext/sfst_machine/fst.h b/ext/sfst_machine/fst.h
@@ -25,7 +25,7 @@
 
 #include "mem.h"
 
-typedef unsigned short VType;
+typedef unsigned long VType;
 
 extern int Quiet;
 

diff --git a/ext/sfst_machine/sfst_machine.cc b/ext/sfst_machine/sfst_machine.cc
@@ -352,7 +352,6 @@ static bool _regular_transducer_yield(Transducer *t, Node *node, VALUE result_ar
 
 static VALUE _regular_transducer_analyze_or_generate(Transducer *t, VALUE string, bool generate)
 {
-  t->vmark = 0;
   Transducer *a2, *a3;
   Transducer a1(RSTRING(string)->ptr, &(t->alphabet), false);
   if (generate) {

diff --git a/test/test_sfst.rb b/test/test_sfst.rb
@@ -121,11 +121,19 @@ def test_analyze
 class StressTestCase < Test::Unit::TestCase
   def setup
     SFST::compile(TEST_SCRIPT_FILE, TEST_COMPILED_REGULAR_FILE, :compact => false)
+    SFST::compile(TEST_SCRIPT_FILE, TEST_COMPILED_COMPACT_FILE, :compact => true)
   end
 
-  def test_repeated_analyses
+  def test_repeated_analyses_regular
     fst = SFST::RegularTransducer.new(TEST_COMPILED_REGULAR_FILE)
-    65535.times do
+    65536.times do
+      assert_equal ['bar', 'baz'], fst.analyse('foo').sort
+    end
+  end
+
+  def test_repeated_analyses_compact
+    fst = SFST::CompactTransducer.new(TEST_COMPILED_COMPACT_FILE)
+    65536.times do
       assert_equal ['bar', 'baz'], fst.analyse('foo').sort
     end
   end