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.

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

Remove Optional/fold and Optional/build #1802

Merged
merged 1 commit into from
May 27, 2020

Conversation

sjakobi
Copy link
Collaborator

@sjakobi sjakobi commented May 20, 2020

…as standardized in dhall-lang/dhall-lang#1014.

Note that the test suite doesn't completely pass yet since we haven't updated the code to comply with dhall-lang/dhall-lang#980 yet.

@sjakobi
Copy link
Collaborator Author

sjakobi commented May 20, 2020

I don't understand why the type-inference failure tests that I added fail in this way:

  type-inference tests
    discover
      ./dhall-lang/tests/type-inference/failure/unit/RemovedBuiltinOptionalBuild:                                              FAIL
        tests/Dhall/Test/TypeInference.hs:109:
        ./dhall-lang/tests/type-inference/failure/unit/RemovedBuiltinOptionalBuild should have parsed
      ./dhall-lang/tests/type-inference/failure/unit/RemovedBuiltinOptionalFold:                                               FAIL
        tests/Dhall/Test/TypeInference.hs:109:
        ./dhall-lang/tests/type-inference/failure/unit/RemovedBuiltinOptionalFold should have parsed

Indeed Optional/fold and Optional/build fail to parse(!) in the REPL too:

⊢ Optional/fold

Error: Invalid input

(input):1:9:
  |
1 | Optional/fold
  |         ^
unexpected '/'
expecting ->, :, end of input, keyword, operator, or whitespace

⊢ Optional/build

Error: Invalid input

(input):1:9:
  |
1 | Optional/build
  |         ^
unexpected '/'
expecting ->, :, end of input, keyword, operator, or whitespace

I assume I must have made a mistake somewhere in the parser…

@sjakobi
Copy link
Collaborator Author

sjakobi commented May 20, 2020

Ah, I had forgotten to update the reservedIdentifiers list! :)

@sjakobi sjakobi marked this pull request as ready for review May 20, 2020 12:51
@sjakobi sjakobi changed the title WIP: Remove Optional/fold and Optional/build Remove Optional/fold and Optional/build May 20, 2020
@sjakobi sjakobi force-pushed the sjakobi/remove-optional-build-fold branch from 0547a47 to 4e684f2 Compare May 27, 2020 11:55
@sjakobi sjakobi force-pushed the sjakobi/remove-optional-build-fold branch from 4e684f2 to a0cecc6 Compare May 27, 2020 12:23
@sjakobi
Copy link
Collaborator Author

sjakobi commented May 27, 2020

Got a hopefully spurious AppVeyor error:

Build started
git clone -q https://github.com/dhall-lang/dhall-haskell.git C:\projects\dhall-haskell
fatal: unable to access 'https://github.com/dhall-lang/dhall-haskell.git/': Could not resolve host: github.com
Command exited with code 128

Retrying…

@sjakobi sjakobi removed the merge me label May 27, 2020
@sjakobi sjakobi force-pushed the sjakobi/remove-optional-build-fold branch from a0cecc6 to c352e43 Compare May 27, 2020 13:13
@sjakobi
Copy link
Collaborator Author

sjakobi commented May 27, 2020

I had forgotten to update the .dhall.bin files in dhall/benchmark/examples

@Gabriella439
Copy link
Collaborator

@sjakobi: hydra is failing with this error:

Building source dist for dhall-1.32.0...
dhall-lang/tests/import/cache/dhall/1220efc43103e49b56c5bf089db8e0365bbfc455b8a2f0dc6ee5727a3586f85969fd: getPermissions:getFileStatus: does not exist (No such file or directory)
builder for '/nix/store/ky647iz7avzm9l5xddd9a1zixc00q2dy-dhall-sdist.drv' failed with exit code 

https://hydra.dhall-lang.org/jobset/dhall-haskell/1802#tabs-errors

I think this just requires updating the path in the Extra-Source-Files section

@sjakobi
Copy link
Collaborator Author

sjakobi commented May 27, 2020

@sjakobi sjakobi force-pushed the sjakobi/remove-optional-build-fold branch 4 times, most recently from a46322b to d32a713 Compare May 27, 2020 15:24
@Gabriella439
Copy link
Collaborator

@sjakobi: You're welcome! 🙂

@sjakobi sjakobi force-pushed the sjakobi/remove-optional-build-fold branch from d32a713 to 12e4365 Compare May 27, 2020 16:11
@mergify mergify bot merged commit f49e273 into master May 27, 2020
@mergify mergify bot deleted the sjakobi/remove-optional-build-fold branch May 27, 2020 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants