add isl_aff_mod_val

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

diff --git a/cat.c b/cat.c
index 21fbf66..6313142 100644 (file)
--- a/cat.c
+++ b/cat.c
@@ -1,10 +1,14 @@
 #include <assert.h>
-#include <isl_map.h>
+#include <isl/obj.h>
+#include <isl/printer.h>
+#include <isl/stream.h>
+#include <isl/options.h>
 
 struct isl_arg_choice cat_format[] = {
        {"isl",         ISL_FORMAT_ISL},
        {"omega",       ISL_FORMAT_OMEGA},
        {"polylib",     ISL_FORMAT_POLYLIB},
+       {"ext-polylib", ISL_FORMAT_EXT_POLYLIB},
        {"latex",       ISL_FORMAT_LATEX},
        {0}
 };
@@ -14,32 +18,39 @@ struct cat_options {
        unsigned                 format;
 };
 
-struct isl_arg cat_options_arg[] = {
-ISL_ARG_CHILD(struct cat_options, isl, "isl", isl_options_arg, "isl options")
+ISL_ARGS_START(struct cat_options, cat_options_args)
+ISL_ARG_CHILD(struct cat_options, isl, "isl", &isl_options_args, "isl options")
 ISL_ARG_CHOICE(struct cat_options, format, 0, "format", \
        cat_format,     ISL_FORMAT_ISL, "output format")
-ISL_ARG_END
-};
+ISL_ARGS_END
 
-ISL_ARG_DEF(cat_options, struct cat_options, cat_options_arg)
+ISL_ARG_DEF(cat_options, struct cat_options, cat_options_args)
 
 int main(int argc, char **argv)
 {
        struct isl_ctx *ctx;
-       struct isl_map *map;
+       struct isl_stream *s;
+       struct isl_obj obj;
        struct cat_options *options;
+       isl_printer *p;
 
        options = cat_options_new_with_defaults();
        assert(options);
        argc = cat_options_parse(options, argc, argv, ISL_ARG_ALL);
 
-       ctx = isl_ctx_alloc_with_options(cat_options_arg, options);
+       ctx = isl_ctx_alloc_with_options(&cat_options_args, options);
+
+       s = isl_stream_new_file(ctx, stdin);
+       obj = isl_stream_read_obj(s);
+       isl_stream_free(s);
+
+       p = isl_printer_to_file(ctx, stdout);
+       p = isl_printer_set_output_format(p, options->format);
+       p = obj.type->print(p, obj.v);
+       p = isl_printer_end_line(p);
+       isl_printer_free(p);
 
-       map = isl_map_read_from_file(ctx, stdin, -1);
-       isl_map_print(map, stdout, 0, options->format);
-       if (options->format == ISL_FORMAT_ISL)
-               printf("\n");
-       isl_map_free(map);
+       obj.type->free(obj.v);
 
        isl_ctx_free(ctx);