diff --git a/spec/propane_spec.rb b/spec/propane_spec.rb index 0da89ff..f69aedf 100644 --- a/spec/propane_spec.rb +++ b/spec/propane_spec.rb @@ -1087,12 +1087,12 @@ ast; token a; token bb; -token ccc; +token c /c(.|\\n)*c/; drop /\\s+/; Start -> T T T; T -> a; T -> bb; -T -> ccc; +T -> c; EOF run_propane(language: language) compile("spec/test_ast_token_positions.#{language}", language: language) diff --git a/spec/test_ast_token_positions.c b/spec/test_ast_token_positions.c index 7282f06..71e93e6 100644 --- a/spec/test_ast_token_positions.c +++ b/spec/test_ast_token_positions.c @@ -23,7 +23,7 @@ int main() assert_eq(0, start->pT3->pToken->end_position.row); assert_eq(5, start->pT3->pToken->end_position.col); - input = "\n\n bb\nccc\n\n a"; + input = "\n\n bb\nc\ncc\n\n a"; p_context_init(&context, (uint8_t const *)input, strlen(input)); assert(p_parse(&context) == P_SUCCESS); start = p_result(&context); @@ -33,11 +33,11 @@ int main() assert_eq(3, start->pT1->pToken->end_position.col); assert_eq(3, start->pT2->pToken->position.row); assert_eq(0, start->pT2->pToken->position.col); - assert_eq(3, start->pT2->pToken->end_position.row); - assert_eq(2, start->pT2->pToken->end_position.col); - assert_eq(5, start->pT3->pToken->position.row); + assert_eq(4, start->pT2->pToken->end_position.row); + assert_eq(1, start->pT2->pToken->end_position.col); + assert_eq(6, start->pT3->pToken->position.row); assert_eq(5, start->pT3->pToken->position.col); - assert_eq(5, start->pT3->pToken->end_position.row); + assert_eq(6, start->pT3->pToken->end_position.row); assert_eq(5, start->pT3->pToken->end_position.col); return 0; diff --git a/spec/test_ast_token_positions.d b/spec/test_ast_token_positions.d index 0cbd6d6..a7312d2 100644 --- a/spec/test_ast_token_positions.d +++ b/spec/test_ast_token_positions.d @@ -27,7 +27,7 @@ unittest assert_eq(0, start.pT3.pToken.end_position.row); assert_eq(5, start.pT3.pToken.end_position.col); - input = "\n\n bb\nccc\n\n a"; + input = "\n\n bb\nc\ncc\n\n a"; p_context_init(&context, input); assert(p_parse(&context) == P_SUCCESS); start = p_result(&context); @@ -37,10 +37,10 @@ unittest assert_eq(3, start.pT1.pToken.end_position.col); assert_eq(3, start.pT2.pToken.position.row); assert_eq(0, start.pT2.pToken.position.col); - assert_eq(3, start.pT2.pToken.end_position.row); - assert_eq(2, start.pT2.pToken.end_position.col); - assert_eq(5, start.pT3.pToken.position.row); + assert_eq(4, start.pT2.pToken.end_position.row); + assert_eq(1, start.pT2.pToken.end_position.col); + assert_eq(6, start.pT3.pToken.position.row); assert_eq(5, start.pT3.pToken.position.col); - assert_eq(5, start.pT3.pToken.end_position.row); + assert_eq(6, start.pT3.pToken.end_position.row); assert_eq(5, start.pT3.pToken.end_position.col); }