@@ -27,7 +27,7 @@ Datumspell_lexize(PG_FUNCTION_ARGS);
2727static void
2828freeDictISpell (DictISpell * d )
2929{
30- FreeIspell (& (d -> obj ));
30+ NIFree (& (d -> obj ));
3131freestoplist (& (d -> stoplist ));
3232free (d );
3333}
@@ -71,7 +71,7 @@ spell_init(PG_FUNCTION_ARGS)
7171 (errcode (ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE ),
7272errmsg ("dictionary already loaded" )));
7373}
74- if (ImportDictionary (& (d -> obj ),pcfg -> value ))
74+ if (NIImportDictionary (& (d -> obj ),pcfg -> value ))
7575{
7676freeDictISpell (d );
7777ereport (ERROR ,
@@ -90,7 +90,7 @@ spell_init(PG_FUNCTION_ARGS)
9090 (errcode (ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE ),
9191errmsg ("affixes already loaded" )));
9292}
93- if (ImportAffixes (& (d -> obj ),pcfg -> value ))
93+ if (NIImportAffixes (& (d -> obj ),pcfg -> value ))
9494{
9595freeDictISpell (d );
9696ereport (ERROR ,
@@ -132,8 +132,8 @@ spell_init(PG_FUNCTION_ARGS)
132132
133133if (affloaded && dictloaded )
134134{
135- SortDictionary (& (d -> obj ));
136- SortAffixes (& (d -> obj ));
135+ NISortDictionary (& (d -> obj ));
136+ NISortAffixes (& (d -> obj ));
137137}
138138else if (!affloaded )
139139{
@@ -168,7 +168,7 @@ spell_lexize(PG_FUNCTION_ARGS)
168168
169169res = palloc (sizeof (char * )* 2 );
170170txt = pnstrdup (in ,PG_GETARG_INT32 (2 ));
171- res = NormalizeWord (& (d -> obj ),txt );
171+ res = NINormalizeWord (& (d -> obj ),txt );
172172pfree (txt );
173173
174174if (res == NULL )