summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/rat_tests-lexers.adb48
1 files changed, 35 insertions, 13 deletions
diff --git a/test/rat_tests-lexers.adb b/test/rat_tests-lexers.adb
index 6d8c34f..f508b2b 100644
--- a/test/rat_tests-lexers.adb
+++ b/test/rat_tests-lexers.adb
@@ -88,11 +88,13 @@ package body Rat_Tests.Lexers is
Result4 : Slexy.Combinator_Result := Slebug.Empty_Fail;
Result5 : Slexy.Combinator_Result :=
Slebug.Create_Result (3, Packrat.Failure);
+ Result6 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Seq_Abc (Test_Str, 1) /= Result1 or Seq_Abc (Test_Str, 2) /= Result5 or
Seq_Abc (Test_Str, 4) /= Result3 or Seq_Abc (Test_Str, 10) /= Result2 or
Seq_Abc (Test_Str, 3) /= Result4 or
- Seq_Abc (Test_Str, Test_Str'Last + 5) /= Result4
+ Seq_Abc (Test_Str, Test_Str'Last + 5) /= Result6
then
return Fail;
end if;
@@ -121,12 +123,14 @@ package body Rat_Tests.Lexers is
Result5 : Slexy.Combinator_Result :=
Slebug.Create_Result (12, Packrat.Success);
Result6 : Slexy.Combinator_Result := Slebug.Empty_Fail;
+ Result7 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Count_2A (Test_Str, 1) /= Result1 or Count_2A (Test_Str, 3) /= Result2 or
Count_3B (Test_Str, 2) /= Result3 or Count_3B (Test_Str, 19) /= Result4 or
Count_3B (Test_Str, 10) /= Result5 or Count_3B (Test_Str, 1) /= Result6 or
Count_2A (Test_Str, 2) /= Result6 or
- Count_2A (Test_Str, Test_Str'Last + 5) /= Result6
+ Count_2A (Test_Str, Test_Str'Last + 5) /= Result7
then
return Fail;
end if;
@@ -161,7 +165,8 @@ package body Rat_Tests.Lexers is
Slebug.Create_Result (10, Packrat.Success);
Result4 : Slexy.Combinator_Result :=
Slebug.Create_Result (3, Packrat.Failure);
- Result5 : Slexy.Combinator_Result := Slebug.Empty_Fail;
+ Result5 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
Result6 : Slexy.Combinator_Result :=
Slebug.Create_Result (13, Packrat.Needs_More);
Result7 : Slexy.Combinator_Result :=
@@ -199,14 +204,16 @@ package body Rat_Tests.Lexers is
Result3 : Slexy.Combinator_Result :=
Slebug.Create_Result (15, Packrat.Needs_More);
Result4 : Slexy.Combinator_Result := Slebug.Empty_Fail;
+ Result5 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Many_Until_0 (Test_Str, 1) /= Result1 or
Many_Until_0 (Test_Str, 7) /= Result2 or
Many_Until_3 (Test_Str, 7) /= Result2 or
Many_Until_3 (Test_Str, 13) /= Result3 or
Many_Until_0 (Test_Str, 5) /= Result4 or
- Many_Until_0 (Test_Str, Test_Str'Last + 5) /= Result4 or
- Many_Until_3 (Test_Str, Test_Str'Last + 5) /= Result4
+ Many_Until_0 (Test_Str, Test_Str'Last + 5) /= Result5 or
+ Many_Until_3 (Test_Str, Test_Str'Last + 5) /= Result5
then
return Fail;
end if;
@@ -240,11 +247,13 @@ package body Rat_Tests.Lexers is
Result2 : Slexy.Combinator_Result :=
Slebug.Create_Result (6, Packrat.Success);
Result3 : Slexy.Combinator_Result := Slebug.Empty_Fail;
+ Result4 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Satisfy_123 (Test_Str, 6) /= Result2 or
Satisfy_Abc (Test_Str, 2) /= Result1 or
Satisfy_Abc (Test_Str, 8) /= Result3 or
- Satisfy_123 (Test_Str, Test_Str'Last + 5) /= Result3
+ Satisfy_123 (Test_Str, Test_Str'Last + 5) /= Result4
then
return Fail;
end if;
@@ -284,11 +293,13 @@ package body Rat_Tests.Lexers is
Result2 : Slexy.Combinator_Result :=
Slebug.Create_Result (7, Packrat.Success);
Result3 : Slexy.Combinator_Result := Slebug.Empty_Fail;
+ Result4 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Satisfy_Bcd (Test_Str, 3) /= Result1 or
Satisfy_234 (Test_Str, 7) /= Result2 or
Satisfy_Bcd (Test_Str, 1) /= Result3 or
- Satisfy_234 (Test_Str, Test_Str'Last + 5) /= Result3
+ Satisfy_234 (Test_Str, Test_Str'Last + 5) /= Result4
then
return Fail;
end if;
@@ -312,12 +323,14 @@ package body Rat_Tests.Lexers is
Result3 : Slexy.Combinator_Result :=
Slebug.Create_Result (7, Packrat.Success);
Result4 : Slexy.Combinator_Result := Slebug.Empty_Fail;
+ Result5 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Match_A (Test_Str, 1) /= Result1 or
Match_Slash (Test_Str, 9) /= Result2 or
Match_4 (Test_Str, 7) /= Result3 or
Match_A (Test_Str, 3) /= Result4 or
- Match_A (Test_Str, Test_Str'Last + 5) /= Result4
+ Match_A (Test_Str, Test_Str'Last + 5) /= Result5
then
return Fail;
end if;
@@ -345,11 +358,13 @@ package body Rat_Tests.Lexers is
Result2 : Slexy.Combinator_Result :=
Slebug.Create_Result (5, Packrat.Success);
Result3 : Slexy.Combinator_Result := Slebug.Empty_Fail;
+ Result4 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Match_A (Test_Str, 1) /= Result1 or
Match_6 (Test_Str, 5) /= Result2 or
Match_A (Test_Str, 2) /= Result3 or
- Match_A (Test_Str, Test_Str'Last + 5) /= Result3
+ Match_A (Test_Str, Test_Str'Last + 5) /= Result4
then
return Fail;
end if;
@@ -374,13 +389,15 @@ package body Rat_Tests.Lexers is
Result4 : Slexy.Combinator_Result :=
Slebug.Create_Result (8, Packrat.Failure);
Result5 : Slexy.Combinator_Result := Slebug.Empty_Fail;
+ Result6 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Match_String1 (Test_Str, 1) /= Result1 or
Match_String1 (Test_Str, 7) /= Result4 or
Match_String2 (Test_Str, 9) /= Result3 or
Match_String2 (Test_Str, 3) /= Result5 or
Match_String1 (Test_Str, 19) /= Result2 or
- Match_String1 (Test_Str, Test_Str'Last + 5) /= Result5
+ Match_String1 (Test_Str, Test_Str'Last + 5) /= Result6
then
return Fail;
end if;
@@ -402,7 +419,8 @@ package body Rat_Tests.Lexers is
Slebug.Create_Result (9, Packrat.Needs_More);
Result3 : Slexy.Combinator_Result :=
Slebug.Create_Result (7, Packrat.Success);
- Result4 : Slexy.Combinator_Result := Slebug.Empty_Fail;
+ Result4 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Take_1 (Test_Str, 2) /= Result1 or Take_5 (Test_Str, 7) /= Result2 or
Take_5 (Test_Str, 3) /= Result3 or
@@ -434,13 +452,15 @@ package body Rat_Tests.Lexers is
Result5 : Slexy.Combinator_Result := Slebug.Empty_Fail;
Result6 : Slexy.Combinator_Result :=
Slebug.Create_Result (22, Packrat.Optional_More);
+ Result7 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Take_Letters (Test_Str, 2) /= Result1 or
Take_Letters (Test_Str, 13) /= Result2 or
Take_Punch (Test_Str, 6) /= Result3 or
Take_Punch (Test_Str, 17) /= Result4 or
Take_Letters (Test_Str, 7) /= Result5 or
- Take_Punch (Test_Str, Test_Str'Last + 5) /= Result5 or
+ Take_Punch (Test_Str, Test_Str'Last + 5) /= Result7 or
Take_Digits (Test_Str, 20) /= Result6
then
return Fail;
@@ -466,13 +486,15 @@ package body Rat_Tests.Lexers is
Result4 : Slexy.Combinator_Result :=
Slebug.Create_Result (17, Packrat.Success);
Result5 : Slexy.Combinator_Result := Slebug.Empty_Fail;
+ Result6 : Slexy.Combinator_Result :=
+ Slebug.Create_Result (0, Packrat.Needs_More);
begin
if Take_Till_Punch (Test_Str, 4) /= Result1 or
Take_Till_Punch (Test_Str, 16) /= Result2 or
Take_Till_Digit (Test_Str, 1) /= Result3 or
Take_Till_Digit (Test_Str, 12) /= Result4 or
Take_Till_Punch (Test_Str, 11) /= Result5 or
- Take_Till_Punch (Test_Str, Test_Str'Last + 5) /= Result5
+ Take_Till_Punch (Test_Str, Test_Str'Last + 5) /= Result6
then
return Fail;
end if;