Make gen-mirroring-tab and gen-unicode-version work. gen.tab/ works now.

12 files changed, 137 insertions, 81 deletions

diff --git a/Makefile.am b/Makefile.am
index bfebc9d..3bb8035 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ##############################################################################
-## $Id: Makefile.am,v 1.3 2004-05-07 06:30:37 behdad Exp $
+## $Id: Makefile.am,v 1.4 2004-05-22 11:21:39 behdad Exp $
 ## $Author: behdad $
-## $Date: 2004-05-07 06:30:37 $
-## $Revision: 1.3 $
+## $Date: 2004-05-22 11:21:39 $
+## $Revision: 1.4 $
 ## $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/Makefile.am,v $
 ##############################################################################
 ##                                               -*- Automake -*-
@@ -31,6 +31,10 @@ MAINTAINERCLEANFILES = \
 		`find "$(srcdir)" -type f -name Makefile.in -print` \
 		`find "$(srcdir)" -type f -name "*~" -print`
 
+BUILT_SOURCES = lib/fribidi-unicode-version.h
+lib/fribidi-unicode-version.h:
+	(cd lib && $(MAKE) $(AM_MAKEFLAGS) fribidi-unicode-version.h)
+
 # Indent all C source and header files
 
 .PHONY: indent
diff --git a/bin/Makefile.am b/bin/Makefile.am
index e5a9eee..1a988ec 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = fribidi
 
-noinst_PROGRAMS = fribidi-benchmark bidi-type-serialize
+noinst_PROGRAMS = fribidi-benchmark
 
 getopt_SOURCES = getopt.c getopt1.c getopt_int.h getopt.h
 
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
 		-I$(top_srcdir)/charset \
 		$(MISC_CFLAGS)
 
-LDADD = $(top_builddir)/lib/libfribidi.la $(GLIB_LIBS)
+LDADD = $(top_builddir)/lib/libfribidi.la $(MISC_LIBS)
 
 if FRIBIDI_CHARSETS
 else # !FRIBIDI_CHARSETS
diff --git a/bin/fribidi-benchmark.c b/bin/fribidi-benchmark.c
index 7c9bd2d..b49fa3e 100644
--- a/bin/fribidi-benchmark.c
+++ b/bin/fribidi-benchmark.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * fribidi-benchmark.c - command line benchmark tool for libfribidi
  *
- * $Id: fribidi-benchmark.c,v 1.2 2004-05-03 22:05:19 behdad Exp $
+ * $Id: fribidi-benchmark.c,v 1.3 2004-05-22 11:21:40 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-03 22:05:19 $
- * $Revision: 1.2 $
+ * $Date: 2004-05-22 11:21:40 $
+ * $Revision: 1.3 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/bin/fribidi-benchmark.c,v $
  *
  * Authors:
