melisa 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 205e021f379f1009ef2e94bd6c8410defb584807
-  data.tar.gz: 4c949dfa387e5c8533f887d2d3a992e3d06c32c6
+  metadata.gz: 296663b7acc8e5049b755fce207a1df657b5fd82
+  data.tar.gz: ca5cfaf23076e952cc58b6ee2bc086f5c3ccb8b0
 SHA512:
-  metadata.gz: 23b87b08dec6f10478176a4fdcb79eb1d40b966596970869a460166c262067be58fe2f73ff8cd4ee44bf991955f33d07ad5278d979166d37d634a5a35a335761
-  data.tar.gz: 29f3cabec9128662c6e1094d2feede6100b7b1a5fee6e0b254bea77af07dc38cfad7bfbd27c233c49d56999cbc7181bc251bdb4e0a3a6fb5195383a678c907d6
+  metadata.gz: 2107658429a570ad56ea3226e15c0d39d150c76ca89991ac602f19cc371e4e929e4df166a4c42739074055b480e588da17c29173eadac96dc233cf48f94b5f90
+  data.tar.gz: 61a4141ddfdc3fc3d360796c52183dd1dd229d0e5273ff1ef2213b9d0f40ce8a0eb6a1d37ff1d703e687e22f470caf1a614ac01d42b4378a4901a0261f2c4d42

data/bin/melisa

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'open3'
 
-BIN_PATH = File.join(File.dirname(__FILE__), '..', 'ext', 'pkg', 'bin')
+BIN_PATH = File.join(File.dirname(__FILE__), '..', 'ext', 'marisa-0.2.4', 'pkg', 'bin')
 
 available_commands = %w(lookup reverse-lookup predictive-search benchmark build common-prefix-search dump)
 

data/ext/extconf.rb

@@ -17,9 +17,8 @@ if `which make`.strip.empty?
   exit(1)
 end
 
-MELISA_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 MARISA_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "marisa-0.2.4"))
-PREFIX = File.join(MELISA_ROOT, 'ext', 'pkg')
+PREFIX = File.join(MARISA_ROOT, 'pkg')
 
 FileUtils.cd(MARISA_ROOT) do
   sys "./configure --enable-sse3 --prefix='#{PREFIX}'"

data/ext/marisa-0.2.4/mkmf.log

@@ -1,4 +1,4 @@
-"./configure --enable-sse3 --prefix='/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg' --bindir='/Users/duane/Dropbox/Projects/wordtree/melisa/bin'"
+"./configure --enable-sse3 --prefix='/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg'"
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
 checking for a thread-safe mkdir -p... ./install-sh -c -d
@@ -121,7 +121,7 @@ marisa 0.2.4 configuration:
   CXX:       g++
   CXXFLAGS:  -g -O2 -DMARISA_USE_SSE3 -msse3
   LDFLAGS:   
-  PREFIX:    /Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg
+  PREFIX:    /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg
 
   SSE2:      yes
   SSE3:      yes
@@ -169,24 +169,24 @@ mv -f .deps/tail.Tpo .deps/tail.Plo
 libtool: compile:  g++ -DPACKAGE_NAME=\"marisa\" -DPACKAGE_TARNAME=\"marisa\" -DPACKAGE_VERSION=\"0.2.4\" "-DPACKAGE_STRING=\"marisa 0.2.4\"" -DPACKAGE_BUGREPORT=\"syata@acm.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"marisa\" -DVERSION=\"0.2.4\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -I. -Wall -Weffc++ -Wextra -g -O2 -DMARISA_USE_SSE3 -msse3 -MT louds-trie.lo -MD -MP -MF .deps/louds-trie.Tpo -c marisa/grimoire/trie/louds-trie.cc  -fno-common -DPIC -o .libs/louds-trie.o
 libtool: compile:  g++ -DPACKAGE_NAME=\"marisa\" -DPACKAGE_TARNAME=\"marisa\" -DPACKAGE_VERSION=\"0.2.4\" "-DPACKAGE_STRING=\"marisa 0.2.4\"" -DPACKAGE_BUGREPORT=\"syata@acm.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"marisa\" -DVERSION=\"0.2.4\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -I. -Wall -Weffc++ -Wextra -g -O2 -DMARISA_USE_SSE3 -msse3 -MT louds-trie.lo -MD -MP -MF .deps/louds-trie.Tpo -c marisa/grimoire/trie/louds-trie.cc -o louds-trie.o >/dev/null 2>&1
 mv -f .deps/louds-trie.Tpo .deps/louds-trie.Plo
-/bin/sh ../libtool --tag=CXX   --mode=link g++ -Wall -Weffc++ -Wextra -g -O2 -DMARISA_USE_SSE3 -msse3   -o libmarisa.la -rpath /Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib keyset.lo agent.lo trie.lo mapper.lo reader.lo writer.lo bit-vector.lo tail.lo louds-trie.lo  
-libtool: link: g++ -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -o .libs/libmarisa.0.dylib  .libs/keyset.o .libs/agent.o .libs/trie.o .libs/mapper.o .libs/reader.o .libs/writer.o .libs/bit-vector.o .libs/tail.o .libs/louds-trie.o    -O2 -msse3   -install_name  /Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib/libmarisa.0.dylib -compatibility_version 1 -current_version 1.0 -Wl,-single_module
+/bin/sh ../libtool --tag=CXX   --mode=link g++ -Wall -Weffc++ -Wextra -g -O2 -DMARISA_USE_SSE3 -msse3   -o libmarisa.la -rpath /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib keyset.lo agent.lo trie.lo mapper.lo reader.lo writer.lo bit-vector.lo tail.lo louds-trie.lo  
+libtool: link: g++ -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -o .libs/libmarisa.0.dylib  .libs/keyset.o .libs/agent.o .libs/trie.o .libs/mapper.o .libs/reader.o .libs/writer.o .libs/bit-vector.o .libs/tail.o .libs/louds-trie.o    -O2 -msse3   -install_name  /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib/libmarisa.0.dylib -compatibility_version 1 -current_version 1.0 -Wl,-single_module
 libtool: link: (cd ".libs" && rm -f "libmarisa.dylib" && ln -s "libmarisa.0.dylib" "libmarisa.dylib")
 libtool: link: ar cru .libs/libmarisa.a  keyset.o agent.o trie.o mapper.o reader.o writer.o bit-vector.o tail.o louds-trie.o
 libtool: link: ranlib .libs/libmarisa.a
 libtool: link: ( cd ".libs" && rm -f "libmarisa.la" && ln -s "../libmarisa.la" "libmarisa.la" )
