linkparser 1.0.3 → 1.0.4

data/ChangeLog

@@ -1,3 +1,50 @@
+-- Tue, 09 Jun 2009 06:21:42 -0000 by deveiant (r55) -----
+   Changed: README
+            INSTALL
+            ChangeLog
+
+    * Updated versions of the link-grammar library referenced in the docs.
+
+
+-- Wed, 03 Jun 2009 14:29:26 -0000 by deveiant (r54) -----
+   Deleted: link-grammar-4.4.3.tar.gz
+
+   Removing old link-grammar library
+
+
+-- Wed, 03 Jun 2009 12:52:13 -0000 by deveiant (r53) -----
+   Added:   link-grammar-4.5.6.tar.gz
+            -> renamed from /trunk/link-grammar-4.4.1.tar.gz@r51
+   Changed: lib/linkparser.rb
+            spec/linkparser/sentence_spec.rb
+            ext/sentence.c
+            lib/linkparser/sentence.rb
+            spec/linkparser/parseoptions_spec.rb
+            ChangeLog (and 5 other/s)
+
+    * Updated to link-grammar-4.5.6.
+    * Added support for ParseOptions#spell_guessing_enabled
+    * Fixed buggy sentence behavior when the underlying Sentence hadn't yet been parsed.
+    * Made the exception raised when a delegated linkage method is called on a Sentence
+    that doesn't have any linkages. Thanks to Michael Bisignani <mbisignani@gmail.com> for
+    bringing this problem to my attention.
+    * Fixed some type-qualifier warnings.
+    * Bumped version to 1.0.4.
+
+
+-- Wed, 18 Mar 2009 21:51:03 -0000 by deveiant (r52) -----
+   Added:   link-grammar-4.4.3.tar.gz
+            -> renamed from /trunk/link-grammar-4.4.1.tar.gz@r51
+   Changed: README
+            LICENSE
+            Rakefile
+            project.yml
+   Deleted: link-grammar-4.4.1.tar.gz
+
+    * Update license year.
+    * Updated build.
+
+
 -- Sat, 20 Dec 2008 19:51:24 -0000 by deveiant (r49) -----
    Changed: Rakefile
             project.yml

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008, Michael Granger
+Copyright (c) 2006-2009, The FaerieMUD Consortium
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README

@@ -12,7 +12,7 @@ of English.
 == Requirements
 
 * Ruby 1.8.6
