diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/rat_tests-lexers.adb | 12 | ||||
-rw-r--r-- | test/rat_tests-lexers.ads | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/rat_tests-lexers.adb b/test/rat_tests-lexers.adb index 17fd20f..15a5d6f 100644 --- a/test/rat_tests-lexers.adb +++ b/test/rat_tests-lexers.adb @@ -582,13 +582,13 @@ package body Rat_Tests.Lexers is end Stamp_Check; - function Ignore_Check + function Discard_Check return Test_Result is use type Packrat.Result_Status; function Match_Abc is new Slexy.Multimatch ("abc"); - function My_Ignore is new Slexy.Ignore (Two, Match_Abc); + function My_Discard is new Slexy.Discard (Two, Match_Abc); Test_Str1 : String := "abcdefghi"; Test_Str2 : String := "ab"; @@ -598,21 +598,21 @@ package body Rat_Tests.Lexers is Comp_Code : Slexy.Component_Result; begin - Comp_Code := My_Ignore (Test_Str1, Context1); + Comp_Code := My_Discard (Test_Str1, Context1); if Slebug.So_Far (Context1).Length /= 0 or Slebug.Position (Context1) /= 4 or Slebug.Status (Context1) /= Packrat.Success or Slebug.Has_Pass (Context1) then return Fail; end if; - Comp_Code := My_Ignore (Test_Str1, Context1); + Comp_Code := My_Discard (Test_Str1, Context1); if Slebug.So_Far (Context1).Length /= 0 or Slebug.Position (Context1) /= 4 or not Slebug.Is_Failure (Comp_Code) or Slebug.Has_Pass (Context1) then return Fail; end if; - Comp_Code := My_Ignore (Test_Str2, Context2); + Comp_Code := My_Discard (Test_Str2, Context2); if Slebug.So_Far (Context2).Length /= 0 or Slebug.Position (Context2) /= 1 or Slebug.Status (Context2) /= Packrat.Needs_More or (not Slebug.Has_Pass (Context2) or else Slebug.Pass (Context2) /= "ab") @@ -620,7 +620,7 @@ package body Rat_Tests.Lexers is return Fail; end if; return Pass; - end Ignore_Check; + end Discard_Check; diff --git a/test/rat_tests-lexers.ads b/test/rat_tests-lexers.ads index 23d18d2..af9b221 100644 --- a/test/rat_tests-lexers.ads +++ b/test/rat_tests-lexers.ads @@ -62,7 +62,7 @@ package Rat_Tests.Lexers is function Stamp_Check return Test_Result; - function Ignore_Check return Test_Result; + function Discard_Check return Test_Result; function Scan_Parts_Check return Test_Result; function Scan_Once_Check return Test_Result; @@ -78,7 +78,7 @@ package Rat_Tests.Lexers is Lexer_Tests : Test_Array := ((+"Stamp", Stamp_Check'Access), - (+"Ignore", Ignore_Check'Access), + (+"Discard", Discard_Check'Access), (+"Scan_Parts", Scan_Parts_Check'Access), (+"Scan_Once", Scan_Once_Check'Access), (+"Scan_With", Scan_With_Check'Access), @@ -123,7 +123,7 @@ private function Many_Whitespace is new Swordy.Many (Satisfy_Whitespace, 1); function Stamp_Word is new Swordy.Stamp (Word, Many_Letter); - function Ignore_Whitespace is new Swordy.Ignore (Whitespace, Many_Whitespace); + function Ignore_Whitespace is new Swordy.Discard (Whitespace, Many_Whitespace); end Rat_Tests.Lexers; |