@@ -2415,7 +2415,8 @@ def _eval_scalar(value, params):
2415
2415
if _is_kind_number (value ):
2416
2416
value = value .split ('_' )[0 ]
2417
2417
try :
2418
- value = str (eval (value , {}, params ))
2418
+ value = eval (value , {}, params )
2419
+ value = (repr if isinstance (value , str ) else str )(value )
2419
2420
except (NameError , SyntaxError , TypeError ):
2420
2421
return value
2421
2422
except Exception as msg :
@@ -2614,10 +2615,6 @@ def analyzevars(block):
2614
2615
vars [n ]['dimension' ].append (d )
2615
2616
2616
2617
if 'dimension' in vars [n ]:
2617
- if isintent_c (vars [n ]):
2618
- shape_macro = 'shape'
2619
- else :
2620
- shape_macro = 'shape' # 'fshape'
2621
2618
if isstringarray (vars [n ]):
2622
2619
if 'charselector' in vars [n ]:
2623
2620
d = vars [n ]['charselector' ]
@@ -2647,7 +2644,6 @@ def analyzevars(block):
2647
2644
n_is_input = l_or (isintent_in , isintent_inout ,
2648
2645
isintent_inplace )(vars [n ])
2649
2646
if 'dimension' in vars [n ]: # n is array
2650
- ni = len (vars [n ]['dimension' ]) # array dimensionality
2651
2647
for i , d in enumerate (vars [n ]['dimension' ]):
2652
2648
coeffs_and_deps = dimension_exprs .get (d )
2653
2649
if coeffs_and_deps is None :
@@ -2721,7 +2717,6 @@ def analyzevars(block):
2721
2717
if v_deps :
2722
2718
vars [v ]['depend' ] = list (set (v_deps ))
2723
2719
elif isstring (vars [n ]):
2724
- length = '1'
2725
2720
if 'charselector' in vars [n ]:
2726
2721
if '*' in vars [n ]['charselector' ]:
2727
2722
length = _eval_length (vars [n ]['charselector' ]['*' ],
0 commit comments