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

Timestamp:

05/23/07 19:47:51 (19 months ago)

Author:

oren

Message:

Fix a bug (greedy assigment of properties to collection instead of to entry, ypaste # 6).

Files:

• trunk/YamlReference/Text/Yaml/Reference.bnf (modified) (1 diff)

trunk/YamlReference/Text/Yaml/Reference.bnf

@@ -653 +653 @@
 s_l__flow_in_block  n   = s_separate n FlowOut & ns_flow_node (n .+ 1) FlowOut & s_l_comments
 s_l__block_in_block n c = nest BeginNode
-                        & ( s_separate n c & c_ns_properties n c ?)
-                        & s_l__block_content n c
+                        & ( s_l__block_scalar n c / s_l__block_collection n c )
                         & nest EndNode
-s_l__block_content  n c = s_separate n c & c_l__literal n
-                        / s_separate n c & c_l__folded n
-                        / s_l_comments & l__block_sequence (seq_spaces n c)
-                        / s_l_comments & l__block_mapping n
+
+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 )
 
 -- Document: