mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-10-31 11:46:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

implemented working float literals and removed the 5,2 workaround: 5.2 is now a float! (see 10.5.debug()).

Browse Source 
this was an issue for so long because it requires an exception to the usual dot syntax, and exceptions can be dangerous. So if there is an issue, you can resort to { 10.5 }.something() or { 10 }.5 (although this doesn't make sense) to convince the parser to do what you want.
This commit is contained in:
Dummi26 2023-04-15 14:22:41 +02:00
parent b2a36416cf
commit effdc096a2
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mers/src/parse/parse.rs
View File

@ -447,10 +447,14 @@ fn parse_statement_adv(
} else {
let mut start = String::new();
loop {
match match file.peek() {
Some(ch) if matches!(ch, '}' | ']' | ')' | '.') => Some(ch),
fn is_delimeter(ch: char) -> bool {
matches!(ch, '}' | ']' | ')' | '.')
}
let nchar = match file.peek() {
Some(ch) if is_delimeter(ch) => Some(ch),
_ => file.next(),
} {
};
match nchar {
Some('=') => {
break parse_statement(file)?.output_to(start.trim().to_string());
}
@ -460,7 +464,7 @@ fn parse_statement_adv(
parse_statement(file)?,
)));
}
Some(ch) if ch.is_whitespace() || matches!(ch, '}' | ']' | ')' | '.') => {
Some(ch) if ch.is_whitespace() || is_delimeter(ch) => {
file.skip_whitespaces();
if let Some('=') = file.peek() {
continue;
@ -583,9 +587,28 @@ fn parse_statement_adv(
// int, float, var
break {
if let Ok(v) = start.parse() {
SStatementEnum::Value(VDataEnum::Int(v).to()).into()
} else if let Ok(v) = start.replace(",", ".").parse() {
SStatementEnum::Value(VDataEnum::Float(v).to()).into()
if let Some('.') = nchar {
let pos = *file.get_pos();
file.next();
let mut pot_float = String::new();
for ch in &mut *file {
if ch.is_whitespace() || is_delimeter(ch) {
break;
}
pot_float.push(ch);
}
if let Ok(v) = format!("{start}.{pot_float}").parse() {
SStatementEnum::Value(VDataEnum::Float(v).to())
.into()
} else {
file.set_pos(pos);
SStatementEnum::Value(VDataEnum::Int(v).to()).into()
}
} else {
SStatementEnum::Value(VDataEnum::Int(v).to()).into()
}
// } else if let Ok(v) = start.parse() {
// SStatementEnum::Value(VDataEnum::Float(v).to()).into()
} else {
if start.starts_with('&') {
SStatementEnum::Variable(start[1..].to_string(), true)