Changeset 4 for trunk/YamlReference

Timestamp:

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

Author:

oren

Message:

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

Location:

trunk/YamlReference

Files:

• Text/Yaml/Reference.bnf (modified) (1 diff)
• Text/Yaml/Reference.hs (modified) (2 diffs)
• YamlReference.cabal (modified) (1 diff)
• tests/c-ns-properties.n=0.c=block-out.error (deleted)
• tests/c-ns-properties.n=0.c=flow-out.error (deleted)
• tests/c-ns-properties.n=0.c=flow-out.invalid.error (deleted)
• tests/s-l+block-collection.n=2.c=block-in.sequence.input (added)
• tests/s-l+block-collection.n=2.c=block-in.sequence.output (added)
• tests/s-l+block-collection.n=2.c=block-out.invalid.input (added)
• tests/s-l+block-collection.n=2.c=block-out.invalid.output (added)
• tests/s-l+block-collection.n=2.c=block-out.mapping.input (added)
• tests/s-l+block-collection.n=2.c=block-out.mapping.output (added)
• tests/s-l+block-content.n=2.c=block-in.sequence.input (deleted)
• tests/s-l+block-content.n=2.c=block-in.sequence.output (deleted)
• tests/s-l+block-content.n=2.c=block-out.folded.input (deleted)
• tests/s-l+block-content.n=2.c=block-out.folded.output (deleted)
• tests/s-l+block-content.n=2.c=block-out.invalid.input (deleted)
• tests/s-l+block-content.n=2.c=block-out.invalid.output (deleted)
• tests/s-l+block-content.n=2.c=block-out.literal.input (deleted)
• tests/s-l+block-content.n=2.c=block-out.literal.output (deleted)
• tests/s-l+block-content.n=2.c=block-out.mapping.input (deleted)
• tests/s-l+block-content.n=2.c=block-out.mapping.output (deleted)
• tests/s-l+block-node.n=-1.c=block-out.input (added)
• tests/s-l+block-node.n=-1.c=block-out.output (added)
• tests/s-l+block-scalar.n=2.c=block-out.folded.input (added)
• tests/s-l+block-scalar.n=2.c=block-out.folded.output (added)
• tests/s-l+block-scalar.n=2.c=block-out.literal.input (added)
• tests/s-l+block-scalar.n=2.c=block-out.literal.output (added)

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:

trunk/YamlReference/Text/Yaml/Reference.hs

@@ -470 +470 @@
 -- that it is that easy to draw the line - is @sLine@ generic or specific?).
 data State = State {
-    sName         :: !String,          -- ^ The input name for error messages.
-    sEncoding     :: !Encoding,        -- ^ The input UTF encoding.
-    sDecision     :: !String,          -- ^ Current decision name.
-    sLimit        :: !Int,             -- ^ Lookahead characters limit.
-    sForbidden    :: !(Maybe Pattern), -- ^ Pattern we must not enter into.
-    sIsPeek       :: !Bool,            -- ^ Disables token generation.
-    sChars        :: ![Char],          -- ^ (Reversed) characters collected for a token.
-    sOffset       :: !Int,             -- ^ Offset in characters in the input.
-    sLine         :: !Int,             -- ^ Builds on YAML's line break definition.
-    sColumn       :: !Int,             -- ^ Actually character number - we hate tabs.
-    sCode         :: !Code,            -- ^ Of token we are collecting chars for.
-    sLast         :: !Char,            -- ^ Last matched character.
-    sInput        :: ![Char]           -- ^ The decoded input characters.
+    sName      :: !String,          -- ^ The input name for error messages.
+    sEncoding  :: !Encoding,        -- ^ The input UTF encoding.
+    sDecision  :: !String,          -- ^ Current decision name.
+    sLimit     :: !Int,             -- ^ Lookahead characters limit.
+    sForbidden :: !(Maybe Pattern), -- ^ Pattern we must not enter into.
+    sIsPeek    :: !Bool,            -- ^ Disables token generation.
+    sChars     :: ![Char],          -- ^ (Reversed) characters collected for a token.
+    sOffset    :: !Int,             -- ^ Offset in characters in the input.
+    sLine      :: !Int,             -- ^ Builds on YAML's line break definition.
+    sColumn    :: !Int,             -- ^ Actually character number - we hate tabs.
+    sCode      :: !Code,            -- ^ Of token we are collecting chars for.
+    sLast      :: !Char,            -- ^ Last matched character.
+    sInput     :: ![Char]           -- ^ The decoded input characters.
   }
 
@@ -1414 +1414 @@
                  $ PAT(ns_s_flow_map_entries)
                  $ PAT(ns_s_flow_seq_entries)
-                 $ PAT(s_l__block_content)
+                 $ PAT(s_l__block_collection)
                  $ PAT(s_l__block_in_block)
                  $ PAT(s_l__block_indented)
                  $ PAT(s_l__block_node)
+                 $ PAT(s_l__block_scalar)
                  $ PAT(s_ns_flow_map_explicit_empty)
                  $ PAT(s_ns_flow_map_explicit_entry)

trunk/YamlReference/YamlReference.cabal

@@ -23 +23 @@
                  \"immediately\" begin to generate output. The memory leak that
                  existed in previous version has been plugged.
-Build-Depends:   base >= 2.0, HUnit >= 1.1, regex-compat >= 0.71, dlist >= 0.2
+Build-Depends:   base >= 2.0, HUnit >= 1.1, regex-compat >= 0.71, dlist >= 0.2, mtl
 Exposed-Modules: Text.Yaml.Reference
 Extensions:      CPP, MultiParamTypeClasses