valitydev/yamerl
14
0
Fork 0
mirror of https://github.com/valitydev/yamerl.git synced 2024-11-06 02:45:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename yaml_node_(json|ext)_$type to yaml_node_$type_(json|ext)

Browse Source
This commit is contained in:
Jean-Sébastien Pédron 2011-09-29 14:04:09 +02:00
parent c3d2d217ca
commit 958ada0d22
13 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/yaml_nodes.hrl
View File

@ -200,10 +200,10 @@
]).
-define(JSON_SCHEMA_MODS, [
yaml_node_json_null,
yaml_node_json_bool,
yaml_node_json_int,
yaml_node_json_float,
yaml_node_null_json,
yaml_node_bool_json,
yaml_node_int_json,
yaml_node_float_json,
yaml_node_str,
yaml_node_seq,
yaml_node_map

14
src/Makefile.am
View File

@ -9,16 +9,16 @@ dist_erlsrc_DATA = yaml_app.erl \
yaml_node_map.erl \
yaml_node_str.erl \
yaml_node_null.erl \
yaml_node_json_null.erl \
yaml_node_null_json.erl \
yaml_node_bool.erl \
yaml_node_json_bool.erl \
yaml_node_ext_bool.erl \
yaml_node_bool_json.erl \
yaml_node_bool_ext.erl \
yaml_node_int.erl \
yaml_node_json_int.erl \
yaml_node_ext_int.erl \
yaml_node_int_json.erl \
yaml_node_int_ext.erl \
yaml_node_float.erl \
yaml_node_json_float.erl \
yaml_node_ext_float.erl \
yaml_node_float_json.erl \
yaml_node_float_ext.erl \
yaml_node_size.erl \
yaml_node_timestamp.erl \
yaml_node_ipaddr.erl \

2
src/yaml_node_ext_bool.erl → src/yaml_node_bool_ext.erl
View File

@ -1,4 +1,4 @@
-module(yaml_node_ext_bool).
-module(yaml_node_bool_ext).
-include("yaml_tokens.hrl").
-include("yaml_nodes.hrl").

2
src/yaml_node_json_bool.erl → src/yaml_node_bool_json.erl
View File

@ -1,4 +1,4 @@
-module(yaml_node_json_bool).
-module(yaml_node_bool_json).
-include("yaml_tokens.hrl").
-include("yaml_nodes.hrl").

4
src/yaml_node_ext_float.erl → src/yaml_node_float_ext.erl
View File

@ -1,4 +1,4 @@
-module(yaml_node_ext_float).
-module(yaml_node_float_ext).
-include("yaml_errors.hrl").
-include("yaml_tokens.hrl").
@ -103,7 +103,7 @@ string_to_float2(Text) ->
Opts2),
case Ret of
{match, [P1, P2, Dec]} ->
case yaml_node_ext_int:base60_to_integer(P1 ++ P2, 0, 0) of
case yaml_node_int_ext:base60_to_integer(P1 ++ P2, 0, 0) of
error ->
error;
Int ->

2
src/yaml_node_json_float.erl → src/yaml_node_float_json.erl
View File

@ -1,4 +1,4 @@
-module(yaml_node_json_float).
-module(yaml_node_float_json).
-include("yaml_errors.hrl").
-include("yaml_tokens.hrl").

2
src/yaml_node_ext_int.erl → src/yaml_node_int_ext.erl
View File

@ -1,4 +1,4 @@
-module(yaml_node_ext_int).
-module(yaml_node_int_ext).
-include("yaml_errors.hrl").
-include("yaml_tokens.hrl").

2
src/yaml_node_json_int.erl → src/yaml_node_int_json.erl
View File

@ -1,4 +1,4 @@
-module(yaml_node_json_int).
-module(yaml_node_int_json).
-include("yaml_errors.hrl").
-include("yaml_tokens.hrl").

2
src/yaml_node_json_null.erl → src/yaml_node_null_json.erl
View File

@ -1,4 +1,4 @@
-module(yaml_node_json_null).
-module(yaml_node_null_json).
-include("yaml_tokens.hrl").
-include("yaml_nodes.hrl").

52
testsuite/data/construction/bool.pattern
View File

@ -73,7 +73,7 @@
],
yaml_constr:file("${FILENAME}",
[{simple_structs, true}, {schema, failsafe},
{node_mods, [yaml_node_ext_bool]}])
{node_mods, [yaml_node_bool_ext]}])
),
?_assertMatch(
[
@ -160,7 +160,7 @@
{yaml_doc,
{yaml_seq,yaml_node_seq,"tag:yaml.org,2002:seq",
[{line,1},{column,1}],
[{yaml_bool,yaml_node_json_bool,
[{yaml_bool,yaml_node_bool_json,
"tag:yaml.org,2002:bool",
[{line,1},{column,3}],
true},
@ -194,7 +194,7 @@
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
[{line,11},{column,3}],
"ON"},
{yaml_bool,yaml_node_json_bool,
{yaml_bool,yaml_node_bool_json,
"tag:yaml.org,2002:bool",
[{line,13},{column,3}],
false},
@ -322,71 +322,71 @@
{yaml_doc,
{yaml_seq,yaml_node_seq,"tag:yaml.org,2002:seq",
[{line,1},{column,1}],
[{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
[{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,1},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,2},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,3},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,4},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,5},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,6},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,7},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,8},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,9},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,10},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,11},{column,3}],
true},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,13},{column,3}],
false},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,14},{column,3}],
false},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,15},{column,3}],
false},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,16},{column,3}],
false},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,17},{column,3}],
false},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,18},{column,3}],
false},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,19},{column,3}],
false},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,20},{column,3}],
false},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,21},{column,3}],
false},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,22},{column,3}],
false},
{yaml_bool,yaml_node_ext_bool,"tag:yaml.org,2002:bool",
{yaml_bool,yaml_node_bool_ext,"tag:yaml.org,2002:bool",
[{line,23},{column,3}],
false},
@ -398,7 +398,7 @@
],
yaml_constr:file("${FILENAME}",
[{simple_structs, false}, {schema, failsafe},
{node_mods, [yaml_node_ext_bool]}])
{node_mods, [yaml_node_bool_ext]}])
)
]
}

