Overview
Comment: | Can now resolve package references in simple word definitions. |
---|---|
Timelines: | family | ancestors | descendants | both | modules |
Files: | files | file ages | folders |
SHA3-256: |
6416ab78b930cf3ee1562fd59911593a |
User & Date: | robin.hansen on 2021-02-10 11:03:11 |
Other Links: | branch diff | manifest | tags |
Context
2021-02-10
| ||
11:04 | Update elm-format. check-in: a4e1d24585 user: robin.hansen tags: modules | |
11:03 | Can now resolve package references in simple word definitions. check-in: 6416ab78b9 user: robin.hansen tags: modules | |
2021-02-09
| ||
11:27 | Turn tuple into record in preperation of registering words which requires loading additional modules... check-in: 7eff2f2dbd user: robin.hansen tags: modules | |
Changes
Modified src/Play/Qualifier.elm from [98de1e5664] to [0057c74a3e].
85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 ... 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 ... 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 ... 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 ... 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 ... 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 ... 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 ... 572 573 574 575 576 577 578 579 580 581 582 583 584 585 ... 587 588 589 590 591 592 593 594 595 596 597 598 599 600 ... 617 618 619 620 621 622 623 |
run : RunConfig -> Result (List Problem) AST run config = let ( typeErrors, qualifiedTypes ) = Dict.foldl (\_ val acc -> qualifyType config val acc) ( [], Dict.empty ) config.ast.types |> Tuple.mapSecond (\qt -> Dict.map (\_ v -> resolveUnionInTypeDefs qt v) qt) ( wordErrors, qualifiedWords ) = Dict.foldl (\_ val acc -> qualifyDefinition config qualifiedTypes val acc) ( [], Dict.empty ) config.ast.words in case ( typeErrors, wordErrors ) of ( [], [] ) -> Ok { types = qualifiedTypes , words = qualifiedWords , additionalModulesRequired = Set.empty , checkForExistingTypes = Set.empty , checkForExistingWords = Set.empty } _ -> Err <| typeErrors ++ wordErrors resolveUnionInTypeDefs : Dict String TypeDefinition -> TypeDefinition -> TypeDefinition ................................................................................ Ok type_ qualifyDefinition : RunConfig -> Dict String TypeDefinition -> Parser.WordDefinition -> ( List Problem, Dict String WordDefinition ) -> ( List Problem, Dict String WordDefinition ) qualifyDefinition config qualifiedTypes unqualifiedWord ( errors, acc ) = let ( whens, impl ) = case unqualifiedWord.implementation of Parser.SoloImpl defImpl -> ( [], defImpl ) Parser.MultiImpl whenImpl defImpl -> ( whenImpl, defImpl ) ( newWordsAfterWhens, qualifiedWhensResult ) = List.foldr (qualifyWhen config qualifiedTypes unqualifiedWord.name) ( acc, [] ) whens |> Tuple.mapSecond Result.combine ( newWordsAfterImpl, qualifiedImplementationResult ) = initQualifyNode unqualifiedWord.name config newWordsAfterWhens impl qualifiedMetadataResult = qualifyMetadata config qualifiedTypes unqualifiedWord.metadata qualifiedName = qualifyName config unqualifiedWord.name in case ( qualifiedWhensResult, qualifiedImplementationResult, qualifiedMetadataResult ) of ( Ok qualifiedWhens, Ok qualifiedImplementation, Ok qualifiedMetadata ) -> ( errors , Dict.insert qualifiedName { name = qualifiedName , metadata = qualifiedMetadata , implementation = if List.isEmpty qualifiedWhens then SoloImpl qualifiedImplementation ................................................................................ MultiImpl qualifiedWhens qualifiedImplementation } newWordsAfterImpl ) ( Err whenError, _, _ ) -> ( whenError :: errors , newWordsAfterImpl ) ( _, Err implError, _ ) -> ( implError :: errors , newWordsAfterImpl ) ( _, _, Err metaError ) -> ( metaError :: errors , newWordsAfterImpl ) qualifyMetadata : RunConfig -> Dict String TypeDefinition -> Metadata -> Result Problem Metadata qualifyMetadata config qualifiedTypes meta = let ................................................................................ -> Dict String TypeDefinition -> String -> ( Parser.TypeMatch, List Parser.AstNode ) -> ( Dict String WordDefinition, List (Result Problem ( TypeMatch, List Node )) ) -> ( Dict String WordDefinition, List (Result Problem ( TypeMatch, List Node )) ) qualifyWhen config qualifiedTypes wordName ( typeMatch, impl ) ( qualifiedWords, result ) = let ( newWords, qualifiedImplementationResult ) = initQualifyNode wordName config qualifiedWords impl qualifiedMatchResult = qualifyMatch config qualifiedTypes typeMatch in case ( qualifiedImplementationResult, qualifiedMatchResult ) of ( Err err, _ ) -> ................................................................................ initQualifyNode : String -> RunConfig -> Dict String WordDefinition -> List Parser.AstNode -> ( Dict String WordDefinition, Result Problem (List Node) ) initQualifyNode currentDefName config qualifiedWords impl = List.foldr (qualifyNode config currentDefName) (initQualifyNodeAccumulator qualifiedWords) impl |> (\acc -> ( acc.qualifiedWords, Result.combine acc.qualifiedNodes )) type alias QualifyNodeAccumulator = { availableQuoteId : Int , qualifiedWords : Dict String WordDefinition , qualifiedNodes : List (Result Problem Node) , externalWords : List ( List String, String ) } initQualifyNodeAccumulator : Dict String WordDefinition -> QualifyNodeAccumulator initQualifyNodeAccumulator qualifiedWords = { availableQuoteId = 1 , qualifiedWords = qualifiedWords , qualifiedNodes = [] , externalWords = [] } qualifyNode : RunConfig -> String -> Parser.AstNode -> QualifyNodeAccumulator -> QualifyNodeAccumulator qualifyNode config currentDefName node acc = case node of Parser.Integer loc value -> ................................................................................ Just builtin -> { acc | qualifiedNodes = Ok (Builtin loc builtin) :: acc.qualifiedNodes } Nothing -> { acc | qualifiedNodes = Err (UnknownWordRef loc value) :: acc.qualifiedNodes } Parser.PackageWord loc path value -> qualifyNode config currentDefName (Parser.Word loc value) acc Parser.ExternalWord loc path value -> qualifyNode config currentDefName (Parser.Word loc value) acc Parser.ConstructType typeName -> { acc | qualifiedNodes = Ok (ConstructType (qualifyName config typeName)) :: acc.qualifiedNodes } ................................................................................ quoteName = if String.startsWith "quote:" currentDefName then currentDefName ++ "/" ++ String.fromInt acc.availableQuoteId else "quote:" ++ qualifyName config currentDefName ++ "/" ++ String.fromInt acc.availableQuoteId ( newWordsAfterQuot, qualifiedQuotImplResult ) = initQualifyNode quoteName config acc.qualifiedWords quotImpl in case qualifiedQuotImplResult of Ok [ Word _ wordRef ] -> case Dict.get wordRef newWordsAfterQuot of Nothing -> Debug.todo "Cannot happen" ................................................................................ Just oldWord -> { acc | qualifiedWords = Dict.insert wordRef { oldWord | metadata = Metadata.isQuoted oldWord.metadata } newWordsAfterQuot , qualifiedNodes = Ok (WordRef sourceLocation wordRef) :: acc.qualifiedNodes } Ok qualifiedQuotImpl -> { acc | availableQuoteId = acc.availableQuoteId + 1 , qualifiedWords = Dict.insert quoteName ................................................................................ , metadata = Metadata.default |> Metadata.isQuoted , implementation = SoloImpl qualifiedQuotImpl } newWordsAfterQuot , qualifiedNodes = Ok (WordRef sourceLocation quoteName) :: acc.qualifiedNodes } Err err -> { acc | qualifiedNodes = Err err :: acc.qualifiedNodes } typeDefinitionName : TypeDefinition -> String ................................................................................ [ "/" , config.packageName , "/" , config.modulePath , "/" , name ] |
| | > > > > > > > > > > | | | | | | > > > > | | | | | | > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > |
85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 ... 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 ... 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 ... 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 ... 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 ... 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 ... 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 ... 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 ... 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 ... 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 |
run : RunConfig -> Result (List Problem) AST run config = let ( typeErrors, qualifiedTypes ) = Dict.foldl (\_ val acc -> qualifyType config val acc) ( [], Dict.empty ) config.ast.types |> Tuple.mapSecond (\qt -> Dict.map (\_ v -> resolveUnionInTypeDefs qt v) qt) ( wordErrors, externalWords, qualifiedWords ) = Dict.foldl (\_ val acc -> qualifyDefinition config qualifiedTypes val acc) ( [], Set.empty, Dict.empty ) config.ast.words requiredModules = Set.toList externalWords |> List.map Tuple.first |> Set.fromList wordsToCheck = Set.toList externalWords |> List.map (\( path, name ) -> path ++ "/" ++ name) |> Set.fromList in case ( typeErrors, wordErrors ) of ( [], [] ) -> Ok { types = qualifiedTypes , words = qualifiedWords , additionalModulesRequired = requiredModules , checkForExistingTypes = Set.empty , checkForExistingWords = wordsToCheck } _ -> Err <| typeErrors ++ wordErrors resolveUnionInTypeDefs : Dict String TypeDefinition -> TypeDefinition -> TypeDefinition ................................................................................ Ok type_ qualifyDefinition : RunConfig -> Dict String TypeDefinition -> Parser.WordDefinition -> ( List Problem, Set ( String, String ), Dict String WordDefinition ) -> ( List Problem, Set ( String, String ), Dict String WordDefinition ) qualifyDefinition config qualifiedTypes unqualifiedWord ( errors, externalWords, acc ) = let ( whens, impl ) = case unqualifiedWord.implementation of Parser.SoloImpl defImpl -> ( [], defImpl ) Parser.MultiImpl whenImpl defImpl -> ( whenImpl, defImpl ) ( newWordsAfterWhens, qualifiedWhensResult ) = List.foldr (qualifyWhen config qualifiedTypes unqualifiedWord.name) ( acc, [] ) whens |> Tuple.mapSecond Result.combine ( newWordsAfterImpl, externalWordsAfterImpl, qualifiedImplementationResult ) = initQualifyNode unqualifiedWord.name config newWordsAfterWhens impl qualifiedMetadataResult = qualifyMetadata config qualifiedTypes unqualifiedWord.metadata qualifiedName = qualifyName config unqualifiedWord.name in case ( qualifiedWhensResult, qualifiedImplementationResult, qualifiedMetadataResult ) of ( Ok qualifiedWhens, Ok qualifiedImplementation, Ok qualifiedMetadata ) -> ( errors , Set.union externalWords externalWordsAfterImpl , Dict.insert qualifiedName { name = qualifiedName , metadata = qualifiedMetadata , implementation = if List.isEmpty qualifiedWhens then SoloImpl qualifiedImplementation ................................................................................ MultiImpl qualifiedWhens qualifiedImplementation } newWordsAfterImpl ) ( Err whenError, _, _ ) -> ( whenError :: errors , externalWords , newWordsAfterImpl ) ( _, Err implError, _ ) -> ( implError :: errors , externalWords , newWordsAfterImpl ) ( _, _, Err metaError ) -> ( metaError :: errors , externalWords , newWordsAfterImpl ) qualifyMetadata : RunConfig -> Dict String TypeDefinition -> Metadata -> Result Problem Metadata qualifyMetadata config qualifiedTypes meta = let ................................................................................ -> Dict String TypeDefinition -> String -> ( Parser.TypeMatch, List Parser.AstNode ) -> ( Dict String WordDefinition, List (Result Problem ( TypeMatch, List Node )) ) -> ( Dict String WordDefinition, List (Result Problem ( TypeMatch, List Node )) ) qualifyWhen config qualifiedTypes wordName ( typeMatch, impl ) ( qualifiedWords, result ) = let ( newWords, externalWords, qualifiedImplementationResult ) = initQualifyNode wordName config qualifiedWords impl qualifiedMatchResult = qualifyMatch config qualifiedTypes typeMatch in case ( qualifiedImplementationResult, qualifiedMatchResult ) of ( Err err, _ ) -> ................................................................................ initQualifyNode : String -> RunConfig -> Dict String WordDefinition -> List Parser.AstNode -> ( Dict String WordDefinition, Set ( String, String ), Result Problem (List Node) ) initQualifyNode currentDefName config qualifiedWords impl = List.foldr (qualifyNode config currentDefName) (initQualifyNodeAccumulator qualifiedWords) impl |> (\acc -> ( acc.qualifiedWords, acc.externalWords, Result.combine acc.qualifiedNodes )) type alias QualifyNodeAccumulator = { availableQuoteId : Int , qualifiedWords : Dict String WordDefinition , qualifiedNodes : List (Result Problem Node) , externalWords : Set ( String, String ) } initQualifyNodeAccumulator : Dict String WordDefinition -> QualifyNodeAccumulator initQualifyNodeAccumulator qualifiedWords = { availableQuoteId = 1 , qualifiedWords = qualifiedWords , qualifiedNodes = [] , externalWords = Set.empty } qualifyNode : RunConfig -> String -> Parser.AstNode -> QualifyNodeAccumulator -> QualifyNodeAccumulator qualifyNode config currentDefName node acc = case node of Parser.Integer loc value -> ................................................................................ Just builtin -> { acc | qualifiedNodes = Ok (Builtin loc builtin) :: acc.qualifiedNodes } Nothing -> { acc | qualifiedNodes = Err (UnknownWordRef loc value) :: acc.qualifiedNodes } Parser.PackageWord loc path value -> let normalizedPath = String.join "/" path qualifiedPath = qualifyPackageModule config normalizedPath qualifiedName = String.join "/" [ qualifiedPath, value ] in { acc | qualifiedNodes = Ok (Word loc qualifiedName) :: acc.qualifiedNodes , externalWords = Set.insert ( qualifiedPath, value ) acc.externalWords } Parser.ExternalWord loc path value -> qualifyNode config currentDefName (Parser.Word loc value) acc Parser.ConstructType typeName -> { acc | qualifiedNodes = Ok (ConstructType (qualifyName config typeName)) :: acc.qualifiedNodes } ................................................................................ quoteName = if String.startsWith "quote:" currentDefName then currentDefName ++ "/" ++ String.fromInt acc.availableQuoteId else "quote:" ++ qualifyName config currentDefName ++ "/" ++ String.fromInt acc.availableQuoteId ( newWordsAfterQuot, externalWords, qualifiedQuotImplResult ) = initQualifyNode quoteName config acc.qualifiedWords quotImpl in case qualifiedQuotImplResult of Ok [ Word _ wordRef ] -> case Dict.get wordRef newWordsAfterQuot of Nothing -> Debug.todo "Cannot happen" ................................................................................ Just oldWord -> { acc | qualifiedWords = Dict.insert wordRef { oldWord | metadata = Metadata.isQuoted oldWord.metadata } newWordsAfterQuot , qualifiedNodes = Ok (WordRef sourceLocation wordRef) :: acc.qualifiedNodes , externalWords = Set.union externalWords acc.externalWords } Ok qualifiedQuotImpl -> { acc | availableQuoteId = acc.availableQuoteId + 1 , qualifiedWords = Dict.insert quoteName ................................................................................ , metadata = Metadata.default |> Metadata.isQuoted , implementation = SoloImpl qualifiedQuotImpl } newWordsAfterQuot , qualifiedNodes = Ok (WordRef sourceLocation quoteName) :: acc.qualifiedNodes , externalWords = Set.union externalWords acc.externalWords } Err err -> { acc | qualifiedNodes = Err err :: acc.qualifiedNodes } typeDefinitionName : TypeDefinition -> String ................................................................................ [ "/" , config.packageName , "/" , config.modulePath , "/" , name ] qualifyPackageModule : RunConfig -> String -> String qualifyPackageModule config path = if config.packageName == "" then path else String.concat [ "/" , config.packageName , "/" , path ] |
Modified tests/Test/Qualifier.elm from [878063bcf2] to [d8f0c7e9d7].
5
6
7
8
9
10
11
12
13
14
15
16
17
18
...
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
|
import Expect import Play.Data.Builtin as Builtin import Play.Data.Metadata as Metadata import Play.Data.SourceLocation exposing (emptyRange) import Play.Data.Type as Type import Play.Parser as AST import Play.Qualifier exposing (..) import Test exposing (Test, describe, test) import Test.Parser.Util as ParserUtil import Test.Qualifier.Util as QualifierUtil suite : Test suite = ................................................................................ [ GetMember "/play/test/some/module/Cent" "cent-value" ] } ] } in QualifierUtil.expectModuleOutput unqualifiedAst expectedAst , describe "Module loading" [ test "Detects external reference in simple word" <| \_ -> let unqualifiedAst = { types = Dict.empty , words = Dict.fromListBy .name [ { name = "call-external" , metadata = Metadata.default , implementation = AST.SoloImpl [ AST.Integer emptyRange 1 , AST.ExternalWord emptyRange [ "external", "module" ] "sample" ] } ] } in QualifierUtil.expectModuleRequirements unqualifiedAst [ "/external/module" ] [] [ "/external/module/sample" ] ] ] |
>
|
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
<
<
<
<
>
>
>
|
>
>
|
>
|
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
...
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
|
import Expect import Play.Data.Builtin as Builtin import Play.Data.Metadata as Metadata import Play.Data.SourceLocation exposing (emptyRange) import Play.Data.Type as Type import Play.Parser as AST import Play.Qualifier exposing (..) import Set import Test exposing (Test, describe, test) import Test.Parser.Util as ParserUtil import Test.Qualifier.Util as QualifierUtil suite : Test suite = ................................................................................ [ GetMember "/play/test/some/module/Cent" "cent-value" ] } ] } in QualifierUtil.expectModuleOutput unqualifiedAst expectedAst , describe "Module loading" [ test "Detects package reference in simple word" <| \_ -> let unqualifiedAst = { types = Dict.empty , words = Dict.fromListBy .name [ { name = "call-external" , metadata = Metadata.default , implementation = AST.SoloImpl [ AST.Integer emptyRange 1 , AST.PackageWord emptyRange [ "package", "module" ] "sample" ] } ] } expectedAst = { additionalModulesRequired = Set.fromList [ "/play/test/package/module" ] , checkForExistingTypes = Set.empty , checkForExistingWords = Set.fromList [ "/play/test/package/module/sample" ] , types = Dict.empty , words = Dict.fromListBy .name [ { name = "/play/test/package/tests/call-external" , metadata = Metadata.default , implementation = SoloImpl [ Integer emptyRange 1 , Word emptyRange "/play/test/package/module/sample" ] } ] } result = run { packageName = "play/test" , modulePath = "package/tests" , ast = unqualifiedAst } in case result of Err err -> Expect.fail <| "Did not expect qualification to fail with error: " ++ Debug.toString err Ok actualAst -> Expect.equal expectedAst actualAst ] ] |
Modified tests/Test/Qualifier/Util.elm from [d0efb594d1] to [0a51ee943f].
1
2
3
4
5
6
7
8
9
10
11
..
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
module Test.Qualifier.Util exposing ( addFunctionsForStructs , expectModuleOutput , expectModuleRequirements , expectOutput ) import Dict exposing (Dict) import Dict.Extra as Dict import Expect exposing (Expectation) import Play.Data.Metadata as Metadata ................................................................................ Ok actualAst -> Expect.equal expectedAst { types = actualAst.types , words = actualAst.words } expectModuleRequirements : Parser.AST -> List String -> List String -> List String -> Expectation expectModuleRequirements parserAst expectedModulesToLoad expectedTypesToCheck expectedWordsToCheck = let result = AST.run { packageName = "" , modulePath = "" , ast = parserAst } in case result of Err errors -> Expect.fail <| "Did not expect qualification to fail. Errors: " ++ Debug.toString errors Ok actualAst -> Expect.equal { additionalModulesRequired = Set.fromList expectedModulesToLoad , checkForExistingTypes = Set.fromList expectedTypesToCheck , checkForExistingWords = Set.fromList expectedWordsToCheck } { additionalModulesRequired = actualAst.additionalModulesRequired , checkForExistingTypes = actualAst.checkForExistingTypes , checkForExistingWords = actualAst.checkForExistingWords } addFunctionsForStructs : FullyLoadedAST -> FullyLoadedAST addFunctionsForStructs ast = let helper _ t wipAst = case t of AST.CustomTypeDef name _ generics members -> |
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
|
1
2
3
4
5
6
7
8
9
10
..
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
module Test.Qualifier.Util exposing
( addFunctionsForStructs
, expectModuleOutput
, expectOutput
)
import Dict exposing (Dict)
import Dict.Extra as Dict
import Expect exposing (Expectation)
import Play.Data.Metadata as Metadata
................................................................................
Ok actualAst ->
Expect.equal expectedAst
{ types = actualAst.types
, words = actualAst.words
}
addFunctionsForStructs : FullyLoadedAST -> FullyLoadedAST
addFunctionsForStructs ast =
let
helper _ t wipAst =
case t of
AST.CustomTypeDef name _ generics members ->
|