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

Feature/atlas import #1474

Draft
wants to merge 154 commits into
base: main
Choose a base branch
from
Draft

Feature/atlas import #1474

wants to merge 154 commits into from

Commits on Mar 15, 2024

  1. Eerste aanzet Atlas importer

    @hanjoosten
    hanjoosten committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    8435d98 View commit details
    Browse the repository at this point in the history

  2. Remove fSpec requirement

    @hanjoosten
    hanjoosten committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    42bd7f2 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. Update stack-action to v5

    @hanjoosten
    hanjoosten committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    e2ee679 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. New Origin constructor

    @hanjoosten
    hanjoosten committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    66071ed View commit details
    Browse the repository at this point in the history

  2. add Aeson support

    @hanjoosten
    hanjoosten committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    3ff8c70 View commit details
    Browse the repository at this point in the history

  3. first instances of FromJSON

    @hanjoosten
    hanjoosten committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    22dbe66 View commit details
    Browse the repository at this point in the history

  4. fix freckle/stack-action calls

    @hanjoosten
    hanjoosten committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    d19742b View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. don't upgrade stack during ci/cd

    @hanjoosten
    hanjoosten committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    4fb33a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. First version AtlasImport.hs 

    - P_Context
- PCDDef
- PConceptDef
- P_Concept
- PProp
- P_Sign
- P_Relation
- PMeaning
- PMessage
- P_Markup
- P_Rule
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    3469a4e View commit details
    Browse the repository at this point in the history

  2. Adjustment PrettyPrinters.hs to fit proper .adl sturcture 

    - MEANING of CONCEPT print adjusted
