Merge branch 'master' into cooking

diff --git a/parser.c b/parser.c
index 7d9ac6a353155724928a29a70b10c4e25f27cca9..97a3ccba57f5c74428312d17b6222380483488ba 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -280,12 +280,12 @@ static ast_value* parser_const_string(parser_t *parser, const char *str, bool do
         char name[32];
         util_snprintf(name, sizeof(name), "dotranslate_%lu", (unsigned long)(parser->translated++));
         out = ast_value_new(parser_ctx(parser), name, TYPE_STRING);
+        out->expression.flags |= AST_FLAG_INCLUDE_DEF;
     } else
         out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_STRING);
     out->cvq      = CV_CONST;
     out->hasvalue = true;
     out->isimm    = true;
-    out->expression.flags |= AST_FLAG_INCLUDE_DEF;
     out->constval.vstring = parser_strdup(str);
     vec_push(parser->imm_string, out);
     util_htseth(parser->ht_imm_string, str, hash, out);