- BugFix of the last fix ...

[libfirm] / ir / ir / irargs.c

diff --git a/ir/ir/irargs.c b/ir/ir/irargs.c
index b65c8fb..66bbd7f 100644 (file)
--- a/ir/ir/irargs.c
+++ b/ir/ir/irargs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -27,13 +27,13 @@
 # include "config.h"
 #endif
 
-#ifdef WITH_LIBCORE
+#include "firm_config.h"
 
 #include "bitset.h"
 
 #include <ctype.h>
-#include <libcore/lc_printf.h>
 
+#include "lc_printf.h"
 #include "firm_common.h"
 #include "irnode_t.h"
 #include "entity_t.h"
@@ -249,10 +249,11 @@ static int firm_emit_indent(lc_appendable_t *app,
     const lc_arg_occ_t *occ, const lc_arg_value_t *arg)
 {
        int i;
-       int amount = arg->v_int * (occ->width > 0 ? occ->width : 1);
+       int width  = occ->width > 0 ? occ->width : 1;
+       int amount = arg->v_int * width;
 
        for(i = 0; i < amount; ++i)
-               lc_appendable_chadd(app, ' ');
+               lc_appendable_chadd(app, (i % width) == 0 ? '|' : ' ');
 
        return amount;
 }
@@ -271,7 +272,6 @@ static int firm_emit_pnc(lc_appendable_t *app,
 
 lc_arg_env_t *firm_get_arg_env(void)
 {
-#define X(name, letter) {"firm:" name, letter}
 
   static lc_arg_env_t *env = NULL;
 
@@ -286,6 +286,7 @@ lc_arg_env_t *firm_get_arg_env(void)
     const char *name;
     char letter;
   } args[] = {
+#define X(name, letter) {"firm:" name, letter}
     X("type",      't'),
     X("entity",    'e'),
     X("entity_ld", 'E'),
@@ -296,6 +297,7 @@ lc_arg_env_t *firm_get_arg_env(void)
     X("mode",      'm'),
     X("block",     'B'),
     X("cg_path",   'P'),
+#undef X
   };
 
   size_t i;
@@ -309,7 +311,7 @@ lc_arg_env_t *firm_get_arg_env(void)
       lc_arg_register(env, args[i].name, args[i].letter, &firm_handler);
 
     lc_arg_register(env, "firm:ident",    'I', &ident_handler);
-    lc_arg_register(env, "firm:indent",   '>', &indent_handler);
+    lc_arg_register(env, "firm:indent",   'D', &indent_handler);
     lc_arg_register(env, "firm:dbg_info", 'G', &debug_handler);
     lc_arg_register(env, "firm:bitset",   'B', &bitset_handler);
     lc_arg_register(env, "firm:pnc",      '=', &pnc_handler);
@@ -317,5 +319,3 @@ lc_arg_env_t *firm_get_arg_env(void)
 
   return env;
 }
-
-#endif /* WITH_LIBCORE */