@@ -76,7 +76,7 @@ libdfsch_la_SOURCES = src/dfsch.c dfsch/dfsch.h src/internal.h\ src/hash.c dfsch/hash.h \ src/promise.c dfsch/promise.h \ src/number.c dfsch/number.h src/bignum.c dfsch/bignum.h \ - src/strings.c dfsch/strings.h src/udata.h src/udata.c\ + src/strings.c dfsch/strings.h udata.h udata.c\ src/object.c dfsch/object.h \ src/weak.c dfsch/weak.h \ src/format.c dfsch/format.h \ @@ -90,6 +90,17 @@ libdfsch_la_SOURCES = src/dfsch.c dfsch/dfsch.h src/internal.h\ src/generic.c dfsch/generic.h \ src/mkhash.c dfsch/mkhash.h +noinst_PROGRAMS=udata-gen +BUILT_SOURCES=udata.c udata.h +strings.o: udata.h +udata.h: udata-gen src/UnicodeData.txt + ./udata-gen header $(srcdir)/src/UnicodeData.txt udata.h +udata.c: udata-gen src/UnicodeData.txt + ./udata-gen data $(srcdir)/src/UnicodeData.txt udata.c + +udata_gen_SOURCES=src/udata-gen.c +udata_gen_LDADD= -lgc + libdfsch_la_LDFLAGS = -version-info 5:0:0 libdfsch_la_LIBADD = -lgc -lpthread -ldl -lm Makefile.am @@ -203,14 +203,7 @@ void compact_tables(){ } -void emit_tables(){ - uint32_t i; - int j; - int k; - FILE* f; - - f = fopen("udata.h", "w"); - +void emit_header(FILE* f){ fprintf(f, "/* \n" " * This file is automatically generated from UnicodeData.txt\n" @@ -243,10 +236,14 @@ void emit_tables(){ "extern unsigned char dfsch__udata_tables[][%d];\n", SECOND_SIZE); fprintf(f, "extern udata_entry_t dfsch__udata_properties[];"); + +} - fclose(f); +void emit_tables(FILE* f){ + uint32_t i; + int j; + int k; - f = fopen("udata.c", "w"); fprintf(f, "/* \n" " * This file is automatically generated from UnicodeData.txt\n" @@ -288,18 +285,43 @@ void emit_tables(){ distinct[i].title_offset); } fprintf(f, "};\n"); - fclose(f); } int main(int argc, char**argv){ char buf[1024]; - init_database(); - fprintf(stderr, "Parsing..."); - while(fgets(buf, 1024, stdin)){ - process_line(parse_line(buf)); + FILE* in; + FILE* out; + + if (argc == 4){ + in = fopen(argv[2], "r"); + if (!in){ + perror(argv[2]); + return 1; + } + out = fopen(argv[3], "w"); + if (!out){ + perror(argv[3]); + return 1; + } + if (strcmp(argv[1], "data") == 0){ + init_database(); + fprintf(stderr, "Parsing..."); + while(fgets(buf, 1024, in)){ + process_line(parse_line(buf)); + } + fprintf(stderr, "done\n"); + compact_props(); + compact_tables(); + emit_tables(out); + fclose(out); + return 0; + } else if (strcmp(argv[1], "header") == 0){ + emit_header(out); + fclose(out); + return 0; + } } - fprintf(stderr, "done\n"); - compact_props(); - compact_tables(); - emit_tables(); + + fprintf(stderr, "usage: %s header|data <input-file> <output-file>\n", argv[0]); + return 1; } src/udata-gen.c src/udata.c src/udata.h 68b4f8dc35bb105d37e31ef2942c5d6b2d9b656b Ales Hakl ales@hakl.net http://github.com/adh/dfsch/commit/5d0e7385f4ae8f55a24d7082a6656a62f1b5432e 5d0e7385f4ae8f55a24d7082a6656a62f1b5432e 2009-11-12T05:50:12-08:00 2009-11-12T05:50:12-08:00 integrate unicode data processing into buildsystem ea143bdf8402c286078a01c0487d81e4fa1145e6 Ales Hakl ales@hakl.net