Use "yamerl" as the extensions namespace instead of "yakaz.com"

PR:	#842
This commit is contained in:
Jean-Sébastien Pédron 2012-11-16 14:53:52 +01:00
parent 2cd8688712
commit 180a0644f4
8 changed files with 26 additions and 26 deletions

View File

@ -4,6 +4,6 @@ nobase_dist_headers_DATA = yamerl_types.hrl \
yamerl_errors.hrl \ yamerl_errors.hrl \
yamerl_tokens.hrl \ yamerl_tokens.hrl \
yamerl_nodes.hrl \ yamerl_nodes.hrl \
yamerl_nodes_yakaz.hrl \ yamerl_nodes_yamerl_extensions.hrl \
internal/yamerl_parser.hrl \ internal/yamerl_parser.hrl \
internal/yamerl_constr.hrl internal/yamerl_constr.hrl

View File

@ -1,5 +1,5 @@
-ifndef(yamerl_nodes_yakaz_hrl). -ifndef(yamerl_nodes_yamerl_extensions_hrl).
-define(yamerl_nodes_yakaz_hrl, true). -define(yamerl_nodes_yamerl_extensions_hrl, true).
-include("yamerl_types.hrl"). -include("yamerl_types.hrl").

View File

@ -3,7 +3,7 @@
-include("yamerl_errors.hrl"). -include("yamerl_errors.hrl").
-include("yamerl_tokens.hrl"). -include("yamerl_tokens.hrl").
-include("yamerl_nodes.hrl"). -include("yamerl_nodes.hrl").
-include("yamerl_nodes_yakaz.hrl"). -include("yamerl_nodes_yamerl_extensions.hrl").
-include("internal/yamerl_constr.hrl"). -include("internal/yamerl_constr.hrl").
%% Public API. %% Public API.
@ -15,7 +15,7 @@
parse/1 parse/1
]). ]).
-define(TAG, "tag:yakaz.com,2011:ipaddr"). -define(TAG, "tag:yamerl,2012:ipaddr").
%% ------------------------------------------------------------------- %% -------------------------------------------------------------------
%% Public API. %% Public API.

View File

@ -13,7 +13,7 @@
node_pres/1 node_pres/1
]). ]).
-define(TAG, "tag:yakaz.com,2011:size"). -define(TAG, "tag:yamerl,2012:size").
-define(REGEX, "^([0-9]+)(k|M|G|T)(B?)$"). -define(REGEX, "^([0-9]+)(k|M|G|T)(B?)$").

View File