-test -z "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib" || .././install-sh -c -d "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib"
- /bin/sh ../libtool   --mode=install /usr/bin/install -c   libmarisa.la '/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib'
-libtool: install: /usr/bin/install -c .libs/libmarisa.0.dylib /Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib/libmarisa.0.dylib
-libtool: install: (cd /Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib && { ln -s -f libmarisa.0.dylib libmarisa.dylib || { rm -f libmarisa.dylib && ln -s libmarisa.0.dylib libmarisa.dylib; }; })
-libtool: install: /usr/bin/install -c .libs/libmarisa.lai /Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib/libmarisa.la
-libtool: install: /usr/bin/install -c .libs/libmarisa.a /Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib/libmarisa.a
-libtool: install: chmod 644 /Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib/libmarisa.a
-libtool: install: ranlib /Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib/libmarisa.a
-test -z "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/include" || .././install-sh -c -d "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/include"
- /usr/bin/install -c -m 644 marisa.h '/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/include'
-test -z "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/include/marisa" || .././install-sh -c -d "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/include/marisa"
- /usr/bin/install -c -m 644 marisa/base.h marisa/exception.h marisa/scoped-ptr.h marisa/scoped-array.h marisa/key.h marisa/keyset.h marisa/query.h marisa/agent.h marisa/stdio.h marisa/iostream.h marisa/trie.h '/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/include/marisa'
+test -z "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib" || .././install-sh -c -d "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib"
+ /bin/sh ../libtool   --mode=install /usr/bin/install -c   libmarisa.la '/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib'
+libtool: install: /usr/bin/install -c .libs/libmarisa.0.dylib /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib/libmarisa.0.dylib
+libtool: install: (cd /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib && { ln -s -f libmarisa.0.dylib libmarisa.dylib || { rm -f libmarisa.dylib && ln -s libmarisa.0.dylib libmarisa.dylib; }; })
+libtool: install: /usr/bin/install -c .libs/libmarisa.lai /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib/libmarisa.la
+libtool: install: /usr/bin/install -c .libs/libmarisa.a /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib/libmarisa.a
+libtool: install: chmod 644 /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib/libmarisa.a
+libtool: install: ranlib /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib/libmarisa.a
+test -z "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/include" || .././install-sh -c -d "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/include"
+ /usr/bin/install -c -m 644 marisa.h '/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/include'
+test -z "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/include/marisa" || .././install-sh -c -d "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/include/marisa"
+ /usr/bin/install -c -m 644 marisa/base.h marisa/exception.h marisa/scoped-ptr.h marisa/scoped-array.h marisa/key.h marisa/keyset.h marisa/query.h marisa/agent.h marisa/stdio.h marisa/iostream.h marisa/trie.h '/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/include/marisa'
 Making install in tools
 /bin/sh ../libtool --tag=CXX   --mode=compile g++ -DPACKAGE_NAME=\"marisa\" -DPACKAGE_TARNAME=\"marisa\" -DPACKAGE_VERSION=\"0.2.4\" -DPACKAGE_STRING=\"marisa\ 0.2.4\" -DPACKAGE_BUGREPORT=\"syata@acm.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"marisa\" -DVERSION=\"0.2.4\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -I.    -Wall -Weffc++ -Wextra -I../lib -g -O2 -DMARISA_USE_SSE3 -msse3 -MT cmdopt.lo -MD -MP -MF .deps/cmdopt.Tpo -c -o cmdopt.lo cmdopt.cc
 libtool: compile:  g++ -DPACKAGE_NAME=\"marisa\" -DPACKAGE_TARNAME=\"marisa\" -DPACKAGE_VERSION=\"0.2.4\" "-DPACKAGE_STRING=\"marisa 0.2.4\"" -DPACKAGE_BUGREPORT=\"syata@acm.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"marisa\" -DVERSION=\"0.2.4\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -I. -Wall -Weffc++ -Wextra -I../lib -g -O2 -DMARISA_USE_SSE3 -msse3 -MT cmdopt.lo -MD -MP -MF .deps/cmdopt.Tpo -c cmdopt.cc  -fno-common -DPIC -o .libs/cmdopt.o
@@ -224,22 +224,22 @@ g++ -DPACKAGE_NAME=\"marisa\" -DPACKAGE_TARNAME=\"marisa\" -DPACKAGE_VERSION=\"0
 mv -f .deps/marisa-benchmark.Tpo .deps/marisa-benchmark.Po
 /bin/sh ../libtool --tag=CXX   --mode=link g++ -Wall -Weffc++ -Wextra -I../lib -g -O2 -DMARISA_USE_SSE3 -msse3   -o marisa-benchmark marisa-benchmark.o ../lib/libmarisa.la libcmdopt.la 
 libtool: link: g++ -Wall -Weffc++ -Wextra -I../lib -g -O2 -DMARISA_USE_SSE3 -msse3 -o .libs/marisa-benchmark marisa-benchmark.o -Wl,-bind_at_load  ../lib/.libs/libmarisa.dylib ./.libs/libcmdopt.a
