Changeset 9 for trunk

Timestamp:

05/15/08 15:45:42 (5 months ago)

Author:

oren

Message:

May 11, 2008 spec

Location:

trunk/YamlReference

Files:

• Text/Yaml/Reference.bnf (modified) (28 diffs)
• Text/Yaml/Reference.hs (modified) (27 diffs)
• YamlReference.cabal (modified) (22 diffs)
• tests/c-flow-indicator.collect-entry.input (added)
• tests/c-flow-indicator.collect-entry.output (added)
• tests/c-flow-indicator.invalid.input (added)
• tests/c-flow-indicator.invalid.output (added)
• tests/c-flow-indicator.mapping-end.input (added)
• tests/c-flow-indicator.mapping-end.output (added)
• tests/c-flow-indicator.mapping-start.input (added)
• tests/c-flow-indicator.mapping-start.output (added)
• tests/c-flow-indicator.sequence-end.input (added)
• tests/c-flow-indicator.sequence-end.output (added)
• tests/c-flow-indicator.sequence-start.input (added)
• tests/c-flow-indicator.sequence-start.output (added)
• tests/c-l-block-seq-entry.n=2.invalid.input (modified) (1 diff)
• tests/c-l-block-seq-entry.n=2.invalid.output (modified) (1 diff)
• tests/c-printable.invalid.input (modified) (1 diff)
• tests/c-printable.invalid.output (modified) (1 diff)
• tests/l+block-sequence.n=1.output (modified) (2 diffs)
• tests/nb-ns-plain-in-line.c=flow-out.invalid.input (added)
• tests/nb-ns-plain-in-line.c=flow-out.invalid.output (added)
• tests/s-l+block-indented.n=2.c=block-in.in-line-map.output (modified) (2 diffs)
• tests/s-l+block-indented.n=2.c=block-in.in-line-seq.output (modified) (2 diffs)
• tests/s-l+block-indented.n=2.c=block-out.in-line-map.output (modified) (2 diffs)
• tests/s-l+block-indented.n=2.c=block-out.in-line-seq.output (modified) (2 diffs)
• yeast2html (modified) (2 diffs)

trunk/YamlReference/Text/Yaml/Reference.bnf

@@ -10 +10 @@
                       / ('\x10000', '\x10FFFF')
 
+c_json {- 2 -} = '\x9' / '\xA' / '\xD' / ('\x20', '\x10ffff')
+
 -- 5.2 Character Encodings
 
-c_byte_order_mark {- 2 -} = '\xFEFF' & detect_utf_encoding
+c_byte_order_mark {- 3 -} = '\xFEFF' & detect_utf_encoding
 
 -- 5.3 Indicator Characters
 
-c_sequence_entry {-  3 -} = indicator '-'
-c_mapping_key    {-  4 -} = indicator '?'
-c_mapping_value  {-  5 -} = indicator ':'
-
-c_collect_entry  {-  6 -} = indicator ','
-c_sequence_start {-  7 -} = indicator '['
-c_sequence_end   {-  8 -} = indicator ']'
-c_mapping_start  {-  9 -} = indicator '{'
-c_mapping_end    {- 10 -} = indicator '}'
-
-c_comment        {- 11 -} = indicator '#'
-
-c_anchor         {- 12 -} = indicator '&'
-c_alias          {- 13 -} = indicator '*'
-c_tag            {- 14 -} = indicator '!'
-
-c_literal        {- 15 -} = indicator '|'
-c_folded         {- 16 -} = indicator '>'
-
-c_single_quote   {- 17 -} = indicator '\''
-c_double_quote   {- 18 -} = indicator '"'
-
-c_directive      {- 19 -} = indicator '%'
-
-c_reserved       {- 20 -} = indicator ( '@' /  '`' )
-
-c_indicator {- 21 -} = c_sequence_entry / c_mapping_key / c_mapping_value / c_collect_entry
+c_sequence_entry {-  4 -} = indicator '-'
+c_mapping_key    {-  5 -} = indicator '?'
+c_mapping_value  {-  6 -} = indicator ':'
+
+c_collect_entry  {-  7 -} = indicator ','
+c_sequence_start {-  8 -} = indicator '['
+c_sequence_end   {-  9 -} = indicator ']'
+c_mapping_start  {- 10 -} = indicator '{'
+c_mapping_end    {- 11 -} = indicator '}'
+
+c_comment        {- 12 -} = indicator '#'
+
+c_anchor         {- 13 -} = indicator '&'
+c_alias          {- 14 -} = indicator '*'
+c_tag            {- 15 -} = indicator '!'
+
+c_literal        {- 16 -} = indicator '|'
+c_folded         {- 17 -} = indicator '>'
+
+c_single_quote   {- 18 -} = indicator '\''
+c_double_quote   {- 19 -} = indicator '"'
+
+c_directive      {- 20 -} = indicator '%'
+
+c_reserved       {- 21 -} = indicator ( '@' /  '`' )
+
+c_indicator {- 22 -} = c_sequence_entry / c_mapping_key / c_mapping_value / c_collect_entry
                      / c_sequence_start / c_sequence_end / c_mapping_start / c_mapping_end
                      / c_comment / c_anchor / c_alias / c_tag