@@ -198,9 +198,13 @@ benchmark (
     {
       /* Create a bidi string */
       base = FRIBIDI_TYPE_ON;
-      fribidi_log2vis (us, len, &base,
-		       /* output */
-		       out_us, positionVtoL, positionLtoV, embedding_list);
+      if (!fribidi_log2vis (us, len, &base,
+			    /* output */
+			    out_us, positionVtoL, positionLtoV,
+			    embedding_list))
+	die2
+	  ("something failed in fribidi_log2vis.\n"
+	   "perhaps memory allocation failure.", NULL);
     }
 
   /* stop timer */
diff --git a/charset/fribidi-char-sets-cap-rtl.c b/charset/fribidi-char-sets-cap-rtl.c
index afdc991..a6807e7 100644
--- a/charset/fribidi-char-sets-cap-rtl.c
+++ b/charset/fribidi-char-sets-cap-rtl.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * fribidi-char-sets-cap-rtl.c - CapRTL character set conversion routines
  *
- * $Id: fribidi-char-sets-cap-rtl.c,v 1.3 2004-05-07 06:30:37 behdad Exp $
+ * $Id: fribidi-char-sets-cap-rtl.c,v 1.4 2004-05-22 11:21:40 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-07 06:30:37 $
- * $Revision: 1.3 $
+ * $Date: 2004-05-22 11:21:40 $
+ * $Revision: 1.4 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/charset/fribidi-char-sets-cap-rtl.c,v $
  *
  * Authors:
@@ -93,11 +93,11 @@ init_cap_rtl (
 	  if (to_type[j] == CapRTLCharTypes[i])
 	    break;
 	if (j == num_types)
-	{
-	  num_types++;
-	  to_type[j] = CapRTLCharTypes[i];
-	  request[j] = 0;
-	}
+	  {
+	    num_types++;
+	    to_type[j] = CapRTLCharTypes[i];
+	    request[j] = 0;
+	  }
 	request[j]++;
 	count++;
       }
diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c
index edaada3..be94f7f 100644
--- a/charset/fribidi-char-sets.c
+++ b/charset/fribidi-char-sets.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * fribidi-char-sets.c - character set conversion routines
  *
- * $Id: fribidi-char-sets.c,v 1.3 2004-05-12 07:06:21 behdad Exp $
+ * $Id: fribidi-char-sets.c,v 1.4 2004-05-22 11:21:40 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-12 07:06:21 $
- * $Revision: 1.3 $
+ * $Date: 2004-05-22 11:21:40 $
+ * $Revision: 1.4 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/charset/fribidi-char-sets.c,v $
  *
  * Authors:
@@ -128,7 +128,7 @@ fribidi_strcasecmp (
       s1++;
       s2++;
     }
-  return toupper(*s1) - toupper(*s2);
+  return toupper (*s1) - toupper (*s2);
 }
 #else /* FRIBIDI_USE_GLIB */
 # include <glib/gstrfuncs.h>
diff --git a/gen.tab/Makefile.am b/gen.tab/Makefile.am
index c35c75e..e468b8c 100644
--- a/gen.tab/Makefile.am
+++ b/gen.tab/Makefile.am
@@ -8,6 +8,7 @@ gen_mirroring_tab_SOURCES = gen-mirroring-tab.c
 gen_unicode_version_SOURCES = gen-unicode-version.c
 
 CLEANFILES = $(EXTRA_PROGRAMS)
+DISTCLEANFILES =
 
 AM_CPPFLAGS = \
 		-I$(top_builddir)/lib \
@@ -15,6 +16,8 @@ AM_CPPFLAGS = \
 		-I$(top_srcdir)/charset \
 		$(MISC_CFLAGS)
 
+LDADD = $(MISC_LIBS)
+
 VPATH += \
 		$(builddir)/unidata \
 		$(builddir)/unidata/extracted \
@@ -26,36 +29,80 @@ VPATH += \
 
 COMPRESSION = 4
 
-GEN_BIDI_TYPE_TAB = \
-	$(MAKE) $(AM_MAKEFLAGS) gen-bidi-type-tab && \
-	(DATA_FILE_TYPE=`echo $< | sed s,.*/,,`; \
-	./gen-bidi-type-tab $(COMPRESSION) \
-	 $$DATA_FILE_TYPE $< > $@ || ($(RM) $@ && false))
+BIDI_TYPE_TAB_VARIANTS = \
+		UnicodeData_bidi-type.tab.i \
+		DerivedBidiClass_bidi-type.tab.i
 
-bidi-type_UnicodeData.tab.i: \
+UnicodeData_bidi-type.tab.i: \
 		UnicodeData.txt \
 		fribidi-unicode-version.h \
-		$(gen_bidi_type_tab_sources)
+		$(gen_bidi_type_tab_SOURCES)
 
-bidi-type_DerivedBidiClass.tab.i: \
+DerivedBidiClass_bidi-type.tab.i: \
 		DerivedBidiClass.txt \
 		fribidi-unicode-version.h \
-		$(gen_bidi_type_tab_sources)
+		$(gen_bidi_type_tab_SOURCES)
 
-bidi-type_UnicodeData.tab.i bidi-type_DerivedBidiClass.tab.i:
-	$(GEN_BIDI_TYPE_TAB)
+$(BIDI_TYPE_TAB_VARIANTS):
+	$(MAKE) $(AM_MAKEFLAGS) gen-bidi-type-tab
+	(DATA_FILE_TYPE=`echo $< | sed s,.*/,,`; \
+	./gen-bidi-type-tab $(COMPRESSION) \
+	 $$DATA_FILE_TYPE $< > $@ || ($(RM) $@ && false))
 
 bidi-type.tab.i:
-	@ \
-	($(MAKE) $(AM_MAKEFLAGS) bidi-type_DerivedBidiClass.tab.i \
-	&& mv bidi-type_DerivedBidiClass.tab.i $@) \
-	|| \
-	($(MAKE) $(AM_MAKEFLAGS) bidi-type_UnicodeData.tab.i \
-	&& mv bidi-type_UnicodeData.tab.i $@) \
-	|| \
-	(echo Cannot build $@. \
-	&& false)
-
-BUILT_TEMP_FILES = \
-		bidi-type_DerivedBidiClass.tab.i \
-		bidi-type_UnicodeData.tab.i
+	@for x in $(BIDI_TYPE_TAB_VARIANTS); do \
+	   if $(MAKE) $(AM_MAKEFLAGS) $$x && mv $$x $@; then \
+	     break; \
+	   fi; \
+	 done; \
+	 test -f $@ || (echo Could not build $@; false)
+
+DISTCLEANFILES += $(BIDI_TYPE_TAB_VARIANTS)
+
+# mirroring.tab.i
+
+MIRRORING_TAB_VARIANTS = \
+		BidiMirroring_mirroring.tab.i
+
+BidiMirroring_mirroring.tab.i: \
+		BidiMirroring.txt \
+		fribidi-unicode-version.h \
+		$(gen_mirroring_tab_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) gen-mirroring-tab
+	(DATA_FILE_TYPE=`echo $< | sed s,.*/,,`; \
+	./gen-mirroring-tab \
+	 $$DATA_FILE_TYPE $< > $@ || ($(RM) $@ && false))
+
+mirroring.tab.i:
+	@for x in $(MIRRORING_TAB_VARIANTS); do \
+	   if $(MAKE) $(AM_MAKEFLAGS) $$x && mv $$x $@; then \
+	     break; \
+	   fi; \
+	 done; \
+	 test -f $@ || (echo Could not build $@; false)
+
+DISTCLEANFILES += $(MIRRORING_TAB_VARIANTS)
+
+# fribidi-unicode-version.h
+
+UNICODE_VERSION_VARIANTS = \
+		ReadMe_fribidi-unicode-version.h
+
+ReadMe_fribidi-unicode-version.h: \
+		ReadMe.txt \
+		$(gen_unicode_version_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) gen-unicode-version
+	(DATA_FILE_TYPE=`echo $< | sed s,.*/,,`; \
+	./gen-unicode-version \
+	 $$DATA_FILE_TYPE $< > $@ || ($(RM) $@ && false))
+
+fribidi-unicode-version.h:
+	@for x in $(UNICODE_VERSION_VARIANTS); do \
+	   if $(MAKE) $(AM_MAKEFLAGS) $$x && mv $$x $@; then \
+	     break; \
+	   fi; \
+	 done; \
+	 test -f $@ || (echo Could not build $@; false)
+
+DISTCLEANFILES += $(UNICODE_VERSION_VARIANTS)
+
diff --git a/gen.tab/gen-bidi-type-tab.c b/gen.tab/gen-bidi-type-tab.c
index c5b54f2..786ff13 100644
--- a/gen.tab/gen-bidi-type-tab.c
+++ b/gen.tab/gen-bidi-type-tab.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * gen-bidi-type-tab.c - generate bidi-type.tab.i for libfribidi
  *
- * $Id: gen-bidi-type-tab.c,v 1.5 2004-05-22 10:35:30 behdad Exp $
+ * $Id: gen-bidi-type-tab.c,v 1.6 2004-05-22 11:21:40 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-22 10:35:30 $
- * $Revision: 1.5 $
+ * $Date: 2004-05-22 11:21:40 $
+ * $Revision: 1.6 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/gen.tab/gen-bidi-type-tab.c,v $
  *
  * Author:
@@ -196,7 +196,7 @@ init (
   for (i = type_names_count - 1; i >= 0; i--)
     names[type_names[i].key] = type_names[i].name;
 
-  init_tab();
+  init_tab ();
 }
 
 static void
diff --git a/gen.tab/gen-mirroring-tab.c b/gen.tab/gen-mirroring-tab.c
index 5b40fde..1b86f72 100644
--- a/gen.tab/gen-mirroring-tab.c
+++ b/gen.tab/gen-mirroring-tab.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * gen-mirroring-tab.c - generate mirroring.tab.i for libfribidi
  *
- * $Id: gen-mirroring-tab.c,v 1.4 2004-05-22 10:35:30 behdad Exp $
+ * $Id: gen-mirroring-tab.c,v 1.5 2004-05-22 11:21:40 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-22 10:35:30 $
- * $Revision: 1.4 $
+ * $Date: 2004-05-22 11:21:40 $
+ * $Revision: 1.5 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/gen.tab/gen-mirroring-tab.c,v $
  *
  * Author:
@@ -82,8 +82,8 @@ static void
 die4 (
   char *fmt,
   unsigned long l,
-  char *p,
-  char *q
+  unsigned long p,
+  unsigned long q
 )
 {
   fprintf (stderr, appname ": ");
diff --git a/gen.tab/gen-unicode-version.c b/gen.tab/gen-unicode-version.c
index 87b71be..43dc24a 100644
--- a/gen.tab/gen-unicode-version.c
+++ b/gen.tab/gen-unicode-version.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * gen-unicode-version.c - generate fribidi-unicode-version.h for libfribidi
  *
- * $Id: gen-unicode-version.c,v 1.2 2004-05-22 10:35:30 behdad Exp $
+ * $Id: gen-unicode-version.c,v 1.3 2004-05-22 11:21:40 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-22 10:35:30 $
- * $Revision: 1.2 $
+ * $Date: 2004-05-22 11:21:40 $
+ * $Revision: 1.3 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/gen.tab/gen-unicode-version.c,v $
  *
  * Author:
@@ -79,14 +79,14 @@ die2 (
 }
 
 int version_major, version_minor, version_micro;
-char *unicode_version;
+char unicode_version[100];
 
 static void
 init_tab (
 )
 {
   version_major = version_minor = version_micro = 0;
-  unicode_version = "unknown";
+  strcpy (unicode_version, "(unknown)");
 }
 
 static void
@@ -102,7 +102,6 @@ read_read_me_txt (
       {
 	sscanf (p, "Version %d.%d.%d", &version_major, &version_minor,
 		&version_micro);
-	unicode_version = fribidi_malloc (100);
 	sprintf (unicode_version, "%d.%d.%d", version_major, version_minor,
 		 version_micro);
 	return;
diff --git a/lib/common.h b/lib/common.h
index 60fdeb0..9c56ce1 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -1,10 +1,10 @@
 /* FriBidi
  * common.h - common include for library sources
  *
- * $Id: common.h,v 1.9 2004-05-22 10:35:31 behdad Exp $
+ * $Id: common.h,v 1.10 2004-05-22 11:21:40 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-22 10:35:31 $
- * $Revision: 1.9 $
+ * $Date: 2004-05-22 11:21:40 $
+ * $Revision: 1.10 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/lib/common.h,v $
  *
  * Author:
@@ -69,7 +69,7 @@
 # endif	/* !fribidi_assert */
 # ifndef __C2MAN__
 #  include <glib/gmacros.h>
-# endif /* !__C2MAN__ */
+# endif	/* !__C2MAN__ */
 # ifndef FRIBIDI_BEGIN_STMT
 #  define FRIBIDI_BEGIN_STMT G_STMT_START {
 #  define FRIBIDI_END_STMT } G_STMT_END
@@ -80,23 +80,23 @@
 # endif	/* !LIKELY */
 # ifndef false
 #  define false FALSE
-# endif /* !false */
+# endif	/* !false */
 # ifndef true
 #  define true TRUE
-# endif /* !true */
+# endif	/* !true */
 #endif /* FRIBIDI_USE_GLIB */
 
 #ifndef false
 # define false (0)
-# endif /* !false */
+# endif	/* !false */
 # ifndef true
 #  define true (!false)
-# endif /* !true */
+# endif	/* !true */
 
 #ifndef NULL
 #  ifdef __cplusplus
 #    define NULL        (0L)
-#  else /* !__cplusplus */
+#  else	/* !__cplusplus */
 #    define NULL        ((void*) 0)
 #  endif /* !__cplusplus */
 #endif /* !NULL */
@@ -116,7 +116,7 @@
 #else /* fribidi_malloc */
 # ifndef fribidi_free
 #  error You should define fribidi_free too when you define fribidi_malloc.
-# endif /* !fribidi_free */
+# endif	/* !fribidi_free */
 #endif /* fribidi_malloc */
 
 /* FRIBIDI_CHUNK_SIZE is the number of bytes in each chunk of memory being
diff --git a/lib/fribidi-bidi-type.c b/lib/fribidi-bidi-type.c
index ef8e8b3..c30b298 100644
--- a/lib/fribidi-bidi-type.c
+++ b/lib/fribidi-bidi-type.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * fribidi-bidi-type.c - get character bidi type
  *
- * $Id: fribidi-bidi-type.c,v 1.6 2004-05-12 08:17:19 behdad Exp $
+ * $Id: fribidi-bidi-type.c,v 1.7 2004-05-22 11:21:40 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-12 08:17:19 $
- * $Revision: 1.6 $
+ * $Date: 2004-05-22 11:21:40 $
+ * $Revision: 1.7 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/lib/Attic/fribidi-bidi-type.c,v $
  *
  * Authors:
@@ -110,4 +110,3 @@ fribidi_get_types (
 {
   fribidi_get_bidi_types (str, len, type);
 }
-
diff --git a/lib/fribidi-mem.c b/lib/fribidi-mem.c
index 49eac9a..532c58f 100644
--- a/lib/fribidi-mem.c
+++ b/lib/fribidi-mem.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * fribidi-mem.c - memory manipulation routines
  *
- * $Id: fribidi-mem.c,v 1.5 2004-05-07 06:30:38 behdad Exp $
+ * $Id: fribidi-mem.c,v 1.6 2004-05-22 11:21:40 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-07 06:30:38 $
- * $Revision: 1.5 $
+ * $Date: 2004-05-22 11:21:40 $
+ * $Revision: 1.6 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/lib/fribidi-mem.c,v $
  *
  * Authors:
@@ -87,7 +87,9 @@ fribidi_mem_chunk_alloc (
 	(chunk)
 	{
 	  if (mem_chunk->chunk)
-	    * (void **) chunk = (char *) mem_chunk->chunk + mem_chunk->empty_size - mem_chunk->area_size;
+	    *(void **) chunk =
+	      (char *) mem_chunk->chunk + mem_chunk->empty_size -
+	      mem_chunk->area_size;
 	  chunk = (char *) chunk + mem_chunk->atom_size;
 	  mem_chunk->chunk = chunk;
 	  mem_chunk->empty_size = mem_chunk->area_size - mem_chunk->atom_size;
@@ -115,7 +117,8 @@ fribidi_mem_chunk_destroy (
 
   fribidi_assert (mem_chunk);
 
-  chunk = (char *) mem_chunk->chunk + mem_chunk->empty_size - mem_chunk->area_size;
+  chunk =
+    (char *) mem_chunk->chunk + mem_chunk->empty_size - mem_chunk->area_size;
   while LIKELY
     (chunk)
     {