X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconcord.c;h=7b1b9cc720e4fcf777e0a31a4173705400562cbc;hb=cd2292bbfe34d2aba639cf019094dcb85802508c;hp=bc468f148df37b0ccd85b7ef37e69213ac413395;hpb=4d53f254da1086692ac5ef0e516940b3603ef200;p=chise%2Fxemacs-chise.git.1 diff --git a/src/concord.c b/src/concord.c index bc468f1..7b1b9cc 100644 --- a/src/concord.c +++ b/src/concord.c @@ -1,5 +1,5 @@ /* XEmacs routines to deal with CONCORD. - Copyright (C) 2005,2006 MORIOKA Tomohiko + Copyright (C) 2005,2006,2008,2010 MORIOKA Tomohiko This file is part of XEmacs. @@ -27,40 +27,34 @@ Boston, MA 02111-1307, USA. */ #include "sysfile.h" #include "buffer.h" #include -#include +#include "elconcord.h" +#ifdef HAVE_LIBCHISE +# include +#endif EXFUN (Fread_from_string, 3); -EXFUN (Fconcord_decode_object, 4); -EXFUN (Fconcord_object_put, 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; +Lisp_Object Vconcord_genre_object_hash_table; -typedef struct Lisp_CONCORD_DS Lisp_CONCORD_DS; -DECLARE_LRECORD (concord_ds, Lisp_CONCORD_DS); +/* + * data source + */ Lisp_Object Qconcord_dsp; -struct Lisp_CONCORD_DS -{ - struct lcrecord_header header; - CONCORD_DS ds; -}; - -#define XCONCORD_DS(x) XRECORD (x, concord_ds, Lisp_CONCORD_DS) -#define XSET_CONCORD_DS(x, p) XSETRECORD (x, p, concord_ds) -#define CONCORD_DS_P(x) RECORDP (x, concord_ds) -#define CHECK_CONCORD_DS(x) CHECK_RECORD (x, concord_ds) -#define CONCHECK_CONCORD_DS(x) CONCHECK_RECORD (x, concord_ds) - static Lisp_CONCORD_DS* allocate_concord_ds (void) { @@ -255,6 +249,10 @@ Return concord-ds of GENRE. CHECK_SYMBOL (genre); retval = Fgethash (genre, Vconcord_genre_hash_table, Qunbound); +#ifdef HAVE_LIBCHISE + if ( UNBOUNDP (retval) ) + retval = Vchise_system_db_directory; +#endif if ( STRINGP (retval) ) { retval = Fconcord_open_ds (retval, Qnil, Qnil, Qnil); @@ -317,28 +315,12 @@ Return the list of all existing features in GENRE. } -typedef struct Lisp_CONCORD_Object Lisp_CONCORD_Object; -DECLARE_LRECORD (concord_object, Lisp_CONCORD_Object); +/* + * Concord-object + */ Lisp_Object Qconcord_objectp; -struct Lisp_CONCORD_Object -{ - struct lcrecord_header header; - CONCORD_Genre genre; - Lisp_Object id; -}; - -#define XCONCORD_OBJECT(x) XRECORD (x, concord_object, Lisp_CONCORD_Object) -#define XSET_CONCORD_OBJECT(x, p) XSETRECORD (x, p, concord_object) -#define CONCORD_OBJECT_P(x) RECORDP (x, concord_object) -#define CHECK_CONCORD_OBJECT(x) CHECK_RECORD (x, concord_object) -#define CONCHECK_CONCORD_OBJECT(x) CONCHECK_RECORD (x, concord_object) -#define CONCORD_OBJECT_GENRE(x) ((x)->genre) -#define CONCORD_OBJECT_ID(x) ((x)->id) -#define XCONCORD_OBJECT_ID(x) CONCORD_OBJECT_ID (XCONCORD_OBJECT(x)) -#define XCONCORD_OBJECT_GENRE(x) CONCORD_OBJECT_GENRE (XCONCORD_OBJECT(x)) - static Lisp_CONCORD_Object* allocate_concord_object (void) { @@ -364,8 +346,10 @@ print_concord_object (Lisp_Object obj, 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); @@ -374,14 +358,11 @@ print_concord_object (Lisp_Object obj, print_internal (lcobj->id, printcharfun, escapeflag); UNGCPRO; write_c_string (")", printcharfun); +#if 0 } else { write_c_string ("#genre)), - printcharfun); - write_c_string (":", printcharfun); write_c_string (concord_genre_get_name (lcobj->genre), printcharfun); write_c_string (";", printcharfun); GCPRO2 (obj, printcharfun); @@ -389,6 +370,7 @@ print_concord_object (Lisp_Object obj, UNGCPRO; write_c_string ("\">", printcharfun); } +#endif } static void @@ -406,6 +388,13 @@ finalize_concord_object (void *header, int for_disksave) } } +static int +concord_object_equal (Lisp_Object cobj1, Lisp_Object cobj2, int depth) +{ + return internal_equal ( XCONCORD_OBJECT_ID(cobj1), + XCONCORD_OBJECT_ID(cobj2), depth); +} + static const struct lrecord_description concord_object_description[] = { { XD_LISP_OBJECT, offsetof (Lisp_CONCORD_Object, id) }, { XD_END } @@ -413,10 +402,38 @@ static const struct lrecord_description concord_object_description[] = { DEFINE_LRECORD_IMPLEMENTATION ("concord_object", concord_object, mark_concord_object, print_concord_object, - finalize_concord_object, 0, 0, + finalize_concord_object, + concord_object_equal, 0, concord_object_description, Lisp_CONCORD_Object); +static Lisp_Object +concord_genre_cache_get_object (Lisp_Object genre, Lisp_Object id) +{ + Lisp_Object obj_hash; + + obj_hash = Fgethash (genre, Vconcord_genre_object_hash_table, Qunbound); + if (UNBOUNDP (obj_hash)) + return Qunbound; + return Fgethash (id, obj_hash, Qunbound); +} + +static Lisp_Object +concord_genre_cache_put_object (Lisp_Object genre, Lisp_Object id, + Lisp_Object object) +{ + Lisp_Object obj_hash; + + obj_hash = Fgethash (genre, Vconcord_genre_object_hash_table, Qunbound); + if (UNBOUNDP (obj_hash)) + { + obj_hash + = make_lisp_hash_table (256, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); + Fputhash (genre, obj_hash, Vconcord_genre_object_hash_table); + } + return Fputhash (id, object, obj_hash); +} + DEFUN ("concord-make-object", Fconcord_make_object, 1, 3, 0, /* Make and return a Concord-object from ID and GENRE. Optional argument DS specifies the data-source of the GENRE. @@ -424,47 +441,52 @@ Optional argument DS specifies the data-source of the GENRE. (genre, id, ds)) { Lisp_CONCORD_DS* lds; - char* genre_name; + Lisp_Object genre_string; + char* genre_name_str; CONCORD_Genre c_genre; Lisp_CONCORD_Object* lcobj; Lisp_Object retval; + if (!NILP (id)) + { + retval = concord_genre_cache_get_object (genre, id); + if (!UNBOUNDP (retval)) + { + return retval; + } + } if (NILP (ds)) ds = Fconcord_genre_ds (genre); CHECK_CONCORD_DS (ds); lds = XCONCORD_DS (ds); if (lds->ds == NULL) return Qnil; - if ( !STRINGP(genre) ) - genre = Fsymbol_name (genre); - TO_EXTERNAL_FORMAT (LISP_STRING, genre, - C_STRING_ALLOCA, genre_name, + if ( STRINGP(genre) ) + genre_string = genre; + else + genre_string = Fsymbol_name (genre); + TO_EXTERNAL_FORMAT (LISP_STRING, genre_string, + C_STRING_ALLOCA, genre_name_str, Qfile_name); - c_genre = concord_ds_get_genre (lds->ds, genre_name); + c_genre = concord_ds_get_genre (lds->ds, genre_name_str); if (c_genre == NULL) return Qnil; -#if 0 - if (!NILP (id)) - { - retval = Fconcord_decode_object (Q_id, id, genre, ds); - if (!NILP (retval)) - return retval; - } -#endif lcobj = allocate_concord_object (); lcobj->genre = c_genre; lcobj->id = id; XSET_CONCORD_OBJECT (retval, lcobj); -#if 0 if (!NILP (id)) { struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; GCPRO4 (retval, id, genre, ds); - Fconcord_object_put (retval, Q_id, id); + concord_genre_cache_put_object (genre, id, retval); +#if 1 + if (!EQ (Fconcord_object_get (retval, Q_id), id)) + Fconcord_object_put (retval, Q_id, id); +#endif UNGCPRO; } -#endif return retval; } @@ -485,6 +507,15 @@ Return an id of Concord-object OBJECT. 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. @@ -545,7 +576,9 @@ Optional argument DS specifies the data-source of the GENRE. status = concord_index_strid_get_obj_string (c_index, strid, &st_id); if (!status) { - GCPRO3 (genre, ds, obj); + Lisp_Object retval; + + GCPRO4 (genre, ds, obj, retval); #if 0 obj = read_from_c_string (CONCORD_String_data (&st_id), CONCORD_String_size (&st_id) ); @@ -556,8 +589,9 @@ Optional argument DS specifies the data-source of the GENRE. Qfile_name), Qnil, Qnil)); #endif + retval = Fconcord_make_object (genre, obj, ds); UNGCPRO; - return Fconcord_make_object (genre, obj, ds); + return retval; } return Qnil; } @@ -611,10 +645,9 @@ Return the value of OBJECT's FEATURE. return Qnil; } -DEFUN ("concord-object-put", Fconcord_object_put, 3, 3, 0, /* -Store a VALUE of OBJECT's FEATURE. -*/ - (object, feature, value)) +static Lisp_Object +concord_object_put (Lisp_Object object, Lisp_Object feature, + Lisp_Object value) { struct gcpro gcpro1, gcpro2, gcpro3; int previous_print_readably; @@ -627,7 +660,6 @@ Store a VALUE of OBJECT's FEATURE. Lisp_Object value_string; char* c_value; - CHECK_CONCORD_OBJECT (object); if ( !STRINGP(feature) ) feature = Fsymbol_name (feature); previous_print_readably = print_readably; @@ -663,16 +695,121 @@ Store a VALUE of OBJECT's FEATURE. status = chise_feature_sync (c_feature); if (status) return Qnil; - if (feature_name[0] == '=') + if (XSTRING_DATA(feature)[0] == '=') { CONCORD_INDEX c_index = concord_genre_get_index (c_genre, feature_name); - status = concord_index_strid_put_obj (c_index, c_value, c_obj); + concord_index_strid_put_obj (c_index, c_value, c_obj); + concord_index_sync (c_index); + } + return Qt; +} + +DEFUN ("concord-object-put", Fconcord_object_put, 3, 3, 0, /* +Store a VALUE of OBJECT's FEATURE. +*/ + (object, feature, value)) +{ + Lisp_String* name; + Bufbyte *name_str; + + CHECK_CONCORD_OBJECT (object); + CHECK_SYMBOL (feature); + name = symbol_name (XSYMBOL (feature)); + name_str = string_data (name); + if ( NILP (concord_object_put (object, feature, value)) ) + return Qnil; + if ( EQ (feature, Q_subsumptive) || + EQ (feature, Q_subsumptive_from) || + EQ (feature, Q_denotational) || + EQ (feature, Q_denotational_from) || + ( ( ((name_str[0] == '-') && (name_str[1] == '>')) || + ((name_str[0] == '<') && (name_str[1] == '-')) ) + && (memchr (name_str, '*', name->size) == NULL) ) ) + { + Lisp_Object rest = value; + Lisp_Object ret; + Lisp_Object rev_feature = Qnil; + struct gcpro gcpro1; + + GCPRO1 (rev_feature); + if (EQ (feature, Q_subsumptive)) + rev_feature = Q_subsumptive_from; + else if (EQ (feature, Q_subsumptive_from)) + rev_feature = Q_subsumptive; + else if (EQ (feature, Q_denotational)) + rev_feature = Q_denotational_from; + else if (EQ (feature, Q_denotational_from)) + rev_feature = Q_denotational; + else + { + Bytecount length = string_length (name); + Bufbyte *rev_name_str = alloca (length + 1); + + memcpy (rev_name_str + 2, name_str + 2, length - 2); + if (name_str[0] == '<') + { + rev_name_str[0] = '-'; + rev_name_str[1] = '>'; + } + else + { + rev_name_str[0] = '<'; + rev_name_str[1] = '-'; + } + rev_name_str[length] = 0; + rev_feature = intern (rev_name_str); + } + + while (CONSP (rest)) + { + ret = XCAR (rest); + + if ( CONCORD_OBJECT_P (ret) && !EQ (ret, object) ) + { + Lisp_Object ffv; + + ffv = Fconcord_object_get (ret, rev_feature); + if (!CONSP (ffv)) + concord_object_put (ret, rev_feature, list1 (object)); + else if (NILP (Fmember (object, ffv))) + concord_object_put + (ret, rev_feature, + nconc2 (Fcopy_sequence (ffv), list1 (object))); + Fsetcar (rest, ret); + } + rest = XCDR (rest); + } + UNGCPRO; } return Qt; } +DEFUN ("concord-object-adjoin", Fconcord_object_adjoin, 3, 3, 0, /* +Cons ITEM onto the front of FEATURE's value of OBJECT only if it's not already there. +*/ + (object, feature, item)) +{ + Lisp_Object ret = Fconcord_object_get (object, feature); + + if ( NILP (Fmember (item, ret)) ) + return Fconcord_object_put (object, feature, Fcons (item, ret)); + return Qnil; +} + +DEFUN ("concord-object-adjoin*", Fconcord_object_adjoinX, 3, 3, 0, /* +Append ITEM onto the end of FEATURE's value of OBJECT only if it's not already there. +*/ + (object, feature, item)) +{ + Lisp_Object ret = Fconcord_object_get (object, feature); + + if ( NILP (Fmember (item, ret)) ) + return Fconcord_object_put (object, feature, nconc2 (ret, list1 (item))); + return Qnil; +} + struct closure_for_object_spec { char* object_id; @@ -741,6 +878,31 @@ Return the spec of OBJECT. return concord_object_spec_closure->spec; } +DEFUN ("concord-define-object", Fconcord_define_object, 2, 3, 0, /* +Define an object of which spec is a set of features SPEC. +*/ + (spec, genre, ds)) +{ + Lisp_Object id = Fcdr (Fassq (Q_id, spec)); + Lisp_Object obj; + + if (!NILP (id)) + { + Lisp_Object rest = spec; + Lisp_Object cell; + + obj = Fconcord_make_object (genre, id, ds); + while (!NILP (rest)) + { + cell = Fcar (rest); + Fconcord_object_put (obj, Fcar (cell), Fcdr (cell)); + rest = Fcdr (rest); + } + return obj; + } + return Qnil; +} + struct closure_for_each_object { Lisp_Object function; @@ -754,6 +916,7 @@ func_for_each_object (CONCORD_String object_id, CONCORD_Feature feature, CONCORD_String value) { + struct gcpro gcpro1, gcpro2; Lisp_Object obj, val, ret; #if 0 @@ -766,6 +929,7 @@ func_for_each_object (CONCORD_String object_id, Qfile_name), Qnil, Qnil)); #endif + GCPRO1 (obj); obj = Fconcord_make_object (for_each_object_closure->genre, obj, for_each_object_closure->ds); @@ -779,7 +943,10 @@ func_for_each_object (CONCORD_String object_id, Qfile_name), Qnil, Qnil)); #endif + UNGCPRO; + GCPRO2 (obj, val); ret = call2 (for_each_object_closure->function, obj, val); + UNGCPRO; for_each_object_closure->ret = ret; return !NILP (ret); } @@ -793,6 +960,7 @@ When the FUNCTION returns non-nil, it breaks the repeat. */ (function, feature, genre, ds)) { + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; Lisp_CONCORD_DS* lds; char* genre_name; CONCORD_Genre c_genre; @@ -829,7 +997,12 @@ When the FUNCTION returns non-nil, it breaks the repeat. for_each_object_closure->genre = genre; for_each_object_closure->ds = ds; for_each_object_closure->ret = Qnil; + GCPRO4 (for_each_object_closure->function, + for_each_object_closure->genre, + for_each_object_closure->ds, + for_each_object_closure->ret); concord_feature_foreach_obj_string (c_feature, func_for_each_object); + UNGCPRO; /* return Qt; */ return for_each_object_closure->ret; } @@ -849,8 +1022,27 @@ concord_name_validate (Lisp_Object keyword, Lisp_Object value, } 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; + Lisp_Object retval; Lisp_Object valw = Qnil; Lisp_Object genre = Qnil; Lisp_Object oid = Qnil; @@ -882,7 +1074,10 @@ concord_object_validate (Lisp_Object data, Error_behavior errb) return 0; } - if (NILP (Fconcord_make_object (genre, oid, Qnil))) + GCPRO3 (genre, oid, retval); + retval = Fconcord_make_object (genre, oid, Qnil); + UNGCPRO; + if (NILP (retval)) { maybe_signal_simple_error_2 ("No such Concord-object", oid, genre, Qconcord_object, errb); @@ -919,6 +1114,10 @@ syms_of_concord (void) 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); @@ -933,9 +1132,13 @@ syms_of_concord (void) 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); + DEFSUBR (Fconcord_object_adjoin); + DEFSUBR (Fconcord_object_adjoinX); + DEFSUBR (Fconcord_define_object); DEFSUBR (Fconcord_object_spec); DEFSUBR (Fconcord_foreach_object_in_feature); } @@ -950,7 +1153,7 @@ structure_type_create_concord (void) 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 @@ -965,4 +1168,17 @@ vars_of_concord (void) staticpro (&Vconcord_genre_hash_table); Vconcord_genre_hash_table = make_lisp_hash_table (16, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); + + staticpro (&Vconcord_genre_object_hash_table); + 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 }