linkparser 1.0.4 → 1.1.0

data/ext/linkparser.c

@@ -1,6 +1,6 @@
 /*
  *  linkparser.c - Ruby LinkParser
- *  $Id: linkparser.c 48 2008-12-19 18:30:33Z deveiant $
+ *  $Id: linkparser.c,v 53ec62029ee4 2010/10/12 15:45:26 ged $
  *  
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -90,6 +90,7 @@ static VALUE
 rlink_link_grammar_version( VALUE self ) {
 #ifdef HAVE_LINKGRAMMAR_GET_VERSION
 	const char *version = linkgrammar_get_version();
+	if ( !version ) rb_bug( "linkgrammar_get_version returned NULL pointer" );
 	return rb_str_new2( version );
 #else
 	return rb_str_new2( "link-grammar-4.3.9-or-earlier" );
@@ -109,7 +110,7 @@ Init_linkparser_ext() {
 
 	rb_define_singleton_method( rlink_mLinkParser, "link_grammar_version",
 		rlink_link_grammar_version, 0 );
-	
+
 	setlocale( LC_ALL, "" );
 
 	rlink_init_dict();

data/ext/linkparser.h

@@ -1,6 +1,6 @@
 /*
  *		linkparser.h - Ruby-LinkParser Header
- *		$Id: linkparser.h 39 2008-11-18 16:18:11Z deveiant $
+ *		$Id: linkparser.h,v 53ec62029ee4 2010/10/12 15:45:26 ged $
  *
  *		Authors:
  *		  * Michael Granger <ged@FaerieMUD.org>
@@ -16,12 +16,12 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <assert.h>
 
-#include <ruby.h>
-#include <intern.h>				/* For rb_dbl2big() */
-
-#include <link-grammar/link-includes.h>
+#include "ruby.h"
+#include "ruby/intern.h"
 
+#include "link-grammar/link-includes.h"
 
 
 /* Debugging functions/macros */
@@ -62,18 +62,22 @@ extern VALUE rlink_eLpError;
 
 /* 
  * Structures
- */ 
-typedef struct {
+ */
+struct rlink_dictionary {
+	Dictionary dict;
+};
+
+struct rlink_sentence {
 	Sentence 	sentence;
 	VALUE	 	dictionary;
 	VALUE		parsed_p;
 	VALUE		options;
-} rlink_SENTENCE;
+};
 
-typedef struct {
+struct rlink_linkage {
 	Linkage		linkage;
 	VALUE		sentence;
-} rlink_LINKAGE;
+};
 
 
 
