mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-03-10 14:13:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed order of operations

Browse Source
This commit is contained in:
mark 2023-05-23 20:49:39 +02:00
parent 220d992eb9
commit 9fd09eff37
4 changed files with 129 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mers/c.mers
View File

@ -1,6 +0,0 @@
list = [1 ...]
b = list
&list.pop()
// &list.push(5)
println(b.to_string())
list

2
mers/src/lang/val_type.rs
View File

@ -425,7 +425,7 @@ impl VSingleType {
} }
}) || info.custom_types[*t].fits_in(rhs, info).is_empty() }) || info.custom_types[*t].fits_in(rhs, info).is_empty()
} }
_ => rhs.types.iter().any(|t| self.fits_in(t, info)), _ => rhs.types.iter().any(|b| self.fits_in(b, info)),
} }
} }
} }

255
mers/src/parsing/parse.rs
View File

@ -844,16 +844,134 @@ pub mod implementation {
// special characters that can follow a statement (loop because these can be chained) // special characters that can follow a statement (loop because these can be chained)
loop { loop {
file.skip_whitespaces(); file.skip_whitespaces();
// most local (a.b) // least local (evaluated last)
// 010 . // 0 =
// 020 + - // 020 == !=
// 025 * / % // 025 > < >= <=
// 050 == != > < >= <= // 050 + -
// 200 = // 055 * / %
// least local (a == b) | -> a.b == c + 2 works as expected // 080 .
// most local (evaluated first)
out = match (chain_level, file.peek()) { out = match (chain_level, file.peek()) {
// 010 . // 000 =
(0..=10, Some('.')) (0..=0, Some('=')) => {
file.next();
match out.statement.as_mut() {
SStatementEnum::Variable(name, r) => {
if name.starts_with("*") {
*name = name[1..].to_owned();
} else {
*r = true
}
}
_ => {}
}
// NOTE: Set this 0 to 1 to prevent a = b = c from being valid
parse_statement(file)?.output_to(out, 0)
}
// 020 == !=
(0..=20, Some('='))
if matches!(
file.get_char(file.get_pos().current_char_index + 1),
Some('=')
) =>
{
file.next();
file.next();
SStatementEnum::FunctionCall(
"eq".to_owned(),
vec![out, parse_statement_adv(file, false, 21)?],
)
.to()
}
(0..=20, Some('!'))
if matches!(
file.get_char(file.get_pos().current_char_index + 1),
Some('=')
) =>
{
file.next();
file.next();
SStatementEnum::FunctionCall(
"ne".to_owned(),
vec![out, parse_statement_adv(file, false, 21)?],
)
.to()
}
// 025 > >= < <=
(0..=25, Some('>')) => {
file.next();
SStatementEnum::FunctionCall(
if let Some('=') = file.peek() {
file.next();
"gtoe".to_owned()
} else {
"gt".to_owned()
},
vec![out, parse_statement_adv(file, false, 26)?],
)
.to()
}
(0..=25, Some('<')) => {
file.next();
SStatementEnum::FunctionCall(
if let Some('=') = file.peek() {
file.next();
"ltoe".to_owned()
} else {
"lt".to_owned()
},
vec![out, parse_statement_adv(file, false, 26)?],
)
.to()
}
// 050 + -
(0..=50, Some('+')) => {
file.next();
SStatementEnum::FunctionCall(
"add".to_owned(),
// AMONG
vec![out, parse_statement_adv(file, false, 51)?],
)
.to()
}
(0..=50, Some('-')) => {
file.next();
SStatementEnum::FunctionCall(
"sub".to_owned(),
// US
vec![out, parse_statement_adv(file, false, 51)?],
)
.to()
}
// 055 * / %
(0..=55, Some('*')) => {
file.next();
SStatementEnum::FunctionCall(
"mul".to_owned(),
vec![out, parse_statement_adv(file, false, 56)?],
)
.to()
}
(0..=55, Some('/')) => {
file.next();
SStatementEnum::FunctionCall(
"div".to_owned(),
// RED SUSSY MOGUS MAN
vec![out, parse_statement_adv(file, false, 56)?],
)
.to()
}
(0..=55, Some('%')) => {
file.next();
SStatementEnum::FunctionCall(
"mod".to_owned(),
vec![out, parse_statement_adv(file, false, 56)?],
)
.to()
}
// 080 .
(0..=80, Some('.'))
if !matches!( if !matches!(
file.get_char(file.get_pos().current_char_index + 1), file.get_char(file.get_pos().current_char_index + 1),
Some('.') Some('.')
@ -861,7 +979,7 @@ pub mod implementation {
{ {
file.next(); file.next();
let err_start_of_wrapper = *file.get_pos(); let err_start_of_wrapper = *file.get_pos();
let wrapper = parse_statement_adv(file, true, 11)?; let wrapper = parse_statement_adv(file, true, 81)?;
let err_end_of_wrapper = *file.get_pos(); let err_end_of_wrapper = *file.get_pos();
match *wrapper.statement { match *wrapper.statement {
SStatementEnum::FunctionCall(func, args) => { SStatementEnum::FunctionCall(func, args) => {
@ -903,123 +1021,6 @@ pub mod implementation {
} }
} }
} }
// 20 + -
(0..=20, Some('+')) => {
file.next();
SStatementEnum::FunctionCall(
"add".to_owned(),
// AMONG
vec![out, parse_statement_adv(file, false, 21)?],
)
.to()
}
(0..=20, Some('-')) => {
file.next();
SStatementEnum::FunctionCall(
"sub".to_owned(),
// US
vec![out, parse_statement_adv(file, false, 21)?],
)
.to()
}
// 025 * / %
(0..=25, Some('*')) => {
file.next();
SStatementEnum::FunctionCall(
"mul".to_owned(),
vec![out, parse_statement_adv(file, false, 26)?],
)
.to()
}
(0..=25, Some('/')) => {
file.next();
SStatementEnum::FunctionCall(
"div".to_owned(),
// RED SUSSY MOGUS MAN
vec![out, parse_statement_adv(file, false, 26)?],
)
.to()
}
(0..=25, Some('%')) => {
file.next();
SStatementEnum::FunctionCall(
"mod".to_owned(),
vec![out, parse_statement_adv(file, false, 26)?],
)
.to()
}
// 045 > >= < <=
(0..=45, Some('>')) => {
file.next();
SStatementEnum::FunctionCall(
if let Some('=') = file.peek() {
file.next();
"gtoe".to_owned()
} else {
"gt".to_owned()
},
vec![out, parse_statement_adv(file, false, 46)?],
)
.to()
}
(0..=45, Some('<')) => {
file.next();
SStatementEnum::FunctionCall(
if let Some('=') = file.peek() {
file.next();
"ltoe".to_owned()
} else {
"lt".to_owned()
},
vec![out, parse_statement_adv(file, false, 46)?],
)
.to()
}
// 050 == !=
(0..=50, Some('='))
if matches!(
file.get_char(file.get_pos().current_char_index + 1),
Some('=')
) =>
{
file.next();
file.next();
SStatementEnum::FunctionCall(
"eq".to_owned(),
vec![out, parse_statement_adv(file, false, 51)?],
)
.to()
}
(0..=50, Some('!'))
if matches!(
file.get_char(file.get_pos().current_char_index + 1),
Some('=')
) =>
{
file.next();
file.next();
SStatementEnum::FunctionCall(
"ne".to_owned(),
vec![out, parse_statement_adv(file, false, 51)?],
)
.to()
}
// 200 =
(0..=200, Some('=')) => {
file.next();
match out.statement.as_mut() {
SStatementEnum::Variable(name, r) => {
if name.starts_with("*") {
*name = name[1..].to_owned();
} else {
*r = true
}
}
_ => {}
}
// NOTE: Set this 0 to 201 to prevent a = b = c from being valid
parse_statement(file)?.output_to(out, 0)
}
_ => break, _ => break,
}; };
} }

11
mers/t.mers
View File

@ -1,11 +0,0 @@
a = (max int) {
println("Max: " + max.to_string())
for i max {
println(i.to_string())
}
}
a.debug()
// why does this work
a.thread(10).await()
// and this just blocks and does nothing
a.run(10)