Support * and / in reader
This commit is contained in:
@@ -89,6 +89,58 @@ input_1_plus_2_plus_3_is_parsed_as_a_left_nested_application(void)
|
||||
ASSERT_EQUAL(3, operand1->number);
|
||||
}
|
||||
|
||||
static void
|
||||
input_1_times_2_times_3_is_parsed_as_a_left_nested_application(void)
|
||||
{
|
||||
init_memory_pool(&pool);
|
||||
const expression_t *result = read_expression(&pool, "1*2*3", 5);
|
||||
ASSERT_NOT_NULL(result);
|
||||
ASSERT_FALSE(result->is_number);
|
||||
ASSERT_EQUAL(OPERATOR_MULTIPLY, result->application.operator);
|
||||
|
||||
const expression_t *operand0 = result->application.operands[0];
|
||||
ASSERT_NOT_NULL(operand0);
|
||||
ASSERT_FALSE(operand0->is_number);
|
||||
ASSERT_EQUAL(OPERATOR_MULTIPLY, operand0->application.operator);
|
||||
ASSERT_NOT_NULL(operand0->application.operands[0]);
|
||||
ASSERT_TRUE(operand0->application.operands[0]->is_number);
|
||||
ASSERT_EQUAL(1, operand0->application.operands[0]->number);
|
||||
ASSERT_NOT_NULL(operand0->application.operands[1]);
|
||||
ASSERT_TRUE(operand0->application.operands[1]->is_number);
|
||||
ASSERT_EQUAL(2, operand0->application.operands[1]->number);
|
||||
|
||||
const expression_t *operand1 = result->application.operands[1];
|
||||
ASSERT_NOT_NULL(operand1);
|
||||
ASSERT_TRUE(operand1->is_number);
|
||||
ASSERT_EQUAL(3, operand1->number);
|
||||
}
|
||||
|
||||
static void
|
||||
input_1_plus_2_times_3_is_parsed_as_a_right_nested_application(void)
|
||||
{
|
||||
init_memory_pool(&pool);
|
||||
const expression_t *result = read_expression(&pool, "1+2*3", 5);
|
||||
ASSERT_NOT_NULL(result);
|
||||
ASSERT_FALSE(result->is_number);
|
||||
ASSERT_EQUAL(OPERATOR_ADD, result->application.operator);
|
||||
|
||||
const expression_t *operand0 = result->application.operands[0];
|
||||
ASSERT_NOT_NULL(operand0);
|
||||
ASSERT_TRUE(operand0->is_number);
|
||||
ASSERT_EQUAL(1, operand0->number);
|
||||
|
||||
const expression_t *operand1 = result->application.operands[1];
|
||||
ASSERT_NOT_NULL(operand1);
|
||||
ASSERT_FALSE(operand1->is_number);
|
||||
ASSERT_EQUAL(OPERATOR_MULTIPLY, operand1->application.operator);
|
||||
ASSERT_NOT_NULL(operand1->application.operands[0]);
|
||||
ASSERT_TRUE(operand1->application.operands[0]->is_number);
|
||||
ASSERT_EQUAL(2, operand1->application.operands[0]->number);
|
||||
ASSERT_NOT_NULL(operand1->application.operands[1]);
|
||||
ASSERT_TRUE(operand1->application.operands[1]->is_number);
|
||||
ASSERT_EQUAL(3, operand1->application.operands[1]->number);
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
TESTING_BEGIN();
|
||||
@@ -100,5 +152,7 @@ int main(void)
|
||||
RUN_TEST(
|
||||
input_6_minus_2_with_no_spaces_is_read_as_a_subtract_application);
|
||||
RUN_TEST(input_1_plus_2_plus_3_is_parsed_as_a_left_nested_application);
|
||||
RUN_TEST(input_1_times_2_times_3_is_parsed_as_a_left_nested_application);
|
||||
RUN_TEST(input_1_plus_2_times_3_is_parsed_as_a_right_nested_application);
|
||||
TESTING_END();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user