@@ -98,15 +102,15 @@ typedef struct {
 /* -------------------------------------------------------
  * Initializer functions
  * ------------------------------------------------------- */
-extern void rlink_init_dict						_(( void ));
-extern void rlink_init_sentence					_(( void ));
-extern void rlink_init_linkage					_(( void ));
-extern void rlink_init_parseoptions				_(( void ));
+extern void rlink_init_dict							_(( void ));
+extern void rlink_init_sentence						_(( void ));
+extern void rlink_init_linkage						_(( void ));
+extern void rlink_init_parseoptions					_(( void ));
 
 /* Fetchers */
-extern Dictionary rlink_get_dict				_(( VALUE ));
-extern rlink_SENTENCE *rlink_get_sentence		_(( VALUE ));
-extern Parse_Options rlink_get_parseopts		_(( VALUE ));
+extern struct rlink_dictionary * rlink_get_dict		_(( VALUE ));
+extern struct rlink_sentence *rlink_get_sentence	_(( VALUE ));
+extern Parse_Options rlink_get_parseopts			_(( VALUE ));
 
 #endif /* _R_LINKPARSER_H */
 

data/ext/parseoptions.c

@@ -1,6 +1,6 @@
 /*
  *  parseoptions.c - Ruby LinkParser::ParseOptions class
- *  $Id: parseoptions.c 53 2009-06-03 12:52:13Z deveiant $
+ *  $Id: parseoptions.c,v 53ec62029ee4 2010/10/12 15:45:26 ged $
  *  
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -48,7 +48,7 @@ check_parseopts( VALUE self ) {
 		rb_raise( rb_eTypeError, "wrong argument type %s (expected LinkParser::ParseOptions)",
 				  rb_class2name(CLASS_OF( self )) );
     }
-	
+
 	return DATA_PTR( self );
 }
 
@@ -114,7 +114,7 @@ rlink_parseopts_init( int argc, VALUE *argv, VALUE self ) {
 	if ( ! check_parseopts(self) ) {
 		Parse_Options opts;
 		VALUE opthash = Qnil;
-		
+
 		debugMsg(( "Initializing a ParseOptions: %p", self ));
 		DATA_PTR( self ) = opts = parse_options_create();
 
@@ -124,7 +124,7 @@ rlink_parseopts_init( int argc, VALUE *argv, VALUE self ) {
 			rb_iterate( rb_each, opthash, rlink_parseopts_each_opthash_i, self );
 		}
 	}
-	
+
 	else {
 		rb_raise( rb_eRuntimeError, "Cannot re-initialize a Dictionary object." );
 	}
@@ -142,19 +142,19 @@ rlink_parseopts_each_opthash_i( VALUE pair, VALUE self ) {
 	VALUE key, val, keystring;
 	char *method_name;
 	ID method;
-	
+
 	key = rb_ary_entry( pair, 0 );
 	val = rb_ary_entry( pair, 1 );
 
 	keystring = rb_obj_as_string( key );
-	
-	method_name = ALLOCA_N( char, RSTRING(keystring)->len + 1 );
-	strncpy( method_name, RSTRING(keystring)->ptr, RSTRING(keystring)->len + 1 );
+
+	method_name = ALLOCA_N( char, RSTRING_LEN(keystring) + 1 );
+	strncpy( method_name, RSTRING_PTR(keystring), RSTRING_LEN(keystring) + 1 );
 	strncat( method_name, "=", 1 );
-	
+
 	debugMsg(( "Calling method %s", method_name ));
 	method = rb_intern( method_name );
-	
+
 	return rb_funcall( self, method, 1, val );
 }
 
@@ -168,7 +168,7 @@ rlink_parseopts_each_opthash_i( VALUE pair, VALUE self ) {
  */
 /*static VALUE
 rlink_parseopts_merge( VALUE self, other ) {
-	
+
 }
 */
 
@@ -1105,7 +1105,7 @@ rlink_parseopts_reset_resources( VALUE self ) {
  */
 void
 rlink_init_parseoptions() {
-	rlink_cParseOptions = rb_define_class_under( rlink_mLinkParser, 
+	rlink_cParseOptions = rb_define_class_under( rlink_mLinkParser,
 		"ParseOptions", rb_cObject );
 
 	rb_define_alloc_func( rlink_cParseOptions, rlink_parseopts_s_alloc );
@@ -1114,113 +1114,113 @@ rlink_init_parseoptions() {
 	rb_define_method( rlink_cParseOptions, "merge", rlink_parseopts_merge, 1 );
 	rb_define_method( rlink_cParseOptions, "merge!", rlink_parseopts_merge_bang, 1 );
 */
-	rb_define_method( rlink_cParseOptions, "verbosity=", 
+	rb_define_method( rlink_cParseOptions, "verbosity=",
 		rlink_parseopts_set_verbosity, 1 );
-	rb_define_method( rlink_cParseOptions, "verbosity", 
+	rb_define_method( rlink_cParseOptions, "verbosity",
 		rlink_parseopts_get_verbosity, 0 );
-	rb_define_method( rlink_cParseOptions, "linkage_limit=", 
+	rb_define_method( rlink_cParseOptions, "linkage_limit=",
 		rlink_parseopts_set_linkage_limit, 1 );
-	rb_define_method( rlink_cParseOptions, "linkage_limit", 
+	rb_define_method( rlink_cParseOptions, "linkage_limit",
 		rlink_parseopts_get_linkage_limit, 0 );
-	rb_define_method( rlink_cParseOptions, "disjunct_cost=", 
+	rb_define_method( rlink_cParseOptions, "disjunct_cost=",
 		rlink_parseopts_set_disjunct_cost, 1 );
-	rb_define_method( rlink_cParseOptions, "disjunct_cost", 
+	rb_define_method( rlink_cParseOptions, "disjunct_cost",
 		rlink_parseopts_get_disjunct_cost, 0 );
-	rb_define_method( rlink_cParseOptions, "min_null_count=", 
+	rb_define_method( rlink_cParseOptions, "min_null_count=",
 		rlink_parseopts_set_min_null_count, 1 );
-	rb_define_method( rlink_cParseOptions, "min_null_count", 
+	rb_define_method( rlink_cParseOptions, "min_null_count",
 		rlink_parseopts_get_min_null_count, 0 );
-	rb_define_method( rlink_cParseOptions, "max_null_count=", 
+	rb_define_method( rlink_cParseOptions, "max_null_count=",
 		rlink_parseopts_set_max_null_count, 1 );
-	rb_define_method( rlink_cParseOptions, "max_null_count", 
+	rb_define_method( rlink_cParseOptions, "max_null_count",
 		rlink_parseopts_get_max_null_count, 0 );
-	rb_define_method( rlink_cParseOptions, "null_block=", 
+	rb_define_method( rlink_cParseOptions, "null_block=",
 		rlink_parseopts_set_null_block, 1 );
-	rb_define_method( rlink_cParseOptions, "null_block", 
+	rb_define_method( rlink_cParseOptions, "null_block",
 		rlink_parseopts_get_null_block, 0 );
-	rb_define_method( rlink_cParseOptions, "islands_ok=", 
+	rb_define_method( rlink_cParseOptions, "islands_ok=",
 		rlink_parseopts_set_islands_ok, 1 );
-	rb_define_method( rlink_cParseOptions, "islands_ok?", 
+	rb_define_method( rlink_cParseOptions, "islands_ok?",
 		rlink_parseopts_get_islands_ok_p, 0 );
-	rb_define_method( rlink_cParseOptions, "short_length=", 
+	rb_define_method( rlink_cParseOptions, "short_length=",
 		rlink_parseopts_set_short_length, 1 );
-	rb_define_method( rlink_cParseOptions, "short_length", 
+	rb_define_method( rlink_cParseOptions, "short_length",
 		rlink_parseopts_get_short_length, 0 );
-	rb_define_method( rlink_cParseOptions, "max_memory=", 
+	rb_define_method( rlink_cParseOptions, "max_memory=",
 		rlink_parseopts_set_max_memory, 1 );
-	rb_define_method( rlink_cParseOptions, "max_memory", 
+	rb_define_method( rlink_cParseOptions, "max_memory",
 		rlink_parseopts_get_max_memory, 0 );
-	rb_define_method( rlink_cParseOptions, "max_sentence_length=", 
+	rb_define_method( rlink_cParseOptions, "max_sentence_length=",
 		rlink_parseopts_set_max_sentence_length, 1 );
-	rb_define_method( rlink_cParseOptions, "max_sentence_length", 
+	rb_define_method( rlink_cParseOptions, "max_sentence_length",
 		rlink_parseopts_get_max_sentence_length, 0 );
-	rb_define_method( rlink_cParseOptions, "max_parse_time=", 
+	rb_define_method( rlink_cParseOptions, "max_parse_time=",
 		rlink_parseopts_set_max_parse_time, 1 );
-	rb_define_method( rlink_cParseOptions, "max_parse_time", 
+	rb_define_method( rlink_cParseOptions, "max_parse_time",
 		rlink_parseopts_get_max_parse_time, 0 );
-	rb_define_method( rlink_cParseOptions, "screen_width=", 
+	rb_define_method( rlink_cParseOptions, "screen_width=",
 		rlink_parseopts_set_screen_width, 1 );
-	rb_define_method( rlink_cParseOptions, "screen_width", 
+	rb_define_method( rlink_cParseOptions, "screen_width",
 		rlink_parseopts_get_screen_width, 0 );
-	rb_define_method( rlink_cParseOptions, "allow_null=", 
+	rb_define_method( rlink_cParseOptions, "allow_null=",
 		rlink_parseopts_set_allow_null, 1 );
-	rb_define_method( rlink_cParseOptions, "allow_null?", 
+	rb_define_method( rlink_cParseOptions, "allow_null?",
 		rlink_parseopts_get_allow_null_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_walls=", 
+	rb_define_method( rlink_cParseOptions, "display_walls=",
 		rlink_parseopts_set_display_walls, 1 );
-	rb_define_method( rlink_cParseOptions, "display_walls?", 
+	rb_define_method( rlink_cParseOptions, "display_walls?",
 		rlink_parseopts_get_display_walls_p, 0 );
-	rb_define_method( rlink_cParseOptions, "all_short_connectors=", 
+	rb_define_method( rlink_cParseOptions, "all_short_connectors=",
 		rlink_parseopts_set_all_short_connectors, 1 );
-	rb_define_method( rlink_cParseOptions, "all_short_connectors?", 
+	rb_define_method( rlink_cParseOptions, "all_short_connectors?",
 		rlink_parseopts_get_all_short_connectors_p, 0 );
-	rb_define_method( rlink_cParseOptions, "cost_model_type=", 
+	rb_define_method( rlink_cParseOptions, "cost_model_type=",
 		rlink_parseopts_set_cost_model_type, 1 );
 
 /*  (No way to get the cost_model_type from the API)
 
-	rb_define_method( rlink_cParseOptions, "cost_model_type", 
+	rb_define_method( rlink_cParseOptions, "cost_model_type",
 		rlink_parseopts_get_cost_model_type, 0 );
 */
-	rb_define_method( rlink_cParseOptions, "batch_mode=", 
+	rb_define_method( rlink_cParseOptions, "batch_mode=",
 		rlink_parseopts_set_batch_mode, 1 );
-	rb_define_method( rlink_cParseOptions, "batch_mode?", 
+	rb_define_method( rlink_cParseOptions, "batch_mode?",
 		rlink_parseopts_get_batch_mode_p, 0 );
-	rb_define_method( rlink_cParseOptions, "panic_mode=", 
+	rb_define_method( rlink_cParseOptions, "panic_mode=",
 		rlink_parseopts_set_panic_mode, 1 );
-	rb_define_method( rlink_cParseOptions, "panic_mode?", 
+	rb_define_method( rlink_cParseOptions, "panic_mode?",
 		rlink_parseopts_get_panic_mode_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_on=", 
+	rb_define_method( rlink_cParseOptions, "display_on=",
 		rlink_parseopts_set_display_on, 1 );
-	rb_define_method( rlink_cParseOptions, "display_on?", 
+	rb_define_method( rlink_cParseOptions, "display_on?",
 		rlink_parseopts_get_display_on_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_postscript=", 
+	rb_define_method( rlink_cParseOptions, "display_postscript=",
 		rlink_parseopts_set_display_postscript, 1 );
-	rb_define_method( rlink_cParseOptions, "display_postscript?", 
+	rb_define_method( rlink_cParseOptions, "display_postscript?",
 		rlink_parseopts_get_display_postscript_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_constituents=", 
+	rb_define_method( rlink_cParseOptions, "display_constituents=",
 		rlink_parseopts_set_display_constituents, 1 );
-	rb_define_method( rlink_cParseOptions, "display_constituents?", 
+	rb_define_method( rlink_cParseOptions, "display_constituents?",
 		rlink_parseopts_get_display_constituents_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_bad=", 
+	rb_define_method( rlink_cParseOptions, "display_bad=",
 		rlink_parseopts_set_display_bad, 1 );
-	rb_define_method( rlink_cParseOptions, "display_bad?", 
+	rb_define_method( rlink_cParseOptions, "display_bad?",
 		rlink_parseopts_get_display_bad_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_links=", 
+	rb_define_method( rlink_cParseOptions, "display_links=",
 		rlink_parseopts_set_display_links, 1 );
-	rb_define_method( rlink_cParseOptions, "display_links?", 
+	rb_define_method( rlink_cParseOptions, "display_links?",
 		rlink_parseopts_get_display_links_p, 0 );
-	rb_define_method( rlink_cParseOptions, "display_union=", 
+	rb_define_method( rlink_cParseOptions, "display_union=",
 		rlink_parseopts_set_display_union, 1 );
-	rb_define_method( rlink_cParseOptions, "display_union?", 
+	rb_define_method( rlink_cParseOptions, "display_union?",
 		rlink_parseopts_get_display_union_p, 0 );
-	rb_define_method( rlink_cParseOptions, "echo_on=", 
+	rb_define_method( rlink_cParseOptions, "echo_on=",
 		rlink_parseopts_set_echo_on, 1 );
-	rb_define_method( rlink_cParseOptions, "echo_on?", 
+	rb_define_method( rlink_cParseOptions, "echo_on?",
 		rlink_parseopts_get_echo_on_p, 0 );
-	rb_define_method( rlink_cParseOptions, "spell_guessing_enabled=", 
+	rb_define_method( rlink_cParseOptions, "spell_guessing_enabled=",
 		rlink_parseopts_set_spell_guess, 1 );
-	rb_define_method( rlink_cParseOptions, "spell_guessing_enabled?", 
+	rb_define_method( rlink_cParseOptions, "spell_guessing_enabled?",
 		rlink_parseopts_get_spell_guess_p, 0 );
 
 	rb_define_method( rlink_cParseOptions, "timer_expired?",
@@ -1231,6 +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 53 2009-06-03 12:52:13Z deveiant $
+ *  $Id: sentence.c,v 53ec62029ee4 2010/10/12 15:45:26 ged $
  *  
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -29,16 +29,16 @@
 /*
  * Allocation function
  */
-static rlink_SENTENCE *
+static struct rlink_sentence *
 rlink_sentence_alloc() {
-	rlink_SENTENCE *ptr = ALLOC( rlink_SENTENCE );
-	
+	struct rlink_sentence *ptr = ALLOC( struct rlink_sentence );
+
 	ptr->sentence	= NULL;
 	ptr->dictionary	= Qnil;
 	ptr->parsed_p	= Qfalse;
 	ptr->options	= Qnil;
-	
-	debugMsg(( "Initialized an rlink_SENTENCE <%p>", ptr ));
+
+	debugMsg(( "Initialized an rlink_sentence <%p>", ptr ));
 	return ptr;
 }
 
@@ -47,16 +47,16 @@ rlink_sentence_alloc() {
  * GC Mark function
  */
 static void
-rlink_sentence_gc_mark( rlink_SENTENCE *ptr ) {
+rlink_sentence_gc_mark( struct rlink_sentence *ptr ) {
 	debugMsg(( "Marking LinkParser::Sentence %p", ptr ));
-	
+
 	if ( ptr ) {
 		rb_gc_mark( ptr->dictionary );
 		rb_gc_mark( ptr->options );
 	}
-	
+
 	else {
-		debugMsg(( "Not marking uninitialized rlink_SENTENCE" ));
+		debugMsg(( "Not marking uninitialized rlink_sentence struct" ));
 	}
 }
 
@@ -65,24 +65,35 @@ rlink_sentence_gc_mark( rlink_SENTENCE *ptr ) {
  * GC Free function
  */
 static void
-rlink_sentence_gc_free( rlink_SENTENCE *ptr ) {
+rlink_sentence_gc_free( struct rlink_sentence *ptr ) {
 	if ( ptr ) {
 		debugMsg(( "In free function of Sentence <%p>", ptr ));
-		
-		if ( rlink_get_dict(ptr->dictionary) ) {
-			debugMsg(( "Freeing Sentence <%p>", ptr->sentence ));
-			sentence_delete( (Sentence)ptr->sentence );
+
+		if ( ptr->dictionary && TYPE(ptr->dictionary) == T_DATA ) {
+			struct rlink_dictionary *dictionary = rlink_get_dict( ptr->dictionary );
+			debugMsg(( "  sentence's dictionary is: <%p>", dictionary ));
+
+			/* Freeing the dictionary automatically frees the sentences it belongs to, so
+			   don't double-free if the dictionary struct or its pointer is done. */
+			if ( dictionary->dict ) {
+				debugMsg(( "  deleting Sentence <%p>", ptr->sentence ));
+				sentence_delete( (Sentence)ptr->sentence );
+			}
 		} else {
-			debugMsg(( "Not freeing a Sentence belonging to an already-freed dictionary." ));
+			debugMsg(( "  not deleting a Sentence belonging to an already-freed dictionary." ));
 		}
 
 		ptr->sentence = NULL;
 		ptr->options = Qnil;
 		ptr->dictionary = Qnil;
+
+		debugMsg(( "  freeing rlink_sentence <%p>", ptr ));
+		xfree( ptr );
+		ptr = NULL;
 	}
-	
+
 	else {
-		debugMsg(( "Not freeing an uninitialized rlink_SENTENCE" ));
+		debugMsg(( "Not freeing an uninitialized rlink_sentence struct" ));
 	}
 }
 
@@ -90,7 +101,7 @@ rlink_sentence_gc_free( rlink_SENTENCE *ptr ) {
 /*
  * Object validity checker. Returns the data pointer.
  */
-static rlink_SENTENCE *
+static struct rlink_sentence *
 check_sentence(  VALUE	self ) {
 	Check_Type( self, T_DATA );
 
@@ -98,7 +109,7 @@ check_sentence(  VALUE	self ) {
 		rb_raise( rb_eTypeError, "wrong argument type %s (expected LinkParser::Sentence)",
 				  rb_class2name(CLASS_OF( self )) );
     }
-	
+
 	return DATA_PTR( self );
 }
 
@@ -106,9 +117,9 @@ check_sentence(  VALUE	self ) {
 /*
  * Fetch the data pointer and check it for sanity.
  */
-static rlink_SENTENCE *
+static struct rlink_sentence *
 get_sentence(  VALUE self ) {
-	rlink_SENTENCE *ptr = check_sentence( self );
+	struct rlink_sentence *ptr = check_sentence( self );
 
 	if ( !ptr )
 		rb_raise( rb_eRuntimeError, "uninitialized Sentence" );
@@ -120,7 +131,7 @@ get_sentence(  VALUE self ) {
 /*
  * Publicly-usable sentence-fetcher
  */
-rlink_SENTENCE *
+struct rlink_sentence *
 rlink_get_sentence( VALUE self ) {
 	return get_sentence( self );
 }
@@ -162,19 +173,19 @@ rlink_sentence_s_alloc(  VALUE klass ) {
 static VALUE
 rlink_sentence_init( VALUE self, VALUE input_string, VALUE dictionary ) {
 	if ( !check_sentence(self) ) {
-		rlink_SENTENCE *ptr;
+		struct rlink_sentence *ptr;
 		Sentence sent;
-		Dictionary dict = rlink_get_dict( dictionary );
-	
-		if ( !(sent = sentence_create( StringValueCStr(input_string), dict )) )
+		struct rlink_dictionary *dictptr = rlink_get_dict( dictionary );
+
+		if ( !(sent = sentence_create( StringValueCStr(input_string), dictptr->dict )) )
 			rlink_raise_lp_error();
 
 		DATA_PTR( self ) = ptr = rlink_sentence_alloc();
-		
+
 		ptr->sentence = sent;
 		ptr->dictionary = dictionary;
 		ptr->options = Qnil;
-		
+
 	} else {
 		rb_raise( rb_eRuntimeError,
 				  "Cannot re-initialize a sentence once it's been created." );
@@ -195,7 +206,7 @@ rlink_sentence_init( VALUE self, VALUE input_string, VALUE dictionary ) {
  */
 static VALUE
 rlink_sentence_parse( int argc, VALUE *argv, VALUE self ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct rlink_sentence *ptr = get_sentence( self );
 	Parse_Options opts;
 	VALUE defopts = Qnil;
 	VALUE options = Qnil;
@@ -223,7 +234,7 @@ rlink_sentence_parse( int argc, VALUE *argv, VALUE self ) {
 
 	ptr->options = options;
 	ptr->parsed_p = Qtrue;
-	
+
 	return INT2FIX( link_count );
 }
 
@@ -240,7 +251,7 @@ rlink_sentence_parse( int argc, VALUE *argv, VALUE self ) {
  */
 static VALUE
 rlink_sentence_parsed_p( VALUE self ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct rlink_sentence *ptr = get_sentence( self );
 	return ptr->parsed_p;
 }
 
@@ -256,7 +267,7 @@ rlink_sentence_parsed_p( VALUE self ) {
  */
 static VALUE
 rlink_sentence_options( VALUE self ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct rlink_sentence *ptr = get_sentence( self );
 	return ptr->options;
 }
 
@@ -273,7 +284,7 @@ rlink_sentence_options( VALUE self ) {
  */
 static VALUE
 rlink_sentence_linkages( VALUE self ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct rlink_sentence *ptr = get_sentence( self );
 	int i, count = 0;
 	VALUE rary;
 
@@ -282,18 +293,18 @@ rlink_sentence_linkages( VALUE self ) {
 
 	count = sentence_num_valid_linkages( (Sentence)ptr->sentence );
 	rary = rb_ary_new2( count );
-	
+
 	for ( i = 0; i < count; i++ ) {
 		VALUE linkage;
 		VALUE args[2];
-		
+
 		args[0] = INT2FIX( i );
 		args[1] = self;
-		
+
 		linkage = rb_class_new_instance( 2, args, rlink_cLinkage );
 		rb_ary_store( rary, i, linkage );
 	}
-	
+
 	return rary;
 }
 
@@ -309,14 +320,14 @@ rlink_sentence_linkages( VALUE self ) {
 
 static VALUE
 rlink_sentence_length( VALUE self ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct rlink_sentence *ptr = get_sentence( self );
 
 	if ( !RTEST(ptr->parsed_p) )
 		rlink_sentence_parse( 0, 0, self );
 
 	return INT2FIX( sentence_length((Sentence)ptr->sentence) );
 }
-	
+
 
 /*
  *  call-seq:
@@ -327,9 +338,9 @@ rlink_sentence_length( VALUE self ) {
  */
 static VALUE
 rlink_sentence_word( VALUE self, VALUE n ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct rlink_sentence *ptr = get_sentence( self );
 	const char *word;
-	
+
 	if ( !RTEST(ptr->parsed_p) )
 		rlink_sentence_parse( 0, 0, self );
 
@@ -349,11 +360,11 @@ rlink_sentence_word( VALUE self, VALUE n ) {
  */
 static VALUE
 rlink_sentence_words( VALUE self ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct rlink_sentence *ptr = get_sentence( self );
 	const char *word;
 	int i, length;
 	VALUE words = rb_ary_new();
-	
+
 	if ( !RTEST(ptr->parsed_p) )
 		rlink_sentence_parse( 0, 0, self );
 
@@ -363,7 +374,7 @@ rlink_sentence_words( VALUE self ) {
 		debugMsg(( "Word %d: <%s>", i, word ));
 		rb_ary_push( words, rb_str_new2(word) );
 	}
-	
+
 	return words;
 }
 
@@ -406,16 +417,16 @@ rlink_sentence_aref( argc, argv, self )
  */
 static VALUE
 rlink_sentence_null_count( VALUE self ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct 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 );
 }
-	
+
 
 /*
  *  call-seq:
@@ -426,14 +437,14 @@ rlink_sentence_null_count( VALUE self ) {
  */
 static VALUE
 rlink_sentence_num_linkages_found( VALUE self ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct rlink_sentence *ptr = get_sentence( self );
 	int i = 0;
-	
+
 	if ( !RTEST(ptr->parsed_p) )
 		rlink_sentence_parse( 0, 0, self );
 
 	i = sentence_num_linkages_found( (Sentence)ptr->sentence );
-	
+
 	return INT2FIX( i );
 }
 
@@ -446,16 +457,16 @@ rlink_sentence_num_linkages_found( VALUE self ) {
  */
 static VALUE
 rlink_sentence_num_valid_linkages( VALUE self ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct 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 );
 }
-	
+
 
 /*
  *  call-seq:
@@ -466,16 +477,16 @@ rlink_sentence_num_valid_linkages( VALUE self ) {
  */
 static VALUE
 rlink_sentence_num_linkages_post_processed( VALUE self ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct 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 );
 }
-	
+
 
 /*
  *  call-seq:
@@ -486,16 +497,16 @@ rlink_sentence_num_linkages_post_processed( VALUE self ) {
  */
 static VALUE
 rlink_sentence_num_violations( VALUE self, VALUE i ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct 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 );
 }
-	
+
 
 /*
  *  call-seq:
@@ -505,16 +516,16 @@ rlink_sentence_num_violations( VALUE self, VALUE i ) {
  */
 static VALUE
 rlink_sentence_disjunct_cost( VALUE self, VALUE i ) {
-	rlink_SENTENCE *ptr = get_sentence( self );
+	struct 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 );
 }
-	
+
 
 /*
  * Document-class: LinkParser::Sentence
@@ -529,7 +540,7 @@ void
 rlink_init_sentence() {
 	rlink_cSentence = rb_define_class_under( rlink_mLinkParser, "Sentence",
 	 	rb_cObject );
-	
+
 	rb_define_alloc_func( rlink_cSentence, rlink_sentence_s_alloc );
 
 	rb_define_method( rlink_cSentence, "initialize", rlink_sentence_init, 2 );