Refactor: 重构Parser和AST结构,以支持新的语言特性
- 更新了 ParserTest,以改进文件路径处理和输出格式。 - 在 StmtParser 中新增了 parseConstDecl 和 parseForStmt 方法,用于处理常量声明和 for 循环。 - TypeExpr现归类为Expr。TypeExpr属于Expr,语义阶段视为Expr - 添加了新的 AST 节点:PostfixExpr、TernaryExpr、ForStmt 和 ImportStmt,用于表示新的语法结构。
This commit is contained in:
+12
-3
@@ -16,6 +16,8 @@ namespace Fig
|
||||
{TokenType::Minus, UnaryOperator::Negate},
|
||||
{TokenType::Not, UnaryOperator::Not},
|
||||
{TokenType::Ampersand, UnaryOperator::AddressOf},
|
||||
{TokenType::DoublePlus, UnaryOperator::Increment},
|
||||
{TokenType::DoubleMinus, UnaryOperator::Decrement},
|
||||
};
|
||||
return unaryOpMap;
|
||||
}
|
||||
@@ -40,6 +42,8 @@ namespace Fig
|
||||
|
||||
{TokenType::And, BinaryOperator::LogicalAnd},
|
||||
{TokenType::Or, BinaryOperator::LogicalOr},
|
||||
{TokenType::DoubleAmpersand, BinaryOperator::LogicalAnd},
|
||||
{TokenType::DoublePipe, BinaryOperator::LogicalOr},
|
||||
|
||||
{TokenType::Power, BinaryOperator::Power},
|
||||
|
||||
@@ -49,6 +53,7 @@ namespace Fig
|
||||
{TokenType::AsteriskEqual, BinaryOperator::MultiplyAssign},
|
||||
{TokenType::SlashEqual, BinaryOperator::DivideAssign},
|
||||
{TokenType::PercentEqual, BinaryOperator::ModuloAssign},
|
||||
{TokenType::Caret, BinaryOperator::BitXor},
|
||||
{TokenType::CaretEqual, BinaryOperator::BitXorAssign},
|
||||
|
||||
{TokenType::Pipe, BinaryOperator::BitOr},
|
||||
@@ -56,7 +61,7 @@ namespace Fig
|
||||
{TokenType::ShiftLeft, BinaryOperator::ShiftLeft},
|
||||
{TokenType::ShiftRight, BinaryOperator::ShiftRight},
|
||||
|
||||
{TokenType::Dot, BinaryOperator::MemberAccess},
|
||||
{TokenType::As, BinaryOperator::As},
|
||||
};
|
||||
return binaryOpMap;
|
||||
}
|
||||
@@ -78,6 +83,8 @@ namespace Fig
|
||||
{UnaryOperator::Negate, 20001},
|
||||
{UnaryOperator::Not, 20001},
|
||||
{UnaryOperator::AddressOf, 20001},
|
||||
{UnaryOperator::Increment, 20001},
|
||||
{UnaryOperator::Decrement, 20001},
|
||||
};
|
||||
return unbpm;
|
||||
}
|
||||
@@ -109,6 +116,7 @@ namespace Fig
|
||||
{BinaryOperator::GreaterEqual, 2100},
|
||||
|
||||
{BinaryOperator::Is, 2100},
|
||||
{BinaryOperator::As, 2100},
|
||||
|
||||
{BinaryOperator::ShiftLeft, 3000},
|
||||
{BinaryOperator::ShiftRight, 3000},
|
||||
@@ -117,10 +125,9 @@ namespace Fig
|
||||
{BinaryOperator::Subtract, 4000},
|
||||
{BinaryOperator::Multiply, 4500},
|
||||
{BinaryOperator::Divide, 4500},
|
||||
{BinaryOperator::Modulo, 4500},
|
||||
|
||||
{BinaryOperator::Power, 5000},
|
||||
|
||||
{BinaryOperator::MemberAccess, 40001},
|
||||
};
|
||||
return bnbpm;
|
||||
}
|
||||
@@ -153,6 +160,8 @@ namespace Fig
|
||||
case BinaryOperator::BitXorAssign:
|
||||
case BinaryOperator::Power: return GetBinaryOpLBp(op) - 1;
|
||||
|
||||
case BinaryOperator::As: return GetBinaryOpLBp(op) + 1;
|
||||
|
||||
default:
|
||||
/*
|
||||
左结合, 左绑定力 < 右
|
||||
|
||||
Reference in New Issue
Block a user