比較演算子に対応

Author: corgi0901

BNF.txt

@@ -1,6 +1,7 @@
 program = expr ("," expr | "\n" expr)*
-expr = ident "=" add | add
+expr = ident "=" compare | compare
+compare = add | add ("==" | "!=" | "<" | "<=" | ">" | ">=")  add
 add = mul ("+" mul | "-" mul)*
 mul = unary ("*" unary | "/" unary)*
 unary = ("+" | "-")? primary
-primary = ident | num | "(" add ")"
+primary = ident | num | "(" compare ")"

generator.cpp

@@ -92,6 +92,46 @@ void Generator::gen(Node* node)
 
 			break;
 
+		case ND_EQ:
+			gen(node->left);
+			gen(node->right);
+
+			operations.push_back( Operation{ OP_POP, REG_GR0 } );
+			operations.push_back( Operation{ OP_POP, REG_GR1 } );
+			operations.push_back( Operation{ OP_EQ, REG_GR1, REG_GR0 } );
+
+			break;
+
+		case ND_NEQ:
+			gen(node->left);
+			gen(node->right);
+
+			operations.push_back( Operation{ OP_POP, REG_GR0 } );
+			operations.push_back( Operation{ OP_POP, REG_GR1 } );
+			operations.push_back( Operation{ OP_NEQ, REG_GR1, REG_GR0 } );
+
+			break;
+
+		case ND_LESS:
+			gen(node->left);
+			gen(node->right);
+
+			operations.push_back( Operation{ OP_POP, REG_GR0 } );
+			operations.push_back( Operation{ OP_POP, REG_GR1 } );
+			operations.push_back( Operation{ OP_LESS, REG_GR1, REG_GR0 } );
+
+			break;
+
+		case ND_EQLESS:
+			gen(node->left);
+			gen(node->right);
+
+			operations.push_back( Operation{ OP_POP, REG_GR0 } );
+			operations.push_back( Operation{ OP_POP, REG_GR1 } );
+			operations.push_back( Operation{ OP_EQLESS, REG_GR1, REG_GR0 } );
+
+			break;
+
 		case ND_ASSIGN:
 			gen_var(node->left);
 			gen(node->right);

parser.cpp

