functions
This commit is contained in:
+1
-1
@@ -8,7 +8,7 @@ mod variable;
|
||||
fn main() {
|
||||
let mut vars = Variables::new();
|
||||
let mut trsp = transpiler::Transpiler::default();
|
||||
let out = trsp.transpile("{xyz}".to_string(), 0, &mut vars);
|
||||
let out = trsp.transpile("void main() {int x}".to_string(), 0, &mut vars);
|
||||
for p in trsp.problems {
|
||||
println!("{:?}: {}", p.problem_type, p.problem_msg)
|
||||
}
|
||||
|
||||
+13
-1
@@ -16,6 +16,7 @@ pub enum Token {
|
||||
}
|
||||
pub enum Ast {
|
||||
Variable(String, String),
|
||||
Function(String, String, String, String),
|
||||
}
|
||||
|
||||
pub fn get_token(v: String, t: u32, state: State) -> Token {
|
||||
@@ -131,7 +132,7 @@ pub fn tokenize(code: String, root: &mut Transpiler) -> Vec<Token> {
|
||||
});
|
||||
}
|
||||
}
|
||||
if t != token_type && token_type != 0 {
|
||||
if (t != token_type || tval == '\n') && token_type != 0 {
|
||||
tokens.push(get_token(
|
||||
token_value.clone(),
|
||||
token_type,
|
||||
@@ -165,6 +166,17 @@ pub fn parse(code: String, vars: &mut Variables, root: &mut Transpiler) -> Vec<A
|
||||
while tokens.len() > 0 {
|
||||
let mut drain: usize = 1;
|
||||
match tokens.as_slice() {
|
||||
[Token::Identifier(var_type, state0), Token::Identifier(var_name, state1), Token::Round(round, state2), Token::Curly(curly, state3), ..] =>
|
||||
{
|
||||
ast.push(Ast::Function(
|
||||
var_type.clone(),
|
||||
var_name.clone(),
|
||||
round.clone(),
|
||||
curly.clone(),
|
||||
));
|
||||
drain += 1;
|
||||
vars.new_func(var_name.clone(), state1.clone(), "".to_string());
|
||||
}
|
||||
[Token::Identifier(var_type, state0), Token::Identifier(var_name, state1), ..] => {
|
||||
ast.push(Ast::Variable(var_type.clone(), var_name.clone()));
|
||||
drain += 1;
|
||||
|
||||
@@ -41,6 +41,13 @@ impl Transpiler {
|
||||
Ast::Variable(var_type, var_name) => {
|
||||
res += format!("let mut {}: {}", var_name, var_type).as_str();
|
||||
}
|
||||
Ast::Function(var_type, var_name, round, curly) => {
|
||||
res += format!(
|
||||
"fn {}({}) -> {} {}{}{}",
|
||||
var_name, round, var_type, "{", curly, "}"
|
||||
)
|
||||
.as_str();
|
||||
}
|
||||
}
|
||||
}
|
||||
res
|
||||
|
||||
Reference in New Issue
Block a user