Changeset 5 for trunk/YamlReference/Text/Yaml/Reference.bnf

Timestamp:

01/13/08 16:07:30 (11 months ago)

Author:

oren

Message:

Updated to version 0.8.
Versions from here on should only be created in this repository.

Files:

• trunk/YamlReference/Text/Yaml/Reference.bnf (modified) (6 diffs)

trunk/YamlReference/Text/Yaml/Reference.bnf

@@ -385 +385 @@
                             & ( ns_s_flow_seq_entries n c ?) ?)
 
-ns_flow_seq_entry n c = "pair" ^ ( ns_flow_map_single_pair n c / "node" ^ ns_flow_node n c )
+ns_flow_seq_entry n c = "pair" ^ ( ns_flow_pair n c / "node" ^ ns_flow_node n c )
 
 -- Flow mapping:
@@ -401 +401 @@
                             & ( s_separate n c ?)
                             & ( ns_s_flow_map_entries n c ?) ?)
-
-ns_flow_map_entry n c = nest BeginPair
-                      & "pair"
-                      ^ ( c_mapping_key ! "pair" & s_ns_flow_map_explicit_entry n c
-                        / ns_flow_map_implicit_entry n c )
-                      & nest EndPair
-
-s_ns_flow_map_explicit_entry n c = "entry"
-                                 ^ ( s_ns_flow_map_explicit_json n c
-                                   / s_ns_flow_map_explicit_yaml n c
-                                   / s_ns_flow_map_explicit_empty n c
-                                   / e_node & e_node )
-s_ns_flow_map_explicit_json  n c = s_separate n c
-                                 & ( "node" ^ c_flow_json_node n c ) ! "entry"
+ns_flow_map_entry   n c = nest BeginPair
+                            & "key"
+                            ^ ( c_mapping_key ! "key" & s_separate n c & ns_flow_map_explicit_entry n c
+                              / ns_flow_map_implicit_entry n c )
+                            & nest EndPair
+
+ns_flow_map_explicit_entry n c = ns_flow_map_implicit_entry n c
+                               / e_node & e_node
+ns_flow_map_implicit_entry n c = "pair"
+                               ^ ( c_ns_flow_map_json_key_entry n c
+                                 / ns_flow_map_yaml_key_entry n c
+                                 / ns_flow_map_empty_key_entry n c )
+
+c_ns_flow_map_json_key_entry n c = ( "node" ^ c_flow_json_node n c ) ! "pair"
                                  & ( ( s_separate n c ?) & c_ns_flow_map_adjacent_value n c
                                    / e_node )
-s_ns_flow_map_explicit_yaml  n c = s_separate n c
-                                 & ( "node" ^ ns_flow_yaml_node n c ) ! "entry"
+ns_flow_map_yaml_key_entry   n c = ( "node" ^ ns_flow_yaml_node n c ) ! "pair"
                                  & ( ( s_separate n c ?) & c_ns_flow_map_separate_value n c
                                    / e_node )
-s_ns_flow_map_explicit_empty n c = s_separate n c & e_node & c_ns_flow_map_separate_value n c
+ns_flow_map_empty_key_entry  n c = e_node & c_ns_flow_map_separate_value n c
 
 c_ns_flow_map_separate_value n c = c_mapping_value ! "pair"
@@ -430 +429 @@
                                    / e_node )
 
