Hello community, here is the log from the commit of package link-grammar for openSUSE:Factory checked in at 2012-05-22 08:16:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/link-grammar (Old) and /work/SRC/openSUSE:Factory/.link-grammar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "link-grammar", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/link-grammar/link-grammar.changes 2012-05-07 22:48:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.link-grammar.new/link-grammar.changes 2012-05-22 08:16:35.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Apr 28 14:34:25 UTC 2012 - dims...@opensuse.org + +- Update to version 4.7.6: + + fast-match.c: unroll recursive call into loop. + + Fix accidental inclusion of internal header file from public + header file. +- Drop link-grammar-install-include.patch: No longer needed, as the + header is no longer referenced by the main header. + +------------------------------------------------------------------- Old: ---- link-grammar-4.7.5.tar.gz link-grammar-install-include.patch New: ---- link-grammar-4.7.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ link-grammar.spec ++++++ --- /var/tmp/diff_new_pack.Po5Inj/_old 2012-05-22 08:16:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Po5Inj/_new 2012-05-22 08:16:36.000000000 +0200 @@ -17,15 +17,13 @@ Name: link-grammar -Version: 4.7.5 +Version: 4.7.6 Release: 0 Summary: An English grammar checker License: BSD-3-Clause Group: Productivity/Text/Spell Url: http://www.abisource.com/projects/link-grammar/ -Source: http://www.abisource.com/downloads/link-grammar/4.7.5/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM link-grammar-install-include.patch vu...@opensuse.org -- Install additional header referenced by other headers (sent upstream by mail on 2012-04-26) -Patch0: link-grammar-install-include.patch +Source: http://www.abisource.com/downloads/link-grammar/4.7.6/%{name}-%{version}.tar.gz BuildRequires: aspell-devel BuildRequires: gcc-c++ BuildRequires: glibc-devel @@ -59,7 +57,6 @@ %prep %setup -q -%patch0 -p1 %build # --enable-sat-solver and --enable-corpus-stats are still at the prototype stage ++++++ link-grammar-4.7.5.tar.gz -> link-grammar-4.7.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/ChangeLog new/link-grammar-4.7.6/ChangeLog --- old/link-grammar-4.7.5/ChangeLog 2012-04-16 22:44:21.000000000 +0200 +++ new/link-grammar-4.7.6/ChangeLog 2012-04-26 19:15:14.000000000 +0200 @@ -1,3 +1,7 @@ +Version 4.7.6 (26 April 2012) + * fast-match.c: unroll recursive call into loop (thx Valery Kholodkov). + * Fix accidental inclusion of internal header file from public header file. + Version 4.7.5 (16 April 2012) * Remove several duplicate given names. * Remove malloc-dbg.c from the MSVC9 project file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/README new/link-grammar-4.7.6/README --- old/link-grammar-4.7.5/README 2012-04-16 20:37:05.000000000 +0200 +++ new/link-grammar-4.7.6/README 2012-04-26 19:18:36.000000000 +0200 @@ -1,7 +1,7 @@ Link Grammar Parser ------------------- - Version 4.7.5 + Version 4.7.6 The Link Grammar Parser implements the Sleator/Temperley/Lafferty theory of natural language parsing. This version of the parser is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/configure new/link-grammar-4.7.6/configure --- old/link-grammar-4.7.5/configure 2012-04-16 22:46:06.000000000 +0200 +++ new/link-grammar-4.7.6/configure 2012-04-26 19:20:59.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for link-grammar 4.7.5. +# Generated by GNU Autoconf 2.68 for link-grammar 4.7.6. # # Report bugs to <link-gram...@googlegroups.com>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='link-grammar' PACKAGE_TARNAME='link-grammar' -PACKAGE_VERSION='4.7.5' -PACKAGE_STRING='link-grammar 4.7.5' +PACKAGE_VERSION='4.7.6' +PACKAGE_STRING='link-grammar 4.7.6' PACKAGE_BUGREPORT='link-gram...@googlegroups.com' PACKAGE_URL='' @@ -1371,7 +1371,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures link-grammar 4.7.5 to adapt to many kinds of systems. +\`configure' configures link-grammar 4.7.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1441,7 +1441,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of link-grammar 4.7.5:";; + short | recursive ) echo "Configuration of link-grammar 4.7.6:";; esac cat <<\_ACEOF @@ -1585,7 +1585,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -link-grammar configure 4.7.5 +link-grammar configure 4.7.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2142,7 +2142,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by link-grammar $as_me 4.7.5, which was +It was created by link-grammar $as_me 4.7.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2494,7 +2494,7 @@ PACKAGE=link-grammar LINK_MAJOR_VERSION=4 LINK_MINOR_VERSION=7 -LINK_MICRO_VERSION=5 +LINK_MICRO_VERSION=6 MAJOR_VERSION_PLUS_MINOR_VERSION=`expr $LINK_MAJOR_VERSION + $LINK_MINOR_VERSION` VERSION=$LINK_MAJOR_VERSION.$LINK_MINOR_VERSION.$LINK_MICRO_VERSION VERSION_INFO=$MAJOR_VERSION_PLUS_MINOR_VERSION:$LINK_MICRO_VERSION:$LINK_MINOR_VERSION @@ -2971,7 +2971,7 @@ # Define the identity of the package. PACKAGE='link-grammar' - VERSION='4.7.5' + VERSION='4.7.6' cat >>confdefs.h <<_ACEOF @@ -17647,7 +17647,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by link-grammar $as_me 4.7.5, which was +This file was extended by link-grammar $as_me 4.7.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17704,7 +17704,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -link-grammar config.status 4.7.5 +link-grammar config.status 4.7.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/configure.in new/link-grammar-4.7.6/configure.in --- old/link-grammar-4.7.5/configure.in 2012-04-16 22:43:40.000000000 +0200 +++ new/link-grammar-4.7.6/configure.in 2012-04-26 19:17:32.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(link-grammar, 4.7.5, link-gram...@googlegroups.com) +AC_INIT(link-grammar, 4.7.6, link-gram...@googlegroups.com) dnl Set release number dnl This is derived from "Versioning" chapter of info libtool documentation. @@ -11,7 +11,7 @@ dnl 3) Increment when interfaces not changed at all, dnl only bug fixes or internal changes made. dnl 4b) Set to zero when adding, removing or changing interfaces. -LINK_MICRO_VERSION=5 +LINK_MICRO_VERSION=6 dnl dnl Set this too MAJOR_VERSION_PLUS_MINOR_VERSION=`expr $LINK_MAJOR_VERSION + $LINK_MINOR_VERSION` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/data/en/4.0.dict new/link-grammar-4.7.6/data/en/4.0.dict --- old/link-grammar-4.7.5/data/en/4.0.dict 2012-04-16 22:51:38.000000000 +0200 +++ new/link-grammar-4.7.6/data/en/4.0.dict 2012-04-26 19:18:22.000000000 +0200 @@ -9,8 +9,8 @@ % % %***************************************************************************% -% Dictionary version number is 4.7.5 (formatted as V4v7v5+) -<dictionary-version-number>: V4v7v5+; +% Dictionary version number is 4.7.6 (formatted as V4v7v6+) +<dictionary-version-number>: V4v7v6+; % _ORGANIZATION OF THE DICTIONARY_ % diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/data/en/4.0.dict.m4 new/link-grammar-4.7.6/data/en/4.0.dict.m4 --- old/link-grammar-4.7.5/data/en/4.0.dict.m4 2012-04-16 22:51:25.000000000 +0200 +++ new/link-grammar-4.7.6/data/en/4.0.dict.m4 2012-04-26 19:18:08.000000000 +0200 @@ -18,8 +18,8 @@ % % %***************************************************************************% -% Dictionary version number is 4.7.5 (formatted as V4v7v5+) -<dictionary-version-number>: V4v7v5+; +% Dictionary version number is 4.7.6 (formatted as V4v7v6+) +<dictionary-version-number>: V4v7v6+; % _ORGANIZATION OF THE DICTIONARY_ % diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/analyze-linkage.c new/link-grammar-4.7.6/link-grammar/analyze-linkage.c --- old/link-grammar-4.7.5/link-grammar/analyze-linkage.c 2011-12-07 05:04:17.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/analyze-linkage.c 2012-04-26 18:27:56.000000000 +0200 @@ -13,7 +13,7 @@ #include <stdarg.h> -#include <link-grammar/api.h> +#include "api.h" /** * The functions in this file do several things: () take a linkage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/and.c new/link-grammar-4.7.6/link-grammar/and.c --- old/link-grammar-4.7.5/link-grammar/and.c 2011-12-07 05:12:57.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/and.c 2012-04-26 18:27:29.000000000 +0200 @@ -11,7 +11,7 @@ /* */ /*************************************************************************/ -#include <link-grammar/api.h> +#include "api.h" #include "disjunct-utils.h" /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/api-structures.h new/link-grammar-4.7.6/link-grammar/api-structures.h --- old/link-grammar-4.7.5/link-grammar/api-structures.h 2011-12-07 05:00:45.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/api-structures.h 2012-04-26 18:24:55.000000000 +0200 @@ -11,9 +11,15 @@ /* */ /*************************************************************************/ +/* This file is somewhat misnamed, as everything here defines the + * link-private, internal-use-only "api", which is subject to change + * from revision to revision. No external code should link to this + * stuff. + */ + /***************************************************************************** * -* NOTE: There are five basic "types" in the link parser API. These are: +* NOTE: There are five basic "types" used within the link parser. These are: * * Dictionary, Parse_Options, Sentence, Linkage, PostProcessor * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/api-types.h new/link-grammar-4.7.6/link-grammar/api-types.h --- old/link-grammar-4.7.5/link-grammar/api-types.h 2011-12-07 05:00:34.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/api-types.h 2012-04-26 18:23:17.000000000 +0200 @@ -11,6 +11,12 @@ /* */ /*************************************************************************/ +/* This file is somewhat misnamed, as everything here defines the + * link-private, internal-use-only "api", which is subject to change + * from revision to revision. No external code should link to this + * stuff. + */ + #ifndef _API_TYPES_H_ #define _API_TYPES_H_ @@ -25,13 +31,7 @@ #define MAX_LINKS (2*MAX_SENTENCE-3) /* maximum number of links allowed */ -/* "public" typedefs */ -typedef enum -{ - VDAL=1, /* Sort by Violations, Disjunct cost, And cost, Link cost */ - CORPUS, /* Sort by Corpus cost */ -} Cost_Model_type; - +/* Widely used private typedefs */ typedef struct And_data_s And_data; typedef struct Connector_struct Connector; typedef struct Cost_Model_s Cost_Model; @@ -49,7 +49,7 @@ typedef struct Resources_s * Resources; typedef struct Sublinkage_s Sublinkage; -/* Some private typedefs */ +/* Some of the more obscure typedefs */ typedef char Boolean; typedef struct analyze_context_s analyze_context_t; typedef struct count_context_s count_context_t; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/api.c new/link-grammar-4.7.6/link-grammar/api.c --- old/link-grammar-4.7.5/link-grammar/api.c 2011-06-20 17:58:52.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/api.c 2012-04-26 18:28:32.000000000 +0200 @@ -15,7 +15,7 @@ #include <limits.h> #include <math.h> #include <string.h> -#include <link-grammar/api.h> +#include "api.h" #include "disjuncts.h" #include "error.h" #include "preparation.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/api.h new/link-grammar-4.7.6/link-grammar/api.h --- old/link-grammar-4.7.5/link-grammar/api.h 2011-12-07 05:01:45.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/api.h 2012-04-26 18:26:12.000000000 +0200 @@ -31,35 +31,35 @@ #define link_private #endif -#include <link-grammar/structures.h> -#include <link-grammar/link-includes.h> -#include <link-grammar/api-structures.h> -#include <link-grammar/externs.h> +#include "structures.h" +#include "link-includes.h" +#include "api-structures.h" +#include "externs.h" -#include <link-grammar/analyze-linkage.h> -#include <link-grammar/and.h> -#include <link-grammar/build-disjuncts.h> -#include <link-grammar/constituents.h> -#include <link-grammar/count.h> -#include <link-grammar/error.h> -#include <link-grammar/extract-links.h> -#include <link-grammar/fast-match.h> -#include <link-grammar/idiom.h> -#include <link-grammar/massage.h> -#include <link-grammar/post-process.h> -#include <link-grammar/pp_knowledge.h> -#include <link-grammar/pp_lexer.h> -#include <link-grammar/pp_linkset.h> -#include <link-grammar/preparation.h> -#include <link-grammar/print.h> -#include <link-grammar/print-util.h> -#include <link-grammar/prune.h> -#include <link-grammar/read-dict.h> -#include <link-grammar/resources.h> -#include <link-grammar/string-set.h> -#include <link-grammar/tokenize.h> -#include <link-grammar/utilities.h> -#include <link-grammar/word-file.h> -#include <link-grammar/word-utils.h> +#include "analyze-linkage.h" +#include "and.h" +#include "build-disjuncts.h" +#include "constituents.h" +#include "count.h" +#include "error.h" +#include "extract-links.h" +#include "fast-match.h" +#include "idiom.h" +#include "massage.h" +#include "post-process.h" +#include "pp_knowledge.h" +#include "pp_lexer.h" +#include "pp_linkset.h" +#include "preparation.h" +#include "print.h" +#include "print-util.h" +#include "prune.h" +#include "read-dict.h" +#include "resources.h" +#include "string-set.h" +#include "tokenize.h" +#include "utilities.h" +#include "word-file.h" +#include "word-utils.h" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/build-disjuncts.c new/link-grammar-4.7.6/link-grammar/build-disjuncts.c --- old/link-grammar-4.7.5/link-grammar/build-disjuncts.c 2011-02-13 05:09:01.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/build-disjuncts.c 2012-04-26 18:29:35.000000000 +0200 @@ -14,7 +14,7 @@ /* stuff for transforming a dictionary entry into a disjunct list */ #include <math.h> -#include <link-grammar/api.h> +#include "api.h" #include "disjunct-utils.h" #include "utilities.h" /* For Win32 compatibility features */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/command-line.c new/link-grammar-4.7.6/link-grammar/command-line.c --- old/link-grammar-4.7.5/link-grammar/command-line.c 2011-02-20 18:19:27.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/command-line.c 2012-04-26 19:05:00.000000000 +0200 @@ -14,8 +14,10 @@ #include <wchar.h> #include <wctype.h> -#include <link-grammar/api.h> -#include "utilities.h" // For MSWindows portability +#include <link-grammar/link-includes.h> + +#include "read-dict.h" /* For non-public dict_display_word_info */ +#include "utilities.h" /* For MSWindows portability */ static struct { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/command-line.h new/link-grammar-4.7.6/link-grammar/command-line.h --- old/link-grammar-4.7.5/link-grammar/command-line.h 2009-03-02 19:02:24.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/command-line.h 2012-04-26 18:58:17.000000000 +0200 @@ -11,5 +11,5 @@ /* */ /*************************************************************************/ - +int issue_special_command(const char * line, Parse_Options opts, Dictionary dict); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/constituents.c new/link-grammar-4.7.6/link-grammar/constituents.c --- old/link-grammar-4.7.5/link-grammar/constituents.c 2011-12-07 05:35:08.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/constituents.c 2012-04-26 18:30:10.000000000 +0200 @@ -13,7 +13,7 @@ #include <stdarg.h> #include <string.h> -#include <link-grammar/api.h> +#include "api.h" #include "error.h" #include "constituents.h" #include "post-process.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/count.c new/link-grammar-4.7.6/link-grammar/count.c --- old/link-grammar-4.7.5/link-grammar/count.c 2011-12-07 05:52:06.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/count.c 2012-04-26 18:30:24.000000000 +0200 @@ -11,7 +11,7 @@ /* */ /*************************************************************************/ -#include <link-grammar/api.h> +#include "api.h" #include "disjunct-utils.h" /* This file contains the exhaustive search algorithm. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/error.c new/link-grammar-4.7.6/link-grammar/error.c --- old/link-grammar-4.7.5/link-grammar/error.c 2011-05-29 19:16:21.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/error.c 2012-04-26 18:31:21.000000000 +0200 @@ -16,10 +16,6 @@ #include <string.h> #include <stdarg.h> -#ifdef USE_PTHREADS -#include <pthread.h> -#endif - #include "error.h" #include "structures.h" #include "api-structures.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/extract-links.c new/link-grammar-4.7.6/link-grammar/extract-links.c --- old/link-grammar-4.7.5/link-grammar/extract-links.c 2011-02-13 19:28:31.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/extract-links.c 2012-04-26 18:32:13.000000000 +0200 @@ -12,7 +12,7 @@ /* */ /*************************************************************************/ -#include <link-grammar/api.h> +#include "api.h" /** * The first thing we do is we build a data structure to represent the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/fast-match.c new/link-grammar-4.7.6/link-grammar/fast-match.c --- old/link-grammar-4.7.5/link-grammar/fast-match.c 2011-02-11 04:29:39.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/fast-match.c 2012-04-26 18:32:26.000000000 +0200 @@ -11,7 +11,7 @@ /* */ /**************************************************************************/ -#include <link-grammar/api.h> +#include "api.h" #include "fast-match.h" /** @@ -131,14 +131,28 @@ */ static Match_node * add_to_right_table_list(Match_node * m, Match_node * l) { + Match_node *p, *prev; + if (l == NULL) return m; + + /* Insert m at head of list */ if ((m->d->right->word) <= (l->d->right->word)) { m->next = l; return m; - } else { - l->next = add_to_right_table_list(m, l->next); - return l; } + + /* Walk list to insertion point */ + prev = l; + p = prev->next; + while (p != NULL && ((m->d->right->word) > (p->d->right->word))) { + prev = p; + p = p->next; + } + + m->next = p; + prev->next = m; + + return l; /* return pointer to original head */ } /** @@ -148,19 +162,33 @@ */ static Match_node * add_to_left_table_list(Match_node * m, Match_node * l) { - if (l==NULL) return m; + Match_node *p, *prev; + + if (l == NULL) return m; + + /* Insert m at head of list */ if ((m->d->left->word) >= (l->d->left->word)) { m->next = l; return m; - } else { - l->next = add_to_left_table_list(m, l->next); - return l; } + + /* Walk list to insertion point */ + prev = l; + p = prev->next; + while (p != NULL && ((m->d->left->word) < (p->d->left->word))) { + prev = p; + p = p->next; + } + + m->next = p; + prev->next = m; + + return l; /* return pointer to original head */ } /** * The disjunct d (whose left or right pointer points to c) is put - * into the appropriate hash table + * into the appropriate hash table * dir = 1, we're putting this into a right table. * dir = -1, we're putting this into a left table. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/idiom.c new/link-grammar-4.7.6/link-grammar/idiom.c --- old/link-grammar-4.7.5/link-grammar/idiom.c 2011-12-07 05:13:49.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/idiom.c 2012-04-26 18:32:37.000000000 +0200 @@ -11,7 +11,7 @@ /* */ /*************************************************************************/ -#include <link-grammar/api.h> +#include "api.h" #include "error.h" /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/link-features.h new/link-grammar-4.7.6/link-grammar/link-features.h --- old/link-grammar-4.7.5/link-grammar/link-features.h 2012-04-16 22:46:17.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/link-features.h 2012-04-26 19:22:55.000000000 +0200 @@ -30,8 +30,8 @@ #define LINK_MAJOR_VERSION 4 #define LINK_MINOR_VERSION 7 -#define LINK_MICRO_VERSION 5 +#define LINK_MICRO_VERSION 6 -#define LINK_VERSION_STRING "4.7.5" +#define LINK_VERSION_STRING "4.7.6" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/link-includes.h new/link-grammar-4.7.6/link-grammar/link-includes.h --- old/link-grammar-4.7.5/link-grammar/link-includes.h 2011-12-07 05:11:30.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/link-includes.h 2012-04-26 18:09:23.000000000 +0200 @@ -13,7 +13,6 @@ #ifndef _LINKINCLUDESH_ #define _LINKINCLUDESH_ -#include <link-grammar/api-types.h> #include <link-grammar/link-features.h> LINK_BEGIN_DECLS @@ -70,6 +69,12 @@ * ***********************************************************************/ +typedef enum +{ + VDAL=1, /* Sort by Violations, Disjunct cost, And cost, Link cost */ + CORPUS, /* Sort by Corpus cost */ +} Cost_Model_type; + typedef struct Parse_Options_s * Parse_Options; link_public_api(Parse_Options) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/link-parser.c new/link-grammar-4.7.6/link-grammar/link-parser.c --- old/link-grammar-4.7.5/link-grammar/link-parser.c 2011-02-13 03:21:15.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/link-parser.c 2012-04-26 18:57:24.000000000 +0200 @@ -43,6 +43,7 @@ /* Used for terminal resizing */ #ifndef _WIN32 +#include <langinfo.h> #include <termios.h> #include <sys/ioctl.h> #include <fcntl.h> @@ -58,12 +59,25 @@ #endif #include <link-grammar/link-includes.h> -#include <link-grammar/structures.h> -#include <link-grammar/error.h> #include "command-line.h" #include "expand.h" +#ifndef FALSE +#define FALSE 0 +#endif + +#ifndef TRUE +#define TRUE 1 +#endif + +#if !defined(MIN) +#define MIN(X,Y) ( ((X) < (Y)) ? (X) : (Y)) +#endif +#if !defined(MAX) +#define MAX(X,Y) ( ((X) > (Y)) ? (X) : (Y)) +#endif + #define MAX_INPUT 1024 #define DISPLAY_MAX 1024 #define COMMENT_CHAR '%' /* input lines beginning with this are ignored */ @@ -459,7 +473,7 @@ { parse_options_set_disjunct_costf(opts, 3.0f); parse_options_set_min_null_count(opts, 1); - parse_options_set_max_null_count(opts, MAX_SENTENCE); + parse_options_set_max_null_count(opts, 100); parse_options_set_max_parse_time(opts, 60); parse_options_set_use_fat_links(opts, 0); parse_options_set_islands_ok(opts, 1); @@ -750,6 +764,10 @@ #endif /* Try using a larger list of disjuncts */ + /* XXX fixme: the lg_expand_disjunct_list() routine is not + * currently a part of the public API; it should be made so, + * or this expansion idea should be abandoned... not sure which. + */ if ((num_linkages == 0) && parse_options_get_use_cluster_disjuncts(opts)) { int expanded; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/massage.c new/link-grammar-4.7.6/link-grammar/massage.c --- old/link-grammar-4.7.5/link-grammar/massage.c 2011-02-13 05:08:45.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/massage.c 2012-04-26 18:33:14.000000000 +0200 @@ -11,7 +11,7 @@ /* */ /*************************************************************************/ -#include <link-grammar/api.h> +#include "api.h" #include "disjunct-utils.h" /* This file contains the functions for massaging disjuncts of the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/post-process.c new/link-grammar-4.7.6/link-grammar/post-process.c --- old/link-grammar-4.7.5/link-grammar/post-process.c 2011-06-19 23:29:59.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/post-process.c 2012-04-26 18:33:30.000000000 +0200 @@ -15,7 +15,7 @@ #include <stdarg.h> #include <memory.h> -#include <link-grammar/api.h> +#include "api.h" #include "post-process.h" #include "error.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/pp_knowledge.c new/link-grammar-4.7.6/link-grammar/pp_knowledge.c --- old/link-grammar-4.7.5/link-grammar/pp_knowledge.c 2011-06-19 22:58:16.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/pp_knowledge.c 2012-04-26 18:33:44.000000000 +0200 @@ -19,7 +19,7 @@ pp_lexer.h ***********************************************************************/ -#include <link-grammar/api.h> +#include "api.h" #include "error.h" #include "utilities.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/pp_lexer.c new/link-grammar-4.7.6/link-grammar/pp_lexer.c --- old/link-grammar-4.7.5/link-grammar/pp_lexer.c 2009-08-31 00:24:02.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/pp_lexer.c 2012-04-26 18:34:02.000000000 +0200 @@ -508,7 +508,7 @@ **************************************************************************/ #include <stdarg.h> -#include <link-grammar/api.h> +#include "api.h" #undef yywrap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/pp_linkset.c new/link-grammar-4.7.6/link-grammar/pp_linkset.c --- old/link-grammar-4.7.5/link-grammar/pp_linkset.c 2011-06-19 22:59:10.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/pp_linkset.c 2012-04-26 18:34:13.000000000 +0200 @@ -21,7 +21,7 @@ #include <memory.h> -#include <link-grammar/api.h> +#include "api.h" #define LINKSET_SPARSENESS 2 #define LINKSET_SEED_VALUE 37 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/preparation.c new/link-grammar-4.7.6/link-grammar/preparation.c --- old/link-grammar-4.7.5/link-grammar/preparation.c 2011-02-11 03:29:10.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/preparation.c 2012-04-26 18:34:28.000000000 +0200 @@ -11,7 +11,7 @@ /* */ /*************************************************************************/ -#include <link-grammar/api.h> +#include "api.h" #include "disjunct-utils.h" void free_deletable(Sentence sent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/print-util.c new/link-grammar-4.7.6/link-grammar/print-util.c --- old/link-grammar-4.7.5/link-grammar/print-util.c 2009-04-18 21:47:58.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/print-util.c 2012-04-26 18:34:49.000000000 +0200 @@ -12,7 +12,7 @@ /*************************************************************************/ #include <stdarg.h> -#include <link-grammar/api.h> +#include "api.h" #include "utilities.h" /* This is a "safe" append function, used here to build up a link diagram diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/print.c new/link-grammar-4.7.6/link-grammar/print.c --- old/link-grammar-4.7.5/link-grammar/print.c 2011-06-19 22:17:34.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/print.c 2012-04-26 18:34:39.000000000 +0200 @@ -13,7 +13,7 @@ #include <stdarg.h> -#include <link-grammar/api.h> +#include "api.h" #include "corpus/corpus.h" const char * trailer(int mode); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/prune.c new/link-grammar-4.7.6/link-grammar/prune.c --- old/link-grammar-4.7.5/link-grammar/prune.c 2011-02-13 05:09:39.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/prune.c 2012-04-26 18:35:01.000000000 +0200 @@ -11,7 +11,7 @@ /* */ /*************************************************************************/ -#include <link-grammar/api.h> +#include "api.h" #include "disjunct-utils.h" #define CONTABSZ 8192 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/read-dict.c new/link-grammar-4.7.6/link-grammar/read-dict.c --- old/link-grammar-4.7.5/link-grammar/read-dict.c 2011-04-12 06:24:10.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/read-dict.c 2012-04-26 19:27:57.000000000 +0200 @@ -15,7 +15,7 @@ #include <string.h> #include <wchar.h> #include <wctype.h> -#include <link-grammar/api.h> +#include "api.h" #include "disjunct-utils.h" #include "error.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/read-dict.h new/link-grammar-4.7.6/link-grammar/read-dict.h --- old/link-grammar-4.7.5/link-grammar/read-dict.h 2008-12-17 23:11:46.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/read-dict.h 2012-04-26 19:04:41.000000000 +0200 @@ -11,6 +11,8 @@ /* */ /*************************************************************************/ +#include "api-types.h" + int read_dictionary(Dictionary dict); void dict_display_word_info(Dictionary dict, const char * s); void dict_display_word_expr(Dictionary dict, const char * s); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/resources.c new/link-grammar-4.7.6/link-grammar/resources.c --- old/link-grammar-4.7.5/link-grammar/resources.c 2011-05-29 05:17:53.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/resources.c 2012-04-26 18:36:53.000000000 +0200 @@ -11,7 +11,6 @@ /* */ /*************************************************************************/ -#include <link-grammar/api.h> #include <time.h> #if !defined(_WIN32) @@ -37,6 +36,8 @@ /* Declaration missing from sys/resource.h in sun operating systems (?) */ #endif /* __sun__ */ +#include "api.h" + #define MAX_PARSE_TIME_UNLIMITED -1 #define MAX_MEMORY_UNLIMITED ((size_t) -1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/string-set.c new/link-grammar-4.7.6/link-grammar/string-set.c --- old/link-grammar-4.7.5/link-grammar/string-set.c 2011-06-02 05:51:37.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/string-set.c 2012-04-26 18:37:12.000000000 +0200 @@ -11,7 +11,7 @@ /* */ /*************************************************************************/ -#include <link-grammar/api.h> +#include "api.h" /** * Suppose you have a program that generates strings and keeps pointers to them. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/utilities.c new/link-grammar-4.7.6/link-grammar/utilities.c --- old/link-grammar-4.7.5/link-grammar/utilities.c 2011-12-07 05:18:17.000000000 +0100 +++ new/link-grammar-4.7.6/link-grammar/utilities.c 2012-04-26 18:37:47.000000000 +0200 @@ -12,7 +12,6 @@ /* */ /*************************************************************************/ -#include <link-grammar/api.h> #include <limits.h> #include <locale.h> #include <stdlib.h> @@ -23,7 +22,7 @@ #include <pthread.h> #endif - +#include "api.h" #ifdef ENABLE_BINRELOC #include "prefix.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/word-file.c new/link-grammar-4.7.6/link-grammar/word-file.c --- old/link-grammar-4.7.5/link-grammar/word-file.c 2009-04-14 23:05:13.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/word-file.c 2012-04-26 18:38:07.000000000 +0200 @@ -13,7 +13,7 @@ #include <wchar.h> #include <wctype.h> -#include <link-grammar/api.h> +#include "api.h" #include "error.h" /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar/word-utils.c new/link-grammar-4.7.6/link-grammar/word-utils.c --- old/link-grammar-4.7.5/link-grammar/word-utils.c 2011-05-29 18:39:17.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar/word-utils.c 2012-04-26 18:38:18.000000000 +0200 @@ -17,7 +17,7 @@ #include <math.h> #include <stdio.h> -#include <link-grammar/api.h> +#include "api.h" #include "disjunct-utils.h" #include "word-utils.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/link-grammar-4.7.5/link-grammar.spec new/link-grammar-4.7.6/link-grammar.spec --- old/link-grammar-4.7.5/link-grammar.spec 2012-04-16 22:46:17.000000000 +0200 +++ new/link-grammar-4.7.6/link-grammar.spec 2012-04-26 19:22:55.000000000 +0200 @@ -1,5 +1,5 @@ %define name link-grammar -%define version 4.7.5 +%define version 4.7.6 %define release 1 Summary: A Natural Language Parser based on Link Grammar Theory -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
