This commit was manufactured by cvs2svn to create tag 'php_5_3_0beta1'.

ext/enchant/config.w32

@@ -0,0 +1,16 @@
+// $Id$
+// vim:ft=javascript
+
+ARG_WITH("enchant", "Enchant Support", "no");
+
+if (PHP_ENCHANT == "yes") {
+	if (CHECK_HEADER_ADD_INCLUDE("enchant.h", "CFLAGS_ENCHANT", PHP_ENCHANT+ ";" + PHP_PHP_BUILD + "\\include\\enchant") &&
+			CHECK_HEADER_ADD_INCLUDE("glib.h", "CFLAGS_ENCHANT", PHP_ENCHANT+ ";" + PHP_PHP_BUILD + "\\include\\glib-2.0") &&
+			CHECK_LIB("libenchant.lib", "enchant", PHP_ENCHANT) ) {
+		EXTENSION("enchant", "enchant.c");
+		AC_DEFINE('HAVE_ENCHANT', 1, 'Have Enchant support', false);
+		ADD_FLAG("CFLAG_ENCHANT", "/D _WIN32");
+	} else {
+		WARNING('Could not find enchant.h; skipping');
+	}
+}

ext/enchant/enchant.c

@@ -0,0 +1,778 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 5                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2004 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.0 of the PHP license,       |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available at through the world-wide-web at                           |
+  | http://www.php.net/license/3_0.txt.                                  |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | license@php.net so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author: Pierre-Alain Joye <paj@pearfr.org>                           |
+  |         Ilia Alshanetsky <ilia@prohost.org>                          |
+  +----------------------------------------------------------------------+
+
+  $Id$
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if PHP_WIN32
+#include <glib/glist.h>
+#include <glib/ghash.h>
+#endif
+#include <enchant.h>
+#include "php.h"
+#include "php_ini.h"
+#include "ext/standard/info.h"
+#include "php_enchant.h"
+
+
+typedef EnchantBroker * EnchantBrokerPtr;
+typedef struct _broker_struct enchant_broker;
+typedef struct _dict_struct enchant_dict;
+
+typedef enchant_broker * enchant_brokerPtr;
+typedef enchant_dict * enchant_dictPtr;
+
+typedef struct _broker_struct {
+	EnchantBroker	*pbroker;
+	enchant_dict	**dict;
+	unsigned int	dictcnt;
+	long			rsrc_id;
+} _enchant_broker;
+
+typedef struct _dict_struct {
+	unsigned int	id;
+	EnchantDict		*pdict;
+	enchant_broker	*pbroker;
+	long			rsrc_id;
+	enchant_dict	*next;
+	enchant_dict	*prev;
+} _enchant_dict;
+
+
+/* True global resources - no need for thread safety here */
+static int le_enchant_broker;
+static int le_enchant_dict;
+
+/* If you declare any globals in php_enchant.h uncomment this:*/
+/*ZEND_DECLARE_MODULE_GLOBALS(enchant)*/
+
+/* {{{ enchant_functions[]
+ *
+ * Every user visible function must have an entry in enchant_functions[].
+ */
+function_entry enchant_functions[] = {
+	PHP_FE(enchant_broker_init, NULL)
+	PHP_FE(enchant_broker_free, NULL)
+	PHP_FE(enchant_broker_get_error, NULL)
+	PHP_FE(enchant_broker_list_dicts, NULL)
+	PHP_FE(enchant_broker_request_dict,	NULL)
+	PHP_FE(enchant_broker_request_pwl_dict, NULL)
+	PHP_FE(enchant_broker_free_dict, NULL)
+	PHP_FE(enchant_broker_dict_exists, NULL)
+	PHP_FE(enchant_broker_set_ordering, NULL)
+	PHP_FE(enchant_broker_describe, NULL)
+	PHP_FE(enchant_dict_check, NULL)
+	PHP_FE(enchant_dict_suggest, NULL)
+	PHP_FE(enchant_dict_add_to_personal, NULL)
+	PHP_FE(enchant_dict_add_to_session, NULL)
+	PHP_FE(enchant_dict_is_in_session, NULL)
+	PHP_FE(enchant_dict_store_replacement, NULL)
+	PHP_FE(enchant_dict_get_error, NULL)
+	PHP_FE(enchant_dict_describe, NULL)
+	PHP_FE(enchant_dict_quick_check, NULL)
+
+	{NULL, NULL, NULL}	/* Must be the last line in enchant_functions[] */
+};
+/* }}} */
+
+/* {{{ enchant_module_entry
+ */
+zend_module_entry enchant_module_entry = {
+#if ZEND_MODULE_API_NO >= 20010901
+	STANDARD_MODULE_HEADER,
+#endif
+	"enchant",
+	enchant_functions,
+	PHP_MINIT(enchant),
+	PHP_MSHUTDOWN(enchant),
+	NULL,	/* Replace with NULL if there's nothing to do at request start */
+	NULL,	/* Replace with NULL if there's nothing to do at request end */
+	PHP_MINFO(enchant),
+#if ZEND_MODULE_API_NO >= 20010901
+	PHP_ENCHANT_VERSION,
+#endif
+	STANDARD_MODULE_PROPERTIES
+};
+/* }}} */
+
+#ifdef COMPILE_DL_ENCHANT
+ZEND_GET_MODULE(enchant)
+#endif
+
+static void
+enumerate_providers_fn (const char * const name,
+                        const char * const desc,
+                        const char * const file,
+                        void * ud) /* {{{ */
+{
+	zval *zdesc = (zval *) ud;
+	zval *tmp_array;
+
+	MAKE_STD_ZVAL(tmp_array);
+	array_init(tmp_array);
+
+	add_assoc_string(tmp_array, "name", (char *)name, 1);
+	add_assoc_string(tmp_array, "desc", (char *)desc, 1);
+	add_assoc_string(tmp_array, "file", (char *)file, 1);
+
+	if (Z_TYPE_P(zdesc)!=IS_ARRAY) {
+		array_init(zdesc);
+	}
+
+	add_next_index_zval(zdesc, tmp_array);
+}
+/* }}} */
+
+static void
+describe_dict_fn (const char * const lang,
+                  const char * const name,
+                  const char * const desc,
+                  const char * const file,
+                  void * ud) /* {{{ */
+{
+	zval *zdesc = (zval *) ud;
+	array_init(zdesc);
+	add_assoc_string(zdesc, "lang", (char *)lang, 1);
+	add_assoc_string(zdesc, "name", (char *)name, 1);
+	add_assoc_string(zdesc, "desc", (char *)desc, 1);
+	add_assoc_string(zdesc, "file", (char *)file, 1);
+}
+/* }}} */
+
+static void php_enchant_list_dicts_fn( const char * const lang_tag,
+	   	const char * const provider_name, const char * const provider_desc,
+		const char * const provider_file, void * ud) /* {{{ */
+{
+	zval *zdesc = (zval *) ud;
+	zval *tmp_array;
+
+	MAKE_STD_ZVAL(tmp_array);
+	array_init(tmp_array);
+	add_assoc_string(tmp_array, "lang_tag", (char *)lang_tag, 1);
+	add_assoc_string(tmp_array, "provider_name", (char *)provider_name, 1);
+	add_assoc_string(tmp_array, "provider_desc", (char *)provider_desc, 1);
+	add_assoc_string(tmp_array, "provider_file", (char *)provider_file, 1);
+
+	if (Z_TYPE_P(zdesc) != IS_ARRAY) {
+		array_init(zdesc);
+	}
+	add_next_index_zval(zdesc, tmp_array);
+
+}
+/* }}} */
+
+static void php_enchant_broker_free(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+{
+	if (rsrc->ptr) {
+		enchant_broker *broker = (enchant_broker *)rsrc->ptr;
+		if (broker) {
+			if (broker->pbroker) {
+				if (broker->dictcnt && broker->dict) {
+					if (broker->dict) {
+						int total, tofree;
+						tofree = total = broker->dictcnt-1;
+						do {
+							zend_list_delete(broker->dict[total]->rsrc_id);
+							efree(broker->dict[total]);
+							total--;
+						} while (total>=0);
+					}
+					efree(broker->dict);
+					broker->dict = NULL;
+				}
+				enchant_broker_free(broker->pbroker);
+			}
+			efree(broker);
+		}
+	}
+}
+/* }}} */
+
+static void php_enchant_dict_free(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+
+{
+	if (rsrc->ptr) {
+		enchant_dict *pdict = (enchant_dict *)rsrc->ptr;
+		if (pdict) {
+			if (pdict->pdict && pdict->pbroker) {
+				enchant_broker_free_dict(pdict->pbroker->pbroker, pdict->pdict);
+				if (pdict->id) {
+					pdict->pbroker->dict[pdict->id-1]->next = NULL;
+				}
+				zend_list_delete(pdict->pbroker->rsrc_id);
+			}
+
+		}
+	}
+}
+/* }}} */
+
+/* {{{ PHP_MINIT_FUNCTION
+ */
+PHP_MINIT_FUNCTION(enchant)
+{
+	le_enchant_broker = zend_register_list_destructors_ex(php_enchant_broker_free, NULL, "enchant_broker", module_number);
+	le_enchant_dict = zend_register_list_destructors_ex(php_enchant_dict_free, NULL, "enchant_dict", module_number);
+
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(enchant)
+{
+	return SUCCESS;
+}
+/* }}} */
+
+static void __enumerate_providers_fn (const char * const name,
+                        const char * const desc,
+                        const char * const file,
+                        void * ud) /* {{{ */
+{
+	php_info_print_table_row(3, name, desc, file);
+}
+/* }}} */
+
+/* {{{ PHP_MINFO_FUNCTION
+ */
+PHP_MINFO_FUNCTION(enchant)
+{
+	EnchantBroker *pbroker;
+
+	pbroker = enchant_broker_init();
+	php_info_print_table_start();
+	php_info_print_table_header(2, "enchant support", "enabled");
+	php_info_print_table_row(2, "Version", PHP_ENCHANT_VERSION);
+	php_info_print_table_row(2, "Revision", "$Revision$");
+	php_info_print_table_end();
+
+	php_info_print_table_start();
+	enchant_broker_describe(pbroker, __enumerate_providers_fn, NULL);
+	php_info_print_table_end();
+	enchant_broker_free(pbroker);
+}
+/* }}} */
+
+#define PHP_ENCHANT_GET_BROKER	\
+	ZEND_FETCH_RESOURCE(pbroker, enchant_broker *, &broker, -1, "enchant_broker", le_enchant_broker);	\
+	if (!pbroker || !pbroker->pbroker) {	\
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", "Resource broker invalid");	\
+		RETURN_FALSE;	\
+	}
+
+#define PHP_ENCHANT_GET_DICT	\
+	ZEND_FETCH_RESOURCE(pdict, enchant_dict *, &dict, -1, "enchant_dict", le_enchant_dict);	\
+	if (!pdict || !pdict->pdict) {	\
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", "Invalid dictionary resource.");	\
+		RETURN_FALSE;	\
+	}
+
+/* {{{ proto resource enchant_broker_init()
+   create a new broker object capable of requesting */
+PHP_FUNCTION(enchant_broker_init)
+{
+	enchant_broker *broker;
+	EnchantBroker *pbroker;
+
+	if (ZEND_NUM_ARGS()) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	pbroker = enchant_broker_init();
+
+	if (pbroker) {
+		broker = (enchant_broker *) emalloc(sizeof(enchant_broker));
+		broker->pbroker = pbroker;
+		broker->dict = NULL;
+		broker->dictcnt = 0;
+		broker->rsrc_id = ZEND_REGISTER_RESOURCE(return_value, broker, le_enchant_broker);
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto boolean enchant_broker_free(resource broker)
+   Destroys the broker object and its dictionnaries */
+PHP_FUNCTION(enchant_broker_free)
+{
+	zval *broker;
+	enchant_broker *pbroker;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &broker) == FAILURE) {
+		RETURN_FALSE;
+	}
+	PHP_ENCHANT_GET_BROKER;
+
+	zend_list_delete(Z_RESVAL_P(broker));
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string enchant_broker_get_error(resource broker)
+   Returns the last error of the broker */
+PHP_FUNCTION(enchant_broker_get_error)
+{
+	zval *broker;
+	enchant_broker *pbroker;
+	char *msg;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &broker) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_BROKER;
+
+	msg = enchant_broker_get_error(pbroker->pbroker);
+	if (msg) {
+		RETURN_STRING((char *)msg, 1);
+	}
+	RETURN_FALSE;
+}
+/* }}} */
+
+/* {{{ proto string enchant_broker_list_dicts(resource broker)
+   Lists the dictionaries available for the given broker */
+PHP_FUNCTION(enchant_broker_list_dicts)
+{
+	zval *broker;
+	enchant_broker *pbroker;
+	EnchantDictDescribeFn describetozval = php_enchant_list_dicts_fn;
+
+	char *msg;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &broker) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_BROKER;
+
+	enchant_broker_list_dicts(pbroker->pbroker, php_enchant_list_dicts_fn, (void *)return_value);
+}
+/* }}} */
+
+/* {{{ proto resource enchant_broker_request_dict(resource broker, string tag)
+	create a new dictionary using tag, the non-empty language tag you wish to request
+	a dictionary for ("en_US", "de_DE", ...) */
+PHP_FUNCTION(enchant_broker_request_dict)
+{
+	zval *broker;
+	enchant_broker *pbroker;
+	enchant_dict *dict;
+	EnchantDict *d;
+	char *tag;
+	int taglen;
+	int pos;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &broker, &tag, &taglen) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_BROKER;
+
+	d = enchant_broker_request_dict(pbroker->pbroker, (const char *)tag);
+	if (d) {
+		if (pbroker->dictcnt) {
+			pbroker->dict = (enchant_dict **)erealloc(pbroker->dict, sizeof(enchant_dict *) * pbroker->dictcnt);
+			pos = pbroker->dictcnt++;
+		} else {
+			pbroker->dict = (enchant_dict **)emalloc(sizeof(enchant_dict *));
+			pos = 0;
+			pbroker->dictcnt++;
+		}
+
+		dict = pbroker->dict[pos] = (enchant_dict *)emalloc(sizeof(enchant_dict));
+		dict->id = pos;
+		dict->pbroker = pbroker;
+		dict->pdict = d;
+		dict->prev = pos ? pbroker->dict[pos-1] : NULL;
+		dict->next = NULL;
+		pbroker->dict[pos] = dict;
+
+		if (pos) {
+			pbroker->dict[pos-1]->next = dict;
+		}
+
+		dict->rsrc_id = ZEND_REGISTER_RESOURCE(return_value, dict, le_enchant_dict);
+		zend_list_addref(pbroker->rsrc_id);
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto resource enchant_broker_request_pwl_dict(resource broker, string filename)
+   creates a dictionary using a PWL file. A PWL file is personal word file one word per line. It must exist before the call.*/
+PHP_FUNCTION(enchant_broker_request_pwl_dict)
+{
+	zval *broker;
+	enchant_broker *pbroker;
+	enchant_dict *dict;
+	EnchantDict *d;
+	char *pwl;
+	int pwllen;
+	int pos;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &broker, &pwl, &pwllen) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	if (php_check_open_basedir(pwl TSRMLS_CC)) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_BROKER;
+
+	d = enchant_broker_request_pwl_dict(pbroker->pbroker, (const char *)pwl);
+	if (d) {
+		if (pbroker->dictcnt) {
+			pos = pbroker->dictcnt++;
+			pbroker->dict = (enchant_dict **)erealloc(pbroker->dict, sizeof(enchant_dict *) * pbroker->dictcnt);
+		} else {
+			pbroker->dict = (enchant_dict **)emalloc(sizeof(enchant_dict *));
+			pos = 0;
+			pbroker->dictcnt++;
+		}
+		dict = pbroker->dict[pos] = (enchant_dict *)emalloc(sizeof(enchant_dict));
+		dict->id = pos;
+		dict->pbroker = pbroker;
+		dict->pdict = d;
+		dict->prev = pos?pbroker->dict[pos-1]:NULL;
+		dict->next = NULL;
+		pbroker->dict[pos] = dict;
+		if (pos) {
+			pbroker->dict[pos-1]->next = dict;
+		}
+		dict->rsrc_id = ZEND_REGISTER_RESOURCE(return_value, dict, le_enchant_dict);
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto resource enchant_broker_free_dict(resource dict)
+   Free the dictionary resource */
+PHP_FUNCTION(enchant_broker_free_dict)
+{
+	zval *dict;
+	enchant_dict *pdict;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &dict) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_DICT;
+
+	zend_list_delete(Z_RESVAL_P(dict));
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool enchant_broker_dict_exists(resource broker, string tag)
+   Wether a dictionary exists or not. Using non-empty tag */
+PHP_FUNCTION(enchant_broker_dict_exists)
+{
+	zval *broker;
+	char *tag;
+	int taglen;
+	enchant_broker * pbroker;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &broker, &tag, &taglen) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_BROKER;
+
+	RETURN_BOOL(enchant_broker_dict_exists(pbroker->pbroker, tag));
+}
+/* }}} */
+
+/* {{{ proto bool enchant_broker_set_ordering(resource broker, string tag, string ordering)
+	Declares a preference of dictionaries to use for the language
+	described/referred to by 'tag'. The ordering is a comma delimited
+	list of provider names. As a special exception, the "*" tag can
+	be used as a language tag to declare a default ordering for any
+	language that does not explictly declare an ordering. */
+
+PHP_FUNCTION(enchant_broker_set_ordering)
+{
+	zval *broker;
+	char *pordering;
+	int porderinglen;
+	char *ptag;
+	int ptaglen;
+	enchant_broker * pbroker;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &broker, &ptag, &ptaglen, &pordering, &porderinglen) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_BROKER;
+
+	enchant_broker_set_ordering(pbroker->pbroker, ptag, pordering);
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto array enchant_broker_describe(resource broker)
+	Enumerates the Enchant providers and tells you some rudimentary information about them. The same info is provided through phpinfo() */
+PHP_FUNCTION(enchant_broker_describe)
+{
+	EnchantBrokerDescribeFn describetozval = enumerate_providers_fn;
+	zval *broker;
+	enchant_broker * pbroker;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &broker) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_BROKER;
+
+	enchant_broker_describe(pbroker->pbroker, describetozval, (void *)return_value);
+}
+/* }}} */
+
+/* {{{ proto bool enchant_dict_quick_check(resource dict, string word [, array &suggestions])
+    If the word is correctly spelled return true, otherwise return false, if suggestions variable
+    is provided, fill it with spelling alternatives. */
+PHP_FUNCTION(enchant_dict_quick_check)
+{
+	zval *dict, *sugg = NULL;
+	char *word;
+	int wordlen;
+	enchant_dict *pdict;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|z/", &dict, &word, &wordlen, &sugg) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	if (sugg) {
+		zval_dtor(sugg);
+	}
+
+	PHP_ENCHANT_GET_DICT;
+
+	if (enchant_dict_check(pdict->pdict, word, wordlen) > 0) {
+		int n_sugg;
+		char **suggs;
+
+		if (!sugg && ZEND_NUM_ARGS() == 2) {
+			RETURN_FALSE;
+		}
+
+		array_init(sugg);
+
+		suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, (size_t *) &n_sugg);
+		if (suggs && n_sugg) {
+			int i;
+			for (i = 0; i < n_sugg; i++) {
+				add_next_index_string(sugg, suggs[i], 1);
+			}
+			enchant_dict_free_suggestions(pdict->pdict, suggs);
+		}
+
+
+		RETURN_FALSE;
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool enchant_dict_check(resource dict, string word)
+    If the word is correctly spelled return true, otherwise return false */
+PHP_FUNCTION(enchant_dict_check)
+{
+	zval *dict;
+	char *word;
+	int wordlen;
+	enchant_dict *pdict;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dict, &word, &wordlen) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_DICT;
+
+	RETURN_BOOL(!enchant_dict_check(pdict->pdict, word, wordlen));
+}
+/* }}} */
+
+/* {{{ proto array enchant_dict_suggest(resource dict, string word)
+    Will return a list of values if any of those pre-conditions are not met.*/
+PHP_FUNCTION(enchant_dict_suggest)
+{
+	zval *dict;
+	char *word;
+	int wordlen;
+	char **suggs;
+	enchant_dict *pdict;
+	int n_sugg;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dict, &word, &wordlen) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_DICT;
+
+	suggs = enchant_dict_suggest(pdict->pdict, word, wordlen, (size_t *)&n_sugg);
+	if (suggs && n_sugg) {
+		int i;
+
+		array_init(return_value);
+		for (i = 0; i < n_sugg; i++) {
+			add_next_index_string(return_value, suggs[i], 1);
+		}
+
+		enchant_dict_free_suggestions(pdict->pdict, suggs);
+	}
+}
+/* }}} */
+
+/* {{{ proto void enchant_dict_add_to_personal(resource dict, string word)
+     add 'word' to personal word list */
+PHP_FUNCTION(enchant_dict_add_to_personal)
+{
+	zval *dict;
+	char *word;
+	int wordlen;
+	enchant_dict *pdict;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dict, &word, &wordlen) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_DICT;
+
+	enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
+}
+/* }}} */
+
+/* {{{ proto void enchant_dict_add_to_session(resource dict, string word)
+   add 'word' to this spell-checking session */
+PHP_FUNCTION(enchant_dict_add_to_session)
+{
+	zval *dict;
+	char *word;
+	int wordlen;
+	enchant_dict *pdict;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dict, &word, &wordlen) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_DICT;
+
+	enchant_dict_add_to_session(pdict->pdict, word, wordlen);
+}
+/* }}} */
+
+/* {{{ proto bool enchant_dict_is_in_session(resource dict, string word)
+   whether or not 'word' exists in this spelling-session */
+PHP_FUNCTION(enchant_dict_is_in_session)
+{
+	zval *dict;
+	char *word;
+	int wordlen;
+	enchant_dict *pdict;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dict, &word, &wordlen) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_DICT;
+
+	RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
+}
+/* }}} */
+
+/* {{{ proto void enchant_dict_store_replacement(resource dict, string mis, string cor)
+	add a correction for 'mis' using 'cor'.
+	Notes that you replaced @mis with @cor, so it's possibly more likely
+	that future occurrences of @mis will be replaced with @cor. So it might
+	bump @cor up in the suggestion list.*/
+PHP_FUNCTION(enchant_dict_store_replacement)
+{
+	zval *dict;
+	char *mis, *cor;
+	int mislen, corlen;
+
+	enchant_dict *pdict;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &dict, &mis, &mislen, &cor, &corlen) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_DICT;
+
+	enchant_dict_store_replacement(pdict->pdict, mis, mislen, cor, corlen);
+}
+/* }}} */
+
+/* {{{ proto string enchant_dict_get_error(resource dict)
+   Returns the last error of the current spelling-session */
+PHP_FUNCTION(enchant_dict_get_error)
+{
+	zval *dict;
+	enchant_dict *pdict;
+	char *msg;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &dict) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_DICT;
+
+	msg = enchant_dict_get_error(pdict->pdict);
+	if (msg) {
+		RETURN_STRING((char *)msg, 1);
+	}
+
+	RETURN_FALSE;
+}
+/* }}} */
+
+/* {{{ proto array enchant_dict_describe(resource dict)
+   Describes an individual dictionary 'dict' */
+PHP_FUNCTION(enchant_dict_describe)
+{
+	zval *dict;
+	enchant_dict *pdict;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &dict) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	PHP_ENCHANT_GET_DICT;
+
+	enchant_dict_describe(pdict->pdict, describe_dict_fn, (void *)return_value);
+}
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */