@@ -2415,7 +2415,8 @@ def _eval_scalar(value, params):
24152415 if _is_kind_number (value ):
24162416 value = value .split ('_' )[0 ]
24172417 try :
2418- value = str (eval (value , {}, params ))
2418+ value = eval (value , {}, params )
2419+ value = (repr if isinstance (value , str ) else str )(value )
24192420 except (NameError , SyntaxError , TypeError ):
24202421 return value
24212422 except Exception as msg :
@@ -2614,10 +2615,6 @@ def analyzevars(block):
26142615 vars [n ]['dimension' ].append (d )
26152616
26162617 if 'dimension' in vars [n ]:
2617- if isintent_c (vars [n ]):
2618- shape_macro = 'shape'
2619- else :
2620- shape_macro = 'shape' # 'fshape'
26212618 if isstringarray (vars [n ]):
26222619 if 'charselector' in vars [n ]:
26232620 d = vars [n ]['charselector' ]
@@ -2647,7 +2644,6 @@ def analyzevars(block):
26472644 n_is_input = l_or (isintent_in , isintent_inout ,
26482645 isintent_inplace )(vars [n ])
26492646 if 'dimension' in vars [n ]: # n is array
2650- ni = len (vars [n ]['dimension' ]) # array dimensionality
26512647 for i , d in enumerate (vars [n ]['dimension' ]):
26522648 coeffs_and_deps = dimension_exprs .get (d )
26532649 if coeffs_and_deps is None :
@@ -2721,7 +2717,6 @@ def analyzevars(block):
27212717 if v_deps :
27222718 vars [v ]['depend' ] = list (set (v_deps ))
27232719 elif isstring (vars [n ]):
2724- length = '1'
27252720 if 'charselector' in vars [n ]:
27262721 if '*' in vars [n ]['charselector' ]:
27272722 length = _eval_length (vars [n ]['charselector' ]['*' ],
0 commit comments