lifegpc/msg-tool
1
0
Fork 0
mirror of https://github.com/lifegpc/msg-tool.git synced 2026-06-06 21:08:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix parse bug

Browse Source
This commit is contained in:
lifegpc
2025-07-24 20:08:47 +08:00
parent 978dde8e4e
commit 2172e462d2
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/scripts/artemis/ast/text.rs
View File

@@ -195,7 +195,13 @@ impl<'a> TextParser<'a> {
let key = self.parse_key()?;
let v = if self.is_indent("=") {
self.parse_indent("=")?;
Value::KeyVal((key, Box::new(self.parse_str()?)))
let v = match self.peek().ok_or(self.error2("Unexpected eof"))? {
"\"" => self.parse_str()?,
"-" | "." | "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8"
| "9" => self.parse_any_number()?,
_ => return self.error("Expected value after key"),
};
Value::KeyVal((key, Box::new(v)))
} else {
Value::Str(key)
};
@@ -353,3 +359,47 @@ impl<'a> TextParser<'a> {
))
}
}
#[test]
fn test_gen() {
let v = Value::Array(vec![
Value::Str("\"Hello<Dat>".to_string()),
Value::Array(vec![
Value::Str("title".to_string()),
Value::Int(1),
Value::Float(2.0),
Value::KeyVal((
"name".to_string(),
Box::new(Value::Str("World".to_string())),
)),
Value::KeyVal(("int".to_string(), Box::new(Value::Int(42)))),
Value::KeyVal(("float".to_string(), Box::new(Value::Float(3.0)))),
]),
Value::Str(">World".to_string()),
]);
assert_eq!(
TextGenerator::new().generate(&v).unwrap(),
"\"Hello&lt;Dat><title 1 2.0 name=\"World\" int=42 float=3.0>>World"
);
}
#[test]
fn test_parse() {
let text = "\"Hello&lt;Dat><title 1 2.0 name=\"World\" int=42 float=3.0>>World";
let v = Value::Array(vec![
Value::Str("\"Hello<Dat>".to_string()),
Value::Array(vec![
Value::Str("title".to_string()),
Value::Int(1),
Value::Float(2.0),
Value::KeyVal((
"name".to_string(),
Box::new(Value::Str("World".to_string())),
)),
Value::KeyVal(("int".to_string(), Box::new(Value::Int(42)))),
Value::KeyVal(("float".to_string(), Box::new(Value::Float(3.0)))),
]),
Value::Str(">World".to_string()),
]);
assert_eq!(TextParser::new(text).parse().unwrap(), v);
}

2
src/scripts/artemis/ast/types.rs
View File

@@ -2,7 +2,7 @@ use std::cmp::{PartialEq, PartialOrd};
use std::convert::From;
use std::ops::{Deref, Index, IndexMut};
#[derive(Clone, Debug)]
#[derive(Clone, Debug, PartialEq)]
pub enum Value {
Float(f64),
Int(i64),