@@ -48 +50 @@
                      / c_directive / c_reserved
 
+c_flow_indicator {- 23 -} = c_collect_entry / c_sequence_start / c_sequence_end / c_mapping_start  / c_mapping_end
+
 -- 5.4 Line Break Characters
 
-b_line_feed           {- 22 -} = '\xA'
-b_carriage_return     {- 23 -} = '\xD'
-b_next_line           {- 24 -} = '\x85'
-b_line_separator      {- 25 -} = '\x2028'
-b_paragraph_separator {- 26 -} = '\x2029'
-
-b_char {- 27 -} = b_line_feed / b_carriage_return / b_next_line
-                / b_line_separator / b_paragraph_separator
-
-nb_char {- 28 -} = c_printable - b_char
-
-b_specific {- 29 -} = ( b_line_separator / b_paragraph_separator )
-                    & nextLine
-
-b_generic {- 30 -} = ( b_carriage_return & b_line_feed
-                     / b_carriage_return
-                     / b_line_feed
-                     / b_next_line )
-                   & nextLine
-
-b_as_line_feed {- 31 -} = token LineFeed b_generic
-b_normalized   {- 32 -} = b_as_line_feed / token Break b_specific
-
-b_non_content_generic {- 33 -} = token Continue b_generic
-
-b_non_content_any {- 34 -} = b_non_content_generic / token Continue b_specific
+b_line_feed           {- 24 -} = '\xA'
+b_carriage_return     {- 25 -} = '\xD'
+
+b_char {- 26 -} = b_line_feed / b_carriage_return
+
+nb_char {- 27 -} = c_printable - b_char
+
+nb_json {- 28 -} = c_json - b_char
+
+b_break {- 29 -} = ( b_carriage_return & b_line_feed
+                   / b_carriage_return
+                   / b_line_feed )
+                 & nextLine
+
+b_as_line_feed {- 30 -} = token LineFeed b_break
+
+b_non_content {- 31 -} = token Continue b_break
 
 -- 5.5 White Space Characters
 
-s_space {- 35 -} = '\x20'
-s_tab   {- 36 -} = '\x9'
-s_white {- 37 -} = s_space / s_tab
-
-ns_char {- 38 -} = nb_char - s_white
+s_space {- 32 -} = '\x20'
+s_tab   {- 33 -} = '\x9'
+s_white {- 34 -} = s_space / s_tab
+
+ns_char {- 35 -} = nb_char - s_white
 
 -- 5.6 Miscellaneous Characters
 
-ns_dec_digit {- 39 -} = ('\x30', '\x39')
-
-ns_hex_digit {- 40 -} = ns_dec_digit
+ns_dec_digit {- 36 -} = ('\x30', '\x39')
+
+ns_hex_digit {- 37 -} = ns_dec_digit
                       / ('\x41', '\x46') / ('\x61', '\x66')
 
-ns_ascii_letter {- 41 -} = ('\x41', '\x5A') / ('\x61', '\x7A')
-
-ns_word_char {- 42 -} = ns_dec_digit / ns_ascii_letter / '-'
-
-ns_uri_char {- 43 -} = "escape"
+ns_ascii_letter {- 38 -} = ('\x41', '\x5A') / ('\x61', '\x7A')
+
+ns_word_char {- 39 -} = ns_dec_digit / ns_ascii_letter / '-'
+
+ns_uri_char {- 40 -} = "escape"
                      ^ ( ns_word_char
                        / '%' ! "escape" & ns_hex_digit & ns_hex_digit
@@ -102 +97 @@
                        / '_' / '.' / '!' / '~' / '*' / '\'' / '(' / ')' / '[' / ']' )
 
-ns_tag_char {- 44 -} = ns_uri_char - c_tag
+ns_tag_char {- 41 -} = ns_uri_char - c_tag - c_flow_indicator
 
 -- 5.7 Escaped Characters
 
-c_escape {- 45 -} = indicator '\\'
-
-ns_esc_null                {- 46 -} = meta '0'
-ns_esc_bell                {- 47 -} = meta 'a'
-ns_esc_backspace           {- 48 -} = meta 'b'
-ns_esc_horizontal_tab      {- 49 -} = meta ( 't' / '\x9' )
-ns_esc_line_feed           {- 50 -} = meta 'n'
-ns_esc_vertical_tab        {- 51 -} = meta 'v'
-ns_esc_form_feed           {- 52 -} = meta 'f'
-ns_esc_carriage_return     {- 53 -} = meta 'r'
-ns_esc_escape              {- 54 -} = meta 'e'
-ns_esc_space               {- 55 -} = meta '\x20'
-ns_esc_double_quote        {- 56 -} = meta '"'
-ns_esc_backslash           {- 57 -} = meta '\\'
-ns_esc_next_line           {- 58 -} = meta 'N'
-ns_esc_non_breaking_space  {- 59 -} = meta '_'
-ns_esc_line_separator      {- 60 -} = meta 'L'
-ns_esc_paragraph_separator {- 61 -} = meta 'P'
-ns_esc_8_bit               {- 62 -} = indicator 'x' ! "escaped" & meta ( ns_hex_digit % 2 )
-ns_esc_16_bit              {- 63 -} = indicator 'u' ! "escaped" & meta ( ns_hex_digit % 4 )
-ns_esc_32_bit              {- 64 -} = indicator 'U' ! "escaped" & meta ( ns_hex_digit % 8 )
-
-c_ns_esc_char {- 65 -} = nest BeginEscape
+c_escape {- 42 -} = indicator '\\'
+
+ns_esc_null                {- 43 -} = meta '0'
+ns_esc_bell                {- 44 -} = meta 'a'
+ns_esc_backspace           {- 45 -} = meta 'b'
+ns_esc_horizontal_tab      {- 46 -} = meta ( 't' / '\x9' )
+ns_esc_line_feed           {- 47 -} = meta 'n'
+ns_esc_vertical_tab        {- 48 -} = meta 'v'
+ns_esc_form_feed           {- 49 -} = meta 'f'
+ns_esc_carriage_return     {- 50 -} = meta 'r'
+ns_esc_escape              {- 51 -} = meta 'e'
+ns_esc_space               {- 52 -} = meta '\x20'
+ns_esc_double_quote        {- 53 -} = meta '"'
+ns_esc_slash               {- 54 -} = meta '/'
+ns_esc_backslash           {- 55 -} = meta '\\'
+ns_esc_next_line           {- 56 -} = meta 'N'
+ns_esc_non_breaking_space  {- 57 -} = meta '_'
+ns_esc_line_separator      {- 58 -} = meta 'L'
+ns_esc_paragraph_separator {- 59 -} = meta 'P'
+ns_esc_8_bit               {- 60 -} = indicator 'x' ! "escaped" & meta ( ns_hex_digit % 2 )
+ns_esc_16_bit              {- 61 -} = indicator 'u' ! "escaped" & meta ( ns_hex_digit % 4 )
+ns_esc_32_bit              {- 62 -} = indicator 'U' ! "escaped" & meta ( ns_hex_digit % 8 )
+
+c_ns_esc_char {- 63 -} = nest BeginEscape
               & c_escape ! "escape"
               & "escaped"
@@ -142 +138 @@
                 / ns_esc_space
                 / ns_esc_double_quote
+                / ns_esc_slash
                 / ns_esc_backslash
                 / ns_esc_next_line
@@ -154 +151 @@
 -- 6.1 Indentation Spaces
 
-s_indent    n {- 66 -} = token Indent ( s_space % n )
-
-s_indent_lt n {- 67 -} = token Indent ( s_space <% n )
-s_indent_le n {- 68 -} = token Indent ( s_space <% (n .+ 1) )
+s_indent    n {- 64 -} = token Indent ( s_space % n )
+
+s_indent_lt n {- 65 -} = token Indent ( s_space <% n )
+s_indent_le n {- 66 -} = token Indent ( s_space <% (n .+ 1) )
 
 -- 6.2 Separation Spaces
 
-s_separate_in_line {- 69 -} = token White ( s_white +) / sol
+s_separate_in_line {- 67 -} = token White ( s_white +) / sol
 
 -- 6.3 Line Prefixes
 
-s_line_prefix n c {- 70 -} = case c of
+s_line_prefix n c {- 68 -} = case c of
                                   BlockOut -> s_block_line_prefix n
                                   BlockIn  -> s_block_line_prefix n
@@ -171 +168 @@
                                   FlowIn   -> s_flow_line_prefix n
 
-s_block_line_prefix n {- 71 -} = s_indent n
-s_flow_line_prefix  n {- 72 -} = s_indent n & ( s_separate_in_line ?)
+s_block_line_prefix n {- 69 -} = s_indent n
+s_flow_line_prefix  n {- 70 -} = s_indent n & ( s_separate_in_line ?)
 
 -- 6.4 Empty Lines
 
-l_empty n c {- 73 -} = ( s_line_prefix n c / s_indent_lt n )
-                     & b_normalized
-
--- 6.5 Comments
-
-c_nb_comment_text {- 74 -} = nest BeginComment
+l_empty n c {- 71 -} = ( s_line_prefix n c / s_indent_lt n )
+                     & b_as_line_feed
+
+-- 6.5 Line Folding
+
+b_l_trimmed  n c {- 72 -} = b_non_content & ( l_empty n c +)
+
+b_as_space {- 73 -} = token LineFold b_break
+
+b_l_folded n c  {- 74 -} = b_l_trimmed n c / b_as_space
+
+s_s_flow_folded n {- 75 -} = ( s_separate_in_line ?) & b_l_folded n FlowIn
+                           & s_line_prefix n FlowIn
+
+-- 6.6 Comments
+
+c_nb_comment_text {- 76 -} = nest BeginComment
                            & c_comment & meta ( nb_char *)
                            & nest EndComment
 
-s_b_comment {- 75 -} = ( s_separate_in_line & ( c_nb_comment_text ?) ?)
-                     & b_non_content_any
-
-l_comment {- 76 -} = s_separate_in_line & ( c_nb_comment_text ?) & b_non_content_any
-
-s_l_comments {- 77 -} = ( s_b_comment / sol )
+s_b_comment {- 77 -} = ( s_separate_in_line & ( c_nb_comment_text ?) ?)
+                     & b_non_content
+
+l_comment {- 78 -} = s_separate_in_line & ( c_nb_comment_text ?) & b_non_content
+
+s_l_comments {- 79 -} = ( s_b_comment / sol )
                       & ( l_comment *)
 
--- 6.6 Separation Lines
-
-s_separate n c      {- 78 -} = case c of
+-- 6.7 Separation Lines
+
+s_separate n c      {- 80 -} = case c of
                                     BlockOut -> s_separate_lines n
                                     BlockIn  -> s_separate_lines n
@@ -201 +209 @@
                                     FlowIn   -> s_separate_lines n
                                     FlowKey  -> s_separate_in_line
-s_separate_lines n {- 79 -} = s_l_comments & s_flow_line_prefix n
+s_separate_lines n {- 81 -} = s_l_comments & s_flow_line_prefix n
                             / s_separate_in_line
 
--- 6.7 Line Folding
-
-b_l_folded_specific n c {- 80 -} = token Break b_specific & ( l_empty n c *)
-
-b_l_folded_trimmed  n c {- 81 -} = b_non_content_generic & ( l_empty n c +)
-
-b_l_folded_as_space {-  82 -} = token LineFold b_generic
-
-b_l_folded_any n c  {-  83 -} = b_l_folded_specific n c
-                              / b_l_folded_trimmed n c
-                              / b_l_folded_as_space
-
-s_l_flow_folded n {-  84 -} = ( s_separate_in_line ?) & b_l_folded_any n FlowIn
-
 -- 6.8 Directives
 
-l_directive {-  85 -} = nest BeginDirective
-                      & c_directive
-                      & "directive"
-                      ^ ( ns_yaml_directive
-                        / ns_tag_directive
-                        / ns_reserved_directive )
-                      & nest EndDirective
-                      & s_l_comments
-
-ns_reserved_directive  {-  86 -} = ns_directive_name
-                                 & ( s_separate_in_line & ns_directive_parameter *)
-ns_directive_name      {-  87 -} = meta ( ns_char +)
-ns_directive_parameter {-  88 -} = meta ( ns_char +)
+l_directive {- 82 -} = nest BeginDirective
+                     & c_directive
+                     & "directive"
+                     ^ ( ns_yaml_directive
+                       / ns_tag_directive
+                       / ns_reserved_directive )
+                     & nest EndDirective
+                     & s_l_comments
+
+ns_reserved_directive  {- 83 -} = ns_directive_name
+                                & ( s_separate_in_line & ns_directive_parameter *)
+ns_directive_name      {- 84 -} = meta ( ns_char +)
+ns_directive_parameter {- 85 -} = meta ( ns_char +)
 
 -- 6.8.1 Yaml Directives
 
-ns_yaml_directive {-  89 -} = meta [ 'Y', 'A', 'M', 'L' ] ! "directive"
-                            & s_separate_in_line & ns_yaml_version
-ns_yaml_version   {-  90 -} = meta ( ( ns_dec_digit +) & '.' & ( ns_dec_digit +) )
+ns_yaml_directive {- 86 -} = meta [ 'Y', 'A', 'M', 'L' ] ! "directive"
+                           & s_separate_in_line & ns_yaml_version
+ns_yaml_version   {- 87 -} = meta ( ( ns_dec_digit +) & '.' & ( ns_dec_digit +) )
 
 -- 6.8.2 Tag Directives
 
-ns_tag_directive {-  91 -} = meta [ 'T', 'A', 'G' ] ! "directive"
-                           & s_separate_in_line & c_tag_handle
+ns_tag_directive {- 88 -} = meta [ 'T', 'A', 'G' ] ! "directive"
+                          & s_separate_in_line & c_tag_handle
                            & s_separate_in_line & ns_tag_prefix
 
 -- 6.8.2.1 Tag Handles
 
-c_tag_handle {-  92 -} = c_named_tag_handle
-                       / c_secondary_tag_handle
-                       / c_primary_tag_handle
-
-c_primary_tag_handle   {-  93 -} = nest BeginHandle
-                                 & c_tag
-                                 & nest EndHandle
-
-c_secondary_tag_handle {-  94 -} = nest BeginHandle
-                                 & c_tag & c_tag
-                                 & nest EndHandle
-
-c_named_tag_handle     {-  95 -} = nest BeginHandle
+c_tag_handle {- 89 -} = c_named_tag_handle
+                      / c_secondary_tag_handle
+                      / c_primary_tag_handle
+
+c_primary_tag_handle   {- 90 -} = nest BeginHandle
+                                & c_tag
+                                & nest EndHandle
+
+c_secondary_tag_handle {- 91 -} = nest BeginHandle
+                                & c_tag & c_tag
+                                & nest EndHandle
+
+c_named_tag_handle     {- 92 -} = nest BeginHandle
                                  & c_tag & meta ( ns_word_char +) & c_tag
                                  & nest EndHandle
@@ -266 +260 @@
 -- 6.8.2.2 Tag Prefixes
 
-ns_tag_prefix {-  96 -} = nest BeginTag
-                        & ( c_ns_local_tag_prefix / ns_global_tag_prefix )
-                        & nest EndTag
-
-c_ns_local_tag_prefix {-  97 -} = c_tag & meta ( ns_uri_char *)
-
-ns_global_tag_prefix  {-  98 -} = meta ( ns_tag_char & ( ns_uri_char *) )
+ns_tag_prefix {- 93 -} = nest BeginTag
+                       & ( c_ns_local_tag_prefix / ns_global_tag_prefix )
+                       & nest EndTag
+
+c_ns_local_tag_prefix {- 94 -} = c_tag & meta ( ns_uri_char *)
+
+ns_global_tag_prefix  {- 95 -} = meta ( ns_tag_char & ( ns_uri_char *) )
 
 -- 6.9 Node Properties
 
-c_ns_properties n c {-  99 -} = nest BeginProperties
+c_ns_properties n c {- 96 -} = nest BeginProperties
                               & ( ( c_ns_tag_property
                                   & ( s_separate n c & c_ns_anchor_property ?) )
@@ -285 +279 @@
 -- 6.9.1 Node Tags
 
-c_ns_tag_property {- 100 -} = nest BeginTag
+c_ns_tag_property {- 97 -} = nest BeginTag
                             & ( c_verbatim_tag
                               / c_ns_shorthand_tag
@@ -291 +285 @@
                             & nest EndTag
 
-c_verbatim_tag     {- 101 -} = c_tag & indicator '<' & meta ( ns_uri_char +) & indicator '>'
-
-c_ns_shorthand_tag {- 102 -} = c_named_tag_handle & meta ( ns_uri_char +)
-                             / c_secondary_tag_handle & meta ( ns_uri_char +)
+c_verbatim_tag     {- 98 -} = c_tag & indicator '<' & meta ( ns_uri_char +) & indicator '>'
+
+c_ns_shorthand_tag {- 99 -} = c_named_tag_handle & meta ( ns_tag_char +)
+                             / c_secondary_tag_handle & meta ( ns_tag_char +)
                              / c_primary_tag_handle & meta ( ns_tag_char +)
 
-c_non_specific_tag {- 103 -} = c_tag
+c_non_specific_tag {- 100 -} = c_tag
 
 -- 6.9.2 Node Anchors
 
-c_ns_anchor_property {- 104 -} = nest BeginAnchor
+c_ns_anchor_property {- 101 -} = nest BeginAnchor
                                & c_anchor & ns_anchor_name
                                & nest EndAnchor
 
-ns_anchor_char {- 105 -} = ns_char - ( c_collect_entry / c_sequence_start / c_sequence_end / c_mapping_start  / c_mapping_end )
-ns_anchor_name {- 106 -} = meta ( ns_anchor_char +)
+ns_anchor_char {- 102 -} = ns_char - c_flow_indicator
+ns_anchor_name {- 103 -} = meta ( ns_anchor_char +)
 
 -- 7.1 Alias Nodes
 
-c_ns_alias_node {- 107 -} = nest BeginAlias
+c_ns_alias_node {- 104 -} = nest BeginAlias
                           & c_alias ! "node" & ns_anchor_name
                           & nest EndAlias
@@ -316 +310 @@
 -- 7.2 Empty Nodes
 
-e_scalar {- 108 -} = nest BeginScalar & nest EndScalar
-
-e_node {- 109 -} = nest BeginNode & e_scalar & nest EndNode
+e_scalar {- 105 -} = nest BeginScalar & nest EndScalar
+
+e_node {- 106 -} = nest BeginNode & e_scalar & nest EndNode
 
 -- 7.3.1 Double Quoted Style
 
-nb_double_char {- 110 -} = "escape" ^ ( nb_char - c_escape - c_double_quote / c_ns_esc_char )
-ns_double_char {- 111 -} = nb_double_char - s_white
-
-c_double_quoted n c {- 112 -} = nest BeginScalar
+nb_double_char {- 107 -} = "escape" ^ ( nb_json - c_escape - c_double_quote / c_ns_esc_char )
+ns_double_char {- 108 -} = nb_double_char - s_white
+
+c_double_quoted n c {- 109 -} = nest BeginScalar
                               & c_double_quote ! "node" & text ( nb_double_text n c ) & c_double_quote
                               & nest EndScalar
-nb_double_text n c  {- 113 -} = case c of
+nb_double_text n c  {- 110 -} = case c of
                                      FlowOut -> nb_double_multi_line n
                                      FlowIn  -> nb_double_multi_line n
                                      FlowKey -> nb_double_one_line
-nb_double_one_line  {- 114 -} = ( nb_double_char *)
-
-s_l_double_escaped n {- 115 -} = ( s_white *)
+nb_double_one_line  {- 111 -} = ( nb_double_char *)
+
+s_s_double_escaped n {- 112 -} = ( s_white *)
                                & nest BeginEscape
-                               & c_escape ! "escape" & b_non_content_any
+                               & c_escape ! "escape" & b_non_content
                                & nest EndEscape
                                & ( l_empty n FlowIn *)
-s_l_double_any n     {- 116 -} = "escape" ^ ( s_l_double_escaped n / s_l_flow_folded n )
-
-nb_ns_double_in_line    {- 117 -} = ( ( s_white *) & ns_double_char *)
-s_ns_double_next_line n {- 118 -} = s_l_double_any n
-                                  & s_flow_line_prefix n
+                               & s_line_prefix n FlowIn
+s_s_double_break n   {- 113 -} = "escape" ^ ( s_s_double_escaped n / s_s_flow_folded n )
+
+nb_ns_double_in_line    {- 114 -} = ( ( s_white *) & ns_double_char *)
+s_ns_double_next_line n {- 115 -} = s_s_double_break n
                                   & ns_double_char & nb_ns_double_in_line
-nb_double_multi_line n  {- 119 -} = nb_ns_double_in_line
+nb_double_multi_line n  {- 116 -} = nb_ns_double_in_line
                                   & ( s_ns_double_next_line n *)
                                   & ( s_white *)
@@ -351 +345 @@
 -- 7.3.2 Single Quoted Style
 
-c_quoted_quote {- 120 -} = nest BeginEscape
+c_quoted_quote {- 117 -} = nest BeginEscape
                          & c_single_quote ! "escape" & meta '\''
                          & nest EndEscape
-nb_single_char {- 121 -} = "escape" ^ ( nb_char - c_single_quote / c_quoted_quote )
-ns_single_char {- 122 -} = nb_single_char - s_white
-
-c_single_quoted  n c {- 123 -}= nest BeginScalar
+nb_single_char {- 118 -} = "escape" ^ ( nb_json - c_single_quote / c_quoted_quote )
+ns_single_char {- 119 -} = nb_single_char - s_white
+
+c_single_quoted  n c {- 120 -}= nest BeginScalar
                               & c_single_quote & text ( nb_single_text n c ) & c_single_quote
                               & nest EndScalar
-nb_single_text n c {- 124 -} = case c of
+nb_single_text n c {- 121 -} = case c of
                                     FlowOut -> nb_single_multi_line n
                                     FlowIn  -> nb_single_multi_line n
                                     FlowKey -> nb_single_one_line
-nb_single_one_line {- 125 -} = ( nb_single_char *)
-
-nb_ns_single_in_line    {- 126 -} = ( ( s_white *) & ns_single_char *)
-s_ns_single_next_line n {- 127 -} = s_l_flow_folded n
-                                  & s_flow_line_prefix n
+nb_single_one_line {- 122 -} = ( nb_single_char *)
+
+nb_ns_single_in_line    {- 123 -} = ( ( s_white *) & ns_single_char *)
+s_ns_single_next_line n {- 124 -} = s_s_flow_folded n
                                   & ns_single_char & nb_ns_single_in_line
-nb_single_multi_line n  {- 128 -} = ( nb_ns_single_in_line *)
+nb_single_multi_line n  {- 125 -} = ( nb_ns_single_in_line *)
                                   & ( s_ns_single_next_line n *)
                                   & ( s_white *)
@@ -376 +369 @@
 -- 7.3.3 Plain Style
 
-ns_plain_first c  {- 129 -} = ns_char - c_indicator
+ns_plain_first c  {- 126 -} = ns_char - c_indicator
                             / ( ':' / '?' / '-' ) & ( ns_char >?)
 
-ns_plain_safe c   {- 130 -} = case c of
+ns_plain_safe c   {- 127 -} = case c of
                                    FlowOut -> ns_plain_safe_out
                                    FlowIn  -> ns_plain_safe_in
                                    FlowKey -> ns_plain_safe_in
-ns_plain_safe_out {- 131 -} = ns_char - c_mapping_value - c_comment
-ns_plain_safe_in   {- 132 -}= ns_plain_safe_out - ( c_collect_entry / c_sequence_start / c_sequence_end / c_mapping_start  / c_mapping_end )
-ns_plain_char c   {- 133 -} = ns_plain_safe c
+ns_plain_safe_out {- 128 -} = ns_char - c_mapping_value - c_comment
+ns_plain_safe_in  {- 129 -} = ns_plain_safe_out - c_flow_indicator
+ns_plain_char c   {- 130 -} = ns_plain_safe c
                             / ( ns_char <?) & '#'
                             / ':' & ( ns_char >?)
-nb_plain_char c   {- 134 -} = s_white / ns_plain_char c
-
-ns_plain n c          {- 135 -} = nest BeginScalar
+nb_plain_char c   {- 131 -} = s_white / ns_plain_char c
+
+ns_plain n c          {- 132 -} = nest BeginScalar
                                 & text (case c of
                                               FlowOut -> ns_plain_multi_line n c
@@ -396 +389 @@