-test -z "/Users/duane/Dropbox/Projects/wordtree/melisa/bin" || .././install-sh -c -d "/Users/duane/Dropbox/Projects/wordtree/melisa/bin"
-  /bin/sh ../libtool   --mode=install /usr/bin/install -c marisa-build marisa-lookup marisa-reverse-lookup marisa-common-prefix-search marisa-predictive-search marisa-dump marisa-benchmark '/Users/duane/Dropbox/Projects/wordtree/melisa/bin'
-libtool: install: /usr/bin/install -c .libs/marisa-build /Users/duane/Dropbox/Projects/wordtree/melisa/bin/marisa-build
-libtool: install: /usr/bin/install -c .libs/marisa-lookup /Users/duane/Dropbox/Projects/wordtree/melisa/bin/marisa-lookup
-libtool: install: /usr/bin/install -c .libs/marisa-reverse-lookup /Users/duane/Dropbox/Projects/wordtree/melisa/bin/marisa-reverse-lookup
-libtool: install: /usr/bin/install -c .libs/marisa-common-prefix-search /Users/duane/Dropbox/Projects/wordtree/melisa/bin/marisa-common-prefix-search
-libtool: install: /usr/bin/install -c .libs/marisa-predictive-search /Users/duane/Dropbox/Projects/wordtree/melisa/bin/marisa-predictive-search
-libtool: install: /usr/bin/install -c .libs/marisa-dump /Users/duane/Dropbox/Projects/wordtree/melisa/bin/marisa-dump
-libtool: install: /usr/bin/install -c .libs/marisa-benchmark /Users/duane/Dropbox/Projects/wordtree/melisa/bin/marisa-benchmark
+test -z "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/bin" || .././install-sh -c -d "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/bin"
+  /bin/sh ../libtool   --mode=install /usr/bin/install -c marisa-build marisa-lookup marisa-reverse-lookup marisa-common-prefix-search marisa-predictive-search marisa-dump marisa-benchmark '/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/bin'
+libtool: install: /usr/bin/install -c .libs/marisa-build /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/bin/marisa-build
+libtool: install: /usr/bin/install -c .libs/marisa-lookup /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/bin/marisa-lookup
+libtool: install: /usr/bin/install -c .libs/marisa-reverse-lookup /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/bin/marisa-reverse-lookup
+libtool: install: /usr/bin/install -c .libs/marisa-common-prefix-search /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/bin/marisa-common-prefix-search
+libtool: install: /usr/bin/install -c .libs/marisa-predictive-search /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/bin/marisa-predictive-search
+libtool: install: /usr/bin/install -c .libs/marisa-dump /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/bin/marisa-dump
+libtool: install: /usr/bin/install -c .libs/marisa-benchmark /Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/bin/marisa-benchmark
 make[2]: Nothing to be done for `install-data-am'.
 Making install in tests
 make[2]: Nothing to be done for `install-exec-am'.
 make[2]: Nothing to be done for `install-data-am'.
 make[2]: Nothing to be done for `install-exec-am'.
-test -z "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib/pkgconfig" || ./install-sh -c -d "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib/pkgconfig"
- /usr/bin/install -c -m 644 marisa.pc '/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib/pkgconfig'
+test -z "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib/pkgconfig" || ./install-sh -c -d "/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib/pkgconfig"
+ /usr/bin/install -c -m 644 marisa.pc '/Users/duane/Dropbox/Projects/wordtree/melisa/ext/pkg/lib/pkgconfig'
 "make distclean"
 Making distclean in tests
  rm -f base-test io-test vector-test trie-test marisa-test

data/lib/melisa/bytes_trie.rb

@@ -8,7 +8,7 @@ module Melisa
       @sep = separator
       @sep_c = separator.force_encoding('binary').ord
 
-      add_many(hash, [])
+      add_many(hash)
     end
 
     def add_many(hash, weight=nil)

data/lib/melisa/trie.rb

@@ -52,6 +52,7 @@ module Melisa
     alias :<< :add
 
     def add_many(keys, weights)
+      raise ImmutableError, "Can't add keys, Trie already built" if @built
       for key, weight in keys.zip(weights)
         push(key, weight)
       end
@@ -64,6 +65,13 @@ module Melisa
       agent.key_id if agent.key_str
     end
 
+    def get_weight(key)
+      build_if_necessary
+      agent.set_query(key)
+      trie.lookup(agent)
+      agent.key.weight if agent.key_str
+    end
+
     def get_key(id)
       build_if_necessary
       agent.set_query(id)
@@ -118,7 +126,7 @@ module Melisa
 
     def push(key, weight=nil)
       if weight
-        @keyset.push_back(key) #, weight) # For now, ignore weight due to marisa C++ binding issue
+        @keyset.push_back(key, weight)
       else
         @keyset.push_back(key)
       end

data/lib/melisa/version.rb

@@ -1,3 +1,3 @@
 module Melisa
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/bytes_trie_spec.rb

@@ -5,9 +5,9 @@ describe Melisa::BytesTrie do
   let(:trie) { Melisa::BytesTrie.new(hash) }
 
   it "stores values" do
-    trie['one'].should == '1'
-    trie['two'].should == '2'
-    trie['onetwo'].should == '3'
+    expect(trie['one']).to eq '1'
+    expect(trie['two']).to eq '2'
+    expect(trie['onetwo']).to eq '3'
   end
 
   it "sets and gets values" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: melisa
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Duane Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -157,30 +157,6 @@ files:
 - ext/marisa-0.2.4/marisa.pc.in
 - ext/marisa-0.2.4/missing
 - ext/marisa-0.2.4/mkmf.log
