Skip to content

Commit df514bd

Browse files
emiliotabatkins
authored andcommitted
[css-properties-values-api] Fix syntax string parsing to not treat whitespace between components the same as pipes. (w3c#894)
Fixes w3c#893
1 parent 9637aba commit df514bd

File tree

1 file changed

+14
-23
lines changed

1 file changed

+14
-23
lines changed

css-properties-values-api/Overview.bs

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -586,33 +586,24 @@ Parsing the syntax string {#parsing-syntax}
586586
preprocessed as specified in [[css-syntax-3]].
587587
Let |descriptor| be an initially empty [=list=] of <a>syntax components</a>.
588588

589-
5. Repeatedly consume the <a>next input code point</a> from |stream|:
589+
5. <a>Consume a syntax component</a> from |stream|.
590+
If failure was returned,
591+
return failure;
592+
otherwise,
593+
[=list/append=] the returned value to |descriptor|.
590594

591-
: <a>whitespace</a>
592-
:: Do nothing.
595+
Consume as much <a>whitespace</a> as possible from |stream|.
593596

597+
Consume the <a>next input code point</a> in |stream|:
594598
: EOF
595-
:: If |descriptor|’s [=list/size=] is greater than zero,
596-
return |descriptor|;
597-
otherwise, return failure.
599+
:: return |descriptor|.
598600

599601
: U+007C VERTICAL LINE (|)
600-
:: If |descriptor|’s [=list/size=] is greater than zero,
601-
<a>consume a syntax component</a> from |stream|.
602-
If failure was returned,
603-
return failure;
604-
otherwise,
605-
[=list/append=] the returned value to |descriptor|.
606-
607-
If |descriptor|’s [=list/size=] is zero, return failure.
608-
609-
: anything else
610-
:: <a>Reconsume the current input code point</a> in |stream|.
611-
<a>Consume a syntax component</a> from |stream|.
612-
If failure was returned,
613-
return failure;
614-
otherwise,
615-
[=list/append=] the returned value to |descriptor|.
602+
:: Repeat step 5.
603+
604+
: Anything else:
605+
:: Return failure.
606+
616607
</div>
617608

618609
### Consume a syntax component ### {#consume-syntax-component}
@@ -625,7 +616,7 @@ Parsing the syntax string {#parsing-syntax}
625616
Let |component| be a new <a>syntax component</a> with its |name| and |multiplier| initially
626617
empty.
627618

628-
Consume the <a>next input code point</a> |stream|:
619+
Consume the <a>next input code point</a> in |stream|:
629620

630621
: U+003C LESS-THAN SIGN (&lt;)
631622
:: <a>Consume a data type name</a> from |stream|.

0 commit comments

Comments
 (0)