/* XEmacs routines to deal with CONCORD.
- Copyright (C) 2005,2006,2008 MORIOKA Tomohiko
+ Copyright (C) 2005,2006,2008,2010 MORIOKA Tomohiko
This file is part of XEmacs.
#include "buffer.h"
#include <errno.h>
#include <concord.h>
+#ifdef HAVE_LIBCHISE
+# include <chise.h>
+#endif
EXFUN (Fread_from_string, 3);
Lisp_Object Qconcord;
Lisp_Object Qconcord_object;
Lisp_Object Qgenre, Q_id;
+#ifdef HAVE_LIBCHISE
+Lisp_Object Qcharacter;
+Lisp_Object Qfeature;
+#endif
Lisp_Object Vconcord_ds_hash_table;
Lisp_Object Vconcord_genre_hash_table;
CHECK_SYMBOL (genre);
retval = Fgethash (genre, Vconcord_genre_hash_table, Qunbound);
+ if ( UNBOUNDP (retval) )
+ retval = Vchise_system_db_directory;
if ( STRINGP (retval) )
{
retval = Fconcord_open_ds (retval, Qnil, Qnil, Qnil);
Lisp_CONCORD_Object* lcobj = XCONCORD_OBJECT (obj);
struct gcpro gcpro1, gcpro2;
- if (print_readably)
+#if 0
+ if ( print_readably )
{
+#endif
write_c_string ("#s(concord-object", printcharfun);
write_c_string (" genre ", printcharfun);
write_c_string (concord_genre_get_name (lcobj->genre), printcharfun);
print_internal (lcobj->id, printcharfun, escapeflag);
UNGCPRO;
write_c_string (")", printcharfun);
+#if 0
}
else
{
write_c_string ("#<concord-object \"", printcharfun);
- write_c_string (concord_ds_location
- (concord_genre_get_data_source (lcobj->genre)),
- printcharfun);
- write_c_string (":", printcharfun);
write_c_string (concord_genre_get_name (lcobj->genre), printcharfun);
write_c_string (";", printcharfun);
GCPRO2 (obj, printcharfun);
UNGCPRO;
write_c_string ("\">", printcharfun);
}
+#endif
}
static void
return XCONCORD_OBJECT_ID (object);
}
+DEFUN ("concord-object-genre", Fconcord_object_genre, 1, 1, 0, /*
+Return genre of Concord-object OBJECT.
+*/
+ (object))
+{
+ CHECK_CONCORD_OBJECT (object);
+ return intern (concord_genre_get_name (XCONCORD_OBJECT_GENRE (object)));
+}
+
DEFUN ("concord-decode-object", Fconcord_decode_object, 2, 4, 0, /*
Make and return a Concord-object from FEATURE and VALUE.
Optional argument GENRE specifies the GENRE of the object.
}
static int
+concord_id_validate (Lisp_Object keyword, Lisp_Object value,
+ Error_behavior errb)
+{
+ if (ERRB_EQ (errb, ERROR_ME))
+ {
+ /* CHECK_SYMBOL (value); */
+ if ( INTP (value) || CHARP (value) || SYMBOLP (value) )
+ ;
+ else
+ dead_wrong_type_argument (Qsymbolp, value);
+ return 1;
+ }
+
+ return INTP (value) || CHARP (value) || SYMBOLP (value);
+}
+
+static int
concord_object_validate (Lisp_Object data, Error_behavior errb)
{
struct gcpro gcpro1, gcpro2, gcpro3;
defsymbol (&Qconcord_object, "concord-object");
defsymbol (&Qgenre, "genre");
defsymbol (&Q_id, "=id");
+#ifdef HAVE_LIBCHISE
+ defsymbol (&Qcharacter, "character");
+ defsymbol (&Qfeature, "feature");
+#endif
DEFSUBR (Fconcord_open_ds);
DEFSUBR (Fconcord_ds_p);
DEFSUBR (Fconcord_make_object);
DEFSUBR (Fconcord_object_p);
DEFSUBR (Fconcord_object_id);
+ DEFSUBR (Fconcord_object_genre);
DEFSUBR (Fconcord_decode_object);
DEFSUBR (Fconcord_object_get);
DEFSUBR (Fconcord_object_put);
concord_object_instantiate);
define_structure_type_keyword (st, Qgenre, concord_name_validate);
- define_structure_type_keyword (st, Q_id, concord_name_validate);
+ define_structure_type_keyword (st, Q_id, concord_id_validate);
}
void
Vconcord_genre_object_hash_table
= make_lisp_hash_table (16, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
}
+
+void
+complex_vars_of_concord (void)
+{
+#ifdef HAVE_LIBCHISE
+ Fconcord_assign_genre (Qcharacter, Vchise_system_db_directory);
+ Fconcord_assign_genre (Qfeature, Vchise_system_db_directory);
+#endif
+}