Merge pull request #838 from jaytaph/css-syntax

Fixed css syntax where literals where parsed as tokens

Author: jaytaph

crates/gosub_css3/resources/definitions/definitions.json

@@ -12,7 +12,7 @@ use crate::stylesheet::CssValue;
 
 /// List of elements that are built-in data types in the CSS specification. These will be handled
 /// by the syntax matcher as built-in types.
-const BUILTIN_DATA_TYPES: [&str; 41] = [
+const BUILTIN_DATA_TYPES: [&str; 43] = [
     "absolute-size",
     "age",
     "angle",
@@ -54,6 +54,8 @@ const BUILTIN_DATA_TYPES: [&str; 41] = [
     "color()",
     "attr()",    //TODO: this is not a builtin!
     "element()", //TODO: this is not a builtin!
+    "dynamic-range-limit-mix()",
+    "palette-mix()",
 ];
 
 /// A CSS property definition including its type and initial value and optional expanded values if it's a shorthand property
@@ -584,7 +586,12 @@ mod tests {
 
     #[test]
     fn test_parse_definition_file() {
-        assert_eq!(CSS_DEFINITIONS.len(), 620);
+        // set the log level to WARN
+        simple_logger::SimpleLogger::new()
+            .with_level(log::LevelFilter::Warn)
+            .init()
+            .unwrap();
+        assert_eq!(CSS_DEFINITIONS.len(), 656);
     }
 
     #[test]

crates/gosub_css3/resources/definitions/definitions_at-rules.json

@@ -7,7 +7,7 @@ use nom::character::complete::{alpha1, alphanumeric1, char, digit0, digit1, mult
 use nom::combinator::{map, map_res, opt, recognize};
 use nom::multi::{fold_many1, many0, many1, separated_list0, separated_list1};
 use nom::number::complete::float;
-use nom::sequence::{delimited, pair, preceded, separated_pair};
+use nom::sequence::{delimited, pair, preceded, separated_pair, terminated};
 use nom::Err;
 use nom::IResult;
 use nom::Parser;
@@ -18,7 +18,7 @@ use crate::stylesheet::CssValue;
 // When debugging the parser, it's nice to have some additional information ready. This should maybe
 // be inside a cfg setting, but for now (un)commenting the appropriate line is good enough.
 macro_rules! debug_print {
-    // ($($x:tt)*) => { println!($($x)*) }
+    // ($($x:tt)*) => { println!($($x)*) };
     ($($x:tt)*) => {{}};
 }
 
@@ -341,8 +341,9 @@ fn parse_curly_braces_multiplier(input: &str) -> IResult<&str, SyntaxComponentMu
 
 fn parse_comma_separated_multiplier(input: &str) -> IResult<&str, SyntaxComponentMultiplier> {
     let range = alt((
-        separated_pair(ws(integer), ws(tag(",")), ws(integer)),
-        map(ws(integer), |num| (num, num)),
+        separated_pair(ws(integer), ws(tag(",")), ws(integer)), // "2,5"
+        map(terminated(ws(integer), ws(tag(","))), |num| (num, u32::MAX)), // "3,"
+        map(ws(integer), |num| (num, num)),                     // "3"
     ));
 
     let (input, minmax) = alt((
@@ -367,8 +368,8 @@ fn parse_multipliers(input: &str) -> IResult<&str, Vec<SyntaxComponentMultiplier
         map(tag("+"), |_| SyntaxComponentMultiplier::OneOrMore),
         map(tag("?"), |_| SyntaxComponentMultiplier::Optional),
         map(tag("!"), |_| SyntaxComponentMultiplier::AtLeastOneValue),
-        parse_comma_separated_multiplier,
-        parse_curly_braces_multiplier,
+        parse_comma_separated_multiplier, // Deals with # and #{x,y}
+        parse_curly_braces_multiplier,    // Deals with {x,y}
     )))
     .parse(input)?;
 
@@ -794,7 +795,7 @@ fn parse_component(input: &str) -> IResult<&str, SyntaxComponent> {
 
     component.update_multipliers(multipliers.clone());
 
-    debug_print!("<- Parsed component_type: {:#?} {}", component, multipliers);
+    debug_print!("<- Parsed component_type: {:#?} {:?}", component, multipliers);
 
     Ok((input, component))
 }

crates/gosub_css3/resources/definitions/definitions_properties.json

@@ -0,0 +1,2 @@
+.css_cache
+.output

crates/gosub_css3/resources/definitions/definitions_selectors.json

@@ -2,13 +2,15 @@ package main
 
 import (
 	"bytes"
+	"cmp"
 	"encoding/json"
 	"generate_definitions/mdn"
 	"generate_definitions/utils"
 	"generate_definitions/webref"
 	"log"
 	"os"
 	"path"
+	"slices"
 )
 
 type ExportType int
@@ -21,7 +23,7 @@ const (
 
 const (
 	exportType      = Both
-	ResourcePath    = "crates/gosub_css3/resources/definitions"
+	ResourcePath    = ".output/definitions"
 	SingleFilePath  = ResourcePath + "/definitions.json"
 	MultiFileDir    = ResourcePath
 	MultiFilePrefix = "definitions_"
@@ -109,6 +111,20 @@ func main() {
 		len(data.Properties), len(data.Values), len(data.AtRules), len(data.Selectors),
 	)
 
+	// Sort elements, so that the output is deterministic and we have less issues with version control
+	slices.SortFunc(data.Properties, func(a, b utils.Property) int {
+		return cmp.Compare(a.Name, b.Name)
+	})
+	slices.SortFunc(data.Values, func(a, b utils.Value) int {
+		return cmp.Compare(a.Name, b.Name)
+	})
+	slices.SortFunc(data.AtRules, func(a, b utils.AtRule) int {
+		return cmp.Compare(a.Name, b.Name)
+	})
+	slices.SortFunc(data.Selectors, func(a, b utils.Selector) int {
+		return cmp.Compare(a.Name, b.Name)
+	})
+
 	switch exportType {
 	case SingleFile:
 		ExportSingleFile(&data)
@@ -140,7 +156,6 @@ func ExportMultiFile(data *utils.Data) {
 	ExportData(data.Values, path.Join(MultiFileDir, MultiFilePrefix+"values.json"))
 	ExportData(data.AtRules, path.Join(MultiFileDir, MultiFilePrefix+"at-rules.json"))
 	ExportData(data.Selectors, path.Join(MultiFileDir, MultiFilePrefix+"selectors.json"))
-
 }
 
 func ExportData(data any, path string) {

crates/gosub_css3/resources/definitions/definitions_values.json

@@ -10,9 +10,9 @@ const (
 	REPO             = "w3c/webref"
 	LOCATION         = "ed/css"
 	PATCH_LOCATION   = "ed/csspatches"
-	CACHE_DIR        = "crates/gosub_css3/resources/cache"
+	CACHE_DIR        = ".css_cache"
 	CACHE_INDEX_FILE = CACHE_DIR + "/index/cache_index.json"
-	CUSTOM_PATCH_DIR = "crates/gosub_css3/resources/patches"
+	CUSTOM_PATCH_DIR = ".css_cache/patches"
 	BRANCH           = "curated"
 )