- quoteMeaning added
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    a287acb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/atlas-import' of https://github.com/AmpersandTa… 

    …rski/Ampersand into feature/atlas-import
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    8a937b9 View commit details
    Browse the repository at this point in the history

  4. Parse text from json to a Term Termprim

    @hanjoosten
    hanjoosten committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    d0588ac View commit details
    Browse the repository at this point in the history

  5. Revert "Adjustment PrettyPrinters.hs to fit proper .adl sturcture" 

    This reverts commit a287acb.
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    8298e3c View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2024

  1. Include P_Pattern in parser 

    PPurpose first version
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    4cb221c View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. better parameters for freckle/stack-action

    @hanjoosten
    hanjoosten committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    7405a5a View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. - PPurpose werkend behalve voor relaties

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    8857253 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/atlas-import' of https://github.com/AmpersandTa… 

    …rski/Ampersand into feature/atlas-import
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    39987e6 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. PPurpose fix, alleen RELATION not working

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    f75e9a9 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. PPurpose finished

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    507e51e View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Representation - only OBJECT not working

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    6a5e4d5 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Lang working 

    IDENT not finished
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    b7dd611 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. REPRESENT working 

    qualified Data.Aeson as .JSON
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    759b8c0 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Work in progress: 

    identsegmnt, boxitem, cruds, subifc, boxheader, templatekeyvalue, term, termprim, atomvalue,
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    5f96ece View commit details
    Browse the repository at this point in the history

  2. - IDENT layout working, terrible .json structure

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    cfa56dc View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Ident - niet af

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    90002e8 View commit details
    Browse the repository at this point in the history

  2. Classify + MetaData added

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    bc5d1c5 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. - Ident working 

    - Term TermPrim working
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    cf29b50 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. RoleRule finished

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    f0c7963 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Add ConceptDefinition in formalampersand

    @hanjoosten
    hanjoosten committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    d5dbd7e View commit details
    Browse the repository at this point in the history

  2. Rename ConceptDefinition to ConceptDef

    @hanjoosten
    hanjoosten committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    0bb5e87 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. - Enforce (werkend, maar leeg vanuit rap dus niet meegegeven)

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    3c66962 View commit details
    Browse the repository at this point in the history

  2. Bugfixes in transformers

    @hanjoosten
    hanjoosten committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    4ddf798 View commit details
    Browse the repository at this point in the history

  3. The definition is structured as a Meaning in the A-structure

    @hanjoosten
    hanjoosten committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    5640419 View commit details
    Browse the repository at this point in the history

  4. Throw fatal when transformers and .adl script are not in sync

    @hanjoosten
    hanjoosten committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    10615c2 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. 'fix' initial sync errors, in preparation to work with Stef

    @hanjoosten
    hanjoosten committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    32ca417 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. PairView / PairViewSegment stuff

    @hanjoosten
    hanjoosten committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e010ed7 View commit details
    Browse the repository at this point in the history

  2. Finished sync of PairView and PairViewSegment

    @hanjoosten
    hanjoosten committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    84043ff View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. add represents in generated population script

    @hanjoosten
    hanjoosten committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    b1b53e1 View commit details
    Browse the repository at this point in the history

  2. Add warnings for mismatched properties in meatgrinder

    @hanjoosten
    hanjoosten committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    3ddf74c View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Pattern synced with Transformers / formal ampersand

    @hanjoosten
    hanjoosten committed May 1, 2024
    Configuration menu
    Copy the full SHA
    191f142 View commit details
    Browse the repository at this point in the history

  2. set tag explicitly (no more use of latest)

    @hanjoosten
    hanjoosten committed May 1, 2024
    Configuration menu
    Copy the full SHA
    f859cca View commit details
    Browse the repository at this point in the history

  3. Add graphviz to image

    @hanjoosten
    hanjoosten committed May 1, 2024
    Configuration menu
    Copy the full SHA
    aa3b7f0 View commit details
    Browse the repository at this point in the history

  4. sort installed libraries in RUN statement

    @hanjoosten
    hanjoosten committed May 1, 2024
    Configuration menu
    Copy the full SHA
    4c571c2 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Merge branch 'devcontainer-ghc8-10-7' into main-of-ampersand-4

    @hanjoosten
    hanjoosten committed May 2, 2024
    Configuration menu
    Copy the full SHA
    36675e4 View commit details
    Browse the repository at this point in the history

  2. rename devcontainer to stress that this is about ampersand 4

    @hanjoosten
    hanjoosten committed May 2, 2024
    Configuration menu
    Copy the full SHA
    82335ce View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main-of-ampersand-4' into formalampersand-meatgrinder-u… 

    …pdate-example
    @hanjoosten
    hanjoosten committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9f3a3b3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main-of-ampersand-4' into feature/atlas-import

    @hanjoosten
    hanjoosten committed May 2, 2024
    Configuration menu
    Copy the full SHA
    c6c0f63 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. updates for mac-os runners

    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    1893659 View commit details
    Browse the repository at this point in the history

  2. mac-os fix

    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    bebf581 View commit details
    Browse the repository at this point in the history

  3. update ci2.yml

    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    3db07ec View commit details
    Browse the repository at this point in the history

  4. fix error on mac-os: ghc: could not execute: opt

    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    b70bba4 View commit details
    Browse the repository at this point in the history

  5. Use older mac-os version to fix `Make sure you have installed LLVM be… 

    …tween [9 and 13)`
    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    4f0938e View commit details
    Browse the repository at this point in the history

  6. Stack still is installed on older version of macos

    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    40022b9 View commit details
    Browse the repository at this point in the history

  7. workaround that is already fixed in ampersand 5

    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    f20ac11 View commit details
    Browse the repository at this point in the history

  8. A safestring should not accidently be a keyword

    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    a653271 View commit details
    Browse the repository at this point in the history

  9. more logging to find bug in roundtrip

    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    7730582 View commit details
    Browse the repository at this point in the history

  10. remove previous edits in PrettyPrinters.hs, because of errors in roun… 

    …dtrip
    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    f01a40a View commit details
    Browse the repository at this point in the history

  11. remove warnings and suggestions

    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    4fe20a0 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'feature/atlas-import' into formalampersand-meatgrinder-… 

    …update-example
    @hanjoosten
    hanjoosten committed May 4, 2024
    Configuration menu
    Copy the full SHA
    ea5beec View commit details
    Browse the repository at this point in the history