-- ext/marisa-0.2.4/pkg/bin/marisa-benchmark
-- ext/marisa-0.2.4/pkg/bin/marisa-build
-- ext/marisa-0.2.4/pkg/bin/marisa-common-prefix-search
-- ext/marisa-0.2.4/pkg/bin/marisa-dump
-- ext/marisa-0.2.4/pkg/bin/marisa-lookup
-- ext/marisa-0.2.4/pkg/bin/marisa-predictive-search
-- ext/marisa-0.2.4/pkg/bin/marisa-reverse-lookup
-- ext/marisa-0.2.4/pkg/include/marisa.h
-- ext/marisa-0.2.4/pkg/include/marisa/agent.h
-- ext/marisa-0.2.4/pkg/include/marisa/base.h
-- ext/marisa-0.2.4/pkg/include/marisa/exception.h
-- ext/marisa-0.2.4/pkg/include/marisa/iostream.h
-- ext/marisa-0.2.4/pkg/include/marisa/key.h
-- ext/marisa-0.2.4/pkg/include/marisa/keyset.h
-- ext/marisa-0.2.4/pkg/include/marisa/query.h
-- ext/marisa-0.2.4/pkg/include/marisa/scoped-array.h
-- ext/marisa-0.2.4/pkg/include/marisa/scoped-ptr.h
-- ext/marisa-0.2.4/pkg/include/marisa/stdio.h
-- ext/marisa-0.2.4/pkg/include/marisa/trie.h
-- ext/marisa-0.2.4/pkg/lib/libmarisa.0.dylib
-- ext/marisa-0.2.4/pkg/lib/libmarisa.a
-- ext/marisa-0.2.4/pkg/lib/libmarisa.dylib
-- ext/marisa-0.2.4/pkg/lib/libmarisa.la
-- ext/marisa-0.2.4/pkg/lib/pkgconfig/marisa.pc
 - ext/marisa-0.2.4/tests/Makefile.am
 - ext/marisa-0.2.4/tests/Makefile.in
 - ext/marisa-0.2.4/tests/base-test.cc

data/ext/marisa-0.2.4/pkg/include/marisa.h

@@ -1,14 +0,0 @@
-#ifndef MARISA_H_
-#define MARISA_H_
-
-// "marisa/stdio.h" includes <cstdio> for I/O using std::FILE.
-#include "marisa/stdio.h"
-
-// "marisa/iostream.h" includes <iosfwd> for I/O using std::iostream.
-#include "marisa/iostream.h"
-
-// You can use <marisa/trie.h> instead of <marisa.h> if you don't need the
-// above I/O interfaces and don't want to include the above I/O headers.
-#include "marisa/trie.h"
-
-#endif  // MARISA_H_

data/ext/marisa-0.2.4/pkg/include/marisa/agent.h

@@ -1,73 +0,0 @@
-#ifndef MARISA_AGENT_H_
-#define MARISA_AGENT_H_
-
-#include "key.h"
-#include "query.h"
-
-namespace marisa {
-namespace grimoire {
-namespace trie {
-
-class State;
-
-}  // namespace trie
-}  // namespace grimoire
-
-class Agent {
- public:
-  Agent();
-  ~Agent();
-
-  const Query &query() const {
-    return query_;
-  }
-  const Key &key() const {
-    return key_;
-  }
-
-  void set_query(const char *str);
-  void set_query(const char *ptr, std::size_t length);
-  void set_query(std::size_t key_id);
-
-  const grimoire::trie::State &state() const {
-    return *state_;
-  }
-  grimoire::trie::State &state() {
-    return *state_;
-  }
-
-  void set_key(const char *str) {
-    MARISA_DEBUG_IF(str == NULL, MARISA_NULL_ERROR);
-    key_.set_str(str);
-  }
-  void set_key(const char *ptr, std::size_t length) {
-    MARISA_DEBUG_IF((ptr == NULL) && (length != 0), MARISA_NULL_ERROR);
-    MARISA_DEBUG_IF(length > MARISA_UINT32_MAX, MARISA_SIZE_ERROR);
-    key_.set_str(ptr, length);
-  }
-  void set_key(std::size_t id) {
-    MARISA_DEBUG_IF(id > MARISA_UINT32_MAX, MARISA_SIZE_ERROR);
-    key_.set_id(id);
-  }
-
-  bool has_state() const {
-    return state_.get() != NULL;
-  }
-  void init_state();
-
-  void clear();
-  void swap(Agent &rhs);
-
- private:
-  Query query_;
-  Key key_;
-  scoped_ptr<grimoire::trie::State> state_;
-
-  // Disallows copy and assignment.
-  Agent(const Agent &);
-  Agent &operator=(const Agent &);
-};
-
-}  // namespace marisa
-
-#endif  // MARISA_AGENT_H_

data/ext/marisa-0.2.4/pkg/include/marisa/base.h

