diff --git a/lojbanParser.cabal b/lojbanParser.cabal --- a/lojbanParser.cabal +++ b/lojbanParser.cabal @@ -2,7 +2,7 @@ cabal-version: >= 1.8 name: lojbanParser -version: 0.1.7 +version: 0.1.9 stability: experimental author: .iocikun.juj. maintainer: .iocikun.juj. diff --git a/src/TestPappy.hs b/src/TestPappy.hs --- a/src/TestPappy.hs +++ b/src/TestPappy.hs @@ -456,18 +456,15 @@ testPappySubpre_zei_bu :: Result TestPappyDerivs ( String ), testPappySubStarRule192 :: Result TestPappyDerivs ([Char]), testPappySubStarRule193 :: Result TestPappyDerivs ([ [([String], String)] ]), - testPappySubpost_clause :: Result TestPappyDerivs ( [[([String], String)]] )} + testPappySubany_word_SA_handling :: Result TestPappyDerivs ( ([String], String) )} data TestPappyDerivs4 = TestPappyDerivs4 { - testPappySubpost_clause_no_ind :: Result TestPappyDerivs ( () ), - testPappySubany_word_SA_handling :: Result TestPappyDerivs ( ([String], String) ), testPappySubStarRule194 :: Result TestPappyDerivs ([ () ]), testPappySubPlusRule17 :: Result TestPappyDerivs ([ () ]), testPappySubsi_clause_single :: Result TestPappyDerivs ( () ), testPappySuberasable_clause :: Result TestPappyDerivs ( () ), testPappySubBRIVLA_pre :: Result TestPappyDerivs ( ([String], String) ), testPappySubPlusRule18 :: Result TestPappyDerivs ([String]), - testPappySubBAhE_clause_single :: Result TestPappyDerivs (String), testPappySubStarRule195 :: Result TestPappyDerivs ([ () ]), testPappySubStarRule196 :: Result TestPappyDerivs ([String]), testPappySubStarRule198 :: Result TestPappyDerivs ([String]), @@ -491,12 +488,12 @@ testPappySuby_rafsi :: Result TestPappyDerivs (String), testPappySuby_less_rafsi :: Result TestPappyDerivs (String), testPappySubr_hyphen :: Result TestPappyDerivs (Char), - testPappySubfinal_syllable :: Result TestPappyDerivs (String)} - -data TestPappyDerivs5 = TestPappyDerivs5 { + testPappySubfinal_syllable :: Result TestPappyDerivs (String), testPappySubstressed_syllable :: Result TestPappyDerivs (String), testPappySubstressed_vowel :: Result TestPappyDerivs (Char), - testPappySubunstressed_syllable :: Result TestPappyDerivs (String), + testPappySubunstressed_syllable :: Result TestPappyDerivs (String)} + +data TestPappyDerivs5 = TestPappyDerivs5 { testPappySubStarRule208 :: Result TestPappyDerivs ([Char]), testPappySubconsonantal_syllable :: Result TestPappyDerivs (String), testPappySubcoda :: Result TestPappyDerivs (String), @@ -526,22 +523,24 @@ testPappySubt :: Result TestPappyDerivs (Char), testPappySubdigit :: Result TestPappyDerivs (Char), testPappySubpost_word :: Result TestPappyDerivs (String), - testPappySubPlusRule22 :: Result TestPappyDerivs ([Char])} - -data TestPappyDerivs6 = TestPappyDerivs6 { + testPappySubPlusRule22 :: Result TestPappyDerivs ([Char]), testPappySubPlusRule23 :: Result TestPappyDerivs ([ String ]), testPappySubStarRule236 :: Result TestPappyDerivs ([Char]), - testPappySubStarRule237 :: Result TestPappyDerivs ([Char]), + testPappySubStarRule237 :: Result TestPappyDerivs ([Char])} + +data TestPappyDerivs6 = TestPappyDerivs6 { testPappySubA :: Result TestPappyDerivs (String), testPappySubBAI :: Result TestPappyDerivs (String), testPappySubBAhE :: Result TestPappyDerivs (String), testPappySubBEhO :: Result TestPappyDerivs (String), testPappySubBIhE :: Result TestPappyDerivs (String), testPappySubBIhI :: Result TestPappyDerivs (String), + testPappySubBU :: Result TestPappyDerivs (String), testPappySubBY :: Result TestPappyDerivs (String), testPappySubCAhA :: Result TestPappyDerivs (String), testPappySubCAI :: Result TestPappyDerivs (String), testPappySubCEhE :: Result TestPappyDerivs (String), + testPappySubCO :: Result TestPappyDerivs (String), testPappySubCOI :: Result TestPappyDerivs (String), testPappySubCUhE :: Result TestPappyDerivs (String), testPappySubDAhO :: Result TestPappyDerivs (String), @@ -561,14 +560,15 @@ testPappySubGIhA :: Result TestPappyDerivs (String), testPappySubGOI :: Result TestPappyDerivs (String), testPappySubGOhA :: Result TestPappyDerivs (String), - testPappySubGUhA :: Result TestPappyDerivs (String)} + testPappySubGUhA :: Result TestPappyDerivs (String), + testPappySubJA :: Result TestPappyDerivs (String)} data TestPappyDerivs7 = TestPappyDerivs7 { - testPappySubJA :: Result TestPappyDerivs (String), testPappySubJOhI :: Result TestPappyDerivs (String), testPappySubJOI :: Result TestPappyDerivs (String), testPappySubKEhE :: Result TestPappyDerivs (String), testPappySubKOhA :: Result TestPappyDerivs (String), + testPappySubKU :: Result TestPappyDerivs (String), testPappySubKUhE :: Result TestPappyDerivs (String), testPappySubKUhO :: Result TestPappyDerivs (String), testPappySubLA :: Result TestPappyDerivs (String), @@ -763,16 +763,13 @@ testPappypre_zei_bu = testPappySubpre_zei_bu . testPappySub3 testPappyStarRule192 = testPappySubStarRule192 . testPappySub3 testPappyStarRule193 = testPappySubStarRule193 . testPappySub3 -testPappypost_clause = testPappySubpost_clause . testPappySub3 -testPappypost_clause_no_ind = testPappySubpost_clause_no_ind . testPappySub4 -testPappyany_word_SA_handling = testPappySubany_word_SA_handling . testPappySub4 +testPappyany_word_SA_handling = testPappySubany_word_SA_handling . testPappySub3 testPappyStarRule194 = testPappySubStarRule194 . testPappySub4 testPappyPlusRule17 = testPappySubPlusRule17 . testPappySub4 testPappysi_clause_single = testPappySubsi_clause_single . testPappySub4 testPappyerasable_clause = testPappySuberasable_clause . testPappySub4 testPappyBRIVLA_pre = testPappySubBRIVLA_pre . testPappySub4 testPappyPlusRule18 = testPappySubPlusRule18 . testPappySub4 -testPappyBAhE_clause_single = testPappySubBAhE_clause_single . testPappySub4 testPappyStarRule195 = testPappySubStarRule195 . testPappySub4 testPappyStarRule196 = testPappySubStarRule196 . testPappySub4 testPappyStarRule198 = testPappySubStarRule198 . testPappySub4 @@ -797,9 +794,9 @@ testPappyy_less_rafsi = testPappySuby_less_rafsi . testPappySub4 testPappyr_hyphen = testPappySubr_hyphen . testPappySub4 testPappyfinal_syllable = testPappySubfinal_syllable . testPappySub4 -testPappystressed_syllable = testPappySubstressed_syllable . testPappySub5 -testPappystressed_vowel = testPappySubstressed_vowel . testPappySub5 -testPappyunstressed_syllable = testPappySubunstressed_syllable . testPappySub5 +testPappystressed_syllable = testPappySubstressed_syllable . testPappySub4 +testPappystressed_vowel = testPappySubstressed_vowel . testPappySub4 +testPappyunstressed_syllable = testPappySubunstressed_syllable . testPappySub4 testPappyStarRule208 = testPappySubStarRule208 . testPappySub5 testPappyconsonantal_syllable = testPappySubconsonantal_syllable . testPappySub5 testPappycoda = testPappySubcoda . testPappySub5 @@ -830,19 +827,21 @@ testPappydigit = testPappySubdigit . testPappySub5 testPappypost_word = testPappySubpost_word . testPappySub5 testPappyPlusRule22 = testPappySubPlusRule22 . testPappySub5 -testPappyPlusRule23 = testPappySubPlusRule23 . testPappySub6 -testPappyStarRule236 = testPappySubStarRule236 . testPappySub6 -testPappyStarRule237 = testPappySubStarRule237 . testPappySub6 +testPappyPlusRule23 = testPappySubPlusRule23 . testPappySub5 +testPappyStarRule236 = testPappySubStarRule236 . testPappySub5 +testPappyStarRule237 = testPappySubStarRule237 . testPappySub5 testPappyA = testPappySubA . testPappySub6 testPappyBAI = testPappySubBAI . testPappySub6 testPappyBAhE = testPappySubBAhE . testPappySub6 testPappyBEhO = testPappySubBEhO . testPappySub6 testPappyBIhE = testPappySubBIhE . testPappySub6 testPappyBIhI = testPappySubBIhI . testPappySub6 +testPappyBU = testPappySubBU . testPappySub6 testPappyBY = testPappySubBY . testPappySub6 testPappyCAhA = testPappySubCAhA . testPappySub6 testPappyCAI = testPappySubCAI . testPappySub6 testPappyCEhE = testPappySubCEhE . testPappySub6 +testPappyCO = testPappySubCO . testPappySub6 testPappyCOI = testPappySubCOI . testPappySub6 testPappyCUhE = testPappySubCUhE . testPappySub6 testPappyDAhO = testPappySubDAhO . testPappySub6 @@ -863,11 +862,12 @@ testPappyGOI = testPappySubGOI . testPappySub6 testPappyGOhA = testPappySubGOhA . testPappySub6 testPappyGUhA = testPappySubGUhA . testPappySub6 -testPappyJA = testPappySubJA . testPappySub7 +testPappyJA = testPappySubJA . testPappySub6 testPappyJOhI = testPappySubJOhI . testPappySub7 testPappyJOI = testPappySubJOI . testPappySub7 testPappyKEhE = testPappySubKEhE . testPappySub7 testPappyKOhA = testPappySubKOhA . testPappySub7 +testPappyKU = testPappySubKU . testPappySub7 testPappyKUhE = testPappySubKUhE . testPappySub7 testPappyKUhO = testPappySubKUhO . testPappySub7 testPappyLA = testPappySubLA . testPappySub7 @@ -1087,18 +1087,15 @@ (testPappyParsepre_zei_bu dvs) (testPappyParseStarRule192 dvs) (testPappyParseStarRule193 dvs) - (testPappyParsepost_clause dvs) + (testPappyParseany_word_SA_handling dvs) testPappyDerivs4 dvs = TestPappyDerivs4 - (testPappyParsepost_clause_no_ind dvs) - (testPappyParseany_word_SA_handling dvs) (testPappyParseStarRule194 dvs) (testPappyParsePlusRule17 dvs) (testPappyParsesi_clause_single dvs) (testPappyParseerasable_clause dvs) (testPappyParseBRIVLA_pre dvs) (testPappyParsePlusRule18 dvs) - (testPappyParseBAhE_clause_single dvs) (testPappyParseStarRule195 dvs) (testPappyParseStarRule196 dvs) (testPappyParseStarRule198 dvs) @@ -1123,11 +1120,11 @@ (testPappyParsey_less_rafsi dvs) (testPappyParser_hyphen dvs) (testPappyParsefinal_syllable dvs) - -testPappyDerivs5 dvs = TestPappyDerivs5 (testPappyParsestressed_syllable dvs) (testPappyParsestressed_vowel dvs) (testPappyParseunstressed_syllable dvs) + +testPappyDerivs5 dvs = TestPappyDerivs5 (testPappyParseStarRule208 dvs) (testPappyParseconsonantal_syllable dvs) (testPappyParsecoda dvs) @@ -1158,21 +1155,23 @@ (testPappyParsedigit dvs) (testPappyParsepost_word dvs) (testPappyParsePlusRule22 dvs) - -testPappyDerivs6 dvs = TestPappyDerivs6 (testPappyParsePlusRule23 dvs) (testPappyParseStarRule236 dvs) (testPappyParseStarRule237 dvs) + +testPappyDerivs6 dvs = TestPappyDerivs6 (testPappyParseA dvs) (testPappyParseBAI dvs) (testPappyParseBAhE dvs) (testPappyParseBEhO dvs) (testPappyParseBIhE dvs) (testPappyParseBIhI dvs) + (testPappyParseBU dvs) (testPappyParseBY dvs) (testPappyParseCAhA dvs) (testPappyParseCAI dvs) (testPappyParseCEhE dvs) + (testPappyParseCO dvs) (testPappyParseCOI dvs) (testPappyParseCUhE dvs) (testPappyParseDAhO dvs) @@ -1193,13 +1192,14 @@ (testPappyParseGOI dvs) (testPappyParseGOhA dvs) (testPappyParseGUhA dvs) + (testPappyParseJA dvs) testPappyDerivs7 dvs = TestPappyDerivs7 - (testPappyParseJA dvs) (testPappyParseJOhI dvs) (testPappyParseJOI dvs) (testPappyParseKEhE dvs) (testPappyParseKOhA dvs) + (testPappyParseKU dvs) (testPappyParseKUhE dvs) (testPappyParseKUhO dvs) (testPappyParseLA dvs) @@ -8191,8 +8191,8 @@ Parsed ([]) d e1 pappyAlt1_3 e1 = NoParse e1 -testPappyParsepost_clause :: TestPappyDerivs -> Result TestPappyDerivs ( [[([String], String)]] ) -testPappyParsepost_clause d = +testPappypost_clause :: TestPappyDerivs -> Result TestPappyDerivs ( [[([String], String)]] ) +testPappypost_clause d = case pappyResult1 of Parsed _ d1 e1 -> case pappyResult3 of @@ -8226,8 +8226,8 @@ Parsed v3 d3 e3 -> Parsed (Just v3) d3 e3 NoParse e3 -> Parsed (Nothing) d e3 -testPappyParsepost_clause_no_ind :: TestPappyDerivs -> Result TestPappyDerivs ( () ) -testPappyParsepost_clause_no_ind d = +testPappypost_clause_no_ind :: TestPappyDerivs -> Result TestPappyDerivs ( () ) +testPappypost_clause_no_ind d = case pappyResult1 of Parsed _ d1 e1 -> case pappyResult3 of @@ -9835,8 +9835,8 @@ NoParse e3 -> pappyAlt1_3 (max e3 e1) pappyAlt1_3 e1 = NoParse e1 -testPappyParseBAhE_clause_single :: TestPappyDerivs -> Result TestPappyDerivs (String) -testPappyParseBAhE_clause_single d = +testPappyBAhE_clause_single :: TestPappyDerivs -> Result TestPappyDerivs (String) +testPappyBAhE_clause_single d = case pappyResult1 of Parsed b d1 e1 -> case pappyResult3 of @@ -16384,8 +16384,8 @@ NoParse e5 -> NoParse e5 NoParse e1 -> NoParse e1 -testPappyBU :: TestPappyDerivs -> Result TestPappyDerivs (String) -testPappyBU d = +testPappyParseBU :: TestPappyDerivs -> Result TestPappyDerivs (String) +testPappyParseBU d = case testPappycmavo d of Parsed _ _ e1 -> case pappyResult3 of @@ -16398,7 +16398,10 @@ Parsed b d5 e5 -> case testPappyu d5 of Parsed u d7 e7 -> - Parsed ( [b, u] ) d7 (max e7 e5) + case testPappyh d7 of + NoParse e9 -> + Parsed ( [b, u] ) d7 (maximum [e9,e7,e5]) + Parsed _ _ e9 -> NoParse (maximum [e9,e7,e5]) NoParse e7 -> NoParse (max e7 e5) NoParse e5 -> NoParse e5 NoParse e1 -> NoParse e1 @@ -16889,8 +16892,8 @@ NoParse e5 -> NoParse e5 NoParse e1 -> NoParse e1 -testPappyCO :: TestPappyDerivs -> Result TestPappyDerivs (String) -testPappyCO d = +testPappyParseCO :: TestPappyDerivs -> Result TestPappyDerivs (String) +testPappyParseCO d = case testPappycmavo d of Parsed _ _ e1 -> case pappyResult3 of @@ -16903,7 +16906,10 @@ Parsed c d5 e5 -> case testPappyo d5 of Parsed o d7 e7 -> - Parsed ( [c, o] ) d7 (max e7 e5) + case testPappyh d7 of + NoParse e9 -> + Parsed ( [c, o] ) d7 (maximum [e9,e7,e5]) + Parsed _ _ e9 -> NoParse (maximum [e9,e7,e5]) NoParse e7 -> NoParse (max e7 e5) NoParse e5 -> NoParse e5 NoParse e1 -> NoParse e1 @@ -19367,7 +19373,10 @@ Parsed d d7 e7 -> case testPappya d7 of Parsed a d9 e9 -> - Parsed ( [d, a] ) d9 (maximum [e9,e7,e5]) + case testPappyh d9 of + NoParse e11 -> + Parsed ( [d, a] ) d9 (maximum [e11,e9,e7,e5]) + Parsed _ _ e11 -> pappyAlt5_41 (maximum [e11,e9,e7,e5]) NoParse e9 -> pappyAlt5_41 (maximum [e9,e7,e5]) NoParse e7 -> pappyAlt5_41 (max e7 e5) pappyAlt5_41 e5 = @@ -19375,7 +19384,10 @@ Parsed d d7 e7 -> case testPappye d7 of Parsed e d9 e9 -> - Parsed ( [d, e] ) d9 (maximum [e9,e7,e5]) + case testPappyh d9 of + NoParse e11 -> + Parsed ( [d, e] ) d9 (maximum [e11,e9,e7,e5]) + Parsed _ _ e11 -> pappyAlt5_42 (maximum [e11,e9,e7,e5]) NoParse e9 -> pappyAlt5_42 (maximum [e9,e7,e5]) NoParse e7 -> pappyAlt5_42 (max e7 e5) pappyAlt5_42 e5 = @@ -19394,7 +19406,10 @@ Parsed k d7 e7 -> case testPappyo d7 of Parsed o d9 e9 -> - Parsed ( [k, o] ) d9 (maximum [e9,e7,e5]) + case testPappyh d9 of + NoParse e11 -> + Parsed ( [k, o] ) d9 (maximum [e11,e9,e7,e5]) + Parsed _ _ e11 -> pappyAlt5_44 (maximum [e11,e9,e7,e5]) NoParse e9 -> pappyAlt5_44 (maximum [e9,e7,e5]) NoParse e7 -> pappyAlt5_44 (max e7 e5) pappyAlt5_44 e5 = @@ -19416,8 +19431,8 @@ pappyAlt5_46 e5 = NoParse e5 NoParse e1 -> NoParse e1 -testPappyKU :: TestPappyDerivs -> Result TestPappyDerivs (String) -testPappyKU d = +testPappyParseKU :: TestPappyDerivs -> Result TestPappyDerivs (String) +testPappyParseKU d = case testPappycmavo d of Parsed _ _ e1 -> case pappyResult3 of @@ -19430,7 +19445,10 @@ Parsed k d5 e5 -> case testPappyu d5 of Parsed u d7 e7 -> - Parsed ( [k, u] ) d7 (max e7 e5) + case testPappyh d7 of + NoParse e9 -> + Parsed ( [k, u] ) d7 (maximum [e9,e7,e5]) + Parsed _ _ e9 -> NoParse (maximum [e9,e7,e5]) NoParse e7 -> NoParse (max e7 e5) NoParse e5 -> NoParse e5 NoParse e1 -> NoParse e1