Commit Graph

2972 Commits

Author SHA1 Message Date
SimaDovakin
d474cf83a5 Edited heading in transcripts for testing syntax error of the invalid binary chars. 2024-08-22 16:19:12 +03:00
SimaDovakin
035e800a2a Added support of the binary notation for Nat and Int. 2024-08-21 18:29:54 +03:00
Arya Irani
e388786b48
Merge pull request #5282 from sellout/fix-blank-identifiers
Change handling of “blank” identifiers
2024-08-18 17:06:22 -04:00
Mitchell Rosen
df2c76aa42 rerun generic-parse-errors transcript 2024-08-16 15:25:59 -04:00
Mitchell Rosen
7b3b65f55e implement namespace directive 2024-08-16 15:06:34 -04:00
Greg Pfeil
ebda5ae6e3
Change handling of “blank” identifiers
Previously, they were tokenized separately from other identifiers, but
then most handling checked both tokens anyway. This now always parses
“blanks” as normal identifiers and checks their blankness at the few
places we care about it.

There were two places that treated `Blank` differently than `WordyId`,
and those are preserved. There were also two places where `Blank ""`
(`_`) was treated differently than `Blank n` (`_withSomeSuffix`), and
those have been eliminated.

Fixes #2822.
2024-08-16 08:27:36 -06:00
Greg Pfeil
50429143d1
Add a failing transcript for #2822 2024-08-15 18:48:23 -06:00
Mitchell Rosen
28543adcdd reuse unique type guids in merge after all 2024-08-13 12:46:42 -04:00
Arya Irani
ed555a3ea1 Merge branch 'trunk' into 24-08-01-merge-api 2024-08-13 10:50:02 -04:00
Arya Irani
d5d9d9d9ab
Merge pull request #5270 from unisonweb/arya/fix-3424 2024-08-10 00:37:32 -04:00
Arya Irani
c4f8ffcf39 clear latestTypecheckedFile on update
fixes #3424
2024-08-09 15:50:38 -04:00
Arya Irani
01cae7efdb failing transcript 2024-08-09 15:44:35 -04:00
Chris Penner
c341cc431e Add regression test 2024-08-09 10:58:47 -07:00
Mitchell Rosen
53209c3b69 more mergeblob work 2024-08-08 11:16:43 -04:00
Mitchell Rosen
565eb6625f don't hydrate twice, and hyrate lca defns too 2024-08-05 12:10:16 -04:00
Mitchell Rosen
b94698057d ⅄ trunk → 24-08-01-merge-api 2024-08-05 10:38:38 -04:00
Arya Irani
f63cfbeadb
Merge pull request #5252 from sellout/test-1327 2024-08-03 23:46:39 +00:00
Arya Irani
c049c65ad7
Merge pull request #5187 from sellout/doc-lexer 2024-08-03 23:45:30 +00:00
Arya Irani
97c9109291
Merge pull request #5250 from unisonweb/update-defn-order 2024-08-02 22:22:37 +00:00
Greg Pfeil
1ee188d0e3
Merge remote-tracking branch 'upstream/trunk' into doc-lexer 2024-08-01 23:01:02 -06:00
Greg Pfeil
96f865b37c
Add a transcript showing that #5076 was fixed
Some handling of blocks without final newlines was improved in the course of this PR.

