bool before int

This commit is contained in:
Jesse Bannon 2024-06-02 11:24:49 -07:00
parent 5184113121
commit c91bd7c056
2 changed files with 3 additions and 3 deletions

View file

@ -69,12 +69,12 @@ class ScriptUtils:
return BuiltInFunction( return BuiltInFunction(
name="concat", args=[BuiltInFunction(name="string", args=[arg]) for arg in ast] name="concat", args=[BuiltInFunction(name="string", args=[arg]) for arg in ast]
) )
if isinstance(value, bool):
return Boolean(value)
if isinstance(value, int): if isinstance(value, int):
return Integer(value) return Integer(value)
if isinstance(value, float): if isinstance(value, float):
return Float(value) return Float(value)
if isinstance(value, bool):
return Boolean(value)
if isinstance(value, list): if isinstance(value, list):
return UnresolvedArray([cls._to_script_argument(val) for val in value]) return UnresolvedArray([cls._to_script_argument(val) for val in value])
if isinstance(value, dict): if isinstance(value, dict):

View file

@ -119,7 +119,7 @@ class TestUnstructuredDictFormatterValidator(object):
"key2": "no variables", "key2": "no variables",
"key3": "{ %int(3) }", "key3": "{ %int(3) }",
"key4": "{ %float(4.132) }", "key4": "{ %float(4.132) }",
"key5": "{ %int(True) }", "key5": "{ %bool(True) }",
"key6": "{ { %concat( %string( variable ), %string( '''_key''' ) ): '''value''', '''static_key''': %concat( %string( variable ), %string( '''_value''' ) ) } }", "key6": "{ { %concat( %string( variable ), %string( '''_key''' ) ): '''value''', '''static_key''': %concat( %string( variable ), %string( '''_value''' ) ) } }",
"key7": "{ [ '''list_1''', %concat( %string( '''list_''' ), %string( variable_2 ) ) ] }", "key7": "{ [ '''list_1''', %concat( %string( '''list_''' ), %string( variable_2 ) ) ] }",
"key8": "{ %concat( %string( '''string ''' ), %string( variable1 ), %string( ''' with multiple ''' ), %string( variable2 ) ) }", "key8": "{ %concat( %string( '''string ''' ), %string( variable1 ), %string( ''' with multiple ''' ), %string( variable2 ) ) }",