Fixed GCC warnings with '-m32'.

diff --git a/re2c/src/dfa/dump.cc b/re2c/src/dfa/dump.cc
index fc531a44cc36c6a3770403734d02e62aa4fc4d4f..e884a609c08daddb242da15bff1f3e3f6d2b675e 100644 (file)
--- a/re2c/src/dfa/dump.cc
+++ b/re2c/src/dfa/dump.cc
@@ -98,8 +98,8 @@ void dump_dfa_t::closure(const closure_t &clos, uint32_t state, bool isnew)
                ">", isnew ? "" : "i", state);
 
        for (s = s1; s != s2; ++s) {
-               fprintf(stderr, "<TR><TD ALIGN=\"left\" PORT=\"_%u_%ld\"%s%s><FONT%s>%u",
-                       index(s->state), s - s1, color, style, color, index(s->state));
+               fprintf(stderr, "<TR><TD ALIGN=\"left\" PORT=\"_%u_%d\"%s%s><FONT%s>%u",
+                       index(s->state), (int)(s - s1), color, style, color, index(s->state));
                closure_tags(s);
                fprintf(stderr, "</FONT></TD></TR>");
        }
@@ -122,7 +122,8 @@ void dump_dfa_t::state0(const closure_t &clos)
        closure(clos, 0, true);
        fprintf(stderr, "  void [shape=point]\n");
        for (cclositer_t c = shadow->begin(); c != shadow->end(); ++c) {
-               fprintf(stderr, "  void -> 0:_%u_%ld:w [style=dotted color=lightgray fontcolor=lightgray label=\"", index(c->state), c - shadow->begin());
+               fprintf(stderr, "  void -> 0:_%u_%d:w [style=dotted color=lightgray fontcolor=lightgray label=\"",
+                       index(c->state), (int)(c - shadow->begin()));
                dump_tags(tagpool, c->ttran, c->tvers);
                fprintf(stderr, "\"]\n");
        }
@@ -158,8 +159,8 @@ void dump_dfa_t::state(const closure_t &clos, size_t state, size_t symbol, bool
                fprintf(stderr, "\"]\n");
        }
        for (cclositer_t b = shadow->begin(), c = b; c != shadow->end(); ++c) {
-               fprintf(stderr, "  %u:%u:e -> %s%u:_%u_%ld:w [color=lightgray fontcolor=lightgray label=\"%u",
-                       x, index(c->origin), prefix, z, index(c->state), c - b, a);
+               fprintf(stderr, "  %u:%u:e -> %s%u:_%u_%d:w [color=lightgray fontcolor=lightgray label=\"%u",
+                       x, index(c->origin), prefix, z, index(c->state), (int)(c - b), a);
                dump_tags(tagpool, c->ttran, c->tvers);
                fprintf(stderr, "\"]\n");
        }

diff --git a/re2c/src/skeleton/generate_code.cc b/re2c/src/skeleton/generate_code.cc
index b54d765ec4954ffbd6fb93034672767522dc56e9..1a92709934d7e5273a49fd8b81a6fa358bde4c52 100644 (file)
--- a/re2c/src/skeleton/generate_code.cc
+++ b/re2c/src/skeleton/generate_code.cc
@@ -101,7 +101,7 @@ void emit_start(OutputFile &o, size_t maxfill, const std::string &name,
 {
        const opt_t *opts = o.block().opts;
        const size_t sizeof_cunit = opts->encoding.szCodeUnit();
-       const size_t norule = rule2key(Rule::NONE, sizeof_key, def);
+       const uint64_t norule = rule2key(Rule::NONE, sizeof_key, def);
        std::string filename = opts->output_file;
        if (filename.empty()) {
                filename = "<stdout>";
@@ -484,7 +484,7 @@ void emit_action(OutputFile &o, uint32_t ind, const DFA &dfa, size_t rid)
 {
        const std::string &name = dfa.name;
        const Rule &r = dfa.rules[rid];
-       const size_t rkey = rule2key(rid, dfa.key_size, dfa.def_rule);
+       const uint64_t rkey = rule2key(rid, dfa.key_size, dfa.def_rule);
        size_t ntag = 3;
        for (size_t t = r.ltag; t < r.htag; ++t) {
                const Tag &tag = dfa.tags[t];

diff --git a/re2c/src/skeleton/skeleton.cc b/re2c/src/skeleton/skeleton.cc
index 12b82e0931dfdedc679afa4ea66656d18e95f2f6..acf90da956b6aab7ab1f082fb438006b16cbd30e 100644 (file)
--- a/re2c/src/skeleton/skeleton.cc
+++ b/re2c/src/skeleton/skeleton.cc
@@ -92,7 +92,7 @@ Skeleton::~Skeleton()
        delete[] nodes;
 }
 
-size_t rule2key(size_t rule, size_t key, size_t def)
+uint64_t rule2key(size_t rule, size_t key, size_t def)
 {
        switch (key) {
                default: assert(false); // shouldn't happen

diff --git a/re2c/src/skeleton/skeleton.h b/re2c/src/skeleton/skeleton.h
index 1d91cdfb597111c6a6ebc440f964b0e667eca354..25bc20d8066a19843ce2882fe9d5abc3b44b1fb1 100644 (file)
--- a/re2c/src/skeleton/skeleton.h
+++ b/re2c/src/skeleton/skeleton.h
@@ -99,7 +99,7 @@ template<typename key_t> key_t rule2key(size_t r, size_t def)
        }
 }
 
-size_t rule2key(size_t rule, size_t key, size_t def);
+uint64_t rule2key(size_t rule, size_t key, size_t def);
 uint32_t maxpath(const Skeleton &skel);
 void warn_undefined_control_flow(const Skeleton &skel, Warn &warn);
 void fprint_default_path(FILE *f, const Skeleton &skel, const path_t &p);