1
1
mirror of https://github.com/github/semantic.git synced 2024-12-24 15:35:14 +03:00
Commit Graph

1074 Commits

Author SHA1 Message Date
Rob Rix
16b894e027 Define printDiffF in terms of diffF characterization. 2017-09-12 08:48:53 -04:00
Rob Rix
38c6795e7e Define tableOfContentsBy in terms of diffF characterization. 2017-09-12 08:46:41 -04:00
joshvera
d8e49f38ed Port @tclem's formatTOCError 2017-09-11 16:43:47 -04:00
Rob Rix
c2f4ef3572 Merge branch 'relocate-json-fields' into directed-acyclic-diffs 2017-09-11 16:20:57 -04:00
Rob Rix
6d61c1b683 Merge branch 'specialized-terms-and-diffs' into relocate-json-fields 2017-09-11 16:12:25 -04:00
Timothy Clem
d581f5a70b Cherry-pick cec6c73ea086e3cd5f164d612666c95ee0cc0ae7 2017-09-11 15:54:40 -04:00
Timothy Clem
834ecd717e Cherry-pick 8792b02b1 2017-09-11 15:53:52 -04:00
joshvera
e56374f8ba Cherry-pick d51d7a3aee4c3f8dbf3b54d0d83154506542c408 2017-09-11 15:51:24 -04:00
Rob Rix
3cc8440fae Rename the TermF constructor to In. 2017-09-11 15:36:23 -04:00
Rob Rix
2d25dd44f9 Update TOC. 2017-09-11 15:21:25 -04:00
Rob Rix
828176f64e Update the s-expression renderer. 2017-09-11 12:54:47 -04:00
Rob Rix
127980698e List the imports from Data.Functor.Binding explicitly. 2017-09-11 09:32:07 -04:00
Rob Rix
a77f9c36d2 Move Metavar & Env to Data.Functor.Binding. 2017-09-10 21:22:32 -04:00
Rob Rix
90496bdc1c Copy holds a TermF. 2017-09-10 19:40:48 +01:00
Rob Rix
8b6b4dcc00 Define metavariables as Ints. 2017-09-10 19:14:44 +01:00
Rob Rix
36ac6a4104 Rename MetaVar to Metavar. 2017-09-10 18:28:21 +01:00
Rob Rix
65c7a5ae0b Produce multiple entries inside patches. 2017-09-10 17:12:44 +01:00
Rob Rix
6ee5c2d261 Force the after branch of replacements onto the next line. 2017-09-10 16:11:07 +01:00
Rob Rix
a2d9decbf0 Reformat replacements in sexpression rendering. 2017-09-10 16:03:36 +01:00
Rob Rix
5f7adb59be Dedupe replacements. 2017-09-10 15:54:40 +01:00
Rob Rix
b330eb45eb Produce only a single entry for patches. 2017-09-10 15:38:09 +01:00
Rob Rix
cc1f75cb1a Place entries for patch nodes above the body of the patch. 2017-09-10 15:25:38 +01:00
Rob Rix
fd05f7cb80 Patches count as changes. 2017-09-10 15:23:22 +01:00
Rob Rix
e5d345dca7 Simplify the selection of patches. 2017-09-10 15:15:14 +01:00
Rob Rix
d678048dfd Fix tables of contents for patches. 2017-09-10 10:46:04 +01:00
Rob Rix
8fff046b02 Correct s-expression output on the first line. 2017-09-09 23:16:24 +01:00
Rob Rix
760955c120 Apply padding to terms in renderSExpressionTerm. 2017-09-09 23:06:31 +01:00
Rob Rix
b7fa780060 Simplify some folds. 2017-09-09 23:01:51 +01:00
Rob Rix
e57beaeb9f Tweaks to s-expression rendering. 2017-09-09 22:56:41 +01:00
Rob Rix
66fc464357 Get rid of the other padding mechanism. 2017-09-09 22:27:46 +01:00
Rob Rix
5baab6ea6b Avoid extra newlines on the first line. 2017-09-09 21:48:40 +01:00
Rob Rix
987dcb7839 Patches recur through Diff. 2017-09-09 21:36:18 +01:00
Rob Rix
6eb0f7cff6 Add bindings & variables to diffs. 2017-09-09 18:14:05 +01:00
Rob Rix
0bfd29fddc Merge branch 'relocate-json-fields' into directed-acyclic-diffs 2017-09-09 17:49:12 +01:00
Rob Rix
d0a2687edc 🔥 all the LANGUAGE pragmas in Renderer.JSON. 2017-09-09 17:46:35 +01:00
Rob Rix
7404b41717 Renderer.JSON no longer contains orphan instances. 2017-09-09 17:46:08 +01:00
Rob Rix
c83746e74e Move the Output instance for [Value] to Data.Output. 2017-09-09 17:45:49 +01:00
Rob Rix
f6f1b21d94 Move the Output instance for maps to Data.Output. 2017-09-09 17:45:01 +01:00
Rob Rix
5be89f11ee 🔥 Renderer.JSON’s export of ToJSONFields. 2017-09-09 17:41:24 +01:00
Rob Rix
44aab0edcf Renderer.JSON is decidable. 2017-09-09 17:39:46 +01:00
Rob Rix
c6a111b71d 🔥 the ToJSON instance for Both. 2017-09-09 17:39:08 +01:00
Rob Rix
f30a5d0754 Move the ToJSON/ToJSONFields instances for Diff into Diff. 2017-09-09 17:37:26 +01:00
Rob Rix
c449ad481e Move the ToJSON/ToJSONFields instances for Term into Term. 2017-09-09 17:36:35 +01:00
Rob Rix
8ce60eecb8 Lift the Term/Diff ToJSONFields instances to * -> *. 2017-09-09 17:35:45 +01:00
Rob Rix
aa78f3eaeb Move the ToJSONFields instance for Category into Category. 2017-09-09 17:30:34 +01:00
Rob Rix
0845687d51 Move the ToJSONFields instance for Syntax into Syntax. 2017-09-09 17:25:55 +01:00
Rob Rix
4e3c34d8f7 Move the ToJSONFields instance for Patch into Patch. 2017-09-09 17:24:56 +01:00
Rob Rix
41ecede023 🔥 the ToJSONFields instance for unpopulated Unions. 2017-09-09 17:23:58 +01:00
Rob Rix
5b62e4bf5c Move the ToJSONFields instance for populated Unions into Data.JSON.Fields. 2017-09-09 17:23:49 +01:00
Rob Rix
7bb92dfd98 Move the ToJSONFields instance for [] into Data.JSON.Fields. 2017-09-09 17:23:28 +01:00
Rob Rix
c1b521ab9b Move the ToJSONFields instance for Maybe into Data.JSON.Fields. 2017-09-09 17:23:14 +01:00
Rob Rix
d7a5ea152d Move the ToJSONFields instance for Span into Data.Span. 2017-09-09 17:20:43 +01:00
Rob Rix
42c1795c0a Move the ToJSONFields instance for Range into Data.Range. 2017-09-09 17:19:46 +01:00
Rob Rix
62603c803c Move the ToJSONFields/ToJSON instances for Records into Data.Record. 2017-09-09 17:18:24 +01:00
Rob Rix
7a88cad094 Move the ToJSONFields instance for Both into the Data.JSON.Fields module. 2017-09-09 17:18:10 +01:00
Rob Rix
3e12a91359 Move ToJSONFields into its own module. 2017-09-09 17:16:00 +01:00
Rob Rix
acff088e68 Define printTerm as a catamorphism. 2017-09-09 16:58:41 +01:00
Rob Rix
9765775242 Define printDiff as a catamorphism. 2017-09-09 16:55:32 +01:00
Rob Rix
3ad5374b94 Move all the Listable stuff into the tests. 2017-09-09 14:44:57 +01:00
Rob Rix
b7e211c9c2 Redefine Term as a wrapper for TermF. 2017-09-09 11:47:10 +01:00
Rob Rix
1267fe5ea7 Rename the In constructor to Copy. 2017-09-09 11:27:04 +01:00
Rob Rix
9e40e9a09a Give our own definition of Diff. 2017-09-09 11:23:57 +01:00
Rob Rix
07bef3f75e 🔥 deepseq. 2017-09-08 17:35:55 +01:00
Rob Rix
f2cd05d5fc Rename Cofree/CofreeF to Term/TermF. 2017-09-08 16:45:08 +01:00
Rob Rix
aa9d4c4f19 Give our own definition of CofreeF. 2017-09-08 16:40:23 +01:00
Rob Rix
1a6af2179b Give our own definition of Cofree. 2017-09-08 16:24:11 +01:00
Timothy Clem
7c16f41abc A few comments for clarity 2017-08-28 17:56:04 -07:00
Timothy Clem
3753b4528a Don't generate toc summaries for anon functions 2017-08-28 17:50:55 -07:00
Timothy Clem
ed5f9eb7e8 Return shortened errors in toc summary JSON response 2017-08-25 13:07:51 -07:00
Timothy Clem
25f2ef742b Fix toc summaries for method declars with receivers 2017-08-24 11:44:58 -07:00
joshvera
859bb66e44 Add functionContext to Function 2017-08-22 12:28:40 -04:00
joshvera
4d961bde3c Add param to Method destructure in TOC 2017-08-21 18:51:07 -04:00
Rob Rix
a0adfdf0cf Constrain to Foldable/Functor instead of Traversable. 2017-08-08 10:00:31 -04:00
Rob Rix
fbb217f8e7 Add call stacks to Syntax.Error. 2017-08-06 18:56:02 -04:00
Rob Rix
8e58a76a01 formatError takes Error String. 2017-08-06 18:56:01 -04:00
Rob Rix
60bafabf17 Move error formatting into Data.Error. 2017-08-06 18:56:01 -04:00
Rob Rix
55683ea810 Errors carry a full Span. 2017-08-06 18:56:01 -04:00
Rob Rix
261fb37c44 Syntax.Error holds the expected/actual fields. 2017-08-06 18:56:01 -04:00
Rob Rix
880d26078e Rename formatErrorWithOptions to formatError. 2017-08-06 18:56:01 -04:00
Rob Rix
8a7911313a Pass the position, expected, & actual fields to formatErrorWithOptions separately. 2017-08-06 18:56:01 -04:00
Rob Rix
ba5551fb07 Merge branch 'faster-union-instance-compilation' into delimited-control 2017-08-06 18:47:11 -04:00
Rob Rix
ba895fec3f Define ToJSONFields over Union non-inductively. 2017-08-06 16:32:17 -04:00
Rob Rix
1fa09cebe3 Constrain the types in the union instead of constraining the Union. 2017-08-06 16:23:27 -04:00
Rob Rix
e8074d2955 Merge branch 'master' into delimited-control 2017-08-03 12:16:45 -04:00
Rob Rix
066465e4d1 Syntax.Error always has an Assignment.Error. 2017-08-02 17:20:55 -04:00
Rob Rix
c2e2aa9b7c Log the details of assignment errors in the tree. 2017-08-02 15:35:06 -04:00
Rob Rix
7da8799e08 🔥 Prologue & protolude. 2017-07-28 14:37:02 -04:00
Rob Rix
3646ab2b15 Renderers produce Output. 2017-07-28 11:23:55 -04:00
Rob Rix
aa8ebfcd73 Remove the leaf type parameter from SyntaxTerm. 2017-07-23 15:56:08 -04:00
Rob Rix
0ba3264f32 Remove the leaf type parameter from Syntax. 2017-07-23 15:46:29 -04:00
Rob Rix
a85aa1f8ff Carry the language in error declarations. 2017-07-19 17:17:39 -04:00
Rob Rix
c8416ee0fd Pass blobs to the declaration algebras. 2017-07-19 17:16:51 -04:00
Rick Winfrey
9d1f4f19ca Update ErrorSummary to use MaybeLanguage 2017-07-18 17:18:09 -07:00
Rick Winfrey
c7eb0dc482 🔥 language from Summaries; 🔥 language from JSONSummary
- We only care about the language when there's a parse error, so language is added to ErrorSummary only
2017-07-18 16:49:39 -07:00
Rick Winfrey
565445039e Add language to Summaries 2017-07-18 15:59:55 -07:00
Rick Winfrey
9d2119ffc8 Add language field to JSONSummary 2017-07-18 15:58:37 -07:00
Rob Rix
7b888cd760 Merge branch 'master' into parse-error-symbols 2017-07-13 10:58:28 -04:00
Rob Rix
1e4eb2d24e Remove the error parameter from Syntax.Error. 2017-07-12 16:20:24 -04:00
Timothy Clem
7fff9cc64a Merge branch 'master' into ruby-assignment 2017-07-12 10:49:19 -07:00
Timothy Clem
c314330e14 Handle === style markdown headings 2017-07-11 09:37:24 -07:00
Timothy Clem
bd684d0ed6 Merge remote-tracking branch 'origin/master' into ruby-assignment 2017-07-10 14:09:00 -07:00
Timothy Clem
f715e6fdf1 Show 'Heading N' instead of 'Section' for md toc summaries 2017-07-10 11:15:03 -07:00
Timothy Clem
60c932acd3 Singleton methods 2017-07-07 08:46:06 -07:00
Rob Rix
ed1533f7fc Rename Data.Source.{drop,take,break} to disambiguate. 2017-06-24 11:26:08 -04:00
Rob Rix
43f9e70517 🔥 the export of Data.Source.break. 2017-06-24 11:17:17 -04:00
Rob Rix
d2e4ce8dc3 🔥 the export of Data.Source.take. 2017-06-24 11:11:10 -04:00
Rob Rix
4ff3d9e8ec Rename sourceText to sourceBytes. 2017-06-24 10:50:28 -04:00
Rob Rix
a106d27eb9 Rename Source.length to sourceLength. 2017-06-24 10:32:26 -04:00
Rob Rix
2cc9f28e37 Rename Source.null to nullSource. 2017-06-24 10:28:39 -04:00
Rob Rix
0d1967edb3 Rename the blob fields. 2017-06-24 10:21:54 -04:00
Rob Rix
bed2c473b2 Rename SourceBlob to Blob. 2017-06-24 10:15:31 -04:00
Rob Rix
fc51c92425 Move SourceBlob into Data.Blob. 2017-06-24 10:09:50 -04:00
Rob Rix
fc09d74b73 Rename the Source module to Data.Source. 2017-06-24 09:59:41 -04:00
Rob Rix
1edc6a2718 Rename the Range module to Data.Range. 2017-06-24 09:46:28 -04:00
Rob Rix
4097d4bfc0 Rename SourceSpan to Span and SourcePos to Pos. 2017-06-24 09:30:34 -04:00
Rob Rix
1bf7863186 Define recordSummary at the top level. 2017-06-16 13:00:46 -04:00
Rob Rix
fa74d323a9 tableOfContentsBy employs termTableOfContentsBy. 2017-06-16 12:57:23 -04:00
Rob Rix
a9dd289aae Define a ToC rendering function for parse trees. 2017-06-16 12:26:14 -04:00
Rob Rix
87082918a4 Return term ToCs without a wrapping Entry. 2017-06-16 12:25:20 -04:00
Rob Rix
8fdd1bdf0d Define a function computing the table of contents for a term. 2017-06-16 12:21:40 -04:00
Rob Rix
e392ac01da Rename renderToC to renderToCDiff 2017-06-16 12:03:39 -04:00
Rob Rix
e11b56127f Take the range of headings’ children instead of the whole heading.
We don’t want to include the ## in a section entry, so we union the ranges of the children (if any).
2017-06-16 10:59:23 -04:00
Rob Rix
15f7f81b54 InUnion -> :< 2017-06-08 13:18:44 -04:00
Rob Rix
cf1bded457 Merge branch 'master' into union-unity 2017-06-08 13:13:59 -04:00
Rob Rix
bb1cad8555 Define an algebra for a markup table of contents with section headings. 2017-06-08 12:42:39 -04:00
Rob Rix
5deba93c3e Migrate everything over to Data.Union. 2017-06-08 11:42:57 -04:00
Timothy Clem
572c24d36d Auto derive ToJSON right in Language.hs 2017-06-08 07:01:03 -07:00
Timothy Clem
feb54b14ad Return language field in parse JSON response 2017-06-07 14:59:19 -07:00
Rob Rix
18db448df2 🔥 ToC’s dependence on Category. 2017-06-05 17:03:00 -04:00
Rob Rix
bda8746224 🔥 dedupe’s dependence on Category. 2017-06-05 17:02:50 -04:00
Rob Rix
7a753baf78 🔥 declaration’s dependence on Category. 2017-06-05 17:02:39 -04:00
Rob Rix
ff7234074d Define sameCategory in terms of the toCategoryName computation. 2017-06-05 16:59:36 -04:00
Rob Rix
d3edae8671 🔥 entrySummary’s dependency on Category. 2017-06-05 16:57:42 -04:00
Rob Rix
26c59dc7cb Pick the category name based on the declaration. 2017-06-05 16:56:45 -04:00
Rob Rix
a8538e2287 Drop values missing declarations. 2017-06-05 16:54:32 -04:00
Rob Rix
95047d10a2 Factor the Just construction into recordSummary. 2017-06-05 16:53:20 -04:00
Rob Rix
af841480a7 Pattern match on the declaration directly. 2017-06-05 16:52:14 -04:00
Rob Rix
cff0571b37 Use getDeclaration in entrySummary. 2017-06-05 16:46:32 -04:00
Rob Rix
99197b96d9 JSONSummary holds Text rather than a Category. 2017-06-05 12:45:18 -04:00
Rob Rix
020e4d2066 Indicate errors solely with ErrorDeclaration. 2017-06-05 11:54:20 -04:00
Rob Rix
41e6180e7b Extract the declaration getter to the top level. 2017-06-05 11:53:49 -04:00
Rob Rix
5fecc68324 🔥 Summarizable. 2017-06-05 11:31:37 -04:00
Rob Rix
200c85f480 Reformat JSONSummary. 2017-06-05 11:28:30 -04:00
Rob Rix
30fd038730 Define the declaration algebras with the RAlgebra type synonym. 2017-06-05 11:04:52 -04:00
Rob Rix
64d19d2a5c Define a declarationAlgebra over à la carte syntax. 2017-06-05 10:59:22 -04:00
Rob Rix
31921d7dac Generalize diffTOC and renderToC to arbitrary Traversable functors. 2017-06-05 10:58:15 -04:00
Rob Rix
2086a8a0a2 Avoid rewriting categories. 2017-06-05 10:51:31 -04:00
Rob Rix
727edb5db6 Rename declarationAlgebra to syntaxDeclarationAlgebra 2017-06-05 10:44:09 -04:00
Rob Rix
b862c8186a Don’t append a space after the last field. 2017-05-31 15:51:00 -04:00
Rob Rix
a9a6c34a6f Generalize the s-expression renderers to show all fields. 2017-05-31 15:22:55 -04:00