-* link-grammar (version 4.4.1 or later) from the AbiWord project 
+* link-grammar (version 4.5.6 or later) from the AbiWord project 
   (http://www.abisource.com/projects/link-grammar/) 
 
 
@@ -51,38 +51,11 @@ of English.
 
 == Legal
 
+For licensing information, see the LICENSE file.
+
 For copyright and licensing information for link-grammar itself, see the
 LICENSE file in that distribution.
 
-Copyright (c) 2006-2008, Michael Granger
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the author/s, nor the names of the project's
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
- $Id: README 48 2008-12-19 18:30:33Z deveiant $
+ $Id: README 55 2009-06-09 06:21:42Z deveiant $
 
 

data/Rakefile

@@ -4,7 +4,7 @@
 #
 # Based on various other Rakefiles, especially one by Ben Bleything
 #
-# Copyright (c) 2008 The FaerieMUD Consortium
+# Copyright (c) 2007-2009 The FaerieMUD Consortium
 #
 # Authors:
 #  * Michael Granger <ged@FaerieMUD.org>
@@ -21,15 +21,13 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
 
-require 'rubygems'
-gem 'rake', '>= 0.8.3'
-
 require 'rbconfig'
 require 'rake'
 require 'rake/rdoctask'
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/clean'
+require 'rake/191_compat.rb'
 
 $dryrun = false
 
@@ -174,7 +172,7 @@ DEVELOPMENT_DEPENDENCIES = {
 
 # Non-gem requirements: packagename => version
 REQUIREMENTS = {
-	'link-grammar' => '>= 4.4.1',
+	'link-grammar' => '>= 4.4.2',
 }
 
 # RubyGem specification
@@ -242,7 +240,8 @@ $dryrun = Rake.application.options.dryrun ? true : false
 RAKE_TASKLIBS.each do |tasklib|
 	next if tasklib =~ %r{/(helpers|svn|verifytask)\.rb$}
 	begin
-		require tasklib
+		trace "  loading tasklib %s" % [ tasklib ]
+		require tasklib.expand_path
 	rescue ScriptError => err
 		fail "Task library '%s' failed to load: %s: %s" %
 			[ tasklib, err.class.name, err.message ]

data/Rakefile.local

@@ -58,3 +58,8 @@ task :clobber do
 end	
 CLOBBER.include( EXT_MAKEFILE )
 
+task :debug do
+	log "Setting $DEBUG to true"
+	$DEBUG = true
+end
+

data/ext/extconf.rb

@@ -50,4 +50,6 @@ unless have_func( "linkgrammar_get_version" )
 	message "Trying to build anyway.\n"
 end
 
+have_func( 'parse_options_get_spell_guess' )
+
 create_makefile( 'linkparser_ext' )

data/ext/linkage.c

@@ -1,6 +1,6 @@
 /*
  *  linkage.c - Ruby LinkParser Linkage class
- *  $Id: linkage.c 48 2008-12-19 18:30:33Z deveiant $
+ *  $Id: linkage.c 53 2009-06-03 12:52:13Z deveiant $
  *  
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -470,7 +470,7 @@ rlink_linkage_get_link_num_domains( VALUE self, VALUE index ) {
 static VALUE
 rlink_linkage_get_link_domain_names( VALUE self, VALUE index ) {
 	rlink_LINKAGE *ptr = get_linkage( self );
-	char **names;
+	const char **names;
 	int i = NUM2INT( index );
 	int count;
 	VALUE names_ary;

data/ext/parseoptions.c

@@ -1,6 +1,6 @@
 /*
  *  parseoptions.c - Ruby LinkParser::ParseOptions class
- *  $Id: parseoptions.c 48 2008-12-19 18:30:33Z deveiant $
+ *  $Id: parseoptions.c 53 2009-06-03 12:52:13Z deveiant $
  *  
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -972,6 +972,49 @@ rlink_parseopts_get_echo_on_p( VALUE self ) {
 }
 
 
+
+
+/*
+ *  call-seq:
+ *     opts.spell_guessing_enabled= boolean
+ *
+ *  Enable/disable spell-guessing if it's supported.
+ */
+static VALUE
+rlink_parseopts_set_spell_guess( VALUE self, VALUE val ) {
+#ifdef HAVE_PARSE_OPTIONS_GET_SPELL_GUESS
+	Parse_Options opts = get_parseopts( self );
+	parse_options_set_spell_guess( opts, RTEST(val) );
+	return val;
+#else
+	rb_notimplement();
+	return Qnil;
+#endif /* HAVE_PARSE_OPTIONS_GET_SPELL_GUESS */
+}
+
+
+/*
+ *  call-seq:
+ *     opts.spell_guessing_enabled?   -> true or false
+ *
+ *  Returns +true+ if spell-guessing is enabled. Note that a +true+ return value doesn't
+ *  mean that it's supported, only that it will be used if it is.
+ */
+static VALUE
+rlink_parseopts_get_spell_guess_p( VALUE self ) {
+#ifdef HAVE_PARSE_OPTIONS_GET_SPELL_GUESS
+	Parse_Options opts = get_parseopts( self );
+	int rval;
+
+	rval = parse_options_get_spell_guess( opts );
+	return rval ? Qtrue : Qfalse;
+#else
+	rb_notimplement();
+	return Qnil;
+#endif /* HAVE_PARSE_OPTIONS_GET_SPELL_GUESS */
+}
+
+
 /*
  *  call-seq:
  *     opts.timer_expired?   -> +true+ or +false+
@@ -1175,6 +1218,10 @@ rlink_init_parseoptions() {
 		rlink_parseopts_set_echo_on, 1 );
 	rb_define_method( rlink_cParseOptions, "echo_on?", 
 		rlink_parseopts_get_echo_on_p, 0 );
+	rb_define_method( rlink_cParseOptions, "spell_guessing_enabled=", 
+		rlink_parseopts_set_spell_guess, 1 );
+	rb_define_method( rlink_cParseOptions, "spell_guessing_enabled?", 
+		rlink_parseopts_get_spell_guess_p, 0 );
 
 	rb_define_method( rlink_cParseOptions, "timer_expired?",
 		rlink_parseopts_timer_expired_p, 0 );
@@ -1184,5 +1231,6 @@ rlink_init_parseoptions() {
 		rlink_parseopts_resources_exhausted_p, 0 );
 	rb_define_method( rlink_cParseOptions, "reset_resources",
 		rlink_parseopts_reset_resources, 0 );
+	
 }
 

data/ext/sentence.c

@@ -1,6 +1,6 @@
 /*
  *  sentence.c - Ruby LinkParser
- *  $Id: sentence.c 48 2008-12-19 18:30:33Z deveiant $
+ *  $Id: sentence.c 53 2009-06-03 12:52:13Z deveiant $
  *  
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -201,8 +201,11 @@ rlink_sentence_parse( int argc, VALUE *argv, VALUE self ) {
 	VALUE options = Qnil;
 	int link_count = 0;
 
+	/*
 	if ( RTEST(ptr->parsed_p) )
 		rb_raise( rlink_eLpError, "Can't reparse a sentence." );
+	*/
+	debugMsg(( "Parsing sentence <%p>", ptr ));
 
 	/* Merge the hash from this call with the one from the dict and build
 	   Parse_Options from it. */
@@ -307,6 +310,10 @@ rlink_sentence_linkages( VALUE self ) {
 static VALUE
 rlink_sentence_length( VALUE self ) {
 	rlink_SENTENCE *ptr = get_sentence( self );
+
+	if ( !RTEST(ptr->parsed_p) )
+		rlink_sentence_parse( 0, 0, self );
+
 	return INT2FIX( sentence_length((Sentence)ptr->sentence) );
 }
 	
@@ -321,8 +328,11 @@ rlink_sentence_length( VALUE self ) {
 static VALUE
 rlink_sentence_word( VALUE self, VALUE n ) {
 	rlink_SENTENCE *ptr = get_sentence( self );
-	char *word;
+	const char *word;
 	
+	if ( !RTEST(ptr->parsed_p) )
+		rlink_sentence_parse( 0, 0, self );
+
 	word = sentence_get_word( (Sentence)ptr->sentence, FIX2INT(n) );
 	return rb_str_new2( word );
 }
@@ -340,13 +350,17 @@ rlink_sentence_word( VALUE self, VALUE n ) {
 static VALUE
 rlink_sentence_words( VALUE self ) {
 	rlink_SENTENCE *ptr = get_sentence( self );
-	char *word;
+	const char *word;
 	int i, length;
 	VALUE words = rb_ary_new();
 	
+	if ( !RTEST(ptr->parsed_p) )
+		rlink_sentence_parse( 0, 0, self );
+
 	length = sentence_length( (Sentence)ptr->sentence );
 	for ( i = 0; i < length; i++ ) {
 		word = sentence_get_word( (Sentence)ptr->sentence, i );
+		debugMsg(( "Word %d: <%s>", i, word ));
 		rb_ary_push( words, rb_str_new2(word) );
 	}
 	
@@ -395,6 +409,9 @@ rlink_sentence_null_count( VALUE self ) {
 	rlink_SENTENCE *ptr = get_sentence( self );
 	int count;
 	
+	if ( !RTEST(ptr->parsed_p) )
+		rlink_sentence_parse( 0, 0, self );
+
 	count = sentence_null_count( (Sentence)ptr->sentence );
 	return INT2FIX( count );
 }
@@ -414,6 +431,7 @@ rlink_sentence_num_linkages_found( VALUE self ) {
 	
 	if ( !RTEST(ptr->parsed_p) )
 		rlink_sentence_parse( 0, 0, self );
+
 	i = sentence_num_linkages_found( (Sentence)ptr->sentence );
 	
 	return INT2FIX( i );
@@ -431,6 +449,9 @@ rlink_sentence_num_valid_linkages( VALUE self ) {
 	rlink_SENTENCE *ptr = get_sentence( self );
 	int count;
 	
+	if ( !RTEST(ptr->parsed_p) )
+		rlink_sentence_parse( 0, 0, self );
+
 	count = sentence_num_valid_linkages( (Sentence)ptr->sentence );
 	return INT2FIX( count );
 }
@@ -448,6 +469,9 @@ rlink_sentence_num_linkages_post_processed( VALUE self ) {
 	rlink_SENTENCE *ptr = get_sentence( self );
 	int count;
 	
+	if ( !RTEST(ptr->parsed_p) )
+		rlink_sentence_parse( 0, 0, self );
+
 	count = sentence_num_linkages_post_processed( (Sentence)ptr->sentence );
 	return INT2FIX( count );
 }
@@ -465,6 +489,9 @@ rlink_sentence_num_violations( VALUE self, VALUE i ) {
 	rlink_SENTENCE *ptr = get_sentence( self );
 	int count;
 	
+	if ( !RTEST(ptr->parsed_p) )
+		rlink_sentence_parse( 0, 0, self );
+
 	count = sentence_num_violations( (Sentence)ptr->sentence, FIX2INT(i) );
 	return INT2FIX( count );
 }
@@ -481,6 +508,9 @@ rlink_sentence_disjunct_cost( VALUE self, VALUE i ) {
 	rlink_SENTENCE *ptr = get_sentence( self );
 	int count;
 	
+	if ( !RTEST(ptr->parsed_p) )
+		rlink_sentence_parse( 0, 0, self );
+
 	count = sentence_disjunct_cost( (Sentence)ptr->sentence, FIX2INT(i) );
 	return INT2FIX( count );
 }

data/lib/linkparser.rb

@@ -12,7 +12,7 @@ require 'linkparser_ext'
 #  
 #  == Version
 # 
-#   $Id: linkparser.rb 48 2008-12-19 18:30:33Z deveiant $
+#   $Id: linkparser.rb 53 2009-06-03 12:52:13Z deveiant $
 #  
 #  == License
 # 
@@ -26,13 +26,13 @@ module LinkParser
 	require 'linkparser/linkage'
 
 	# Release version
-	VERSION = '1.0.3'
+	VERSION = '1.0.4'
 
 	# SVN Revision
-	SVNRev = %q$Rev: 48 $
+	SVNRev = %q$Rev: 53 $
 
 	# SVN Id
-	SVNId = %q$Id: linkparser.rb 48 2008-12-19 18:30:33Z deveiant $
+	SVNId = %q$Id: linkparser.rb 53 2009-06-03 12:52:13Z deveiant $
 
 end # class LinkParser
 

data/lib/linkparser/sentence.rb

@@ -33,7 +33,7 @@
 # 
 # == Version
 #
-#  $Id: sentence.rb 21 2008-05-26 21:49:02Z deveiant $
+#  $Id: sentence.rb 53 2009-06-03 12:52:13Z deveiant $
 # 
 
 require 'linkparser'
@@ -42,10 +42,11 @@ require 'linkparser'
 class LinkParser::Sentence
 
 	# SVN Revision
-	SVNRev = %q$Rev: 21 $
+	SVNRev = %q$Rev: 53 $
 
 	# SVN Id
-	SVNId = %q$Id: sentence.rb 21 2008-05-26 21:49:02Z deveiant $
+	SVNId = %q$Id: sentence.rb 53 2009-06-03 12:52:13Z deveiant $
+
 
 
 	######
@@ -54,25 +55,25 @@ class LinkParser::Sentence
 
 	### Return a human-readable representation of the Sentence object.
 	def inspect
-		%{#<%s:0x%x "%s"/%d linkages/%d nulls>} % [
+		contents = ''
+		if self.parsed?
+			contents = %{"%s"/%d linkages/%d nulls} % [
+				self.to_s,
+				self.num_linkages_found,
+				self.null_count,
+			]
+		else
+			contents = "(unparsed)"
+		end
+
+		return "#<%s:0x%x %s>" % [
 			self.class.name,
 			self.object_id / 2,
-			self.words.join(" "),
-			self.num_linkages_found,
-			self.null_count,
+			contents,
 		]
 	end
 
 
-	### Return the Array of words in the sentence as tokenized by the
-	### parser.
-	def words
-		(0...self.length).to_a.collect do |i|
-			self.word( i )
-		end
-	end
-	
-	
 	### Print out the sentence
 	def to_s
 		return self.words.join(" ")
@@ -91,8 +92,13 @@ class LinkParser::Sentence
 
 	### Proxy method -- auto-delegate calls to the first linkage.
 	def method_missing( sym, *args )
-		linkage = self.linkages.first
-		return super unless !linkage.nil? && linkage.respond_to?( sym )
+
+		# Check both symbol and string for forward-compatibility with 1.9.x
+		return super unless
+			LinkParser::Linkage.instance_methods.include?( sym.to_s ) ||
+			LinkParser::Linkage.instance_methods.include?( sym )
+
+		linkage = self.linkages.first or raise LinkParser::Error, "sentence has no linkages"
 		
 		meth = linkage.method( sym )
 		self.singleton_class.send( :define_method, sym, &meth )