diff --git a/src/jsx.erl b/src/jsx.erl index 0af0af1..708a5d9 100644 --- a/src/jsx.erl +++ b/src/jsx.erl @@ -273,19 +273,19 @@ multi_json_body() -> <<"0 1 -1 1e1 0.7 0.7e-1 truefalsenull {} {\"key\": \"value\"}[] [1, 2, 3]\"hope this works\"">>. multi_test_result() -> - [[{integer, "0"}], - [{integer, "1"}], - [{integer, "-1"}], - [{float, "1.0e1"}], - [{float, "0.7"}], - [{float, "0.7e-1"}], + [[{integer, 0}], + [{integer, 1}], + [{integer, -1}], + [{float, 1.0e1}], + [{float, 0.7}], + [{float, 0.7e-1}], [{literal, true}], [{literal, false}], [{literal, null}], [start_object, end_object], [start_object, {key, "key"}, {string, "value"}, end_object], [start_array, end_array], - [start_array, {integer, "1"}, {integer, "2"}, {integer, "3"}, end_array], + [start_array, {integer, 1}, {integer, 2}, {integer, 3}, end_array], [{string, "hope this works"}] ]. diff --git a/test/cases/array.test b/test/cases/array.test index 8b86574..f1c235f 100644 --- a/test/cases/array.test +++ b/test/cases/array.test @@ -13,7 +13,7 @@ {literal,true}, {literal,false}, {literal,null}, - {float,"0.7"}, + {float,0.7}, start_object, {key,"key"}, {string,"value"}, @@ -24,6 +24,6 @@ start_array,end_array,end_array, {string,"\n\r\\"}, start_array, - {integer,"-1"}, + {integer,-1}, end_array,end_array,end_json]}. {json, "array.json"}. diff --git a/test/cases/exp.test b/test/cases/exp.test index 490bbbd..02d4416 100644 --- a/test/cases/exp.test +++ b/test/cases/exp.test @@ -1,14 +1,14 @@ {name, "exp"}. {jsx, [start_array,start_array, - {float,"2.0e7"}, + {float,2.0e7}, end_array, - {float,"2.0e7"}, + {float,2.0e7}, start_object, {key,"key"}, - {float,"2.0e7"}, + {float,2.0e7}, {key,"another key"}, - {float,"2.0e7"}, + {float,2.0e7}, end_object, - {float,"4.2e70"}, + {float,4.2e70}, end_array,end_json]}. {json, "exp.json"}. diff --git a/test/cases/fraction.test b/test/cases/fraction.test index 30b1de2..a0dbd2d 100644 --- a/test/cases/fraction.test +++ b/test/cases/fraction.test @@ -1,19 +1,19 @@ {name, "fraction"}. {jsx, [start_array,start_array, - {float,"2.0"}, + {float,2.0}, end_array, - {float,"2.0"}, + {float,2.0}, start_object, {key,"key"}, - {float,"2.0e7"}, + {float,2.0e7}, {key,"another key"}, - {float,"2.0e7"}, + {float,2.0e7}, end_object,start_object, {key,"key"}, - {float,"2.0"}, + {float,2.0}, {key,"another key"}, - {float,"2.0"}, + {float,2.0}, end_object, - {float,"4.2"}, + {float,4.2}, end_array,end_json]}. {json, "fraction.json"}. \ No newline at end of file diff --git a/test/cases/integer.test b/test/cases/integer.test index 06f75a3..2f2eee9 100644 --- a/test/cases/integer.test +++ b/test/cases/integer.test @@ -1,14 +1,14 @@ {name, "integer"}. {jsx, [start_array,start_array, - {integer,"20"}, + {integer,20}, end_array, - {integer,"20"}, + {integer,20}, start_object, {key,"key"}, - {integer,"20"}, + {integer,20}, {key,"another key"}, - {integer,"20"}, + {integer,20}, end_object, - {integer,"42"}, + {integer,42}, end_array,end_json]}. {json, "integer.json"}. diff --git a/test/cases/naked_number_a.test b/test/cases/naked_number_a.test index 74baa86..debbc47 100644 --- a/test/cases/naked_number_a.test +++ b/test/cases/naked_number_a.test @@ -1,3 +1,3 @@ {name, "naked_number_a"}. -{jsx, [{integer,"42"},end_json]}. +{jsx, [{integer,42},end_json]}. {json, "naked_number_a.json"}. diff --git a/test/cases/naked_number_b.test b/test/cases/naked_number_b.test index 586dca2..55f50f8 100644 --- a/test/cases/naked_number_b.test +++ b/test/cases/naked_number_b.test @@ -1,3 +1,3 @@ {name, "naked_number_b"}. -{jsx, [{integer,"-42"},end_json]}. +{jsx, [{integer,-42},end_json]}. {json, "naked_number_b.json"}. diff --git a/test/cases/naked_number_c.test b/test/cases/naked_number_c.test index 4fddb7f..5715167 100644 --- a/test/cases/naked_number_c.test +++ b/test/cases/naked_number_c.test @@ -1,3 +1,3 @@ {name, "naked_number_c"}. -{jsx, [{float,"-0.7"},end_json]}. +{jsx, [{float,-0.7},end_json]}. {json, "naked_number_c.json"}. diff --git a/test/cases/naked_number_d.test b/test/cases/naked_number_d.test index 27923d6..15202a1 100644 --- a/test/cases/naked_number_d.test +++ b/test/cases/naked_number_d.test @@ -1,3 +1,3 @@ {name, "naked_number_d"}. -{jsx, [{float,"0.7"},end_json]}. +{jsx, [{float,0.7},end_json]}. {json, "naked_number_d.json"}. diff --git a/test/cases/naked_number_e.test b/test/cases/naked_number_e.test index 70d591c..6bf7821 100644 --- a/test/cases/naked_number_e.test +++ b/test/cases/naked_number_e.test @@ -1,3 +1,3 @@ {name, "naked_number_e"}. -{jsx, [{integer,"0"},end_json]}. +{jsx, [{integer,0},end_json]}. {json, "naked_number_e.json"}. diff --git a/test/cases/naked_number_f.test b/test/cases/naked_number_f.test index e8a585d..d3d8ae6 100644 --- a/test/cases/naked_number_f.test +++ b/test/cases/naked_number_f.test @@ -1,3 +1,3 @@ {name, "naked_number_f"}. -{jsx, [{float,"1.0e100"},end_json]}. +{jsx, [{float,1.0e100},end_json]}. {json, "naked_number_f.json"}. diff --git a/test/cases/naked_number_g.test b/test/cases/naked_number_g.test index e795558..45e324a 100644 --- a/test/cases/naked_number_g.test +++ b/test/cases/naked_number_g.test @@ -1,3 +1,3 @@ {name, "naked_number_g"}. -{jsx, [{integer,"7"},end_json]}. +{jsx, [{integer,7},end_json]}. {json, "naked_number_g.json"}. diff --git a/test/cases/negative_zero.test b/test/cases/negative_zero.test index db4ca8d..0ef4f1a 100644 --- a/test/cases/negative_zero.test +++ b/test/cases/negative_zero.test @@ -1,14 +1,14 @@ {name, "negative_zero"}. {jsx, [start_array,start_array, - {integer,"-0"}, + {integer,0}, end_array, - {integer,"-0"}, + {integer,0}, start_object, {key,"key"}, - {integer,"-0"}, + {integer,0}, {key,"another key"}, - {integer,"-0"}, + {integer,0}, end_object, - {integer,"-0"}, + {integer,0}, end_array,end_json]}. {json, "negative_zero.json"}. diff --git a/test/cases/numbers.test b/test/cases/numbers.test index 6ac82bc..85400b2 100644 --- a/test/cases/numbers.test +++ b/test/cases/numbers.test @@ -1,23 +1,23 @@ {name, "numbers"}. {jsx, [start_array, - {integer,"1"}, - {integer,"2"}, - {integer,"3"}, - {integer,"4"}, - {integer,"5"}, - {integer,"6"}, - {integer,"7"}, - {integer,"8"}, - {integer,"9"}, - {integer,"42"}, - {integer,"127"}, - {integer,"99999999999999999999999999999"}, - {float,"1.0e1"}, - {float,"1.0e1"}, - {float,"1.0e1"}, - {float,"1.325e478534"}, - {integer,"-1"}, - {float,"-1.0e-1"}, - {float,"3.7e-57834235"}, + {integer,1}, + {integer,2}, + {integer,3}, + {integer,4}, + {integer,5}, + {integer,6}, + {integer,7}, + {integer,8}, + {integer,9}, + {integer,42}, + {integer,127}, + {integer,99999999999999999999999999999}, + {float,1.0e1}, + {float,1.0e1}, + {float,1.0e1}, + {float,1.325e478534}, + {integer,-1}, + {float,-1.0e-1}, + {float,3.7e-57834235}, end_array,end_json]}. {json, "numbers.json"}. diff --git a/test/cases/whitespace.test b/test/cases/whitespace.test index 2f65d73..b050125 100644 --- a/test/cases/whitespace.test +++ b/test/cases/whitespace.test @@ -1,3 +1,3 @@ {name, "whitespace"}. -{jsx, [start_array,{float,"0.3"},end_array,end_json]}. +{jsx, [start_array,{float,0.3},end_array,end_json]}. {json, "whitespace.json"}. diff --git a/test/cases/zero.test b/test/cases/zero.test index 85e626a..cd072a1 100644 --- a/test/cases/zero.test +++ b/test/cases/zero.test @@ -1,14 +1,14 @@ {name, "zero"}. {jsx, [start_array,start_array, - {integer,"0"}, + {integer,0}, end_array, - {integer,"0"}, + {integer,0}, start_object, {key,"key"}, - {integer,"0"}, + {integer,0}, {key,"another key"}, - {integer,"0"}, + {integer,0}, end_object, - {integer,"0"}, + {integer,0}, end_array,end_json]}. {json, "zero.json"}.