@@ -22,18 +22,47 @@ vector<Node*> Parser::program(void)
 
 Node* Parser::expr(void)
 {
-	if(TK_IDENT == token->kind && strncmp((token+1)->str, "=", 1) == 0){
+	if(TK_IDENT == token->kind && strncmp((token+1)->str, "=", 1) == 0 && (token+1)->len == 1){
 		Node* ident = new Node();
 		ident->kind = ND_IDENT;
 		ident->name = token->str;
 		ident->len = token->len;
 		token++;
 		expect("=");
-		Node* setNode = new Node{ ND_ASSIGN, ident, add() };
-		return setNode;
+		Node* node = new Node{ ND_ASSIGN, ident, compare() };
+		return node;
 	}
 
-	return add();
+	return compare();
+};
+
+Node* Parser::compare(void)
+{
+	Node* addNode = add();
+	Node* node;
+	if(consume("==")){
+		node = new Node{ ND_EQ, addNode, add()};
+	}
+	else if(consume("!=")){
+		node = new Node{ ND_NEQ, addNode, add()};
+	}
+	else if(consume("<")){
+		node = new Node{ ND_LESS, addNode, add()};
+	}
+	else if(consume("<=")){
+		node = new Node{ ND_EQLESS, addNode, add()};
+	}
+	else if(consume(">")){
+		node = new Node{ ND_LESS, add(), addNode}; // 右左辺を入れ替え
+	}
+	else if(consume(">=")){
+		node = new Node{ ND_EQLESS, add(), addNode}; // 右左辺を入れ替え
+	}
+	else{
+		return addNode;
+	}
+
+	return node;
 };
 
 Node* Parser::num(void)
@@ -104,9 +133,9 @@ Node* Parser::unary(void)
 Node* Parser::primary(void)
 {
 	if(consume("(")){
-		Node* addNode = add();
+		Node* node = compare();
 		expect(")");
-		return addNode;
+		return node;
 	}
 	else if(TK_IDENT == token->kind){
 		Node* ident = new Node();

parser.hpp

@@ -13,6 +13,7 @@ class Parser
 
 	vector<Node*> program(void);
 	Node* expr(void);
+	Node* compare(void);
 	Node* num(void);
 	Node* add(void);
 	Node* mul(void);

rook.hpp

@@ -29,6 +29,10 @@ typedef enum {
 	ND_DIV,			// /
 	ND_ASSIGN,		// =
 	ND_IDENT,		// 識別子
+	ND_EQ,			// ==
+	ND_NEQ,			// !=
+	ND_LESS,		// <
+	ND_EQLESS,		// <=
 } NodeKind;
 
 typedef struct Node Node;
@@ -52,6 +56,10 @@ typedef enum {
 	OP_SUB,			// 減算
 	OP_MUL,			// 乗算
 	OP_DIV,			// 除算
+	OP_EQ,			// ==
+	OP_NEQ,			// !=
+	OP_LESS,		// <
+	OP_EQLESS,		// <=
 	OP_STORE,		// レジスタ→メモリへの書き込み
 	OP_LOAD,		// メモリ→レジスタへの読み込み
 } OP_CODE;

test.sh

@@ -38,5 +38,16 @@ test 9 "num = 3, num * num"
 test 10 "a = 5, b = 2, c = a * b"
 test 2 "a = -3, a + 5"
 test 12 "n = 2, ret = 3 * (n + 2)"
+test 1 "1==1"
+test 0 "1==2"
+test 0 "1!=1"
+test 1 "1!=0"
+test 1 "0<1"
+test 0 "1<1"
+test 1 "1<=1"
+test 0 "1<=0"
+test 1 "1>=1"
+test 0 "0>=1"
+test 1 "num = 1, num = num + 1, num == 2"
 
 echo "OK"

tokenizer.cpp

@@ -66,6 +66,36 @@ vector<Token> Tokenizer::tokenize(char* input)
 			tokens.push_back(token);
 			input++;
 		}
+		else if(strncmp(input, "==", 2) == 0){
+			Token token = { TK_RESERVED, input, 2 };
+			tokens.push_back(token);
+			input += 2;
+		}
+		else if(strncmp(input, "!=", 2) == 0){
+			Token token = { TK_RESERVED, input, 2 };
+			tokens.push_back(token);
+			input += 2;
+		}
+		else if(strncmp(input, "<=", 2) == 0){
+			Token token = { TK_RESERVED, input, 2 };
+			tokens.push_back(token);
+			input += 2;
+		}
+		else if(strncmp(input, "<", 1) == 0){
+			Token token = { TK_RESERVED, input, 1 };
+			tokens.push_back(token);
+			input++;
+		}
+		else if(strncmp(input, ">=", 2) == 0){
+			Token token = { TK_RESERVED, input, 2 };
+			tokens.push_back(token);
+			input += 2;
+		}
+		else if(strncmp(input, ">", 1) == 0){
+			Token token = { TK_RESERVED, input, 1 };
+			tokens.push_back(token);
+			input++;
+		}
 		else if(strncmp(input, "=", 1) == 0){
 			Token token = { TK_RESERVED, input, 1 };
 			tokens.push_back(token);

vm.cpp

@@ -62,6 +62,26 @@ DWORD VM::run(vector<Operation>& code)
 				push(reg[op->operand] / reg[op->operand2]);
 				break;
 			}
+			case OP_EQ:
+			{
+				push(reg[op->operand] == reg[op->operand2]);
+				break;
+			}
+			case OP_NEQ:
+			{
+				push(reg[op->operand] != reg[op->operand2]);
+				break;
+			}
+			case OP_LESS:
+			{
+				push(reg[op->operand] < reg[op->operand2]);
+				break;
+			}
+			case OP_EQLESS:
+			{
+				push(reg[op->operand] <= reg[op->operand2]);
+				break;
+			}
 			case OP_STORE:
 			{
 				bp[reg[op->operand]] = reg[op->operand2];