feat: for

src/ast.rs

@@ -3,7 +3,7 @@
 use std::io;
 
 use crate::ast_token::{get_token_keyword, Token, get_token_literal};
-use crate::ast_node::{ Expression, NumberLiteral, StringLiteral, Statement, IdentifierLiteral, ExpressionStatement, PropertyAccessExpression, BinaryExpression, ConditionalExpression, CallExpression, Keywords, Parameter, BlockStatement, ReturnStatement, Declaration, PropertyAssignment, ObjectLiteral, ElementAccessExpression, FunctionDeclaration, PostfixUnaryExpression, PrefixUnaryExpression, AssignExpression, GroupExpression, VariableDeclaration, VariableDeclarationStatement, VariableFlag, ClassDeclaration, ClassMethodDeclaration, ArrayLiteral, ComputedPropertyName, IfStatement};
+use crate::ast_node::{ Expression, NumberLiteral, StringLiteral, Statement, IdentifierLiteral, ExpressionStatement, PropertyAccessExpression, BinaryExpression, ConditionalExpression, CallExpression, Keywords, Parameter, BlockStatement, ReturnStatement, Declaration, PropertyAssignment, ObjectLiteral, ElementAccessExpression, FunctionDeclaration, PostfixUnaryExpression, PrefixUnaryExpression, AssignExpression, GroupExpression, VariableDeclaration, VariableDeclarationStatement, VariableFlag, ClassDeclaration, ClassMethodDeclaration, ArrayLiteral, ComputedPropertyName, IfStatement, ForStatement};
 use crate::ast_utils::{get_hex_number_value, chars_to_string};
 pub struct AST {
  // 当前字符
@@ -108,6 +108,7 @@ impl AST{
  match self.token {
  Token::Var | Token::Let => self.parse_variable_statement(),
  Token::If => self.parse_if_statement(),
+ Token::For => self.parse_for_statement(),
  Token::Function => {
  Statement::Function(self.parse_function(true))
  },
@@ -147,25 +148,29 @@ impl AST{
  self.check_token_and_next(Token::Var);
  }
 
- let mut var_statement = VariableDeclarationStatement {
- list: vec![],
+ let var_statement = VariableDeclarationStatement {
+ list: self.parse_variable_declarations(),
  flag: variable_flag,
  };
+ self.semicolon();
+ return Statement::Var(var_statement);
+ }
+
+ fn parse_variable_declarations(&mut self) -> Vec<Expression> {
+ let mut list: Vec<Expression> = vec![];
  loop {
  let expression = self.parse_variable_declaration();
- var_statement.list.push(expression);
+ list.push(expression);
  // let a= 1, b = 2;
  if self.token != Token::Comma {
  break;
  }
  self.next();
  }
- self.semicolon();
- return Statement::Var(var_statement);
+ list
  }
 
 
-
  // 解析 block statement
  fn parse_block_statement(&mut self) -> Statement {
  // 以左花括号开始
@@ -201,6 +206,48 @@ impl AST{
  return Statement::If(statement)
  }
 
+ // 解析 for 循环
+ // TODO: for in/ of
+ fn parse_for_statement(&mut self) -> Statement {
+ self.check_token_and_next(Token::For);
+ self.check_token_and_next(Token::LeftParenthesis);
+ // 解析 initializer
+ // 需要额外处理 var 的情况
+ let mut initializer = Statement::Unknown;
+ if self.token == Token::Var || self.token == Token::Let {
+ initializer = self.parse_variable_statement();
+ } else if self.token != Token::Semicolon {
+ initializer = Statement::Expression(ExpressionStatement { expression: self.parse_expression() })
+ }
+ // TODO: self.check_token_and_next(Token::Semicolon);
+ let codition = self.parse_expression();
+ println!("codition: {:?} {:?}", codition, self.token);
+ self.check_token_and_next(Token::Semicolon);
+ let incrementor = self.parse_expression();
+ self.check_token_and_next(Token::RightParenthesis);
+ println!("incrementor: {:?} {:?}", incrementor , self.token);
+ let statement = ForStatement {
+ initializer: Box::new(initializer),
+ codition: codition,
+ incrementor: incrementor,
+ statement: Box::new(Statement::Unknown),
+ };
+ // self.check_token_and_next(Token::RightParenthesis);
+ // // 判断是否是 单行if
+ // if self.token == Token::LeftBrace {
+ // statement.then_statement = Box::new(self.parse_block_statement());
+ // } else {
+ // statement.then_statement = Box::new(self.parse_statement());
+ // }
+
+ // if self.token == Token::Else {
+ // self.next();
+ // statement.else_statement = Box::new(self.parse_statement());
+ // }
+ // return Statement::If(statement)
+ return Statement::For(statement);
+ }
+
  // 解析 function statement
  fn parse_function(&mut self, variable_lifting: bool) -> FunctionDeclaration {
  // 如果是 function 关键字，则跳过

src/ast_node.rs

@@ -6,6 +6,7 @@ use crate::{ast_token::Token, value::Value, builtins::{object::Object}};
 pub enum Statement {
  Var(VariableDeclarationStatement),
  If(IfStatement),
+ For(ForStatement),
  Function(FunctionDeclaration),
  Class(ClassDeclaration),
  Block(BlockStatement),
@@ -96,6 +97,14 @@ pub struct IfStatement {
  pub else_statement: Box<Statement>,
 }
 
+#[derive(Debug, Clone, PartialEq)]
+pub struct ForStatement {
+ pub initializer: Box<Statement>,
+ pub codition: Expression,
+ pub incrementor: Expression,
+ pub statement: Box<Statement>,
+}
+
 
 
 #[derive(Debug, Clone, PartialEq)]

tests/confitional_test.rs

@@ -2,7 +2,7 @@
 use jsi::{JSI, value::Value};
 
 #[test]
-fn run_function_instances_has_class() {
+fn run_if_else() {
  let mut jsi = JSI::new();
  let result = jsi.run(String::from("\
  let a = false;
@@ -14,4 +14,16 @@ fn run_function_instances_has_class() {
  }\n
  b"));
  assert_eq!(result , Value::Number(2f64));
+}
+
+#[test]
+fn run_for() {
+ let mut jsi = JSI::new();
+ let result = jsi.run(String::from("\
+ let a = [];
+ for(let i = 0; i < 3; i++) {
+ a.push(i);
+ }\n
+ a.join(':')"));
+ assert_eq!(result , Value::String(String::from("0:1:2")));
 }