@ -13,7 +13,7 @@
node_pres/1 node_pres/1
]). ]).
-define(TAG, "tag:yakaz.com,2011:timestamp"). -define(TAG, "tag:yamerl,2012:timestamp").
-define(REGEX, -define(REGEX,
"^(?:" "^(?:"

View File

@ -27,30 +27,30 @@
{yamerl_seq,yamerl_node_seq,"tag:yaml.org,2002:seq", {yamerl_seq,yamerl_node_seq,"tag:yaml.org,2002:seq",
[{line,1},{column,1}], [{line,1},{column,1}],
[{yamerl_ip_addr,yamerl_node_ipaddr, [{yamerl_ip_addr,yamerl_node_ipaddr,
"tag:yakaz.com,2011:ipaddr", "tag:yamerl,2012:ipaddr",
[{line,1},{column,3}], [{line,1},{column,3}],
{192,168,1,10}}, {192,168,1,10}},
{yamerl_ip_netmask,yamerl_node_ipaddr, {yamerl_ip_netmask,yamerl_node_ipaddr,
"tag:yakaz.com,2011:ipaddr", "tag:yamerl,2012:ipaddr",
[{line,2},{column,3}], [{line,2},{column,3}],
{192,168,1,10}, {192,168,1,10},
24}, 24},
{yamerl_ip_range,yamerl_node_ipaddr, {yamerl_ip_range,yamerl_node_ipaddr,
"tag:yakaz.com,2011:ipaddr", "tag:yamerl,2012:ipaddr",
[{line,3},{column,3}], [{line,3},{column,3}],
{192,168,1,10}, {192,168,1,10},
{192,168,1,20}}, {192,168,1,20}},
{yamerl_ip_addr,yamerl_node_ipaddr, {yamerl_ip_addr,yamerl_node_ipaddr,
"tag:yakaz.com,2011:ipaddr", "tag:yamerl,2012:ipaddr",
[{line,5},{column,3}], [{line,5},{column,3}],
{8193,16848,1,28696,0,0,1,2}}, {8193,16848,1,28696,0,0,1,2}},
{yamerl_ip_netmask,yamerl_node_ipaddr, {yamerl_ip_netmask,yamerl_node_ipaddr,
"tag:yakaz.com,2011:ipaddr", "tag:yamerl,2012:ipaddr",
[{line,6},{column,3}], [{line,6},{column,3}],
{8193,16848,1,28696,0,0,1,0}, {8193,16848,1,28696,0,0,1,0},
64}, 64},
{yamerl_ip_range,yamerl_node_ipaddr, {yamerl_ip_range,yamerl_node_ipaddr,
"tag:yakaz.com,2011:ipaddr", "tag:yamerl,2012:ipaddr",
[{line,7},{column,3}], [{line,7},{column,3}],
{8193,16848,1,28696,0,0,1,2}, {8193,16848,1,28696,0,0,1,2},
{8193,16848,1,28696,0,0,1,5}}, {8193,16848,1,28696,0,0,1,5}},

View File

@ -22,28 +22,28 @@
{yamerl_doc, {yamerl_doc,
{yamerl_seq,yamerl_node_seq,"tag:yaml.org,2002:seq", {yamerl_seq,yamerl_node_seq,"tag:yaml.org,2002:seq",
[{line,1},{column,1}], [{line,1},{column,1}],
[{yamerl_int,yamerl_node_size,"tag:yakaz.com,2011:size", [{yamerl_int,yamerl_node_size,"tag:yamerl,2012:size",
[{line,1},{column,3}], [{line,1},{column,3}],
2000}, 2000},
{yamerl_int,yamerl_node_size,"tag:yakaz.com,2011:size", {yamerl_int,yamerl_node_size,"tag:yamerl,2012:size",
[{line,2},{column,3}], [{line,2},{column,3}],
2000000}, 2000000},
{yamerl_int,yamerl_node_size,"tag:yakaz.com,2011:size", {yamerl_int,yamerl_node_size,"tag:yamerl,2012:size",
[{line,3},{column,3}], [{line,3},{column,3}],
2000000000}, 2000000000},
{yamerl_int,yamerl_node_size,"tag:yakaz.com,2011:size", {yamerl_int,yamerl_node_size,"tag:yamerl,2012:size",
[{line,4},{column,3}], [{line,4},{column,3}],
2000000000000}, 2000000000000},
{yamerl_int,yamerl_node_size,"tag:yakaz.com,2011:size", {yamerl_int,yamerl_node_size,"tag:yamerl,2012:size",
[{line,6},{column,3}], [{line,6},{column,3}],
2048}, 2048},
{yamerl_int,yamerl_node_size,"tag:yakaz.com,2011:size", {yamerl_int,yamerl_node_size,"tag:yamerl,2012:size",
[{line,7},{column,3}], [{line,7},{column,3}],
2097152}, 2097152},
{yamerl_int,yamerl_node_size,"tag:yakaz.com,2011:size", {yamerl_int,yamerl_node_size,"tag:yamerl,2012:size",
[{line,8},{column,3}], [{line,8},{column,3}],
2147483648}, 2147483648},
{yamerl_int,yamerl_node_size,"tag:yakaz.com,2011:size", {yamerl_int,yamerl_node_size,"tag:yamerl,2012:size",
[{line,9},{column,3}], [{line,9},{column,3}],
2199023255552}, 2199023255552},
{yamerl_str,yamerl_node_str,"tag:yaml.org,2002:str", {yamerl_str,yamerl_node_str,"tag:yaml.org,2002:str",

View File

@ -26,27 +26,27 @@
{yamerl_seq,yamerl_node_seq,"tag:yaml.org,2002:seq", {yamerl_seq,yamerl_node_seq,"tag:yaml.org,2002:seq",
[{line,1},{column,1}], [{line,1},{column,1}],
[{yamerl_timestamp,yamerl_node_timestamp, [{yamerl_timestamp,yamerl_node_timestamp,
"tag:yakaz.com,2011:timestamp", "tag:yamerl,2012:timestamp",
[{line,1},{column,3}], [{line,1},{column,3}],
2011,5,26,undefined,undefined,undefined, 2011,5,26,undefined,undefined,undefined,
0,0}, 0,0},
{yamerl_timestamp,yamerl_node_timestamp, {yamerl_timestamp,yamerl_node_timestamp,
"tag:yakaz.com,2011:timestamp", "tag:yamerl,2012:timestamp",
[{line,2},{column,3}], [{line,2},{column,3}],
undefined,undefined,undefined,14,58,3, undefined,undefined,undefined,14,58,3,
0,0}, 0,0},
{yamerl_timestamp,yamerl_node_timestamp, {yamerl_timestamp,yamerl_node_timestamp,
"tag:yakaz.com,2011:timestamp", "tag:yamerl,2012:timestamp",
[{line,3},{column,3}], [{line,3},{column,3}],
2011,5,26,14,58,3, 2011,5,26,14,58,3,
0,0}, 0,0},
{yamerl_timestamp,yamerl_node_timestamp, {yamerl_timestamp,yamerl_node_timestamp,
"tag:yakaz.com,2011:timestamp", "tag:yamerl,2012:timestamp",
[{line,4},{column,3}], [{line,4},{column,3}],
2011,5,26,14,58,3, 2011,5,26,14,58,3,
0,0}, 0,0},
{yamerl_timestamp,yamerl_node_timestamp, {yamerl_timestamp,yamerl_node_timestamp,
"tag:yakaz.com,2011:timestamp", "tag:yamerl,2012:timestamp",
[{line,5},{column,3}], [{line,5},{column,3}],
2011,5,26,14,58,3, 2011,5,26,14,58,3,
0,0}, 0,0},