Commit 0325c3bc authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Emit utf8 strings

parent 5917b885
...@@ -1906,14 +1906,14 @@ def _assign_expression(expr): ...@@ -1906,14 +1906,14 @@ def _assign_expression(expr):
basic_right = find_basic_type (expr.right.exprType) basic_right = find_basic_type (expr.right.exprType)
cast_left, cast_right = type_name(basic_left), type_name(basic_right) cast_left, cast_right = type_name(basic_left), type_name(basic_right)
if cast_left != cast_right: if cast_left != cast_right:
res = '{cast}({val})'.format(cast=cast_left, val=right_str) res = u'{cast}({val})'.format(cast=cast_left, val=right_str)
else: else:
if hasattr (expr.right, "expected_type") \ if hasattr (expr.right, "expected_type") \
and expr.right.expected_type is not None: and expr.right.expected_type is not None:
cast_expected = type_name (expr.right.expected_type) cast_expected = type_name (expr.right.expected_type)
if cast_expected != cast_left: if cast_expected != cast_left:
res = '{cast}({val})'.format(cast=cast_left, res = u'{cast}({val})'.format(cast=cast_left,
val=right_str) val=right_str)
else: else:
res = right_str res = right_str
...@@ -2178,6 +2178,7 @@ def _conditional(cond): ...@@ -2178,6 +2178,7 @@ def _conditional(cond):
stmts = [] stmts = []
tmp_type = type_name(cond.exprType) tmp_type = type_name(cond.exprType)
print "CONDITIONAL : ", cond.inputString, tmp_type
if tmp_type == 'String': if tmp_type == 'String':
then_str = cond.value['then'].value.replace("'", '"') then_str = cond.value['then'].value.replace("'", '"')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment