From 8504e4a8670955348dbf0131a93a71020f074cf1 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Mon, 27 Jan 2014 19:23:50 +0100 Subject: [PATCH] keep track of indentation of extracted code This allows us to print the transformed code with the same (initial) indentation. Note that we do not check the indentation when comparing two scops. It is not clear if the way we extract the indentation would produce the same results across different versions of clang. Signed-off-by: Sven Verdoolaege --- emit.c | 15 +++++++++++++ include/pet.h | 2 ++ loc.c | 43 ++++++++++++++++++++++++++++++++++---- loc.h | 4 +++- parse.c | 7 ++++++- pet.cc | 6 +++++- scan.cc | 16 +++++++++----- scop.c | 2 +- tests/QR.scop | 1 + tests/arg.scop | 1 + tests/assume.scop | 1 + tests/assume2.scop | 1 + tests/autodetect/decl.scop | 1 + tests/autodetect/if1.scop | 1 + tests/autodetect/if2.scop | 1 + tests/autodetect/if3.scop | 1 + tests/autodetect/loop1.scop | 1 + tests/autodetect/loop2.scop | 1 + tests/autodetect/loop3.scop | 1 + tests/autodetect/loop4.scop | 1 + tests/autodetect/loop5.scop | 1 + tests/autodetect/scalar.scop | 1 + tests/autodetect/while.scop | 1 + tests/boolean.scop | 1 + tests/break.scop | 1 + tests/break2.scop | 1 + tests/break3.scop | 1 + tests/break4.scop | 1 + tests/break5.scop | 1 + tests/break6.scop | 1 + tests/cast.scop | 1 + tests/ceild.scop | 1 + tests/conditional_assignment.scop | 1 + tests/conditional_assignment2.scop | 1 + tests/continue.scop | 1 + tests/continue2.scop | 1 + tests/continue3.scop | 1 + tests/continue4.scop | 1 + tests/continue5.scop | 1 + tests/cuervo.scop | 1 + tests/data_dependent.scop | 1 + tests/data_dependent2.scop | 1 + tests/dec.scop | 1 + tests/dec2.scop | 1 + tests/dec3.scop | 1 + tests/dec4.scop | 1 + tests/decl.scop | 1 + tests/decl2.scop | 1 + tests/decl3.scop | 1 + tests/div_mod.scop | 1 + tests/dynamic_bound.scop | 1 + tests/dynamic_condition.scop | 1 + tests/empty_domain.scop | 1 + tests/enum.scop | 1 + tests/filter.scop | 1 + tests/filter2.scop | 1 + tests/filter3.scop | 1 + tests/float.scop | 1 + tests/float2.scop | 1 + tests/floord.scop | 1 + tests/floord2.scop | 1 + tests/for_while.scop | 1 + tests/for_while_dec.scop | 1 + tests/for_while_inc.scop | 1 + tests/for_while_inc2.scop | 1 + tests/for_while_inc3.scop | 1 + tests/for_while_inc4.scop | 1 + tests/for_while_init.scop | 1 + tests/for_while_init2.scop | 1 + tests/for_while_init3.scop | 1 + tests/for_while_overflow.scop | 1 + tests/for_while_unsigned.scop | 1 + tests/for_while_unsigned2.scop | 1 + tests/forward_substitution1.scop | 1 + tests/forward_substitution2.scop | 1 + tests/forward_substitution3.scop | 1 + tests/forward_substitution4.scop | 1 + tests/forward_substitution5.scop | 1 + tests/generic_condition.scop | 1 + tests/generic_condition2.scop | 1 + tests/if1.scop | 1 + tests/if2.scop | 1 + tests/implicit_condition.scop | 1 + tests/inc.scop | 1 + tests/inc2.scop | 1 + tests/inc3.scop | 1 + tests/inc4.scop | 1 + tests/inc5.scop | 1 + tests/inf.scop | 1 + tests/inf2.scop | 1 + tests/inf3.scop | 1 + tests/inf4.scop | 1 + tests/iterator_declaration.scop | 1 + tests/label.scop | 1 + tests/loop.scop | 1 + tests/loop2.scop | 1 + tests/loop3.scop | 1 + tests/loop4.scop | 1 + tests/loop5.scop | 1 + tests/loop6.scop | 1 + tests/loop7.scop | 1 + tests/loop8.scop | 1 + tests/loop_body.scop | 1 + tests/loop_body2.scop | 1 + tests/macro.scop | 1 + tests/matmul.scop | 1 + tests/max.scop | 1 + tests/min.scop | 1 + tests/min2.scop | 1 + tests/mod.scop | 1 + tests/mod2.scop | 1 + tests/omega.scop | 1 + tests/piecewise.scop | 1 + tests/piecewise2.scop | 1 + tests/propagate.scop | 1 + tests/quasi_affine.scop | 1 + tests/scalar.scop | 1 + tests/scalar_inc.scop | 1 + tests/shortcut1.scop | 1 + tests/shortcut2.scop | 1 + tests/static.scop | 1 + tests/struct1.scop | 1 + tests/struct10.scop | 1 + tests/struct11.scop | 1 + tests/struct2.scop | 1 + tests/struct3.scop | 1 + tests/struct4.scop | 1 + tests/struct5.scop | 1 + tests/struct6.scop | 1 + tests/struct7.scop | 1 + tests/struct8.scop | 1 + tests/struct9.scop | 1 + tests/ternary.scop | 1 + tests/tobi1.scop | 1 + tests/tobi2.scop | 1 + tests/unsigned1.scop | 1 + tests/unsigned2.scop | 1 + tests/unsigned3.scop | 1 + tests/unsigned_break1.scop | 1 + tests/unsigned_break2.scop | 1 + tests/wdp.scop | 1 + tests/while.scop | 1 + tests/while_affine.scop | 1 + tests/while_break.scop | 1 + tests/while_break2.scop | 1 + tests/while_inc.scop | 1 + tests/while_overflow.scop | 1 + 147 files changed, 221 insertions(+), 13 deletions(-) diff --git a/emit.c b/emit.c index 8ae46df..97bac22 100644 --- a/emit.c +++ b/emit.c @@ -53,6 +53,18 @@ static int emit_string(yaml_emitter_t *emitter, const char *str) return 0; } +/* Print the string "name" and the string "str" to "emitter". + */ +static int emit_named_string(yaml_emitter_t *emitter, const char *name, + const char *str) +{ + if (emit_string(emitter, name) < 0) + return -1; + if (emit_string(emitter, str) < 0) + return -1; + return 0; +} + /* Print the isl_id "id" to "emitter". */ static int emit_id(yaml_emitter_t *emitter, __isl_keep isl_id *id) @@ -653,6 +665,9 @@ static int emit_scop(yaml_emitter_t *emitter, struct pet_scop *scop) return -1; if (emit_named_unsigned(emitter, "end", pet_loc_get_end(scop->loc)) < 0) return -1; + if (emit_named_string(emitter, + "indent", pet_loc_get_indent(scop->loc)) < 0) + return -1; if (emit_string(emitter, "context") < 0) return -1; if (emit_set(emitter, scop->context) < 0) diff --git a/include/pet.h b/include/pet.h index 6d7a2e7..065675b 100644 --- a/include/pet.h +++ b/include/pet.h @@ -46,6 +46,8 @@ unsigned pet_loc_get_start(__isl_keep pet_loc *loc); unsigned pet_loc_get_end(__isl_keep pet_loc *loc); /* Return the line number of a line within the "loc" region. */ int pet_loc_get_line(__isl_keep pet_loc *loc); +/* Return the indentation of the "loc" region. */ +__isl_keep const char *pet_loc_get_indent(__isl_keep pet_loc *loc); enum pet_expr_type { pet_expr_error = -1, diff --git a/loc.c b/loc.c index 42ecd32..598d1d3 100644 --- a/loc.c +++ b/loc.c @@ -40,6 +40,7 @@ * The "start" and "end" fields contain the offsets in the input file * of the region, where end points to the first character after the region. * "line" is the line number of a line inside the region. + * "indentation" is (a reasonable guess at) the indentation of the region. * * A special pet_loc_dummy instance is used to indicate that * no offset information is available (yet). @@ -51,6 +52,7 @@ struct pet_loc { unsigned start; unsigned end; int line; + char *indent; }; /* A special pet_loc object that is used to indicate that @@ -65,18 +67,22 @@ pet_loc pet_loc_dummy = { .start = 0, .end = 0, .line = -1, + .indent = "" }; -/* Allocate a pet_loc with the given start, end and line number. +/* Allocate a pet_loc with the given start, end, line number and indentation. */ __isl_give pet_loc *pet_loc_alloc(isl_ctx *ctx, - unsigned start, unsigned end, int line) + unsigned start, unsigned end, int line, __isl_take char *indent) { pet_loc *loc; + if (!indent) + return NULL; + loc = isl_alloc_type(ctx, struct pet_loc); if (!loc) - return NULL; + goto error; loc->ctx = ctx; isl_ctx_ref(ctx); @@ -85,8 +91,12 @@ __isl_give pet_loc *pet_loc_alloc(isl_ctx *ctx, loc->start = start; loc->end = end; loc->line = line; + loc->indent = indent; return loc; +error: + free(indent); + return NULL; } /* Return a pet_loc that is equal to "loc" and that has only one reference. @@ -105,7 +115,8 @@ __isl_give pet_loc *pet_loc_cow(__isl_take pet_loc *loc) if (loc->ref == 1) return loc; loc->ref--; - return pet_loc_alloc(loc->ctx, loc->start, loc->end, loc->line); + return pet_loc_alloc(loc->ctx, loc->start, loc->end, loc->line, + strdup(loc->indent)); } /* Return an extra reference to "loc". @@ -137,6 +148,7 @@ __isl_null pet_loc *pet_loc_free(__isl_take pet_loc *loc) if (--loc->ref > 0) return NULL; + free(loc->indent); isl_ctx_deref(loc->ctx); free(loc); return NULL; @@ -163,6 +175,13 @@ int pet_loc_get_line(__isl_keep pet_loc *loc) return loc ? loc->line : -1; } +/* Return the indentation of the "loc" region. + */ +__isl_keep const char *pet_loc_get_indent(__isl_keep pet_loc *loc) +{ + return loc ? loc->indent : NULL; +} + /* Update loc->start and loc->end to include the region from "start" * to "end". * @@ -200,3 +219,19 @@ __isl_give pet_loc *pet_loc_update_start_end_from_loc(__isl_take pet_loc *loc, return loc; return pet_loc_update_start_end(loc, loc2->start, loc2->end); } + +/* Replace the indentation of "loc" by "indent". + */ +__isl_give pet_loc *pet_loc_set_indent(__isl_take pet_loc *loc, + __isl_take char *indent) +{ + if (!loc || !indent) + goto error; + + free(loc->indent); + loc->indent = indent; + return loc; +error: + free(indent); + return pet_loc_free(loc); +} diff --git a/loc.h b/loc.h index 3db082a..357c7d8 100644 --- a/loc.h +++ b/loc.h @@ -12,11 +12,13 @@ extern "C" { extern pet_loc pet_loc_dummy; __isl_give pet_loc *pet_loc_alloc(isl_ctx *ctx, - unsigned start, unsigned end, int line); + unsigned start, unsigned end, int line, __isl_take char *indent); __isl_give pet_loc *pet_loc_update_start_end(__isl_take pet_loc *loc, unsigned start, unsigned end); __isl_give pet_loc *pet_loc_update_start_end_from_loc(__isl_take pet_loc *loc, __isl_keep pet_loc *loc2); +__isl_give pet_loc *pet_loc_set_indent(__isl_take pet_loc *loc, + __isl_take char *indent); #if defined(__cplusplus) } diff --git a/parse.c b/parse.c index 8b6b36f..3898fa5 100644 --- a/parse.c +++ b/parse.c @@ -620,6 +620,7 @@ static struct pet_stmt *extract_stmt(isl_ctx *ctx, yaml_document_t *document, yaml_node_pair_t * pair; int line = -1; unsigned start = 0, end = 0; + char *indent = NULL; if (node->type != YAML_MAPPING_NODE) isl_die(ctx, isl_error_invalid, "expecting mapping", @@ -642,6 +643,8 @@ static struct pet_stmt *extract_stmt(isl_ctx *ctx, yaml_document_t *document, isl_die(ctx, isl_error_invalid, "expecting scalar key", return pet_stmt_free(stmt)); + if (!strcmp((char *) key->data.scalar.value, "indent")) + indent = extract_string(ctx, document, value); if (!strcmp((char *) key->data.scalar.value, "line")) line = extract_int(ctx, document, value); if (!strcmp((char *) key->data.scalar.value, "start")) @@ -662,7 +665,9 @@ static struct pet_stmt *extract_stmt(isl_ctx *ctx, yaml_document_t *document, return NULL; } - stmt->loc = pet_loc_alloc(ctx, start, end, line); + if (!indent) + indent = strdup(""); + stmt->loc = pet_loc_alloc(ctx, start, end, line, indent); if (!stmt->loc) return pet_stmt_free(stmt); diff --git a/pet.cc b/pet.cc index d9265b6..1a1f760 100644 --- a/pet.cc +++ b/pet.cc @@ -992,7 +992,9 @@ struct pet_transform_data { * * We first copy the input text code from the end of the previous scop * until the start of "scop" and then print the scop itself through - * a call to data->transform. + * a call to data->transform. We set up the printer to print + * the transformed code with the same (initial) indentation as + * the original code. * Finally, we keep track of the end of "scop" so that we can * continue copying when we find the next scop. * @@ -1010,6 +1012,8 @@ static int pet_transform(struct pet_scop *scop, void *user) goto error; data->end = pet_loc_get_end(scop->loc); scop = pet_scop_set_input_file(scop, data->in); + data->p = isl_printer_set_indent_prefix(data->p, + pet_loc_get_indent(scop->loc)); data->p = data->transform(data->p, scop, data->user); if (!data->p) return -1; diff --git a/scan.cc b/scan.cc index 7bff664..ed2a3d8 100644 --- a/scan.cc +++ b/scan.cc @@ -1314,8 +1314,9 @@ static SourceLocation location_after_semi(SourceLocation loc, SourceManager &SM, #endif /* If the token at "loc" is the first token on the line, then return - * a location referring to the start of the line. - * Otherwise, return "loc". + * a location referring to the start of the line and set *indent + * to the indentation of "loc" + * Otherwise, return "loc" and set *indent to "". * * This function is used to extend a scop to the start of the line * if the first token of the scop is also the first token on the line. @@ -1324,7 +1325,7 @@ static SourceLocation location_after_semi(SourceLocation loc, SourceManager &SM, * then the latter is the location of the first token on the line. */ static SourceLocation move_to_start_of_line_if_first_token(SourceLocation loc, - SourceManager &SM, const LangOptions &LO) + SourceManager &SM, const LangOptions &LO, char **indent) { std::pair file_offset_pair; llvm::StringRef file; @@ -1332,6 +1333,7 @@ static SourceLocation move_to_start_of_line_if_first_token(SourceLocation loc, Token tok; SourceLocation token_loc, line_loc; int col; + const char *s; loc = SM.getExpansionLoc(loc); col = SM.getExpansionColumnNumber(loc); @@ -1345,6 +1347,9 @@ static SourceLocation move_to_start_of_line_if_first_token(SourceLocation loc, lexer.LexFromRawLexer(tok); token_loc = tok.getLocation(); + s = SM.getCharacterData(line_loc); + *indent = strndup(s, token_loc == loc ? col - 1 : 0); + if (token_loc == loc) return line_loc; else @@ -1363,8 +1368,9 @@ __isl_give pet_loc *PetScan::construct_pet_loc(SourceRange range, const LangOptions &LO = PP.getLangOpts(); int line = PP.getSourceManager().getExpansionLineNumber(loc); unsigned start, end; + char *indent; - loc = move_to_start_of_line_if_first_token(loc, SM, LO); + loc = move_to_start_of_line_if_first_token(loc, SM, LO, &indent); start = getExpansionOffset(SM, loc); loc = range.getEnd(); if (skip_semi) @@ -1373,7 +1379,7 @@ __isl_give pet_loc *PetScan::construct_pet_loc(SourceRange range, loc = PP.getLocForEndOfToken(loc); end = getExpansionOffset(SM, loc); - return pet_loc_alloc(ctx, start, end, line); + return pet_loc_alloc(ctx, start, end, line, indent); } /* Convert a top-level pet_expr to an expression pet_tree. diff --git a/scop.c b/scop.c index 6f4ee5b..8c6cffb 100644 --- a/scop.c +++ b/scop.c @@ -589,7 +589,7 @@ struct pet_scop *pet_scop_update_start_end(struct pet_scop *scop, if (scop->loc == &pet_loc_dummy) scop->loc = pet_loc_alloc(isl_set_get_ctx(scop->context), - start, end, -1); + start, end, -1, strdup("")); else scop->loc = pet_loc_update_start_end(scop->loc, start, end); diff --git a/tests/QR.scop b/tests/QR.scop index 1304ce9..dca28de 100644 --- a/tests/QR.scop +++ b/tests/QR.scop @@ -1,5 +1,6 @@ start: 285 end: 840 +indent: ' ' context: '[K, N] -> { : N <= 16 and N >= 8 and K >= 100 and K <= 1000 }' context_value: '[K, N] -> { : K = 256 }' arrays: diff --git a/tests/arg.scop b/tests/arg.scop index be1f26c..5e006d3 100644 --- a/tests/arg.scop +++ b/tests/arg.scop @@ -1,5 +1,6 @@ start: 72 end: 166 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/assume.scop b/tests/assume.scop index 15011e5..6d944ed 100644 --- a/tests/assume.scop +++ b/tests/assume.scop @@ -1,5 +1,6 @@ start: 64 end: 206 +indent: ' ' context: '[S, n, m] -> { : m >= 1 + n and m <= 2147483648 - n and S >= 0 and S <= 2147483647 and n >= -2147483648 and m <= 2147483647 }' arrays: diff --git a/tests/assume2.scop b/tests/assume2.scop index af37043..2eef1f1 100644 --- a/tests/assume2.scop +++ b/tests/assume2.scop @@ -1,5 +1,6 @@ start: 25 end: 94 +indent: "\t" context: '[m] -> { : m >= 6 and m <= 2147483647 }' arrays: - context: '{ : }' diff --git a/tests/autodetect/decl.scop b/tests/autodetect/decl.scop index c98bab7..858d881 100644 --- a/tests/autodetect/decl.scop +++ b/tests/autodetect/decl.scop @@ -1,5 +1,6 @@ start: 25 end: 53 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/autodetect/if1.scop b/tests/autodetect/if1.scop index d7dda7b..db8fa82 100644 --- a/tests/autodetect/if1.scop +++ b/tests/autodetect/if1.scop @@ -1,5 +1,6 @@ start: 25 end: 46 +indent: "\t" context: '[a] -> { : a <= 2147483647 and a >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/autodetect/if2.scop b/tests/autodetect/if2.scop index f8e8066..01ceff8 100644 --- a/tests/autodetect/if2.scop +++ b/tests/autodetect/if2.scop @@ -1,5 +1,6 @@ start: 37 end: 46 +indent: "\t\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/autodetect/if3.scop b/tests/autodetect/if3.scop index 65aa042..4f92ee4 100644 --- a/tests/autodetect/if3.scop +++ b/tests/autodetect/if3.scop @@ -1,5 +1,6 @@ start: 61 end: 70 +indent: "\t\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/autodetect/loop1.scop b/tests/autodetect/loop1.scop index 102aae5..b6bd152 100644 --- a/tests/autodetect/loop1.scop +++ b/tests/autodetect/loop1.scop @@ -1,5 +1,6 @@ start: 52 end: 61 +indent: "\t\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/autodetect/loop2.scop b/tests/autodetect/loop2.scop index 102aae5..b6bd152 100644 --- a/tests/autodetect/loop2.scop +++ b/tests/autodetect/loop2.scop @@ -1,5 +1,6 @@ start: 52 end: 61 +indent: "\t\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/autodetect/loop3.scop b/tests/autodetect/loop3.scop index 1ec9f44..081ae8c 100644 --- a/tests/autodetect/loop3.scop +++ b/tests/autodetect/loop3.scop @@ -1,5 +1,6 @@ start: 34 end: 43 +indent: "\t\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/autodetect/loop4.scop b/tests/autodetect/loop4.scop index f351b40..d4fbaab 100644 --- a/tests/autodetect/loop4.scop +++ b/tests/autodetect/loop4.scop @@ -1,5 +1,6 @@ start: 22 end: 45 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/autodetect/loop5.scop b/tests/autodetect/loop5.scop index 4dad63c..88f23f3 100644 --- a/tests/autodetect/loop5.scop +++ b/tests/autodetect/loop5.scop @@ -1,5 +1,6 @@ start: 72 end: 81 +indent: "\t\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/autodetect/scalar.scop b/tests/autodetect/scalar.scop index 1abb579..c7fa9e9 100644 --- a/tests/autodetect/scalar.scop +++ b/tests/autodetect/scalar.scop @@ -1,5 +1,6 @@ start: 22 end: 30 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/autodetect/while.scop b/tests/autodetect/while.scop index 9bac875..893ffc1 100644 --- a/tests/autodetect/while.scop +++ b/tests/autodetect/while.scop @@ -1,5 +1,6 @@ start: 69 end: 80 +indent: "\t\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/boolean.scop b/tests/boolean.scop index aac5788..a7afc72 100644 --- a/tests/boolean.scop +++ b/tests/boolean.scop @@ -1,5 +1,6 @@ start: 21 end: 83 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/break.scop b/tests/break.scop index b02abae..4f4ebb6 100644 --- a/tests/break.scop +++ b/tests/break.scop @@ -1,5 +1,6 @@ start: 33 end: 179 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/break2.scop b/tests/break2.scop index a56e84f..2b9c0ce 100644 --- a/tests/break2.scop +++ b/tests/break2.scop @@ -1,5 +1,6 @@ start: 33 end: 208 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/break3.scop b/tests/break3.scop index b12978e..181cddc 100644 --- a/tests/break3.scop +++ b/tests/break3.scop @@ -1,5 +1,6 @@ start: 43 end: 186 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/break4.scop b/tests/break4.scop index 41f2b90..972396f 100644 --- a/tests/break4.scop +++ b/tests/break4.scop @@ -1,5 +1,6 @@ start: 43 end: 357 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/break5.scop b/tests/break5.scop index 168f777..3d0dfbe 100644 --- a/tests/break5.scop +++ b/tests/break5.scop @@ -1,5 +1,6 @@ start: 33 end: 269 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/break6.scop b/tests/break6.scop index d1bb3c8..ec98ebe 100644 --- a/tests/break6.scop +++ b/tests/break6.scop @@ -1,5 +1,6 @@ start: 40 end: 184 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/cast.scop b/tests/cast.scop index a83f0b7..55ce225 100644 --- a/tests/cast.scop +++ b/tests/cast.scop @@ -1,5 +1,6 @@ start: 37 end: 80 +indent: "\t" context: '[c] -> { : c <= 127 and c >= -128 }' arrays: - context: '{ : }' diff --git a/tests/ceild.scop b/tests/ceild.scop index 70fa73c..fb3877d 100644 --- a/tests/ceild.scop +++ b/tests/ceild.scop @@ -1,5 +1,6 @@ start: 38 end: 125 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/conditional_assignment.scop b/tests/conditional_assignment.scop index 30bb387..640e0bd 100644 --- a/tests/conditional_assignment.scop +++ b/tests/conditional_assignment.scop @@ -1,5 +1,6 @@ start: 218 end: 496 +indent: "\t" context: '[N, M] -> { : N >= 0 and M >= 0 and N <= 2147483647 and M <= 2147483647 }' arrays: diff --git a/tests/conditional_assignment2.scop b/tests/conditional_assignment2.scop index ccbee0a..b69767c 100644 --- a/tests/conditional_assignment2.scop +++ b/tests/conditional_assignment2.scop @@ -1,5 +1,6 @@ start: 225 end: 507 +indent: "\t" context: '[M, N] -> { : N >= 0 and M >= 0 and M <= 2147483647 and N <= 2147483647 }' arrays: diff --git a/tests/continue.scop b/tests/continue.scop index 18586ae..e5a99a4 100644 --- a/tests/continue.scop +++ b/tests/continue.scop @@ -1,5 +1,6 @@ start: 33 end: 182 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/continue2.scop b/tests/continue2.scop index 2f1b363..9350abd 100644 --- a/tests/continue2.scop +++ b/tests/continue2.scop @@ -1,5 +1,6 @@ start: 47 end: 289 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/continue3.scop b/tests/continue3.scop index 5440d23..e6f8035 100644 --- a/tests/continue3.scop +++ b/tests/continue3.scop @@ -1,5 +1,6 @@ start: 47 end: 215 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/continue4.scop b/tests/continue4.scop index 74bf536..771e64e 100644 --- a/tests/continue4.scop +++ b/tests/continue4.scop @@ -1,5 +1,6 @@ start: 47 end: 216 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/continue5.scop b/tests/continue5.scop index 3670e6e..c7bc3dc 100644 --- a/tests/continue5.scop +++ b/tests/continue5.scop @@ -1,5 +1,6 @@ start: 47 end: 216 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/cuervo.scop b/tests/cuervo.scop index 5a6af85..bba511e 100644 --- a/tests/cuervo.scop +++ b/tests/cuervo.scop @@ -1,5 +1,6 @@ start: 52 end: 176 +indent: "\t" context: '[n, m] -> { : n <= 2147483647 and m <= 2147483647 - n and m >= -2147483648 and n >= -2147483648 and m <= 2147483647 }' arrays: diff --git a/tests/data_dependent.scop b/tests/data_dependent.scop index 3ca7534..e816487 100644 --- a/tests/data_dependent.scop +++ b/tests/data_dependent.scop @@ -1,5 +1,6 @@ start: 274 end: 498 +indent: "\t" context: '[N, M] -> { : N <= 1000 and N >= 10 and M >= 10 and M <= 1000 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/data_dependent2.scop b/tests/data_dependent2.scop index 8af2fab..48e0fcf 100644 --- a/tests/data_dependent2.scop +++ b/tests/data_dependent2.scop @@ -1,5 +1,6 @@ start: 59 end: 206 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/dec.scop b/tests/dec.scop index bf73783..b8142ef 100644 --- a/tests/dec.scop +++ b/tests/dec.scop @@ -1,5 +1,6 @@ start: 38 end: 109 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/dec2.scop b/tests/dec2.scop index f2de269..3bc2ec7 100644 --- a/tests/dec2.scop +++ b/tests/dec2.scop @@ -1,5 +1,6 @@ start: 38 end: 112 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/dec3.scop b/tests/dec3.scop index 782461d..e2c981e 100644 --- a/tests/dec3.scop +++ b/tests/dec3.scop @@ -1,5 +1,6 @@ start: 38 end: 113 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/dec4.scop b/tests/dec4.scop index 72287bf..0d8ed81 100644 --- a/tests/dec4.scop +++ b/tests/dec4.scop @@ -1,5 +1,6 @@ start: 38 end: 112 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/decl.scop b/tests/decl.scop index ad86a98..48fbc63 100644 --- a/tests/decl.scop +++ b/tests/decl.scop @@ -1,5 +1,6 @@ start: 95 end: 282 +indent: "\t" context: '[N, K, M] -> { : K >= 0 and N >= 0 and N <= 2147483647 and K <= 2147483647 and M <= 2147483647 and M >= -2147483648 }' arrays: diff --git a/tests/decl2.scop b/tests/decl2.scop index b926092..188998c 100644 --- a/tests/decl2.scop +++ b/tests/decl2.scop @@ -1,5 +1,6 @@ start: 18 end: 69 +indent: "\t" context: '[N] -> { : N >= 1 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/decl3.scop b/tests/decl3.scop index a31c333..41e8ca3 100644 --- a/tests/decl3.scop +++ b/tests/decl3.scop @@ -1,5 +1,6 @@ start: 18 end: 77 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/div_mod.scop b/tests/div_mod.scop index 9d2c4b2..9b49585 100644 --- a/tests/div_mod.scop +++ b/tests/div_mod.scop @@ -1,5 +1,6 @@ start: 30 end: 232 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/dynamic_bound.scop b/tests/dynamic_bound.scop index 83cbec7..203acd2 100644 --- a/tests/dynamic_bound.scop +++ b/tests/dynamic_bound.scop @@ -1,5 +1,6 @@ start: 143 end: 351 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/dynamic_condition.scop b/tests/dynamic_condition.scop index 567c199..679dc30 100644 --- a/tests/dynamic_condition.scop +++ b/tests/dynamic_condition.scop @@ -1,5 +1,6 @@ start: 50 end: 174 +indent: ' ' context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/empty_domain.scop b/tests/empty_domain.scop index f5028d7..53f3dbf 100644 --- a/tests/empty_domain.scop +++ b/tests/empty_domain.scop @@ -1,5 +1,6 @@ start: 38 end: 114 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/enum.scop b/tests/enum.scop index 5ec4d72..829c78f 100644 --- a/tests/enum.scop +++ b/tests/enum.scop @@ -1,5 +1,6 @@ start: 91 end: 136 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/filter.scop b/tests/filter.scop index d1fc23e..8033db0 100644 --- a/tests/filter.scop +++ b/tests/filter.scop @@ -1,5 +1,6 @@ start: 46 end: 102 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/filter2.scop b/tests/filter2.scop index 95606e8..0068fe6 100644 --- a/tests/filter2.scop +++ b/tests/filter2.scop @@ -1,5 +1,6 @@ start: 37 end: 97 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/filter3.scop b/tests/filter3.scop index a57146c..c88b36f 100644 --- a/tests/filter3.scop +++ b/tests/filter3.scop @@ -1,5 +1,6 @@ start: 51 end: 125 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/float.scop b/tests/float.scop index 548c76a..727d985 100644 --- a/tests/float.scop +++ b/tests/float.scop @@ -1,5 +1,6 @@ start: 24 end: 75 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/float2.scop b/tests/float2.scop index d9a5287..152b105 100644 --- a/tests/float2.scop +++ b/tests/float2.scop @@ -1,5 +1,6 @@ start: 41 end: 82 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/floord.scop b/tests/floord.scop index abb5e02..ef804cb 100644 --- a/tests/floord.scop +++ b/tests/floord.scop @@ -1,5 +1,6 @@ start: 38 end: 115 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/floord2.scop b/tests/floord2.scop index 79c6e52..322962d 100644 --- a/tests/floord2.scop +++ b/tests/floord2.scop @@ -1,5 +1,6 @@ start: 101 end: 178 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/for_while.scop b/tests/for_while.scop index 1c18b60..0008a7a 100644 --- a/tests/for_while.scop +++ b/tests/for_while.scop @@ -1,5 +1,6 @@ start: 83 end: 231 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_dec.scop b/tests/for_while_dec.scop index e058efe..c706bb5 100644 --- a/tests/for_while_dec.scop +++ b/tests/for_while_dec.scop @@ -1,5 +1,6 @@ start: 83 end: 234 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_inc.scop b/tests/for_while_inc.scop index 1f5df2a..3d64434 100644 --- a/tests/for_while_inc.scop +++ b/tests/for_while_inc.scop @@ -1,5 +1,6 @@ start: 83 end: 234 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_inc2.scop b/tests/for_while_inc2.scop index 35228ea..738bc02 100644 --- a/tests/for_while_inc2.scop +++ b/tests/for_while_inc2.scop @@ -1,5 +1,6 @@ start: 83 end: 234 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_inc3.scop b/tests/for_while_inc3.scop index 2fabccd..2d0d026 100644 --- a/tests/for_while_inc3.scop +++ b/tests/for_while_inc3.scop @@ -1,5 +1,6 @@ start: 83 end: 234 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_inc4.scop b/tests/for_while_inc4.scop index 68bdefb..b1881a7 100644 --- a/tests/for_while_inc4.scop +++ b/tests/for_while_inc4.scop @@ -1,5 +1,6 @@ start: 92 end: 239 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_init.scop b/tests/for_while_init.scop index 3243ddf..9001ebb 100644 --- a/tests/for_while_init.scop +++ b/tests/for_while_init.scop @@ -1,5 +1,6 @@ start: 83 end: 231 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_init2.scop b/tests/for_while_init2.scop index 3a3c974..b05a732 100644 --- a/tests/for_while_init2.scop +++ b/tests/for_while_init2.scop @@ -1,5 +1,6 @@ start: 83 end: 234 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_init3.scop b/tests/for_while_init3.scop index 8cb414e..d546a60 100644 --- a/tests/for_while_init3.scop +++ b/tests/for_while_init3.scop @@ -1,5 +1,6 @@ start: 37 end: 145 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_overflow.scop b/tests/for_while_overflow.scop index 598f880..c2fba79 100644 --- a/tests/for_while_overflow.scop +++ b/tests/for_while_overflow.scop @@ -1,5 +1,6 @@ start: 74 end: 191 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_unsigned.scop b/tests/for_while_unsigned.scop index ae771b2..2409994 100644 --- a/tests/for_while_unsigned.scop +++ b/tests/for_while_unsigned.scop @@ -1,5 +1,6 @@ start: 83 end: 244 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/for_while_unsigned2.scop b/tests/for_while_unsigned2.scop index 1ca8f11..bfcc0dc 100644 --- a/tests/for_while_unsigned2.scop +++ b/tests/for_while_unsigned2.scop @@ -1,5 +1,6 @@ start: 100 end: 316 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/forward_substitution1.scop b/tests/forward_substitution1.scop index 99bdfe3..57b570d 100644 --- a/tests/forward_substitution1.scop +++ b/tests/forward_substitution1.scop @@ -1,5 +1,6 @@ start: 31 end: 95 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/forward_substitution2.scop b/tests/forward_substitution2.scop index f6945b1..115e9c8 100644 --- a/tests/forward_substitution2.scop +++ b/tests/forward_substitution2.scop @@ -1,5 +1,6 @@ start: 36 end: 92 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/forward_substitution3.scop b/tests/forward_substitution3.scop index ab63295..acfd294 100644 --- a/tests/forward_substitution3.scop +++ b/tests/forward_substitution3.scop @@ -1,5 +1,6 @@ start: 25 end: 97 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/forward_substitution4.scop b/tests/forward_substitution4.scop index 2a46821..1c8fba5 100644 --- a/tests/forward_substitution4.scop +++ b/tests/forward_substitution4.scop @@ -1,5 +1,6 @@ start: 36 end: 106 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/forward_substitution5.scop b/tests/forward_substitution5.scop index 8908b85..48bc097 100644 --- a/tests/forward_substitution5.scop +++ b/tests/forward_substitution5.scop @@ -1,5 +1,6 @@ start: 36 end: 93 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/generic_condition.scop b/tests/generic_condition.scop index ff5f366..bf91cbf 100644 --- a/tests/generic_condition.scop +++ b/tests/generic_condition.scop @@ -1,5 +1,6 @@ start: 35 end: 101 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/generic_condition2.scop b/tests/generic_condition2.scop index b85f599..515007a 100644 --- a/tests/generic_condition2.scop +++ b/tests/generic_condition2.scop @@ -1,5 +1,6 @@ start: 38 end: 144 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/if1.scop b/tests/if1.scop index e3c7a0f..247672a 100644 --- a/tests/if1.scop +++ b/tests/if1.scop @@ -1,5 +1,6 @@ start: 22 end: 73 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/if2.scop b/tests/if2.scop index b333494..04244b3 100644 --- a/tests/if2.scop +++ b/tests/if2.scop @@ -1,5 +1,6 @@ start: 22 end: 78 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/implicit_condition.scop b/tests/implicit_condition.scop index ec96866..b9809ed 100644 --- a/tests/implicit_condition.scop +++ b/tests/implicit_condition.scop @@ -1,5 +1,6 @@ start: 38 end: 114 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/inc.scop b/tests/inc.scop index 4a94f5e..cf58d77 100644 --- a/tests/inc.scop +++ b/tests/inc.scop @@ -1,5 +1,6 @@ start: 38 end: 107 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/inc2.scop b/tests/inc2.scop index 5a3eceb..4f35b8a 100644 --- a/tests/inc2.scop +++ b/tests/inc2.scop @@ -1,5 +1,6 @@ start: 38 end: 107 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/inc3.scop b/tests/inc3.scop index 1d3aa70..af038af 100644 --- a/tests/inc3.scop +++ b/tests/inc3.scop @@ -1,5 +1,6 @@ start: 38 end: 110 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/inc4.scop b/tests/inc4.scop index 6e35105..d3a09ce 100644 --- a/tests/inc4.scop +++ b/tests/inc4.scop @@ -1,5 +1,6 @@ start: 38 end: 126 +indent: "\t" context: '[N] -> { : N <= 2147483548 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/inc5.scop b/tests/inc5.scop index cdcb21b..061bf2b 100644 --- a/tests/inc5.scop +++ b/tests/inc5.scop @@ -1,5 +1,6 @@ start: 38 end: 115 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '{ : }' diff --git a/tests/inf.scop b/tests/inf.scop index 7d59da6..88ad392 100644 --- a/tests/inf.scop +++ b/tests/inf.scop @@ -1,5 +1,6 @@ start: 74 end: 207 +indent: ' ' context: '[N] -> { : N >= 8 and N <= 16 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/inf2.scop b/tests/inf2.scop index a6644ec..b0b0340 100644 --- a/tests/inf2.scop +++ b/tests/inf2.scop @@ -1,5 +1,6 @@ start: 74 end: 208 +indent: ' ' context: '[N] -> { : N >= 8 and N <= 16 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/inf3.scop b/tests/inf3.scop index 7907575..0e144d8 100644 --- a/tests/inf3.scop +++ b/tests/inf3.scop @@ -1,5 +1,6 @@ start: 31 end: 104 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/inf4.scop b/tests/inf4.scop index 0bb14d2..d4e4698 100644 --- a/tests/inf4.scop +++ b/tests/inf4.scop @@ -1,5 +1,6 @@ start: 74 end: 216 +indent: ' ' context: '[N] -> { : N >= 8 and N <= 16 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/iterator_declaration.scop b/tests/iterator_declaration.scop index 1ea8eb4..c3006e7 100644 --- a/tests/iterator_declaration.scop +++ b/tests/iterator_declaration.scop @@ -1,5 +1,6 @@ start: 38 end: 111 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/label.scop b/tests/label.scop index 3e08424..b5f70d6 100644 --- a/tests/label.scop +++ b/tests/label.scop @@ -1,5 +1,6 @@ start: 22 end: 71 +indent: context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/loop.scop b/tests/loop.scop index cc21c83..b55f19c 100644 --- a/tests/loop.scop +++ b/tests/loop.scop @@ -1,5 +1,6 @@ start: 30 end: 94 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/loop2.scop b/tests/loop2.scop index f17efcd..82bb823 100644 --- a/tests/loop2.scop +++ b/tests/loop2.scop @@ -1,5 +1,6 @@ start: 34 end: 116 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/loop3.scop b/tests/loop3.scop index c65d7dc..7b5a252 100644 --- a/tests/loop3.scop +++ b/tests/loop3.scop @@ -1,5 +1,6 @@ start: 34 end: 124 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/loop4.scop b/tests/loop4.scop index 2e99216..b375afa 100644 --- a/tests/loop4.scop +++ b/tests/loop4.scop @@ -1,5 +1,6 @@ start: 34 end: 127 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/loop5.scop b/tests/loop5.scop index 4c2903c..13b1dc0 100644 --- a/tests/loop5.scop +++ b/tests/loop5.scop @@ -1,5 +1,6 @@ start: 34 end: 110 +indent: "\t" context: '[n, m] -> { : m <= 2147483645 and n <= 2147483646 and m >= -2147483648 and n >= -2147483648 }' arrays: diff --git a/tests/loop6.scop b/tests/loop6.scop index 2a746fd..6ff7219 100644 --- a/tests/loop6.scop +++ b/tests/loop6.scop @@ -1,5 +1,6 @@ start: 30 end: 137 +indent: "\t" context: '[n] -> { : n >= 0 and n <= 2147483647 }' arrays: - context: '[n] -> { : n >= 0 }' diff --git a/tests/loop7.scop b/tests/loop7.scop index 04b2f1c..55ab324 100644 --- a/tests/loop7.scop +++ b/tests/loop7.scop @@ -1,5 +1,6 @@ start: 40 end: 114 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/loop8.scop b/tests/loop8.scop index 1af33ca..f37f2bc 100644 --- a/tests/loop8.scop +++ b/tests/loop8.scop @@ -1,5 +1,6 @@ start: 38 end: 109 +indent: "\t" context: '[N] -> { : N >= 1 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/loop_body.scop b/tests/loop_body.scop index de170d6..9c9a911 100644 --- a/tests/loop_body.scop +++ b/tests/loop_body.scop @@ -1,5 +1,6 @@ start: 58 end: 96 +indent: "\t\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/loop_body2.scop b/tests/loop_body2.scop index a6de375..1ca5a23 100644 --- a/tests/loop_body2.scop +++ b/tests/loop_body2.scop @@ -1,5 +1,6 @@ start: 55 end: 92 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/macro.scop b/tests/macro.scop index 9c41f83..607a1cf 100644 --- a/tests/macro.scop +++ b/tests/macro.scop @@ -1,5 +1,6 @@ start: 39 end: 74 +indent: "\t" context: '{ : }' arrays: [] statements: diff --git a/tests/matmul.scop b/tests/matmul.scop index 73b50ea..40900dc 100644 --- a/tests/matmul.scop +++ b/tests/matmul.scop @@ -1,5 +1,6 @@ start: 95 end: 277 +indent: "\t" context: '[N, K, M] -> { : K >= 0 and N >= 0 and N <= 2147483647 and K <= 2147483647 and M <= 2147483647 and M >= -2147483648 }' arrays: diff --git a/tests/max.scop b/tests/max.scop index bf88c65..1a69725 100644 --- a/tests/max.scop +++ b/tests/max.scop @@ -1,5 +1,6 @@ start: 38 end: 117 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/min.scop b/tests/min.scop index 546b529..affc937 100644 --- a/tests/min.scop +++ b/tests/min.scop @@ -1,5 +1,6 @@ start: 38 end: 121 +indent: "\t" context: '[N] -> { : N <= 1073741823 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/min2.scop b/tests/min2.scop index ea3323e..05374da 100644 --- a/tests/min2.scop +++ b/tests/min2.scop @@ -1,5 +1,6 @@ start: 83 end: 166 +indent: "\t" context: '[N] -> { : N <= 1073741823 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/mod.scop b/tests/mod.scop index e711625..4df4ef6 100644 --- a/tests/mod.scop +++ b/tests/mod.scop @@ -1,5 +1,6 @@ start: 38 end: 123 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/mod2.scop b/tests/mod2.scop index 062b3f1..6426de1 100644 --- a/tests/mod2.scop +++ b/tests/mod2.scop @@ -1,5 +1,6 @@ start: 38 end: 127 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/omega.scop b/tests/omega.scop index 24721c7..81c67bc 100644 --- a/tests/omega.scop +++ b/tests/omega.scop @@ -1,5 +1,6 @@ start: 38 end: 140 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/piecewise.scop b/tests/piecewise.scop index bfaee0d..3cc386a 100644 --- a/tests/piecewise.scop +++ b/tests/piecewise.scop @@ -1,5 +1,6 @@ start: 56 end: 174 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/piecewise2.scop b/tests/piecewise2.scop index a6b350b..02ef78c 100644 --- a/tests/piecewise2.scop +++ b/tests/piecewise2.scop @@ -1,5 +1,6 @@ start: 56 end: 168 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/propagate.scop b/tests/propagate.scop index 311b378..f14a069 100644 --- a/tests/propagate.scop +++ b/tests/propagate.scop @@ -1,5 +1,6 @@ start: 66 end: 204 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= 0 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/quasi_affine.scop b/tests/quasi_affine.scop index fa416f5..429fd2c 100644 --- a/tests/quasi_affine.scop +++ b/tests/quasi_affine.scop @@ -1,5 +1,6 @@ start: 84 end: 218 +indent: "\t" context: '[N, in] -> { : N <= 2147483647 and N >= 0 and in <= 2147483647 and in >= -2147483648 }' arrays: diff --git a/tests/scalar.scop b/tests/scalar.scop index adf20ba..5ab8e9f 100644 --- a/tests/scalar.scop +++ b/tests/scalar.scop @@ -1,5 +1,6 @@ start: 22 end: 59 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/scalar_inc.scop b/tests/scalar_inc.scop index 1d08265..4a87534 100644 --- a/tests/scalar_inc.scop +++ b/tests/scalar_inc.scop @@ -1,5 +1,6 @@ start: 22 end: 65 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/shortcut1.scop b/tests/shortcut1.scop index 468cc25..d025d77 100644 --- a/tests/shortcut1.scop +++ b/tests/shortcut1.scop @@ -1,5 +1,6 @@ start: 26 end: 91 +indent: "\t" context: '[N] -> { : N >= -429496729 and N <= 2147483647 }' arrays: - context: '{ : }' diff --git a/tests/shortcut2.scop b/tests/shortcut2.scop index 342a282..ae3fa0a 100644 --- a/tests/shortcut2.scop +++ b/tests/shortcut2.scop @@ -1,5 +1,6 @@ start: 26 end: 91 +indent: "\t" context: '[N] -> { : N <= 429496729 and N >= -429496729 }' arrays: - context: '{ : }' diff --git a/tests/static.scop b/tests/static.scop index 0ea7fff..09d2624 100644 --- a/tests/static.scop +++ b/tests/static.scop @@ -1,5 +1,6 @@ start: 38 end: 142 +indent: "\t" context: '[n] -> { : n >= 0 and n <= 2147483647 }' arrays: - context: '[n] -> { : n >= 0 }' diff --git a/tests/struct1.scop b/tests/struct1.scop index cd53873..f2029d0 100644 --- a/tests/struct1.scop +++ b/tests/struct1.scop @@ -1,5 +1,6 @@ start: 50 end: 89 +indent: "\t" context: '{ : }' types: - name: s diff --git a/tests/struct10.scop b/tests/struct10.scop index 35c6ba6..d779a3f 100644 --- a/tests/struct10.scop +++ b/tests/struct10.scop @@ -1,5 +1,6 @@ start: 57 end: 99 +indent: "\t" context: '{ : }' types: - name: s diff --git a/tests/struct11.scop b/tests/struct11.scop index 1f2b7fb..fa7adbe 100644 --- a/tests/struct11.scop +++ b/tests/struct11.scop @@ -1,5 +1,6 @@ start: 65 end: 127 +indent: "\t" context: '{ : }' types: - name: s diff --git a/tests/struct2.scop b/tests/struct2.scop index 326f41a..fc0cd2e 100644 --- a/tests/struct2.scop +++ b/tests/struct2.scop @@ -1,5 +1,6 @@ start: 58 end: 166 +indent: "\t" context: '{ : }' types: - name: s diff --git a/tests/struct3.scop b/tests/struct3.scop index b14c97e..597c884 100644 --- a/tests/struct3.scop +++ b/tests/struct3.scop @@ -1,5 +1,6 @@ start: 66 end: 259 +indent: "\t" context: '{ : }' types: - name: s diff --git a/tests/struct4.scop b/tests/struct4.scop index c75a1dc..d3dcded 100644 --- a/tests/struct4.scop +++ b/tests/struct4.scop @@ -1,5 +1,6 @@ start: 75 end: 189 +indent: "\t" context: '{ : }' types: - name: s diff --git a/tests/struct5.scop b/tests/struct5.scop index e6a05d4..5c3139e 100644 --- a/tests/struct5.scop +++ b/tests/struct5.scop @@ -1,5 +1,6 @@ start: 77 end: 191 +indent: "\t" context: '{ : }' types: - name: s diff --git a/tests/struct6.scop b/tests/struct6.scop index 59a9aca..bad92d9 100644 --- a/tests/struct6.scop +++ b/tests/struct6.scop @@ -1,5 +1,6 @@ start: 51 end: 91 +indent: "\t" context: '{ : }' types: - name: s diff --git a/tests/struct7.scop b/tests/struct7.scop index ef9d73d..4178c63 100644 --- a/tests/struct7.scop +++ b/tests/struct7.scop @@ -1,5 +1,6 @@ start: 132 end: 179 +indent: "\t" context: '{ : }' types: - name: scomplex diff --git a/tests/struct8.scop b/tests/struct8.scop index c0bdc3c..23ade7d 100644 --- a/tests/struct8.scop +++ b/tests/struct8.scop @@ -1,5 +1,6 @@ start: 101 end: 225 +indent: "\t" context: '{ : }' types: - name: s diff --git a/tests/struct9.scop b/tests/struct9.scop index 9fbec99..7225a94 100644 --- a/tests/struct9.scop +++ b/tests/struct9.scop @@ -1,5 +1,6 @@ start: 127 end: 359 +indent: "\t" context: '{ : }' types: - name: s diff --git a/tests/ternary.scop b/tests/ternary.scop index 5e605d1..c9d6afd 100644 --- a/tests/ternary.scop +++ b/tests/ternary.scop @@ -1,5 +1,6 @@ start: 47 end: 141 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/tobi1.scop b/tests/tobi1.scop index 0bf00f4..f381f57 100644 --- a/tests/tobi1.scop +++ b/tests/tobi1.scop @@ -1,5 +1,6 @@ start: 47 end: 131 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/tobi2.scop b/tests/tobi2.scop index 5574f77..5e31b4d 100644 --- a/tests/tobi2.scop +++ b/tests/tobi2.scop @@ -1,5 +1,6 @@ start: 102 end: 201 +indent: ' ' context: '[N] -> { : N >= 0 and N <= 4294967295 }' arrays: - context: '{ : }' diff --git a/tests/unsigned1.scop b/tests/unsigned1.scop index 116b730..9b5a40f 100644 --- a/tests/unsigned1.scop +++ b/tests/unsigned1.scop @@ -1,5 +1,6 @@ start: 60 end: 256 +indent: ' ' context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/unsigned2.scop b/tests/unsigned2.scop index 889e181..d77b9f9 100644 --- a/tests/unsigned2.scop +++ b/tests/unsigned2.scop @@ -1,5 +1,6 @@ start: 40 end: 112 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/unsigned3.scop b/tests/unsigned3.scop index 5f87e76..fc7d268 100644 --- a/tests/unsigned3.scop +++ b/tests/unsigned3.scop @@ -1,5 +1,6 @@ start: 40 end: 101 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/unsigned_break1.scop b/tests/unsigned_break1.scop index 686329e..ee6895e 100644 --- a/tests/unsigned_break1.scop +++ b/tests/unsigned_break1.scop @@ -1,5 +1,6 @@ start: 40 end: 150 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/unsigned_break2.scop b/tests/unsigned_break2.scop index 23f27a1..a994bf1 100644 --- a/tests/unsigned_break2.scop +++ b/tests/unsigned_break2.scop @@ -1,5 +1,6 @@ start: 50 end: 172 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/wdp.scop b/tests/wdp.scop index 4b82772..8153fd3 100644 --- a/tests/wdp.scop +++ b/tests/wdp.scop @@ -1,5 +1,6 @@ start: 248 end: 619 +indent: "\t" context: '[N] -> { : N >= 8 and N <= 16 }' arrays: - context: '{ : }' diff --git a/tests/while.scop b/tests/while.scop index adfb9dc..6663ba9 100644 --- a/tests/while.scop +++ b/tests/while.scop @@ -1,5 +1,6 @@ start: 83 end: 210 +indent: "\t" context: '[n] -> { : n <= 2147483647 and n >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/while_affine.scop b/tests/while_affine.scop index 2f7875c..f556e9b 100644 --- a/tests/while_affine.scop +++ b/tests/while_affine.scop @@ -1,5 +1,6 @@ start: 42 end: 206 +indent: "\t" context: '[N] -> { : N >= 0 and N <= 2147483647 }' arrays: - context: '[N] -> { : N >= 0 }' diff --git a/tests/while_break.scop b/tests/while_break.scop index ed4d954..8fbaa38 100644 --- a/tests/while_break.scop +++ b/tests/while_break.scop @@ -1,5 +1,6 @@ start: 45 end: 294 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/while_break2.scop b/tests/while_break2.scop index 4261500..d03dd31 100644 --- a/tests/while_break2.scop +++ b/tests/while_break2.scop @@ -1,5 +1,6 @@ start: 45 end: 157 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= -2147483648 }' arrays: - context: '{ : }' diff --git a/tests/while_inc.scop b/tests/while_inc.scop index 597c7b4..d0ac912 100644 --- a/tests/while_inc.scop +++ b/tests/while_inc.scop @@ -1,5 +1,6 @@ start: 31 end: 109 +indent: "\t" context: '{ : }' arrays: - context: '{ : }' diff --git a/tests/while_overflow.scop b/tests/while_overflow.scop index 352f125..bcc0207 100644 --- a/tests/while_overflow.scop +++ b/tests/while_overflow.scop @@ -1,5 +1,6 @@ start: 74 end: 177 +indent: "\t" context: '[N] -> { : N <= 2147483647 and N >= -2147483648 }' arrays: - context: '{ : }' -- 2.11.4.GIT