Commits on May 5, 2024

  1. fix devcontainer name

    @hanjoosten
    hanjoosten committed May 5, 2024
    Configuration menu
    Copy the full SHA
    0c60e6b View commit details
    Browse the repository at this point in the history

  2. disable checking of prototypeContext

    @hanjoosten
    hanjoosten committed May 5, 2024
    Configuration menu
    Copy the full SHA
    8163df2 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/formalampersand-meatgrinder-upda… 

    …te-example' into feature/atlas-import
    @hanjoosten
    hanjoosten committed May 5, 2024
    Configuration menu
    Copy the full SHA
    8adae88 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Enable checking of prototypetransformers during generation of a proto… 

    …type
    @hanjoosten
    hanjoosten committed May 6, 2024
    Configuration menu
    Copy the full SHA
    2336f3a View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Refactor grind towards grindInto, for stricter usage of grinding

    @hanjoosten
    hanjoosten committed May 7, 2024
    Configuration menu
    Copy the full SHA
    4d761e3 View commit details
    Browse the repository at this point in the history

  2. Add check for prototypecontext being in sync

    @hanjoosten
    hanjoosten committed May 7, 2024
    Configuration menu
    Copy the full SHA
    cd8ece1 View commit details
    Browse the repository at this point in the history

  3. bugfix and more refactoring

    @hanjoosten
    hanjoosten committed May 7, 2024
    Configuration menu
    Copy the full SHA
    a85ebba View commit details
    Browse the repository at this point in the history

  4. Add missing relations from PrototypeConcept in Transformers.hs

    @hanjoosten
    hanjoosten committed May 7, 2024
    Configuration menu
    Copy the full SHA
    dd2b845 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. remove errors for Origins that are different but reference the same t… 

    …hing
    @hanjoosten
    hanjoosten committed May 8, 2024
    Configuration menu
    Copy the full SHA
    886b6ce View commit details
    Browse the repository at this point in the history

  2. ATLAS export via 'eigen' printer

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed May 8, 2024
    Configuration menu
    Copy the full SHA
    2f4e5a2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/atlas-import' of https://github.com/AmpersandTa… 

    …rski/Ampersand into feature/atlas-import
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed May 8, 2024
    Configuration menu
    Copy the full SHA
    41cf895 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. FormalAmpersand changes in session with Stef

    @hanjoosten
    hanjoosten committed May 9, 2024
    Configuration menu
    Copy the full SHA
    d99b840 View commit details
    Browse the repository at this point in the history

  2. Remove specificatin of properties in Transformers, because obsolete

    @hanjoosten
    hanjoosten committed May 9, 2024
    Configuration menu
    Copy the full SHA
    6e369a1 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. refactoring

    @hanjoosten
    hanjoosten committed May 10, 2024
    Configuration menu
    Copy the full SHA
    f0f6ad5 View commit details
    Browse the repository at this point in the history

  2. Enkele transformers ingevuld

    @hanjoosten
    hanjoosten committed May 10, 2024
    Configuration menu
    Copy the full SHA
    44dc571 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. wip

    @hanjoosten
    hanjoosten committed May 11, 2024
    Configuration menu
    Copy the full SHA
    3b7f3da View commit details
    Browse the repository at this point in the history

  2. Even more relations around Interface

    @hanjoosten
    hanjoosten committed May 11, 2024
    Configuration menu
    Copy the full SHA
    7d6830b View commit details
    Browse the repository at this point in the history

  3. Add some ConceptDefs

    @hanjoosten
    hanjoosten committed May 11, 2024
    Configuration menu
    Copy the full SHA
    eb47cc3 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. Status generated population

    @hanjoosten
    hanjoosten committed May 12, 2024
    Configuration menu
    Copy the full SHA
    83c830c View commit details
    Browse the repository at this point in the history

  2. populate some more relations in FA

    @hanjoosten
    hanjoosten committed May 12, 2024
    Configuration menu
    Copy the full SHA
    cfb8664 View commit details
    Browse the repository at this point in the history

  3. Add support for ssh in devcontainer

    @hanjoosten
    hanjoosten committed May 12, 2024
    Configuration menu
    Copy the full SHA
    be3d573 View commit details
    Browse the repository at this point in the history

  4. add mounts to read .ssh

    @hanjoosten
    hanjoosten committed May 12, 2024
    Configuration menu
    Copy the full SHA
    f763d5c View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. eigen Prettyprinter losgehaald van Ampersand voor ATLAS (snellere bui… 

    …ldtime in developement)
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed May 13, 2024
    Configuration menu
    Copy the full SHA
    7578fe2 View commit details
    Browse the repository at this point in the history

  2. Graphviz extention enabled

    @hanjoosten
    hanjoosten committed May 13, 2024
    Configuration menu
    Copy the full SHA
    d2e9095 View commit details
    Browse the repository at this point in the history

  3. Update devcontainer.json 

    Devcontainer startup error in mount: .ssh file directory commented
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed May 13, 2024
    Configuration menu
    Copy the full SHA
    aec05af View commit details
    Browse the repository at this point in the history

  4. fix(?) problem with mount in github desktop

    @hanjoosten
    hanjoosten committed May 13, 2024
    Configuration menu
    Copy the full SHA
    7044df5 View commit details
    Browse the repository at this point in the history

  5. oops

    @hanjoosten
    hanjoosten committed May 13, 2024
    Configuration menu
    Copy the full SHA
    b73aa35 View commit details
    Browse the repository at this point in the history

  6. Interfaces in FormalAmpersand

    @hanjoosten
    hanjoosten committed May 13, 2024
    Configuration menu
    Copy the full SHA
    535a71a View commit details
    Browse the repository at this point in the history

  7. Further work on documentation pattern

    @hanjoosten
    hanjoosten committed May 13, 2024
    Configuration menu
    Copy the full SHA
    4a3261e View commit details
    Browse the repository at this point in the history

  8. Add githd plugin, to see history info for each line in a file.

    @hanjoosten
    hanjoosten committed May 13, 2024
    Configuration menu
    Copy the full SHA
    189a484 View commit details
    Browse the repository at this point in the history

  9. Populate relations avoiding new errors due to properties of new relat… 

    …ions in Transformers.hs
    @hanjoosten
    hanjoosten committed May 13, 2024
    Configuration menu
    Copy the full SHA
    f5c14ab View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Some more population

    @hanjoosten
    hanjoosten committed May 14, 2024
    Configuration menu
    Copy the full SHA
    43342c3 View commit details
    Browse the repository at this point in the history

  2. Fix Error occurred for Markup when implementing the latest version of… 

    … Formal Ampersand in RAP. #1484
    @hanjoosten
    hanjoosten committed May 14, 2024
    Configuration menu
    Copy the full SHA
    6d41e01 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Changes in FormalAmpersand .adl files

    @hanjoosten
    hanjoosten committed May 22, 2024
    Configuration menu
    Copy the full SHA
    a03ceb4 View commit details
    Browse the repository at this point in the history

  2. Add missing relation in transformers of formalampersand

    @hanjoosten
    hanjoosten committed May 22, 2024
    Configuration menu
    Copy the full SHA
    8b7a2c8 View commit details
    Browse the repository at this point in the history

  3. Fix new transformers

    @hanjoosten
    hanjoosten committed May 22, 2024
    Configuration menu
    Copy the full SHA
    63c2ec6 View commit details
    Browse the repository at this point in the history

  4. Fix error in formalAmpersand

    @hanjoosten
    hanjoosten committed May 22, 2024
    Configuration menu
    Copy the full SHA
    c3dd26d View commit details
    Browse the repository at this point in the history

  5. Consolidate different Names

    @hanjoosten
    hanjoosten committed May 22, 2024
    Configuration menu
    Copy the full SHA
    2b20486 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'formalampersand-meatgrinder-update-example' into featur… 

    …e/atlas-import
    @hanjoosten
    hanjoosten committed May 22, 2024
    Configuration menu
    Copy the full SHA
    7c63357 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Temporarily hide issue with totality

    @hanjoosten
    hanjoosten committed May 23, 2024
    Configuration menu
    Copy the full SHA
    e05f3e1 View commit details
    Browse the repository at this point in the history

  2. Revert "Temporarily hide issue with totality" 

    This reverts commit e05f3e1.
    @hanjoosten
    hanjoosten committed May 23, 2024
    Configuration menu
    Copy the full SHA
    0795184 View commit details
    Browse the repository at this point in the history

  3. fix bug in instances of ObjectDef

    @hanjoosten
    hanjoosten committed May 23, 2024
    Configuration menu
    Copy the full SHA
    b9e9f7a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'formalampersand-meatgrinder-update-example' into featur… 

    …e/atlas-import
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed May 23, 2024
    Configuration menu
    Copy the full SHA
    532d917 View commit details
    Browse the repository at this point in the history

  5. Name not showing bug fix

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed May 23, 2024
    Configuration menu
    Copy the full SHA
    39fae6b View commit details
    Browse the repository at this point in the history

  6. Name not showing bug fix

    @SimonvRoozendaalOrdina @hanjoosten
    SimonvRoozendaalOrdina authored and hanjoosten committed May 23, 2024
    Configuration menu
    Copy the full SHA
    828b064 View commit details
    Browse the repository at this point in the history

  7. Testcase for issue 1487

    @hanjoosten
    hanjoosten committed May 23, 2024
    Configuration menu
    Copy the full SHA
    e6a46d5 View commit details
    Browse the repository at this point in the history

  8. Fix CONCEPT that is defined but not used doesn't show up in concs #… 

    …1487
    @hanjoosten
    hanjoosten committed May 23, 2024
    Configuration menu
    Copy the full SHA
    f0714d4 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. On the way to adapting ghc9

    @hanjoosten
    hanjoosten committed May 29, 2024
    Configuration menu
    Copy the full SHA
    d796e46 View commit details
    Browse the repository at this point in the history

  2. Everything compiles again

    @hanjoosten
    hanjoosten committed May 29, 2024
    Configuration menu
    Copy the full SHA
    02052e0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upgrade-GHC' into formalampersand-meatgrinder-update-ex… 

    …ample
    @hanjoosten
    hanjoosten committed May 29, 2024
    Configuration menu
    Copy the full SHA
    489db56 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge branch 'formalampersand-meatgrinder-update-example' into main-o… 

    …f-ampersand-4
    @hanjoosten
    hanjoosten committed May 30, 2024
    Configuration menu
    Copy the full SHA
    5881381 View commit details
    Browse the repository at this point in the history

  2. Releasenotes

    @hanjoosten
    hanjoosten committed May 30, 2024
    Configuration menu
    Copy the full SHA
    356f13c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main-of-ampersand-4' into feature/atlas-import

    @hanjoosten
    hanjoosten committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ded8f21 View commit details
    Browse the repository at this point in the history

  4. Fix error due to changed constructor of PPurpose

    @hanjoosten
    hanjoosten committed May 30, 2024
    Configuration menu
    Copy the full SHA
    e308b11 View commit details
    Browse the repository at this point in the history

  5. kleine verbeteringen, opschoningen en verbeterede testfiles

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed May 30, 2024
    Configuration menu
    Copy the full SHA
    f11c9dd View commit details
    Browse the repository at this point in the history

  6. Update ampersand.cabal

    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed May 30, 2024
    Configuration menu
    Copy the full SHA
    39c7923 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/atlas-import' of https://github.com/AmpersandTa… 

    …rski/Ampersand into feature/atlas-import
    @SimonvRoozendaalOrdina
    SimonvRoozendaalOrdina committed May 30, 2024
    Configuration menu
    Copy the full SHA
    6aea23b View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Layout stuff because of new version of ormolu

    @hanjoosten
    hanjoosten committed May 31, 2024
    Configuration menu
    Copy the full SHA
    80a6cda View commit details
    Browse the repository at this point in the history

  2. Replace PRef2 with PPurpose

    @hanjoosten
    hanjoosten committed May 31, 2024
    Configuration menu
    Copy the full SHA
    4d61084 View commit details
    Browse the repository at this point in the history

  3. - purpose fixed

    @Svroozendaal
    Svroozendaal committed May 31, 2024
    Configuration menu
    Copy the full SHA
    a519c6c View commit details
    Browse the repository at this point in the history

  4. Retrieve fix for DateTime parser

    @hanjoosten
    hanjoosten committed May 31, 2024
    Configuration menu
    Copy the full SHA
    290ef6c View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Revert "Retrieve fix for DateTime parser" 

    This reverts commit 290ef6c.
    @hanjoosten
    hanjoosten committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    c90ed6d View commit details
    Browse the repository at this point in the history

  2. Also read ' UTC' after datetime if present

    @hanjoosten
    hanjoosten committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    cbc8add View commit details
    Browse the repository at this point in the history

  3. Small fix for Windows

    @hanjoosten
    hanjoosten committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    badddcd View commit details
    Browse the repository at this point in the history

  4. Fix Dockerfile

    @hanjoosten
    hanjoosten committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    533cc2e View commit details
    Browse the repository at this point in the history

  5. Minor thing for windows

    @hanjoosten
    hanjoosten committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    7f42788 View commit details
    Browse the repository at this point in the history

  6. Minor enhancement of Setup.hs

    @hanjoosten
    hanjoosten committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    9b67e89 View commit details
    Browse the repository at this point in the history

  7. minor things to ease comming migration

    @hanjoosten
    hanjoosten committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    5afbdd8 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Population still yealds violations

    @hanjoosten
    hanjoosten committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    87e93de View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Fix population of Meaning

    @hanjoosten
    hanjoosten committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    4599950 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/meaning-populate-text' into main-of-ampersand-4

    @hanjoosten
    hanjoosten committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    9bbd879 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. testing files

    @Svroozendaal
    Svroozendaal committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    2b56355 View commit details
    Browse the repository at this point in the history

  2. Prettyprinter update

    @Svroozendaal
    Svroozendaal committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    a2d943f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/atlas-import' of https://github.com/AmpersandTa… 

    …rski/Ampersand into feature/atlas-import
    @Svroozendaal
    Svroozendaal committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    c145aad View commit details
    Browse the repository at this point in the history

  4. Squashed commit of the following: 

    commit 9bbd879
Merge: 5afbdd8 4599950
Author: hanjoosten <[email protected]>
Date:   Mon Jun 10 23:40:51 2024 +0200

    Merge branch 'feature/meaning-populate-text' into main-of-ampersand-4

commit 4599950
Author: hanjoosten <[email protected]>
Date:   Mon Jun 10 21:38:46 2024 +0200

    Fix population of Meaning

commit 87e93de
Author: hanjoosten <[email protected]>
Date:   Tue Jun 4 10:58:20 2024 +0200

    Population still yealds violations

commit 5afbdd8
Author: hanjoosten <[email protected]>
Date:   Sat Jun 1 23:46:29 2024 +0200

    minor things to ease comming migration

commit 9b67e89
Author: hanjoosten <[email protected]>
Date:   Sat Jun 1 16:25:33 2024 +0200

    Minor enhancement of Setup.hs

commit 7f42788
Author: hanjoosten <[email protected]>
Date:   Sat Jun 1 10:21:08 2024 +0200

    Minor thing for windows

commit 533cc2e
Author: hanjoosten <[email protected]>
Date:   Sat Jun 1 10:18:19 2024 +0200

    Fix Dockerfile

commit badddcd
Author: hanjoosten <[email protected]>
Date:   Sat Jun 1 10:11:33 2024 +0200

    Small fix for Windows

