add rgb

scorpdx · Sep 4, 2020 · 63c31f9 · 63c31f9
1 parent 8d8ef66
commit 63c31f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/ck3json/ck3parser.rs b/src/ck3json/ck3parser.rs
@@ -14,7 +14,8 @@ pub fn parse(ck3txt: &str) -> Result<JSONValue, Error<Rule>> {
     use pest::iterators::Pair;
     fn parse_value(pair: Pair<Rule>) -> JSONValue {
         match pair.as_rule() {
-            Rule::object => JSONValue::Object(
+            Rule::rgb
+            | Rule::object => JSONValue::Object(
                 pair.into_inner()
                     .map(|pair| {
                         let mut inner_rules = pair.into_inner();
@@ -38,7 +39,7 @@ pub fn parse(ck3txt: &str) -> Result<JSONValue, Error<Rule>> {
             | Rule::identifier
             | Rule::pair
             | Rule::value
-            | Rule::inner
+            | Rule::string_inner
             | Rule::char
             | Rule::int
             | Rule::float

diff --git a/src/grammars/ck3txt.pest b/src/grammars/ck3txt.pest
@@ -15,12 +15,12 @@ array = {
     "{" ~ value* ~ "}"
 }
 
-value = _{ object | array | date | string | number | boolean | tag }
+value = _{ object | array | rgb | date | string | number | boolean | tag }
 
 boolean = @{ ("yes" | "no") ~ !ASCII_ALPHA }
 
-string = ${ "\"" ~ inner ~ "\"" }
-inner = @{ char* }
+string = ${ "\"" ~ string_inner ~ "\"" }
+string_inner = @{ char* }
 char = {
     !("\"" | "\\") ~ ANY
     | "\\" ~ ("\"" | "\\" | "/" | "b" | "f" | "n" | "r" | "t")
@@ -31,7 +31,7 @@ number = @{ float | int }
 
 int = @{"-"? ~ ASCII_DIGIT+}
 float = @{int? ~ "." ~ ASCII_DIGIT+ ~ "f"?}
-
+rgb = {"rgb" ~ array}
 date = ${ ("\"" ~ date_inner ~ "\"") | date_inner }
 date_inner = @{ASCII_DIGIT+ ~ "." ~ ASCII_DIGIT+ ~ "." ~ ASCII_DIGIT+ }