-ns_flow_map_implicit_entry  n c = c_ns_flow_map_implicit_json n c
-                                / ns_flow_map_implicit_yaml n c
-                                / ns_flow_map_implicit_empty n c
-c_ns_flow_map_implicit_json n c = c_s_simple_json_key  & ( c_ns_flow_map_adjacent_value n c / e_node )
-ns_flow_map_implicit_yaml   n c = ns_s_simple_yaml_key & ( c_ns_flow_map_separate_value n c / e_node )
-ns_flow_map_implicit_empty  n c = e_node & c_ns_flow_map_separate_value n c
-
-c_s_simple_json_key  = ( "node" ^ ( c_flow_json_node  na FlowKey ) & ( s_separate_in_line ?) ) `limitedTo` 1024
-ns_s_simple_yaml_key = ( "node" ^ ( ns_flow_yaml_node na FlowKey ) & ( s_separate_in_line ?) ) `limitedTo` 1024
-
-ns_flow_map_single_pair   n c = nest BeginMapping
-                              & nest BeginPair
-                              & ( c_mapping_key ! "pair" & s_ns_flow_map_explicit_entry n c
-                                / ns_flow_map_single_entry n c )
-                              & nest EndPair
-                              & nest EndMapping
-ns_flow_map_single_entry  n c = "entry"
-                              ^ ( c_ns_flow_map_single_json n c
-                                / ns_flow_map_single_yaml n c
-                                / ns_flow_map_implicit_empty n c )
-c_ns_flow_map_single_json n c = c_s_simple_json_key  & c_ns_flow_map_adjacent_value n c
-ns_flow_map_single_yaml   n c = ns_s_simple_yaml_key & c_ns_flow_map_separate_value n c
+ns_flow_pair n c = nest BeginMapping
+                 & nest BeginPair
+                 & ( c_mapping_key ! "pair" & s_separate n c & ns_flow_map_explicit_entry n c
+                   / ns_flow_pair_entry n c )
+                 & nest EndPair
+                 & nest EndMapping
+ns_flow_pair_entry n c = "entry"
+                       ^ ( c_ns_flow_pair_json_key_entry n c
+                         / ns_flow_pair_yaml_key_entry n c
+                         / ns_flow_map_empty_key_entry n c )
+c_ns_flow_pair_json_key_entry n c = c_s_implicit_json_key  & c_ns_flow_map_adjacent_value n c
+ns_flow_pair_yaml_key_entry   n c = ns_s_implicit_yaml_key & c_ns_flow_map_separate_value n c
+
+c_s_implicit_json_key  = ( "node" ^ ( c_flow_json_node  na FlowKey ) & ( s_separate_in_line ?) ) `limitedTo` 1024
+ns_s_implicit_yaml_key = ( "node" ^ ( ns_flow_yaml_node na FlowKey ) & ( s_separate_in_line ?) ) `limitedTo` 1024
 
 -- Alias:
@@ -635 +627 @@
 ns_l_block_map_implicit_entry n = ns_s_block_map_implicit_key & c_l_block_map_implicit_value n
                                 / e_node & c_l_block_map_implicit_value n
-ns_s_block_map_implicit_key     = c_s_simple_json_key / ns_s_simple_yaml_key
+ns_s_block_map_implicit_key     = c_s_implicit_json_key / ns_s_implicit_yaml_key
 c_l_block_map_implicit_value n  = c_mapping_value ! "node"
                                 & ( s_l__block_node n BlockIn
@@ -651 +643 @@
 s_l__block_node     n c = s_l__block_in_block n c
                         / s_l__flow_in_block n
-s_l__flow_in_block  n   = s_separate n FlowOut & ns_flow_node (n .+ 1) FlowOut & s_l_comments
+s_l__flow_in_block  n   = s_separate (n .+ 1) FlowOut & ns_flow_node (n .+ 1) FlowOut & s_l_comments
 s_l__block_in_block n c = nest BeginNode
                         & ( s_l__block_scalar n c / s_l__block_collection n c )
@@ -658 +650 @@
 s_l__block_scalar     n c = s_separate n c & ( c_ns_properties n c & s_separate n c ?)
                           & ( c_l__literal n / c_l__folded n )
-s_l__block_collection n c = ( s_l_comments / ( s_separate n c & c_ns_properties n c & s_l_comments ) )
-                          & ( l__block_sequence (seq_spaces n c)  / l__block_mapping n )
+s_l__block_collection n c = ( s_separate n c & c_ns_properties n c & s_l_comments / s_l_comments )
+                          & ( l__block_sequence (seq_spaces n c) / l__block_mapping n )
 
 -- Document: