Merge branch 'master' into cooking

This commit is contained in:
Wolfgang Bumiller 2013-06-01 20:12:27 +02:00
commit 9f2b9e1b46

View file

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