Merge branch 'maint'

[platform/upstream/isl.git] / isl_printer.c

diff --git a/isl_printer.c b/isl_printer.c
index 51e1f39..ae7596d 100644 (file)
--- a/isl_printer.c
+++ b/isl_printer.c
@@ -13,6 +13,12 @@ static __isl_give isl_printer *file_end_line(__isl_take isl_printer *p)
        return p;
 }
 
+static __isl_give isl_printer *file_flush(__isl_take isl_printer *p)
+{
+       fflush(p->file);
+       return p;
+}
+
 static __isl_give isl_printer *file_print_str(__isl_take isl_printer *p,
        const char *s)
 {
@@ -85,17 +91,25 @@ error:
 static __isl_give isl_printer *str_start_line(__isl_take isl_printer *p)
 {
        p = str_print_indent(p, p->indent);
-       p = str_print(p, p->prefix, strlen(p->prefix));
+       if (p->prefix)
+               p = str_print(p, p->prefix, strlen(p->prefix));
        return p;
 }
 
 static __isl_give isl_printer *str_end_line(__isl_take isl_printer *p)
 {
-       p = str_print(p, p->suffix, strlen(p->suffix));
+       if (p->suffix)
+               p = str_print(p, p->suffix, strlen(p->suffix));
        p = str_print(p, "\n", strlen("\n"));
        return p;
 }
 
+static __isl_give isl_printer *str_flush(__isl_take isl_printer *p)
+{
+       p->buf_n = 0;
+       return p;
+}
+
 static __isl_give isl_printer *str_print_str(__isl_take isl_printer *p,
        const char *s)
 {
@@ -126,7 +140,7 @@ static __isl_give isl_printer *str_print_isl_int(__isl_take isl_printer *p,
        int len;
        isl_int_print_gmp_free_t gmp_free;
 
-       s = mpz_get_str(0, 10, i);
+       s = isl_int_get_str(i);
        len = strlen(s);
        if (len < p->width)
                p = str_print_indent(p, p->width - len);
@@ -144,6 +158,7 @@ struct isl_printer_ops {
                                                isl_int i);
        __isl_give isl_printer *(*print_str)(__isl_take isl_printer *p,
                                                const char *s);
+       __isl_give isl_printer *(*flush)(__isl_take isl_printer *p);
 };
 
 static struct isl_printer_ops file_ops = {
@@ -151,7 +166,8 @@ static struct isl_printer_ops file_ops = {
        file_end_line,
        file_print_int,
        file_print_isl_int,
-       file_print_str
+       file_print_str,
+       file_flush
 };
 
 static struct isl_printer_ops str_ops = {
@@ -159,7 +175,8 @@ static struct isl_printer_ops str_ops = {
        str_end_line,
        str_print_int,
        str_print_isl_int,
-       str_print_str
+       str_print_str,
+       str_flush
 };
 
 __isl_give isl_printer *isl_printer_to_file(isl_ctx *ctx, FILE *file)
@@ -196,6 +213,7 @@ __isl_give isl_printer *isl_printer_to_str(isl_ctx *ctx)
        if (!p->buf)
                goto error;
        p->buf_n = 0;
+       p->buf[0] = '\0';
        p->buf_size = 256;
        p->indent = 0;
        p->output_format = ISL_FORMAT_ISL;
@@ -218,6 +236,11 @@ void isl_printer_free(__isl_take isl_printer *p)
        free(p);
 }
 
+isl_ctx *isl_printer_get_ctx(__isl_keep isl_printer *printer)
+{
+       return printer ? printer->ctx : NULL;
+}
+
 __isl_give isl_printer *isl_printer_set_isl_int_width(__isl_take isl_printer *p,
        int width)
 {
@@ -240,6 +263,19 @@ __isl_give isl_printer *isl_printer_set_indent(__isl_take isl_printer *p,
        return p;
 }
 
+__isl_give isl_printer *isl_printer_indent(__isl_take isl_printer *p,
+       int indent)
+{
+       if (!p)
+               return NULL;
+
+       p->indent += indent;
+       if (p->indent < 0)
+               p->indent = 0;
+
+       return p;
+}
+
 __isl_give isl_printer *isl_printer_set_prefix(__isl_take isl_printer *p,
        const char *prefix)
 {
@@ -276,27 +312,42 @@ __isl_give isl_printer *isl_printer_set_output_format(__isl_take isl_printer *p,
 __isl_give isl_printer *isl_printer_print_str(__isl_take isl_printer *p,
        const char *s)
 {
+       if (!p)
+               return NULL;
+
        return p->ops->print_str(p, s);
 }
 
 __isl_give isl_printer *isl_printer_print_int(__isl_take isl_printer *p, int i)
 {
+       if (!p)
+               return NULL;
+
        return p->ops->print_int(p, i);
 }
 
 __isl_give isl_printer *isl_printer_print_isl_int(__isl_take isl_printer *p,
        isl_int i)
 {
+       if (!p)
+               return NULL;
+
        return p->ops->print_isl_int(p, i);
 }
 
 __isl_give isl_printer *isl_printer_start_line(__isl_take isl_printer *p)
 {
+       if (!p)
+               return NULL;
+
        return p->ops->start_line(p);
 }
 
 __isl_give isl_printer *isl_printer_end_line(__isl_take isl_printer *p)
 {
+       if (!p)
+               return NULL;
+
        return p->ops->end_line(p);
 }
 
@@ -306,3 +357,11 @@ char *isl_printer_get_str(__isl_keep isl_printer *printer)
                return NULL;
        return strdup(printer->buf);
 }
+
+__isl_give isl_printer *isl_printer_flush(__isl_take isl_printer *p)
+{
+       if (!p)
+               return NULL;
+
+       return p->ops->flush(p);
+}