commit cbc8add
Author: hanjoosten <[email protected]>
Date:   Sat Jun 1 09:19:39 2024 +0200

    Also read ' UTC' after datetime if present

commit c90ed6d
Author: hanjoosten <[email protected]>
Date:   Sat Jun 1 09:12:37 2024 +0200

    Revert "Retrieve fix for DateTime parser"

    This reverts commit 290ef6c.

commit 290ef6c
Author: hanjoosten <[email protected]>
Date:   Fri May 31 15:37:54 2024 +0200

    Retrieve fix for DateTime parser
    @Svroozendaal
    Svroozendaal committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    de22bec View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. - meaning & definition

    @Svroozendaal
    Svroozendaal committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    bd32036 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Add ShowAdl for PairView

    @hanjoosten
    hanjoosten committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    a77057e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/add-showADL-Pairview' into featu… 

    …re/atlas-import
    @Svroozendaal
    Svroozendaal committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    19985a8 View commit details
    Browse the repository at this point in the history

  3. testfile update

    @Svroozendaal
    Svroozendaal committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    ff418b7 View commit details
    Browse the repository at this point in the history

  4. term.adl spell out relations to fix error

    @Svroozendaal
    Svroozendaal committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    a026be0 View commit details
    Browse the repository at this point in the history

  5. Revert "term.adl spell out relations to fix error" 

    This reverts commit a026be0.
    @hanjoosten
    hanjoosten committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    ecfe64e View commit details
    Browse the repository at this point in the history

  6. fix execengine rule to delete ShowADL atoms

    @hanjoosten
    hanjoosten committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    692f999 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'add-showADL-Pairview' into main-of-ampersand-4

    @hanjoosten
    hanjoosten committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    e781fe7 View commit details
    Browse the repository at this point in the history

  8. populate message

    @hanjoosten
    hanjoosten committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    48a1b6e View commit details
    Browse the repository at this point in the history

  9. Message should not be a type of it's own. Markup is intended.

    @hanjoosten
    hanjoosten committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    418fce5 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Merge branch 'add-showADL-Pairview' into feature/atlas-import

    @Svroozendaal
    Svroozendaal committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    513215c View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. eerste versie bug fix (error)

    @Svroozendaal
    Svroozendaal committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    4e6be04 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. FUN & BIJ added to Parser Lexer

    @Svroozendaal
    Svroozendaal committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    e138dc1 View commit details
    Browse the repository at this point in the history

  2. code cleanup

    @Svroozendaal
    Svroozendaal committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    9e60819 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. testfiles

    @Svroozendaal
    Svroozendaal committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    39c442f View commit details
    Browse the repository at this point in the history

  2. Fix instanceList of Meaning

    @hanjoosten
    hanjoosten committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    bb7f225 View commit details
    Browse the repository at this point in the history

  3. See #1489 (comment)

    @hanjoosten
    hanjoosten committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    d5086e5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Add-prop-BIJ-FUN' into feature/atlas-import

    @hanjoosten
    hanjoosten committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    476318b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'add-message-to-rule' into feature/atlas-import

    @hanjoosten
    hanjoosten committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    a0f6675 View commit details
    Browse the repository at this point in the history

  6. Restore restrictions

    @hanjoosten
    hanjoosten committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    98a0cac View commit details
    Browse the repository at this point in the history