Minor things

Author: cdoublev

__tests__/value.js

@@ -550,7 +550,7 @@ describe('backtracking', () => {
      * 1. Replacing must only apply once (ie. not after backtracking).
      * 2. The list index must backtrack to a location stored in state instead of
      * from the index of a component value in the list.
-     * 3. The list must not be updated with the result from parsing because it
+     * 3. The list must not be updated with the result of parsing because it
      * may be different depending on the context production.
      */
     test('replaced value', () => {

doc/parse/parser.md

@@ -179,7 +179,7 @@ A more generic solution is `preprocess(node)` executing any sub-routine associat
 
 There are many semantic rules that can only be applied after matching the value definition, to validate the result against the context, or to create a different representation (eg. math functions and `<an+b>`). This can be achieved with `postprocess(node)` (or `validate(node)` and `represent(node)`).
 
-All numeric values can be replaced with a math function. This can be achieved with `replace(node)` returning the result from parsing the alternative grammar.
+All numeric values can be replaced with a math function. This can be achieved with `replace(node)` returning the result of parsing the alternative grammar.
 
 
 ## Implementation

lib/parse/arbitrary.js

@@ -1,8 +1,8 @@
 
 import { associatedTokens, closingTokens, openingTokens } from '../values/blocks.js'
 import { delimiter, list, omitted } from '../values/value.js'
-import { enterContext, getFunction, getRule, isInputAtEnd, isProducedBy } from '../utils/context.js'
 import { getDeclarationDefinition, matchBlockContents, matchStyleSheet, parseGrammar } from './parser.js'
+import { getFunction, getRule, isInputAtEnd, isProducedBy } from '../utils/context.js'
 import { isCloseCurlyBrace, isDelimiter, isError, isOpenCurlyBrace, isWhitespace } from '../utils/value.js'
 import { create as createError } from '../error.js'
 
@@ -72,12 +72,6 @@ function matchCommaContainingValue(node, match) {
     const fn = getFunction(node)
     // Do not restrict functions defined with a general notation except custom function definitions
     if (fn && (fn.definition.name || isProducedBy(node, '<default-value>'))) {
-        if (isInputAtEnd(node)) {
-            if (parent?.definition.type === 'optional') {
-                return omitted
-            }
-            return null
-        }
         if (input.consume(isOpenCurlyBrace)) {
             const value = match(node, ['}'])
             if (isError(value)) {

lib/parse/postprocess.js

@@ -1068,8 +1068,8 @@ function postParseMediaFeatureName(name, node) {
  * It aborts parsing when the declaration value fails to be parsed against its
  * definition.
  *
- * It represents the declaration value with the result from parsing it against
- * the feature value definition.
+ * It represents the declaration value with the result of parsing it against the
+ * feature value definition.
  */
 function postParseMediaFeaturePlain(declaration, node) {
     const [name,, value] = declaration
@@ -1097,7 +1097,7 @@ function postParseMediaFeaturePlain(declaration, node) {
  * It aborts parsing when the feature type is `discrete` or some value fails to
  * be parsed against the feature value definition.
  *
- * It represents the range values with the result from parsing them against the
+ * It represents the range values with the result of parsing them against the
  * feature value definition.
  */
 function postParseMediaFeatureRange(range, node) {

lib/parse/tokenize.js

@@ -15,7 +15,6 @@ import {
     startsWithNumber,
     toNumber,
 } from '../utils/string.js'
-import Stream from './stream.js'
 import { create as error } from '../error.js'
 
 /**
@@ -73,9 +72,7 @@ function consumeEscapedCodePoint(chars) {
         while (isHexadecimal(chars.next()) && hexCount++ < 5) {
             hex += chars.consume()
         }
-        if (isWhitespace(chars.next())) {
-            chars.consume()
-        }
+        chars.consume(isWhitespace)
         const number = Number(`0x${hex}`)
         if (number === 0 || isSurrogate(number) || number > 0x10FFFF) {
             return '�'

scripts/extract.js

@@ -173,7 +173,7 @@ const replaced = {
         '<url-set>': '<image-set()>',
         '<whole-value>': '<declaration-value>?',
         '<zero>': '<number-token>',
-        // https://github.com/w3c/reffy/issues/1878
+        // https://github.com/w3c/csswg-drafts/issues/10457#issuecomment-3126400963
         '<boolean-expr-group>': '<test> | (<boolean-expr[<test>]>) | <general-enclosed>',
         // https://github.com/w3c/csswg-drafts/pull/8367#issuecomment-1408147460, https://github.com/w3c/csswg-drafts/issues/9729, https://github.com/w3c/csswg-drafts/issues/10833
         '<conic-gradient-syntax>': '[[[from [<angle> | <zero>]]? [at <position>]?]! || <color-interpolation-method>]? , <angular-color-stop-list>',

scripts/initial.js

@@ -2,8 +2,8 @@
  * This script rewrites property and descriptor definition files by replacing
  * their `initial` value with an object associating:
  *
- *   - `parsed` to the result from parsing `initial`
- *   - `serialized` to the result from serializing `parsed`
+ *   - `parsed` to the result of parsing `initial`
+ *   - `serialized` to the result of serializing `parsed`
  */
 import { isFailure, isList, isOmitted } from '../lib/utils/value.js'
 import { quote, tab } from '../lib/utils/string.js'