Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve #9399 using additions from #9408 #9427

Merged
merged 19 commits into from
Sep 25, 2022
Merged

Improve #9399 using additions from #9408 #9427

merged 19 commits into from
Sep 25, 2022

Commits on Sep 25, 2022

  1. Use the externally used records marker.

    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    aaa1faf View commit details
    Browse the repository at this point in the history

  2. Set marker to always be true for the OF.

    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    27d853c View commit details
    Browse the repository at this point in the history

  3. Use a map/dictionary instead of keeping separate lists. 

      - Use a map (string, record Declaration) to keep a track of records in
    the SimCode. This allows for a simpler and quicker check. In addition
    we can update entries easily.
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    40d42e2 View commit details
    Browse the repository at this point in the history

  4. Add MetaModelica records to the map as well.

    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    b013cbf View commit details
    Browse the repository at this point in the history

  5. Debug help

    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    3e0be2f View commit details
    Browse the repository at this point in the history

  6. Fix traversal order to avoid possible(?) infinite recursion.

    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    5c49ce6 View commit details
    Browse the repository at this point in the history

  7. Disable the old creation of record declarations. 

      - See what fails in the testsuite.
  - It was actually affecting some tests because nested records were cycling
    back and messing with the order. Not exactly sure how but is not
    relevant anymore.
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    0a0dffc View commit details
    Browse the repository at this point in the history

  8. Simplify processing of record declrations. 

      - Remove returned lists from functions:
     elaborateNestedRecordDeclarations
     elaborateRecordDeclarationsFromTypes
     elaborateRecordDeclarationsForRecord
     elaborateNestedRecordDeclarations

  - Remove input lists from functions:
    - elaborateRecordDeclarationsFromTypes
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    2fc57ee View commit details
    Browse the repository at this point in the history

  9. Make sure we do not overwrite true values to false. 

      - If an entry already exists in the map and we always update, then there
    is a chance we might overwrite a 'true' value with a 'false' value
    for external conversion marker.

    Check if the entry exists and if it is marked false while then new
    incoming entry is marked true, then update it. Otherwise do nothing.
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    488e939 View commit details
    Browse the repository at this point in the history

  10. Remove input lists from functions 

      - Remove input lists from functions:
    - elaborateNestedRecordDeclarations
    - elaborateRecordDeclarationsForRecord
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    3762296 View commit details
    Browse the repository at this point in the history

  11. Remove input and output lists from more functions. 

      - Removed from
    - elaborateRecordDeclarationsForMetarecords
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    8eb7c59 View commit details
    Browse the repository at this point in the history

  12. Remove input and output lists from elaborateRecordDeclarations.

    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    75ae70d View commit details
    Browse the repository at this point in the history

  13. Remove input and output lists from more functions. 

      - Remove input and output lists from functions:
    - elaborateFunctions2
    - elaborateFunction
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    703ef91 View commit details
    Browse the repository at this point in the history

  14. Convert recursive functions to loops. 

      - Recursive functions converted to loops:
    - elaborateNestedRecordDeclarations
    - elaborateRecordDeclarationsForMetarecords
    - elaborateRecordDeclarationsFromTypes
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    72e4c04 View commit details
    Browse the repository at this point in the history

  15. Rename some functions to be more descriptive. 

      - elaborateRecordDeclarationsForMetarecords -> collectRecDeclsFromMetaRecordCallExps
  - elaborateNestedRecordDeclarations -> collectRecDeclsFromTypesVars
  - elaborateRecordDeclarationsFromTypes -> collectRecDeclsFromTypes
  - elaborateRecordDeclarationsForRecord -> collectRecDeclsFromType
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    3f1c929 View commit details
    Browse the repository at this point in the history

  16. Change how records are collected from metarecordcalls 

      - Instead of:
    - traversing all expressions, collecting all meta record calls to a list,
      and then traversing this list to collect record declarations

    - collect record declarations while traversing all expressions (without
      collecting metarecordcalls into a whole new list.)
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    2c081a3 View commit details
    Browse the repository at this point in the history

  17. Rename functions to be more descriptive. 

      - elaborateRecordDeclarations -> collectRecDeclsFromElems
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    237d047 View commit details
    Browse the repository at this point in the history

  18. Convert recursive functions to loops. 

      - Convert recursive functions to loops:
    - collectRecDeclsFromElems (used to be `elaborateRecordDeclarations`)
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    fc9cdbf View commit details
    Browse the repository at this point in the history

  19. Some minor cleanup and renaming. 

      - declMap -> recDeclsMap
  - needsExternalConversion -> usedExternally
    @mahge
    mahge committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    cffb199 View commit details
    Browse the repository at this point in the history