From 5cd907c478039edef5a24777056ca679a2ba624c Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 21 Dec 2012 16:51:17 +0100 Subject: [PATCH] debug: no longer generate tabs * src/closure.c, src/derives.c, src/nullable.c, tests/sets.at: Use spaces. --- src/closure.c | 11 ++--- src/derives.c | 4 +- src/nullable.c | 2 +- tests/sets.at | 136 ++++++++++++++++++++++++++++----------------------------- 4 files changed, 75 insertions(+), 78 deletions(-) diff --git a/src/closure.c b/src/closure.c index 62d8477..4719c41 100644 --- a/src/closure.c +++ b/src/closure.c @@ -77,12 +77,9 @@ print_firsts (void) for (i = ntokens; i < nsyms; i++) { bitset_iterator iter; - fprintf (stderr, "\t%s firsts\n", symbols[i]->tag); + fprintf (stderr, " %s firsts\n", symbols[i]->tag); BITSET_FOR_EACH (iter, FIRSTS (i), j, 0) - { - fprintf (stderr, "\t\t%s\n", - symbols[j + ntokens]->tag); - } + fprintf (stderr, " %s\n", symbols[j + ntokens]->tag); } fprintf (stderr, "\n\n"); } @@ -98,10 +95,10 @@ print_fderives (void) for (i = ntokens; i < nsyms; i++) { bitset_iterator iter; - fprintf (stderr, "\t%s derives\n", symbols[i]->tag); + fprintf (stderr, " %s derives\n", symbols[i]->tag); BITSET_FOR_EACH (iter, FDERIVES (i), r, 0) { - fprintf (stderr, "\t\t%3d ", r); + fprintf (stderr, " %3d ", r); rule_rhs_print (&rules[r], stderr); fprintf (stderr, "\n"); } diff --git a/src/derives.c b/src/derives.c index 8902392..aa4d927 100644 --- a/src/derives.c +++ b/src/derives.c @@ -47,10 +47,10 @@ print_derives (void) for (i = ntokens; i < nsyms; i++) { rule **rp; - fprintf (stderr, "\t%s derives\n", symbols[i]->tag); + fprintf (stderr, " %s derives\n", symbols[i]->tag); for (rp = derives[i - ntokens]; *rp; ++rp) { - fprintf (stderr, "\t\t%3d ", (*rp)->user_number); + fprintf (stderr, " %3d ", (*rp)->user_number); rule_rhs_print (*rp, stderr); fprintf (stderr, "\n"); } diff --git a/src/nullable.c b/src/nullable.c index 8fe4495..b3769fe 100644 --- a/src/nullable.c +++ b/src/nullable.c @@ -47,7 +47,7 @@ nullable_print (FILE *out) int i; fputs ("NULLABLE\n", out); for (i = ntokens; i < nsyms; i++) - fprintf (out, "\t%s: %s\n", symbols[i]->tag, + fprintf (out, " %s: %s\n", symbols[i]->tag, nullable[i - ntokens] ? "yes" : "no"); fputs ("\n\n", out); } diff --git a/tests/sets.at b/tests/sets.at index 4cbdfd6..89519c3 100644 --- a/tests/sets.at +++ b/tests/sets.at @@ -29,25 +29,25 @@ m4_define([AT_EXTRACT_SETS], :null p n - /^[ ]*$/ !b null + /^ *$/ !b null } /^FIRSTS$/ { :firsts p n - /^[ ]*$/ !b firsts + /^ *$/ !b firsts } /^FDERIVES$/ { :fderiv p n - /^[ ]*$/ !b fderiv + /^ *$/ !b fderiv } /^DERIVES$/ { :deriv p n - /^[ ]*$/ !b deriv + /^ *$/ !b deriv } ]]) AT_CHECK([sed -f extract.sed $1], 0, [stdout]) @@ -82,28 +82,28 @@ AT_BISON_CHECK([[--trace=sets input.y]], [], [], [stderr]) AT_EXTRACT_SETS([stderr], [sets]) AT_CHECK([[cat sets]], [], [[DERIVES - $accept derives - 0 e $end - e derives - 1 'e' - 2 /* empty */ + $accept derives + 0 e $end + e derives + 1 'e' + 2 /* empty */ NULLABLE - $accept: no - e: yes + $accept: no + e: yes FIRSTS - $accept firsts - $accept - e - e firsts - e + $accept firsts + $accept + e + e firsts + e FDERIVES - $accept derives - 0 e $end - 1 'e' - 2 /* empty */ - e derives - 1 'e' - 2 /* empty */ + $accept derives + 0 e $end + 1 'e' + 2 /* empty */ + e derives + 1 'e' + 2 /* empty */ ]]) AT_CLEANUP @@ -164,7 +164,7 @@ h: 'h'; AT_BISON_CHECK([[--trace=sets input.y]], [], [], [stderr]) -AT_CHECK([[sed -n 's/[ ]*$//;/^RTC: Firsts Output BEGIN/,/^RTC: Firsts Output END/p' stderr]], [], +AT_CHECK([[sed -n 's/[ ]*$//;/^RTC: Firsts Output BEGIN/,/^RTC: Firsts Output END/p' stderr]], [], [[RTC: Firsts Output BEGIN 012345678 @@ -212,43 +212,43 @@ AT_BISON_CHECK([[--trace=sets input.y]], [], [], [stderr]) AT_EXTRACT_SETS([stderr], [sets]) AT_CHECK([[cat sets]], [], [[DERIVES - $accept derives - 0 exp $end - exp derives - 1 exp '<' exp - 2 exp '>' exp - 3 exp '+' exp - 4 exp '-' exp - 5 exp '^' exp - 6 exp '=' exp - 7 "exp" + $accept derives + 0 exp $end + exp derives + 1 exp '<' exp + 2 exp '>' exp + 3 exp '+' exp + 4 exp '-' exp + 5 exp '^' exp + 6 exp '=' exp + 7 "exp" NULLABLE - $accept: no - exp: no + $accept: no + exp: no FIRSTS - $accept firsts - $accept - exp - exp firsts - exp + $accept firsts + $accept + exp + exp firsts + exp FDERIVES - $accept derives - 0 exp $end - 1 exp '<' exp - 2 exp '>' exp - 3 exp '+' exp - 4 exp '-' exp - 5 exp '^' exp - 6 exp '=' exp - 7 "exp" - exp derives - 1 exp '<' exp - 2 exp '>' exp - 3 exp '+' exp - 4 exp '-' exp - 5 exp '^' exp - 6 exp '=' exp - 7 "exp" + $accept derives + 0 exp $end + 1 exp '<' exp + 2 exp '>' exp + 3 exp '+' exp + 4 exp '-' exp + 5 exp '^' exp + 6 exp '=' exp + 7 "exp" + exp derives + 1 exp '<' exp + 2 exp '>' exp + 3 exp '+' exp + 4 exp '-' exp + 5 exp '^' exp + 6 exp '=' exp + 7 "exp" ]]) AT_CLEANUP @@ -288,15 +288,15 @@ mv stdout expout # Get the final state in the report, from the "accept" action.. AT_CHECK([sed -n ' /^State \(.*\)/{ - s//final state \1/ - x - } - / accept/{ - x - p - q - } - ' input.output], - 0, [expout]) + s//final state \1/ + x + } + / accept/{ + x + p + q + } + ' input.output], + 0, [expout]) AT_CLEANUP -- 2.7.4