26
testsuite/data/construction/float.pattern
View File

@ -33,7 +33,7 @@
],
yaml_constr:file("${FILENAME}",
[{simple_structs, true}, {schema, failsafe},
{node_mods, [yaml_node_json_float]}])
{node_mods, [yaml_node_float_json]}])
),
?_assertMatch(
[
@ -113,56 +113,56 @@
[{yaml_doc,
{yaml_seq,yaml_node_seq,"tag:yaml.org,2002:seq",
[{line,1},{column,1}],
[{yaml_int,yaml_node_json_float,
[{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,1},{column,4}],
0.0},
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
[{line,2},{column,3}],
"+0"},
{yaml_int,yaml_node_json_float,
{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,3},{column,3}],
0.0},
{yaml_int,yaml_node_json_float,
{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,5},{column,4}],
12.34},
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
[{line,6},{column,3}],
"+12.34"},
{yaml_int,yaml_node_json_float,
{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,7},{column,3}],
-12.34},
{yaml_int,yaml_node_json_float,
{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,9},{column,4}],
1.2e11},
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
[{line,10},{column,3}],
"+12e10"},
{yaml_int,yaml_node_json_float,
{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,11},{column,3}],
-1.2e11},
{yaml_int,yaml_node_json_float,
{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,13},{column,3}],
1.2e11},
{yaml_int,yaml_node_json_float,
{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,14},{column,3}],
1.2e11},
{yaml_int,yaml_node_json_float,
{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,15},{column,3}],
1.2e-11},
{yaml_int,yaml_node_json_float,
{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,17},{column,3}],
1.0e10},
{yaml_int,yaml_node_json_float,
{yaml_int,yaml_node_float_json,
"tag:yaml.org,2002:float",
[{line,18},{column,3}],
1.0e10},
@ -178,7 +178,7 @@
17}}],
yaml_constr:file("${FILENAME}",
[{simple_structs, false}, {schema, failsafe},
{node_mods, [yaml_node_json_float]}])
{node_mods, [yaml_node_float_json]}])
),
?_assertMatch(
[{yaml_doc,

62
testsuite/data/construction/int.pattern
View File

@ -39,7 +39,7 @@
],
yaml_constr:file("${FILENAME}",
[{simple_structs, true}, {schema, failsafe},
{node_mods, [yaml_node_json_int]}])
{node_mods, [yaml_node_int_json]}])
),
?_assertMatch(
[
@ -75,7 +75,7 @@
],
yaml_constr:file("${FILENAME}",
[{simple_structs, true}, {schema, failsafe},
{node_mods, [yaml_node_ext_int]}])
{node_mods, [yaml_node_int_ext]}])
),
?_assertMatch(
[
@ -183,25 +183,25 @@
{yaml_doc,
{yaml_seq,yaml_node_seq,"tag:yaml.org,2002:seq",
[{line,1},{column,1}],
[{yaml_int,yaml_node_json_int,
[{yaml_int,yaml_node_int_json,
"tag:yaml.org,2002:int",
[{line,1},{column,4}],
0},
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
[{line,2},{column,3}],
"+0"},
{yaml_int,yaml_node_json_int,
{yaml_int,yaml_node_int_json,
"tag:yaml.org,2002:int",
[{line,3},{column,3}],
0},
{yaml_int,yaml_node_json_int,
{yaml_int,yaml_node_int_json,
"tag:yaml.org,2002:int",
[{line,5},{column,4}],
123},
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
[{line,6},{column,3}],
"+123"},
{yaml_int,yaml_node_json_int,
{yaml_int,yaml_node_int_json,
"tag:yaml.org,2002:int",
[{line,7},{column,3}],
-123},
@ -282,7 +282,7 @@
],
yaml_constr:file("${FILENAME}",
[{simple_structs, false}, {schema, failsafe},
{node_mods, [yaml_node_json_int]}])
{node_mods, [yaml_node_int_json]}])
),
?_assertMatch(
[
@ -391,31 +391,31 @@
{yaml_doc,
{yaml_seq,yaml_node_seq,"tag:yaml.org,2002:seq",
[{line,1},{column,1}],
[{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
[{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,1},{column,4}],
0},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,2},{column,3}],
0},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,3},{column,3}],
0},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,5},{column,4}],
123},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,6},{column,3}],
123},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,7},{column,3}],
-123},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,9},{column,4}],
5},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,10},{column,3}],
5},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,11},{column,3}],
-5},
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
@ -427,49 +427,49 @@
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
[{line,15},{column,3}],
"-0o123"},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,17},{column,4}],
83},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,18},{column,3}],
83},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,19},{column,3}],
-83},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,21},{column,4}],
427},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,22},{column,3}],
427},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,23},{column,3}],
-427},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,25},{column,4}],
442883},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,26},{column,3}],
442883},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,27},{column,3}],
-442883},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,29},{column,3}],
1234},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,30},{column,3}],
10},
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
[{line,31},{column,3}],
"0o12_34"},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,32},{column,3}],
668},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,33},{column,3}],
50089},
{yaml_int,yaml_node_ext_int,"tag:yaml.org,2002:int",
{yaml_int,yaml_node_int_ext,"tag:yaml.org,2002:int",
[{line,34},{column,3}],
4445768},
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
@ -486,7 +486,7 @@
],
yaml_constr:file("${FILENAME}",
[{simple_structs, false}, {schema, failsafe},
{node_mods, [yaml_node_ext_int]}])
{node_mods, [yaml_node_int_ext]}])
)
]
}

2
testsuite/data/construction/null.pattern
View File

@ -63,7 +63,7 @@
[{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",
[{line,1},{column,3}],
"~"},
{yaml_null,yaml_node_json_null,
{yaml_null,yaml_node_null_json,
"tag:yaml.org,2002:null",
[{line,2},{column,3}]},
{yaml_str,yaml_node_str,"tag:yaml.org,2002:str",