linkparser 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe7be4a20ae19bb237f43e9f2458f6652ab9e468d01c8b77b9851881bfc0a792
-  data.tar.gz: 47dec2c2c30e8aaafe3111942eb65d8f756fdc848113f180db4c0a19b4d934db
+  metadata.gz: 60a11d5f3a0362ec040bd6777b59dda5773119508f77fe17f958b98504da4145
+  data.tar.gz: ea70b44b2f4c7c70851b912644b644a648d9361ced1846897424226e741dd380
 SHA512:
-  metadata.gz: 335a182462b0ad75056b98a2a7ec7b82fabaa5a8e7e1b8e6b3a369a598cd6df8b255031d21643c77346f4266c9f60f4f6ed7fccdeb1115ba6b309f1fba4ddc76
-  data.tar.gz: 458569a866e76cab02ef4049761b2c2888c100d6edec6df4fc67ca83c7288237ad239749e1e8a44dd6ff1ca387a6241220d0ad5e12a405f61c25fb4c7780d13f
+  metadata.gz: fecdcab511f4b1ac9f8f7c6e882238e275127fb05d2380d39c889102e07141e37e990ee32dc77aed3f8773de41b7bd8da56031f425b47671b6db4f95cf4c583e
+  data.tar.gz: 53c2e99535d292f2b0a2e5d3b13e137846a1de39e2a6f8d9b2e5f7422a90308a9eac7ebe7e1cc896bac8bf58710d9d5356b5a148d454dfbf607e507dfba85b7b

data/History.md

@@ -1,3 +1,23 @@
+# Release History for linkparser
+
+---
+## v2.3.0 [2023-01-02] Michael Granger <ged@faeriemud.org>
+
+Enhancements:
+
+- Updated old-style function declarations, made some specs more flexible
+- Update deps, bump default Ruby to 3.2
+
+
+## v2.2.0 [2020-12-24] Michael Granger <ged@faeriemud.org>
+
+Enhancements:
+
+- Updated for Ruby 2.7
+- Add support for fetching the link-grammar config.
+- Updated for link-grammar 5.8.0.
+
+
 ## v2.1.0 [2018-01-10] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/README.md

@@ -1,6 +1,18 @@
 # linkparser
 
-* http://bitbucket.org/ged/linkparser
+home
+: https://hg.sr.ht/~ged/linkparser
+
+code
+: https://hg.sr.ht/~ged/linkparser/browse
+
+docs
+: http://deveiate.org/code/linkparser
+
+github
+: http://github.com/ged/linkparser
+
+
 
 ## Description
 
@@ -58,16 +70,21 @@ installed it somewhere that your linker doesn't look by default:
 ## Contributing
 
 You can check out the current development source