Fixes #5076.
2024-08-01 22:58:13 -06:00
Arya Irani
9100b97e91 tweak output messages 2024-08-01 17:49:45 -04:00
Greg Pfeil
4803d446f1
Add some description to the new transcripts 2024-08-01 12:27:49 -06:00
Mitchell Rosen
2860665925 extract findConflictedAlias to Unison.Merge 2024-08-01 08:03:48 -04:00
Chris Penner
f9db384df1 Fix transcripts 2024-07-31 17:16:18 -07:00
Chris Penner
e545e0b1a7 Rerun transcripts 2024-07-31 16:41:00 -07:00
Greg Pfeil
32472bd9e0
Allow EOF to close layout blocks
This removes the need to pad the lexer stream with trailing `Close` lexemes. If
EOF is reached, the parser will automatically close any layout blocks (but not
context-free blocks).
2024-07-27 00:52:11 -06:00
Arya Irani
b12baa4486
Merge pull request #5238 from neduard/jit-update-readme 2024-07-25 18:55:58 +00:00
Greg Pfeil
80143eb9a2
Add transcripts for some already-fixed issues
This fixes #1327 (which was actually fixed by #5056 or #5061) and #3977
was already closed, but without the transcript to avoid regression.
2024-07-24 12:58:15 -06:00
Greg Pfeil
032e3609a0
Add some transcripts that should error, but don’t 2024-07-24 12:41:55 -06:00
Mitchell Rosen
e64ffb6f2c ⅄ trunk → update-defn-order 2024-07-24 02:40:13 -04:00
Mitchell Rosen
7506ae26b6 get transcripts passing 2024-07-23 13:45:16 -04:00
Chris Penner
1b22343c24 branch.reflog -> reflog 2024-07-22 15:00:47 -07:00
Chris Penner
5bedaf3d1a Update transcripts 2024-07-22 11:06:42 -07:00
Arya Irani
ef62cd99db
Merge pull request #5235 from sellout/refactor-transcript-parser 2024-07-19 19:29:42 +00:00
Eduard Nicodei
55560e58ca update transcripts-manual/gen-racket-libs.output.md 2024-07-18 00:31:16 +01:00
Eduard Nicodei
3cd2a76d5e update scheme-libs/racket/unison/Readme.md 2024-07-18 00:31:16 +01:00
Eduard Nicodei
d66c5c79f8 just whitespace changes 2024-07-17 23:30:14 +01:00
Eduard Nicodei
f18cb2fc9d use /usr/bin/env sh for jit-tests.sh
this is more portable and ensures we can compile on systems without bash (eg *BSD)
2024-07-17 23:01:31 +01:00
Greg Pfeil
00f6c8c954
Refactoring TranscriptParser
A bunch of small changes in TranscriptParser

- remove dead code
- don’t use `Show` for formatted output
- put processed blocks in a separate sum type from unprocessed blocks
- remove `Transcript` from identifiers (changed importers to use
 `qualified as Transcript`)
- deduplicated some error reporting

And one happy fix, IMO – got rid of the `Text.init` that plagued me in
2024-07-16 19:31:01 -06:00
Eduard Nicodei
4e44b94ad6 update transcripts 2024-07-15 19:10:27 +01:00
Eduard Nicodei
6ed06f3089 Merge remote-tracking branch 'origin/trunk' into merged-ghc-upgrade-try-2 2024-07-15 18:21:33 +01:00
Chris Penner
670b0868b9 Port fix2254 to new update 2024-07-11 12:45:44 -07:00
Chris Penner
1e4f1abe73 Fix diff-helper to use the names from both branches 2024-07-11 12:33:19 -07:00
Chris Penner
987cd61976 Swap branch-relative-paths back to relative 2024-07-11 09:49:55 -07:00
Arya Irani
0cd3cd1cff Merge branch 'trunk' into cp/project-root
# Conflicts:
#	unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md
#	unison-src/transcripts-round-trip/main.output.md
#	unison-src/transcripts/add-run.output.md
#	unison-src/transcripts/bug-strange-closure.output.md
#	unison-src/transcripts/cycle-update-5.output.md
#	unison-src/transcripts/delete.output.md
#	unison-src/transcripts/diff-namespace.output.md
#	unison-src/transcripts/move-namespace.output.md
#	unison-src/transcripts/name-selection.output.md
#	unison-src/transcripts/names.output.md
#	unison-src/transcripts/namespace-dependencies.output.md
#	unison-src/transcripts/propagate.output.md
#	unison-src/transcripts/reflog.output.md
#	unison-src/transcripts/reset.output.md
#	unison-src/transcripts/tab-completion.output.md
#	unison-src/transcripts/transcript-parser-commands.output.md
2024-07-10 23:49:04 -04:00
Greg Pfeil
cbd533e40f
Update a couple transcripts to the new formatting
These aren‘t run as part of ./scripts/check.sh, so they got missed in the initial pass.
2024-07-10 16:05:19 -06:00
Greg Pfeil
bf442467a4
Merge remote-tracking branch 'upstream/trunk' into new-transcript-parser 2024-07-10 16:04:10 -06:00
Chris Penner
2f4e57d41b Fix Upgrade 2024-07-10 14:31:56 -07:00
Chris Penner
bf20459954 Typo 2024-07-10 14:29:27 -07:00