乗除算を実装

BNF.txt

@@ -1,2 +1,3 @@
 program = add
-add = num ("+" num | "-" num)*
+add = mul ("+" mul | "-" mul)*
+mul = num ("*" num | "/" num)*

generator.cpp

@@ -32,6 +32,26 @@ vector<Operation> Generator::codegen(Node* node)
 
 			break;
 
+		case ND_MUL:
+			codegen(node->left);
+			codegen(node->right);
+
+			operations.push_back( Operation{ OP_POP, REG_GR0 } );
+			operations.push_back( Operation{ OP_POP, REG_GR1 } );
+			operations.push_back( Operation{ OP_MUL, REG_GR0, REG_GR1 } );
+
+			break;
+
+		case ND_DIV:
+			codegen(node->left);
+			codegen(node->right);
+
+			operations.push_back( Operation{ OP_POP, REG_GR0 } );
+			operations.push_back( Operation{ OP_POP, REG_GR1 } );
+			operations.push_back( Operation{ OP_DIV, REG_GR1, REG_GR0 } );
+
+			break;
+
 		default:
 			break;
 	}

parser.cpp

@@ -22,14 +22,31 @@ Node* Parser::num(void)
 
 Node* Parser::add(void)
 {
-	Node* node = num();
+	Node* node = mul();
 
 	while(1){
 		if(consume("+")){
-			node = new Node{ ND_ADD, node, num() };
+			node = new Node{ ND_ADD, node, mul() };
 		}
 		else if(consume("-")){
-			node = new Node{ ND_SUB, node, num() };
+			node = new Node{ ND_SUB, node, mul() };
+		}
+		else{
+			return node;
+		}
+	}
+};
+
+Node* Parser::mul(void)
+{
+	Node* node = num();
+
+	while(1){
+		if(consume("*")){
+			node = new Node{ ND_MUL, node, num() };
+		}
+		else if(consume("/")){
+			node = new Node{ ND_DIV, node, num() };
 		}
 		else{
 			return node;

parser.hpp

@@ -14,6 +14,7 @@ class Parser
 	Node* program(void);
 	Node* num(void);
 	Node* add(void);
+	Node* mul(void);
 
 	bool consume(const char* str);
 

rook.hpp

@@ -24,6 +24,8 @@ typedef enum {
 	ND_NUM,			// 数値
 	ND_ADD,			// +
 	ND_SUB,			// -
+	ND_MUL,			// *
+	ND_DIV,			// /
 } NodeKind;
 
 typedef struct Node Node;
@@ -42,6 +44,8 @@ typedef enum {
 	OP_POP,			// Pop
 	OP_ADD,			// 加算
 	OP_SUB,			// 減算
+	OP_MUL,			// 乗算
+	OP_DIV,			// 除算
 } OP_CODE;
 
 typedef struct {

test.sh

@@ -20,5 +20,9 @@ test 9 "7+2"
 test 4 "10-6"
 test 8 "12 + 4 - 8"
 test 10 "12 - 4 + 2"
+test 8 "2 * 4"
+test 3 "12 / 4"
+test 10 "5 * 3 - 5"
+test 9 "2 + 2 * 5 - 3"
 
 echo "OK"

tokenizer.cpp

@@ -26,6 +26,16 @@ vector<Token> Tokenizer::tokenize(char* input)
 			tokens.push_back(token);
 			input++;
 		}
+		else if(strncmp(input, "*", 1) == 0){
+			Token token = { TK_OP, input, 1 };
+			tokens.push_back(token);
+			input++;
+		}
+		else if(strncmp(input, "/", 1) == 0){
+			Token token = { TK_OP, input, 1 };
+			tokens.push_back(token);
+			input++;
+		}
 		else if(isdigit(*input)){
 			Token token = { TK_NUM, input, 0 };
 			for(; isdigit(*input); input++) token.len++;

vm.cpp

@@ -46,6 +46,16 @@ DWORD VM::run(vector<Operation>& code)
 				push(reg[op->operand] - reg[op->operand2]);
 				break;
 			}
+			case OP_MUL:
+			{
+				push(reg[op->operand] * reg[op->operand2]);
+				break;
+			}
+			case OP_DIV:
+			{
+				push(reg[op->operand] / reg[op->operand2]);
+				break;
+			}
 			default:
 				break;
 		}