-[with Mercurial](http://repo.deveiate.org/LinkParser),
+[with Mercurial](https://hg.sr.ht/~ged/linkparser),
 or if you prefer Git, via
 [its Github mirror](http://github.com/ged/linkparser).
 
 After checking out the source, run:
 
-	$ rake newb
+    $ gen install -Ng
+    $ rake setup
+
+This will install any missing dependencies and do any neceesary developer setup.
+
+
+## Author(s)
 
-This task will install any missing dependencies, run the tests/specs,
-and generate the API documentation.
+- Michael Granger <ged@faeriemud.org>
 
 
 ## License
@@ -79,7 +96,7 @@ https://www.gnu.org/licenses/lgpl-2.1.html
 
 The gem itself is licensed under the BSD license:
 
-Copyright (c) 2006-2017, The FaerieMUD Consortium
+Copyright (c) 2006-2023, The FaerieMUD Consortium
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/ext/{dictionary.c → linkparser_ext/dictionary.c}

@@ -1,6 +1,6 @@
 /*
  *  dict.c - Ruby LinkParser - Dictionary Class
- *  $Id: dictionary.c,v b3d1301b7235 2017/12/12 01:12:42 ged $
+ *  $Id$
  *
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -21,7 +21,7 @@
  * Allocation function
  */
 static struct rlink_dictionary *
-rlink_dictionary_alloc()
+rlink_dictionary_alloc( void )
 {
 	struct rlink_dictionary *ptr = ALLOC( struct rlink_dictionary );
 
@@ -310,7 +310,7 @@ rlink_parse( int argc, VALUE *argv, VALUE self )
  *  file, and then creates all other objects through it.
  */
 void
-rlink_init_dict()
+rlink_init_dict( void )
 {
 #ifdef FOR_RDOC
 	rlink_mLinkParser = rb_define_module( "LinkParser" );

data/ext/{extconf.rb → linkparser_ext/extconf.rb}

@@ -36,6 +36,9 @@ have_func( 'dictionary_create_lang' )
 have_func( 'parse_options_get_spell_guess' )
 have_func( 'linkage_get_disjunct_str' )
 have_func( 'linkgrammar_get_version' )
+have_func( 'linkgrammar_get_configuration' )
+
+have_const( 'CORPUS' )
 
 create_header()
 create_makefile( 'linkparser_ext' )

data/ext/{linkage.c → linkparser_ext/linkage.c}

@@ -1,6 +1,6 @@
 /*
  *  linkage.c - Ruby LinkParser Linkage class
- *  $Id: linkage.c,v d90624702800 2018/01/10 22:38:26 ged $
+ *  $Id$
  *
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -28,7 +28,7 @@ VALUE max_width_sym;
  * Allocation function
  */
 static struct rlink_linkage *
-rlink_linkage_alloc()
+rlink_linkage_alloc( void )
 {
 	struct rlink_linkage *ptr = ALLOC( struct rlink_linkage );
 
@@ -136,20 +136,17 @@ rlink_linkage_s_alloc(  VALUE klass )
  *  the parse options of the Sentence for the new linkage.
  */
 static VALUE
-rlink_linkage_init( argc, argv, self )
-	int argc;
-	VALUE *argv;
-	VALUE self;
+rlink_linkage_init( int argc, VALUE *argv, VALUE self )
 {
 	if ( !check_linkage(self) ) {
-		int i, link_index, max_index;
+		int link_index, max_index;
 		VALUE index, sentence, options, defopts;
 		struct rlink_sentence *sent_ptr;
 		Linkage linkage;
 		Parse_Options opts;
 		struct rlink_linkage *ptr;
 
-		i = rb_scan_args( argc, argv, "21", &index, &sentence, &options );
+		rb_scan_args( argc, argv, "21", &index, &sentence, &options );
 
 		defopts = rb_hash_new(); /*rb_funcall( sentence, rb_intern("options"), 0 );*/
 		options = rlink_make_parse_options( defopts, options );
@@ -651,7 +648,7 @@ rlink_linkage_get_violation_name( VALUE self )
  *
  */
 void
-rlink_init_linkage()
+rlink_init_linkage( void )
 {
 	rlink_cLinkage = rb_define_class_under( rlink_mLinkParser, "Linkage", rb_cObject );
 

data/ext/{linkparser.c → linkparser_ext/linkparser.c}

@@ -1,6 +1,6 @@
 /*
  *  linkparser.c - Ruby LinkParser
- *  $Id: linkparser.c,v b3d1301b7235 2017/12/12 01:12:42 ged $
+ *  $Id$
  *
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -89,8 +89,8 @@ rlink_log( const char *level, const char *fmt, va_dcl )
  * library will have printed out the actual problem to stderr, and stderr is pointed
  * somewhere useful.
  */
-void
-rlink_raise_lp_error()
+_Noreturn void
+rlink_raise_lp_error( void )
 {
 	rb_raise( rlink_eLpError, "Unknown error" );
 }
@@ -128,11 +128,31 @@ rlink_link_grammar_version( VALUE self )
 }
 
 
+/*
+ *  call-seq:
+ *     LinkParser.link_grammar_config   -> string
+ *
+ *  Return the configuration used by the underlying link-grammar library.
+ *
+ */
+static VALUE
+rlink_link_grammar_config( VALUE self )
+{
+#ifdef HAVE_LINKGRAMMAR_GET_CONFIGURATION
+	const char *config = linkgrammar_get_configuration();
+	if ( !config ) rb_bug( "linkgrammar_get_configuration returned NULL pointer" );
+	return rb_str_new2( config );
+#else
+	return rb_str_new2( "Compiled with: " );
+#endif /* HAVE_LINKGRAMMAR_GET_CONFIGURATION */
+}
+
+
 /*
  * LinkParser extension init function
  */
 void
-Init_linkparser_ext()
+Init_linkparser_ext( void )
 {
 	rlink_mLinkParser = rb_define_module( "LinkParser" );
 
@@ -141,6 +161,8 @@ Init_linkparser_ext()
 
 	rb_define_singleton_method( rlink_mLinkParser, "link_grammar_version",
 		rlink_link_grammar_version, 0 );
+	rb_define_singleton_method( rlink_mLinkParser, "link_grammar_config",
+		rlink_link_grammar_config, 0 );
 
 	rlink_init_dict();
 	rlink_init_sentence();

data/ext/{linkparser.h → linkparser_ext/linkparser.h}

@@ -1,6 +1,6 @@
 /*
  *		linkparser.h - Ruby-LinkParser Header
- *		$Id: linkparser.h,v 85300de8d84c 2015/03/02 16:59:48 ged $
+ *		$Id$
  *
  *		Authors:
  *		  * Michael Granger <ged@FaerieMUD.org>

data/ext/{parseoptions.c → linkparser_ext/parseoptions.c}

@@ -1,6 +1,6 @@
 /*
  *  parseoptions.c - Ruby LinkParser::ParseOptions class
- *  $Id: parseoptions.c,v 92228378be38 2015/03/02 16:44:04 ged $
+ *  $Id$
  *
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -538,13 +538,22 @@ rlink_parseopts_set_cost_model_type( VALUE self, VALUE model_name )
 	if ( model_name == vdal_sym ) {
 		rlink_log_obj( self, "debug", "Selected the 'VDAL' cost model" );
 		model = VDAL;
-	} else if ( model_name == corpus_sym ) {
+	}
+#ifdef CORPUS
+	else if ( model_name == corpus_sym ) {
 		rlink_log_obj( self, "debug", "Selected the 'CORPUS' cost model" );
 		model = CORPUS;
-	} else {
+	}
+	else {
 		rb_raise( rb_eArgError, "Unknown cost model %s (expected either :vdal or :corpus).",
 			 RSTRING_PTR(rb_inspect( model_name )) );
 	}
+#else
+	else {
+		rb_raise( rb_eArgError, "Unknown cost model %s (this system supports only :vdal).",
+			 RSTRING_PTR(rb_inspect( model_name )) );
+	}
+#endif // CORPUS
 
 	rlink_log_obj( self, "info", "Setting the cost model to %s", model == VDAL ? "VDAL" : "CORPUS" );
 	parse_options_reset_resources( opts );
@@ -576,9 +585,11 @@ rlink_parseopts_get_cost_model_type( VALUE self )
 	case VDAL:
 		model_name = vdal_sym;
 		break;
+#ifdef CORPUS
 	case CORPUS:
 		model_name = corpus_sym;
 		break;
+#endif // CORPUS
 	default:
 		rb_bug( "Unhandled cost model type %d", model );
 	}
@@ -715,7 +726,7 @@ rlink_parseopts_reset_resources( VALUE self )
 
 
 void
-rlink_init_parseoptions()
+rlink_init_parseoptions( void )
 {
 	rlink_cParseOptions = rb_define_class_under( rlink_mLinkParser,
 		"ParseOptions", rb_cObject );

data/ext/{sentence.c → linkparser_ext/sentence.c}

@@ -1,6 +1,6 @@
 /*
  *  sentence.c - Ruby LinkParser
- *  $Id: sentence.c,v d90624702800 2018/01/10 22:38:26 ged $
+ *  $Id$
  *
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -30,7 +30,7 @@
  * Allocation function
  */
 static struct rlink_sentence *
-rlink_sentence_alloc()
+rlink_sentence_alloc( void )
 {
 	struct rlink_sentence *ptr = ALLOC( struct rlink_sentence );
 
@@ -459,7 +459,7 @@ rlink_sentence_disjunct_cost( VALUE self, VALUE i )
  *
  */
 void
-rlink_init_sentence()
+rlink_init_sentence( void )
 {
 	rlink_cSentence = rb_define_class_under( rlink_mLinkParser, "Sentence",
 		rb_cObject );

data/lib/linkparser/dictionary.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'linkparser' unless defined?( LinkParser )
 

data/lib/linkparser/linkage.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'yaml'
 

data/lib/linkparser/mixins.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 module LinkParser
 

data/lib/linkparser/parseoptions.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'linkparser' unless defined?( LinkParser )
 

data/lib/linkparser/sentence.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'linkparser' unless defined?( LinkParser )
 

data/lib/linkparser.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'loggability'
 
@@ -9,7 +9,7 @@ module LinkParser
 
 
 	# Release version
-	VERSION = '2.1.0'
+	VERSION = '2.3.0'
 
 
 	# Loggability API -- set up a logger
@@ -31,11 +31,11 @@ module LinkParser
 	end
 
 	require 'linkparser/mixins'
+
 	require 'linkparser/dictionary'
 	require 'linkparser/sentence'
 	require 'linkparser/linkage'
 	require 'linkparser/parseoptions'
 
-
 end # class LinkParser
 

data/spec/bugfixes_spec.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'helpers'
 

data/spec/helpers.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 # SimpleCov test coverage reporting; enable this using the :coverage rake task
 require 'simplecov' if ENV['COVERAGE']

data/spec/linkparser/dictionary_spec.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../helpers'
 

data/spec/linkparser/linkage_spec.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../helpers'
 
@@ -26,7 +26,7 @@ describe LinkParser::Linkage do
 			"    +--------------Xp--------------+\n",
 			"    +-------->WV------->+          |\n",
 			"    +---->Wd-----+      |          |\n",
-			"    |      +Ds**c+--Ss--+--Pa--+   +--RW--+\n",
+			"    |      +Ds**c+-Ss*s-+--Pa--+   +--RW--+\n",
 			"    |      |     |      |      |   |      |\n",
 			"LEFT-WALL the flag.n was.v-d wet.a . RIGHT-WALL\n",
 		)
@@ -49,7 +49,7 @@ describe LinkParser::Linkage do
 			"       LEFT-WALL      Xp            ----Xp-----  Xp              .\n",
 			" (m)   LEFT-WALL      hWV           >---WV---->  dWV             was.v-d\n",
 			" (m)   LEFT-WALL      hWd           >---Wd-----  Wd              flag.n\n",
-			" (m)   flag.n         Ss            ----Ss-----  Ss              was.v-d\n",
+			" (m)   flag.n         Ss*s          ----Ss*s---  Ss              was.v-d\n",
 			" (m)   the            D             ----Ds**c--  Ds**c           flag.n\n",
 			" (m)   was.v-d        Pa            ----Pa-----  Pa              wet.a\n",
 			"       .              RW            ----RW-----  RW              RIGHT-WALL\n",
@@ -133,7 +133,7 @@ describe LinkParser::Linkage do
 		expect( linkage.link_label(0) ).to eq( "Xp" )
 		expect( linkage.link_label(1) ).to eq( "WV" )
 		expect( linkage.link_label(2) ).to eq( "Wd" )
-		expect( linkage.link_label(3) ).to eq( "Ss" )
+		expect( linkage.link_label(3) ).to eq( "Ss*s" )
 		expect( linkage.link_label(4) ).to eq( "Ds**c" )
 		expect( linkage.link_label(5) ).to eq( "Pa" )
 		expect( linkage.link_label(6) ).to eq( "RW" )
@@ -146,7 +146,7 @@ describe LinkParser::Linkage do
 		expect( linkage.link_llabel(0) ).to eq( "Xp" )
 		expect( linkage.link_llabel(1) ).to eq( "hWV" )
 		expect( linkage.link_llabel(2) ).to eq( "hWd" )
-		expect( linkage.link_llabel(3) ).to eq( "Ss" )
+		expect( linkage.link_llabel(3) ).to eq( "Ss*s" )
 		expect( linkage.link_llabel(4) ).to eq( "D" )
 		expect( linkage.link_llabel(5) ).to eq( "Pa" )
 		expect( linkage.link_llabel(6) ).to eq( "RW" )
@@ -169,7 +169,8 @@ describe LinkParser::Linkage do
 
 
 	it "can return the number of domains for any link" do
-		expect( linkage.link_num_domains(0) ).to eq( 0 )
+		pending "are domains deprecated or something?"
+		expect( linkage.link_num_domains(0) ).to eq( -1 )
 		expect( linkage.link_num_domains(1) ).to eq( 1 )
 		expect( linkage.link_num_domains(2) ).to eq( 1 )
 		expect( linkage.link_num_domains(3) ).to eq( 1 )
@@ -182,6 +183,7 @@ describe LinkParser::Linkage do
 
 
 	it "can return the names of the domains of any of its links" do
+		pending "are domains deprecated or something?"
 		expect( linkage.link_domain_names(0) ).to be_an_instance_of( Array )
 		expect( linkage.link_domain_names(0) ).to be_empty
 
@@ -233,13 +235,13 @@ describe LinkParser::Linkage do
 	end
 
 
-	 #       LEFT-WALL      Xp      <---Xp---->  Xp        .
-	 # (m)   LEFT-WALL      WV      <---WV---->  WV        was.v-d
-	 # (m)   LEFT-WALL      Wd      <---Wd---->  Wd        flag.n
-	 # (m)   flag.n         Ss      <---Ss---->  Ss        was.v-d
-	 # (m)   the            D       <---Ds---->  Ds        flag.n
-	 # (m)   was.v-d        Pa      <---Pa---->  Pa        wet.a
-	 #       .              RW      <---RW---->  RW        RIGHT-WALL
+	#       LEFT-WALL      Xp            ----Xp-----  Xp              .
+	# (m)   LEFT-WALL      hWV           >---WV---->  dWV             was.v-d
+	# (m)   LEFT-WALL      hWd           >---Wd-----  Wd              flag.n
+	# (m)   flag.n         Ss*s          ----Ss*s---  Ss              was.v-d
+	# (m)   the            D             ----Ds**c--  Ds**c           flag.n
+	# (m)   was.v-d        Pa            ----Pa-----  Pa              wet.a
+	#       .              RW            ----RW-----  RW              RIGHT-WALL
 	it "contains link structs describing the linkage" do
 		expect( linkage.links ).to be_an_instance_of( Array )
 		expect( linkage.links.length ).to eq( 7 )
@@ -254,7 +256,7 @@ describe LinkParser::Linkage do
 		expect( linkage.links.last.label ).to eq( 'RW' )
 		expect( linkage.links[3].lword ).to eq( 'flag.n' )
 		expect( linkage.links[3].rword ).to eq( 'was.v-d' )
-		expect( linkage.links[3].label ).to eq( 'Ss' )
+		expect( linkage.links[3].label ).to eq( 'Ss*s' )
 	end
 
 
@@ -331,17 +333,18 @@ describe LinkParser::Linkage do
 
 
 	it "should know that it's not an imperative sentence" do
-		expect( linkage.imperative? ).to be_falsey()
+		expect( linkage ).to_not be_imperative()
 	end
 
 
 	context "from an imperative sentence" do
 
 		let( :text ) { "Go to the store!" }
+	  let( :linkage ) { sentence.linkages.find {|l| l.links.detect {|link| link.label == 'Wi' } } }
 
 
 		it "knows that it's an imperative sentence" do
-			expect( linkage.imperative? ).to be_truthy()
+			expect( linkage ).to be_imperative()
 		end
 
 

data/spec/linkparser/mixins_spec.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../helpers'
 

data/spec/linkparser/parseoptions_spec.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../helpers'
 
@@ -15,7 +15,7 @@ describe LinkParser::ParseOptions do
 	it "starts out with documented defaults" do
 		expect( opts.verbosity ).to eq( 1 )             # Docs say this is 0
 		expect( opts.linkage_limit ).to eq( 100 )       # Docs say this is 10000
-		expect( opts.disjunct_cost ).to eq( 2 )
+		expect( opts.disjunct_cost ).to eq( -10000 )    # Docs say this is 2.8
 		expect( opts.min_null_count ).to eq( 0 )
 		expect( opts.max_null_count ).to eq( 0 )
 		expect( opts.islands_ok? ).to eq( false )

data/spec/linkparser/sentence_spec.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../helpers'
 

data/spec/linkparser_spec.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'helpers'
 
@@ -13,5 +13,10 @@ describe LinkParser do
 		expect( LinkParser.link_grammar_version ).to match( /link-grammar-\d+\.\d+\.\d+/i )
 	end
 
+
+	it "knows what the configuration of the link-grammar library was" do
+		expect( LinkParser.link_grammar_config ).to match( /compiled with:/i )
+	end
+
 end