@@ -1,193 +0,0 @@
-#ifndef MARISA_BASE_H_
-#define MARISA_BASE_H_
-
-// Old Visual C++ does not provide stdint.h.
-#ifndef _MSC_VER
- #include <stdint.h>
-#endif  // _MSC_VER
-
-#ifdef __cplusplus
- #include <cstddef>
-#else  // __cplusplus
- #include <stddef.h>
-#endif  // __cplusplus
-
-#ifdef __cplusplus
-extern "C" {
-#endif  // __cplusplus
-
-#ifdef _MSC_VER
-typedef unsigned __int8  marisa_uint8;
-typedef unsigned __int16 marisa_uint16;
-typedef unsigned __int32 marisa_uint32;
-typedef unsigned __int64 marisa_uint64;
-#else  // _MSC_VER
-typedef uint8_t  marisa_uint8;
-typedef uint16_t marisa_uint16;
-typedef uint32_t marisa_uint32;
-typedef uint64_t marisa_uint64;
-#endif  // _MSC_VER
-
-#if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \
-    defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \
-    defined(__sparc64__) || defined(__mips64__) || defined(__aarch64__)
- #define MARISA_WORD_SIZE 64
-#else  // defined(_WIN64), etc.
- #define MARISA_WORD_SIZE 32
-#endif  // defined(_WIN64), etc.
-
-//#define MARISA_WORD_SIZE  (sizeof(void *) * 8)
-
-#define MARISA_UINT8_MAX  ((marisa_uint8)~(marisa_uint8)0)
-#define MARISA_UINT16_MAX ((marisa_uint16)~(marisa_uint16)0)
-#define MARISA_UINT32_MAX ((marisa_uint32)~(marisa_uint32)0)
-#define MARISA_UINT64_MAX ((marisa_uint64)~(marisa_uint64)0)
-#define MARISA_SIZE_MAX   ((size_t)~(size_t)0)
-
-#define MARISA_INVALID_LINK_ID MARISA_UINT32_MAX
-#define MARISA_INVALID_KEY_ID  MARISA_UINT32_MAX
-#define MARISA_INVALID_EXTRA   (MARISA_UINT32_MAX >> 8)
-
-// Error codes are defined as members of marisa_error_code. This library throws
-// an exception with one of the error codes when an error occurs.
-typedef enum marisa_error_code_ {
-  // MARISA_OK means that a requested operation has succeeded. In practice, an
-  // exception never has MARISA_OK because it is not an error.
-  MARISA_OK           = 0,
-
-  // MARISA_STATE_ERROR means that an object was not ready for a requested
-  // operation. For example, an operation to modify a fixed vector throws an
-  // exception with MARISA_STATE_ERROR.
-  MARISA_STATE_ERROR  = 1,
-
-  // MARISA_NULL_ERROR means that an invalid NULL pointer has been given.
-  MARISA_NULL_ERROR   = 2,
-
-  // MARISA_BOUND_ERROR means that an operation has tried to access an out of
-  // range address.
-  MARISA_BOUND_ERROR  = 3,
-
-  // MARISA_RANGE_ERROR means that an out of range value has appeared in
-  // operation.
-  MARISA_RANGE_ERROR  = 4,
-
-  // MARISA_CODE_ERROR means that an undefined code has appeared in operation.
-  MARISA_CODE_ERROR   = 5,
-
-  // MARISA_RESET_ERROR means that a smart pointer has tried to reset itself.
-  MARISA_RESET_ERROR  = 6,
-
-  // MARISA_SIZE_ERROR means that a size has exceeded a library limitation.
-  MARISA_SIZE_ERROR   = 7,
-
-  // MARISA_MEMORY_ERROR means that a memory allocation has failed.
-  MARISA_MEMORY_ERROR = 8,
-
-  // MARISA_IO_ERROR means that an I/O operation has failed.
-  MARISA_IO_ERROR     = 9,
-
-  // MARISA_FORMAT_ERROR means that input was in invalid format.
-  MARISA_FORMAT_ERROR = 10,
-} marisa_error_code;
-
-// Min/max values, flags and masks for dictionary settings are defined below.
-// Please note that unspecified settings will be replaced with the default
-// settings. For example, 0 is equivalent to (MARISA_DEFAULT_NUM_TRIES |
-// MARISA_DEFAULT_TRIE | MARISA_DEFAULT_TAIL | MARISA_DEFAULT_ORDER).
-
-// A dictionary consists of 3 tries in default. Usually more tries make a
-// dictionary space-efficient but time-inefficient.
-typedef enum marisa_num_tries_ {
-  MARISA_MIN_NUM_TRIES     = 0x00001,
-  MARISA_MAX_NUM_TRIES     = 0x0007F,
-  MARISA_DEFAULT_NUM_TRIES = 0x00003,
-} marisa_num_tries;
-
-// This library uses a cache technique to accelerate search functions. The
-// following enumerated type marisa_cache_level gives a list of available cache
-// size options. A larger cache enables faster search but takes a more space.
-typedef enum marisa_cache_level_ {
-  MARISA_HUGE_CACHE        = 0x00080,
-  MARISA_LARGE_CACHE       = 0x00100,
-  MARISA_NORMAL_CACHE      = 0x00200,
-  MARISA_SMALL_CACHE       = 0x00400,
-  MARISA_TINY_CACHE        = 0x00800,
-  MARISA_DEFAULT_CACHE     = MARISA_NORMAL_CACHE
-} marisa_cache_level;
-
-// This library provides 2 kinds of TAIL implementations.
-typedef enum marisa_tail_mode_ {
-  // MARISA_TEXT_TAIL merges last labels as zero-terminated strings. So, it is
-  // available if and only if the last labels do not contain a NULL character.
-  // If MARISA_TEXT_TAIL is specified and a NULL character exists in the last
-  // labels, the setting is automatically switched to MARISA_BINARY_TAIL.
-  MARISA_TEXT_TAIL         = 0x01000,
-
-  // MARISA_BINARY_TAIL also merges last labels but as byte sequences. It uses
-  // a bit vector to detect the end of a sequence, instead of NULL characters.
-  // So, MARISA_BINARY_TAIL requires a larger space if the average length of
-  // labels is greater than 8.
-  MARISA_BINARY_TAIL       = 0x02000,
-
-  MARISA_DEFAULT_TAIL      = MARISA_TEXT_TAIL,
-} marisa_tail_mode;
-
-// The arrangement of nodes affects the time cost of matching and the order of
-// predictive search.
-typedef enum marisa_node_order_ {
-  // MARISA_LABEL_ORDER arranges nodes in ascending label order.
-  // MARISA_LABEL_ORDER is useful if an application needs to predict keys in
-  // label order.
-  MARISA_LABEL_ORDER       = 0x10000,
-
-  // MARISA_WEIGHT_ORDER arranges nodes in descending weight order.
-  // MARISA_WEIGHT_ORDER is generally a better choice because it enables faster
-  // matching.
-  MARISA_WEIGHT_ORDER      = 0x20000,
-
-  MARISA_DEFAULT_ORDER     = MARISA_WEIGHT_ORDER,
-} marisa_node_order;
-
-typedef enum marisa_config_mask_ {
-  MARISA_NUM_TRIES_MASK    = 0x0007F,
-  MARISA_CACHE_LEVEL_MASK  = 0x00F80,
-  MARISA_TAIL_MODE_MASK    = 0x0F000,
-  MARISA_NODE_ORDER_MASK   = 0xF0000,
-  MARISA_CONFIG_MASK       = 0xFFFFF
-} marisa_config_mask;
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif  // __cplusplus
-
-#ifdef __cplusplus
-namespace marisa {
-
-typedef ::marisa_uint8  UInt8;
-typedef ::marisa_uint16 UInt16;
-typedef ::marisa_uint32 UInt32;
-typedef ::marisa_uint64 UInt64;
-
-typedef ::marisa_error_code ErrorCode;
-
-typedef ::marisa_cache_level CacheLevel;
-typedef ::marisa_tail_mode TailMode;
-typedef ::marisa_node_order NodeOrder;
-
-template <typename T>
-inline void swap(T &lhs, T &rhs) {
-  T temp = lhs;
-  lhs = rhs;
-  rhs = temp;
-}
-
-}  // namespace marisa
-#endif  // __cplusplus
-
-#ifdef __cplusplus
- #include "exception.h"
- #include "scoped-ptr.h"
- #include "scoped-array.h"
-#endif  // __cplusplus
-
-#endif  // MARISA_BASE_H_

data/ext/marisa-0.2.4/pkg/include/marisa/exception.h

@@ -1,82 +0,0 @@
-#ifndef MARISA_EXCEPTION_H_
-#define MARISA_EXCEPTION_H_
-
-#include <exception>
-
-#include "base.h"
-
-namespace marisa {
-
-// An exception object keeps a filename, a line number, an error code and an
-// error message. The message format is as follows:
-//  "__FILE__:__LINE__: error_code: error_message"
-class Exception : public std::exception {
- public:
-  Exception(const char *filename, int line,
-      ErrorCode error_code, const char *error_message)
-      : std::exception(), filename_(filename), line_(line),
-        error_code_(error_code), error_message_(error_message) {}
-  Exception(const Exception &ex)
-      : std::exception(), filename_(ex.filename_), line_(ex.line_),
-        error_code_(ex.error_code_), error_message_(ex.error_message_) {}
-  virtual ~Exception() throw() {}
-
-  Exception &operator=(const Exception &rhs) {
-    filename_ = rhs.filename_;
-    line_ = rhs.line_;
-    error_code_ = rhs.error_code_;
-    error_message_ = rhs.error_message_;
-    return *this;
-  }
-
-  const char *filename() const {
-    return filename_;
-  }
-  int line() const {
-    return line_;
-  }
-  ErrorCode error_code() const {
-    return error_code_;
-  }
-  const char *error_message() const {
-    return error_message_;
-  }
-
-  virtual const char *what() const throw() {
-    return error_message_;
-  }
-
- private:
-  const char *filename_;
-  int line_;
-  ErrorCode error_code_;
-  const char *error_message_;
-};
-
-// These macros are used to convert a line number to a string constant.
-#define MARISA_INT_TO_STR(value) #value
-#define MARISA_LINE_TO_STR(line) MARISA_INT_TO_STR(line)
-#define MARISA_LINE_STR MARISA_LINE_TO_STR(__LINE__)
-
-// MARISA_THROW throws an exception with a filename, a line number, an error
-// code and an error message. The message format is as follows:
-//  "__FILE__:__LINE__: error_code: error_message"
-#define MARISA_THROW(error_code, error_message) \
-  (throw marisa::Exception(__FILE__, __LINE__, error_code, \
-       __FILE__ ":" MARISA_LINE_STR ": " #error_code ": " error_message))
-
-// MARISA_THROW_IF throws an exception if `condition' is true.
-#define MARISA_THROW_IF(condition, error_code) \
-  (void)((!(condition)) || (MARISA_THROW(error_code, #condition), 0))
-
-// MARISA_DEBUG_IF is ignored if _DEBUG is undefined. So, it is useful for
-// debugging time-critical codes.
-#ifdef _DEBUG
- #define MARISA_DEBUG_IF(cond, error_code) MARISA_THROW_IF(cond, error_code)
-#else
- #define MARISA_DEBUG_IF(cond, error_code)
-#endif
-
-}  // namespace marisa
-
-#endif  // MARISA_EXCEPTION_H_

data/ext/marisa-0.2.4/pkg/include/marisa/iostream.h

@@ -1,18 +0,0 @@
-#ifndef MARISA_IOSTREAM_H_
-#define MARISA_IOSTREAM_H_
-
-#include <iosfwd>
-
-namespace marisa {
-
-class Trie;
-
-std::istream &read(std::istream &stream, Trie *trie);
-std::ostream &write(std::ostream &stream, const Trie &trie);
-
-std::istream &operator>>(std::istream &stream, Trie &trie);
-std::ostream &operator<<(std::ostream &stream, const Trie &trie);
-
-}  // namespace marisa
-
-#endif  // MARISA_IOSTREAM_H_

data/ext/marisa-0.2.4/pkg/include/marisa/key.h

@@ -1,85 +0,0 @@
-#ifndef MARISA_KEY_H_
-#define MARISA_KEY_H_
-
-#include "base.h"
-
-namespace marisa {
-
-class Key {
- public:
-  Key() : ptr_(NULL), length_(0), union_() {
-    union_.id = 0;
-  }
-  Key(const Key &key)
-      : ptr_(key.ptr_), length_(key.length_), union_(key.union_) {}
-
-  Key &operator=(const Key &key) {
-    ptr_ = key.ptr_;
-    length_ = key.length_;
-    union_ = key.union_;
-    return *this;
-  }
-
-  char operator[](std::size_t i) const {
-    MARISA_DEBUG_IF(i >= length_, MARISA_BOUND_ERROR);
-    return ptr_[i];
-  }
-
-  void set_str(const char *str) {
-    MARISA_DEBUG_IF(str == NULL, MARISA_NULL_ERROR);
-    std::size_t length = 0;
-    while (str[length] != '\0') {
-      ++length;
-    }
-    MARISA_DEBUG_IF(length > MARISA_UINT32_MAX, MARISA_SIZE_ERROR);
-    ptr_ = str;
-    length_ = (UInt32)length;
-  }
-  void set_str(const char *ptr, std::size_t length) {
-    MARISA_DEBUG_IF((ptr == NULL) && (length != 0), MARISA_NULL_ERROR);
-    MARISA_DEBUG_IF(length > MARISA_UINT32_MAX, MARISA_SIZE_ERROR);
-    ptr_ = ptr;
-    length_ = (UInt32)length;
-  }
-  void set_id(std::size_t id) {
-    MARISA_DEBUG_IF(id > MARISA_UINT32_MAX, MARISA_SIZE_ERROR);
-    union_.id = (UInt32)id;
-  }
-  void set_weight(float weight) {
-    union_.weight = weight;
-  }
-
-  const char *ptr() const {
-    return ptr_;
-  }
-  std::size_t length() const {
-    return length_;
-  }
-  std::size_t id() const {
-    return union_.id;
-  }
-  float weight() const {
-    return union_.weight;
-  }
-
-  void clear() {
-    Key().swap(*this);
-  }
-  void swap(Key &rhs) {
-    marisa::swap(ptr_, rhs.ptr_);
-    marisa::swap(length_, rhs.length_);
-    marisa::swap(union_.id, rhs.union_.id);
-  }
-
- private:
-  const char *ptr_;
-  UInt32 length_;
-  union Union {
-    UInt32 id;
-    float weight;
-  } union_;
-};
-
-}  // namespace marisa
-
-#endif  // MARISA_KEY_H_

data/ext/marisa-0.2.4/pkg/include/marisa/keyset.h

@@ -1,80 +0,0 @@
-#ifndef MARISA_KEYSET_H_
-#define MARISA_KEYSET_H_
-
-#include "key.h"
-
-namespace marisa {
-
-class Keyset {
- public:
-  enum {
-    BASE_BLOCK_SIZE  = 4096,
-    EXTRA_BLOCK_SIZE = 1024,
-    KEY_BLOCK_SIZE   = 256
-  };
-
-  Keyset();
-
-  void push_back(const Key &key);
-  void push_back(const Key &key, char end_marker);
-
-  void push_back(const char *str);
-  void push_back(const char *ptr, std::size_t length, float weight = 1.0);
-
-  const Key &operator[](std::size_t i) const {
-    MARISA_DEBUG_IF(i >= size_, MARISA_BOUND_ERROR);
-    return key_blocks_[i / KEY_BLOCK_SIZE][i % KEY_BLOCK_SIZE];
-  }
-  Key &operator[](std::size_t i) {
-    MARISA_DEBUG_IF(i >= size_, MARISA_BOUND_ERROR);
-    return key_blocks_[i / KEY_BLOCK_SIZE][i % KEY_BLOCK_SIZE];
-  }
-
-  std::size_t num_keys() const {
-    return size_;
-  }
-
-  bool empty() const {
-    return size_ == 0;
-  }
-  std::size_t size() const {
-    return size_;
-  }
-  std::size_t total_length() const {
-    return total_length_;
-  }
-
-  void reset();
-
-  void clear();
-  void swap(Keyset &rhs);
-
- private:
-  scoped_array<scoped_array<char> > base_blocks_;
-  std::size_t base_blocks_size_;
-  std::size_t base_blocks_capacity_;
-  scoped_array<scoped_array<char> > extra_blocks_;
-  std::size_t extra_blocks_size_;
-  std::size_t extra_blocks_capacity_;
-  scoped_array<scoped_array<Key> > key_blocks_;
-  std::size_t key_blocks_size_;
-  std::size_t key_blocks_capacity_;
-  char *ptr_;
-  std::size_t avail_;
-  std::size_t size_;
-  std::size_t total_length_;
-
-  char *reserve(std::size_t size);
-
-  void append_base_block();
-  void append_extra_block(std::size_t size);
-  void append_key_block();
-
-  // Disallows copy and assignment.
-  Keyset(const Keyset &);
-  Keyset &operator=(const Keyset &);
-};
-
-}  // namespace marisa
-
-#endif  // MARISA_KEYSET_H_

data/ext/marisa-0.2.4/pkg/include/marisa/query.h

@@ -1,71 +0,0 @@
-#ifndef MARISA_QUERY_H_
-#define MARISA_QUERY_H_
-
-#include "base.h"
-
-namespace marisa {
-
-class Query {
- public:
-  Query() : ptr_(NULL), length_(0), id_(0) {}
-  Query(const Query &query)
-      : ptr_(query.ptr_), length_(query.length_), id_(query.id_) {}
-
-  Query &operator=(const Query &query) {
-    ptr_ = query.ptr_;
-    length_ = query.length_;
-    id_ = query.id_;
-    return *this;
-  }
-
-  char operator[](std::size_t i) const {
-    MARISA_DEBUG_IF(i >= length_, MARISA_BOUND_ERROR);
-    return ptr_[i];
-  }
-
-  void set_str(const char *str) {
-    MARISA_DEBUG_IF(str == NULL, MARISA_NULL_ERROR);
-    std::size_t length = 0;
-    while (str[length] != '\0') {
-      ++length;
-    }
-    ptr_ = str;
-    length_ = length;
-  }
-  void set_str(const char *ptr, std::size_t length) {
-    MARISA_DEBUG_IF((ptr == NULL) && (length != 0), MARISA_NULL_ERROR);
-    ptr_ = ptr;
-    length_ = length;
-  }
-  void set_id(std::size_t id) {
-    id_ = id;
-  }
-
-  const char *ptr() const {
-    return ptr_;
-  }
-  std::size_t length() const {
-    return length_;
-  }
-  std::size_t id() const {
-    return id_;
-  }
-
-  void clear() {
-    Query().swap(*this);
-  }
-  void swap(Query &rhs) {
-    marisa::swap(ptr_, rhs.ptr_);
-    marisa::swap(length_, rhs.length_);
-    marisa::swap(id_, rhs.id_);
-  }
-
- private:
-  const char *ptr_;
-  std::size_t length_;
-  std::size_t id_;
-};
-
-}  // namespace marisa
-
-#endif  // MARISA_QUERY_H_

data/ext/marisa-0.2.4/pkg/include/marisa/scoped-array.h

@@ -1,48 +0,0 @@
-#ifndef MARISA_SCOPED_ARRAY_H_
-#define MARISA_SCOPED_ARRAY_H_
-
-#include "base.h"
-
-namespace marisa {
-
-template <typename T>
-class scoped_array {
- public:
-  scoped_array() : array_(NULL) {}
-  explicit scoped_array(T *array) : array_(array) {}
-
-  ~scoped_array() {
-    delete [] array_;
-  }
-
-  void reset(T *array = NULL) {
-    MARISA_THROW_IF((array != NULL) && (array == array_), MARISA_RESET_ERROR);
-    scoped_array(array).swap(*this);
-  }
-
-  T &operator[](std::size_t i) const {
-    MARISA_DEBUG_IF(array_ == NULL, MARISA_STATE_ERROR);
-    return array_[i];
-  }
-  T *get() const {
-    return array_;
-  }
-
-  void clear() {
-    scoped_array().swap(*this);
-  }
-  void swap(scoped_array &rhs) {
-    marisa::swap(array_, rhs.array_);
-  }
-
- private:
-  T *array_;
-
-  // Disallows copy and assignment.
-  scoped_array(const scoped_array &);
-  scoped_array &operator=(const scoped_array &);
-};
-
-}  // namespace marisa
-
-#endif  // MARISA_SCOPED_ARRAY_H_

data/ext/marisa-0.2.4/pkg/include/marisa/scoped-ptr.h

@@ -1,52 +0,0 @@
-#ifndef MARISA_SCOPED_PTR_H_
-#define MARISA_SCOPED_PTR_H_
-
-#include "base.h"
-
-namespace marisa {
-
-template <typename T>
-class scoped_ptr {
- public:
-  scoped_ptr() : ptr_(NULL) {}
-  explicit scoped_ptr(T *ptr) : ptr_(ptr) {}
-
-  ~scoped_ptr() {
-    delete ptr_;
-  }
-
-  void reset(T *ptr = NULL) {
-    MARISA_THROW_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR);
-    scoped_ptr(ptr).swap(*this);
-  }
-
-  T &operator*() const {
-    MARISA_DEBUG_IF(ptr_ == NULL, MARISA_STATE_ERROR);
-    return *ptr_;
-  }
-  T *operator->() const {
-    MARISA_DEBUG_IF(ptr_ == NULL, MARISA_STATE_ERROR);
-    return ptr_;
-  }
-  T *get() const {
-    return ptr_;
-  }
-
-  void clear() {
-    scoped_ptr().swap(*this);
-  }
-  void swap(scoped_ptr &rhs) {
-    marisa::swap(ptr_, rhs.ptr_);
-  }
-
- private:
-  T *ptr_;
-
-  // Disallows copy and assignment.
-  scoped_ptr(const scoped_ptr &);
-  scoped_ptr &operator=(const scoped_ptr &);
-};
-
-}  // namespace marisa
-
-#endif  // MARISA_SCOPED_PTR_H_

data/ext/marisa-0.2.4/pkg/include/marisa/stdio.h

@@ -1,15 +0,0 @@
-#ifndef MARISA_STDIO_H_
-#define MARISA_STDIO_H_
-
-#include <cstdio>
-
-namespace marisa {
-
-class Trie;
-
-void fread(std::FILE *file, Trie *trie);
-void fwrite(std::FILE *file, const Trie &trie);
-
-}  // namespace marisa
-
-#endif  // MARISA_STDIO_H_

data/ext/marisa-0.2.4/pkg/include/marisa/trie.h

@@ -1,64 +0,0 @@
-#ifndef MARISA_TRIE_H_
-#define MARISA_TRIE_H_
-
-#include "keyset.h"
-#include "agent.h"
-
-namespace marisa {
-namespace grimoire {
-namespace trie {
-
-class LoudsTrie;
-
-}  // namespace trie
-}  // namespace grimoire
-
-class Trie {
-  friend class TrieIO;
-
- public:
-  Trie();
-  ~Trie();
-
-  void build(Keyset &keyset, int config_flags = 0);
-
-  void mmap(const char *filename);
-  void map(const void *ptr, std::size_t size);
-
-  void load(const char *filename);
-  void read(int fd);
-
-  void save(const char *filename) const;
-  void write(int fd) const;
-
-  bool lookup(Agent &agent) const;
-  void reverse_lookup(Agent &agent) const;
-  bool common_prefix_search(Agent &agent) const;
-  bool predictive_search(Agent &agent) const;
-
-  std::size_t num_tries() const;
-  std::size_t num_keys() const;
-  std::size_t num_nodes() const;
-
-  TailMode tail_mode() const;
-  NodeOrder node_order() const;
-
-  bool empty() const;
-  std::size_t size() const;
-  std::size_t total_size() const;
-  std::size_t io_size() const;
-
-  void clear();
-  void swap(Trie &rhs);
-
- private:
-  scoped_ptr<grimoire::trie::LoudsTrie> trie_;
-
-  // Disallows copy and assignment.
-  Trie(const Trie &);
-  Trie &operator=(const Trie &);
-};
-
-}  // namespace marisa
-
-#endif  // MARISA_TRIE_H_

data/ext/marisa-0.2.4/pkg/lib/libmarisa.la

@@ -1,41 +0,0 @@
-# libmarisa.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libmarisa.0.dylib'
-
-# Names of this library.
-library_names='libmarisa.0.dylib libmarisa.dylib'
-
-# The name of the static archive.
-old_library='libmarisa.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=' '
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libmarisa.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg/lib'

data/ext/marisa-0.2.4/pkg/lib/pkgconfig/marisa.pc

@@ -1,11 +0,0 @@
-prefix=/Users/duane/Dropbox/Projects/wordtree/melisa/ext/marisa-0.2.4/pkg
-exec_prefix=${prefix}
-bindir=/Users/duane/Dropbox/Projects/wordtree/melisa/bin
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Marisa
-Description: Matching Algorithm with Recursively Implemented StorAge
-Version: 0.2.4
-Cflags: -I${includedir}
-Libs: -L${libdir} -lmarisa