github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-20 05:11:44 +03:00
Code Issues Projects Releases Wiki Activity
2,850 Commits 19 Branches 16 Tags 46 MiB
8cefd14562
Commit Graph

2034 Commits

Author SHA1 Message Date
joshvera
cfa5d8ae14 Merge branch 'master' into show-empty-space 2015-10-30 09:32:34 -04:00
joshvera
e722325749 render diffs again! 2015-10-29 18:24:29 -04:00
Rob Rix
1ebbbf3f28 Remove the UI path argument. 2015-10-29 18:23:48 -04:00
Rob Rix
ab49d4ab53 Get the path from the info plist. 2015-10-29 18:23:32 -04:00
Rob Rix
58df210d53 Add the path to the info plist. 2015-10-29 18:23:25 -04:00
Rob Rix
465ba7feb2 Try the old standby of NSTemporaryDirectory. 2015-10-29 18:14:02 -04:00
Rob Rix
844d3a2515 Remove the JSON path. 2015-10-29 18:12:07 -04:00
Rob Rix
0d0c6c186d Find the UI path one earlier. 2015-10-29 18:11:58 -04:00
Rob Rix
d38c8b0ff0 Try to make a temporary file. What could go wrong? 2015-10-29 18:10:58 -04:00
Rob Rix
11eece38aa Load on construction. 2015-10-29 16:50:51 -04:00
Rob Rix
c1b2f63c28 Load effects.js 
This reverts commit 0313713d2482ceeb616c44b2e65faea906f7cd64.
 2015-10-29 16:49:34 -04:00
joshvera
7073a35a04 Render pure values 2015-10-29 16:27:41 -04:00
Rob Rix
b02d05fd9f Fetch the parser in one. 2015-10-29 16:25:01 -04:00
Rob Rix
1e24167124 Parsing throws. 2015-10-29 16:23:58 -04:00
Rob Rix
30fa2995cc Add a typealias for parsers. 2015-10-29 16:20:57 -04:00
Rob Rix
de8fc96933 Use Source to represent most of the work. 2015-10-29 16:19:23 -04:00
Rob Rix
ee50dc7215 Move the lists of productions into the parser. 2015-10-29 16:14:05 -04:00
Rob Rix
933d21b198 Rename the table. 2015-10-29 16:10:01 -04:00
Rob Rix
3072e47339 Move the table of languages by file extension into Source. 2015-10-29 16:09:31 -04:00
Rob Rix
aa4f982c42 Sources can be loaded from. 2015-10-29 16:08:40 -04:00
Rob Rix
0f74cd324d Sources are constructed with a string. 2015-10-29 16:06:51 -04:00
Rob Rix
55809d3146 Source types are non-optional. 2015-10-29 16:04:51 -04:00
Rob Rix
9b7e6b4795 add a Source type. 2015-10-29 16:04:10 -04:00
Rob Rix
344c42f9da Clarify a couple of error messages. 2015-10-29 15:59:34 -04:00
Rob Rix
ea90628828 .h is a perfectly cromulent path extension. 2015-10-29 15:50:08 -04:00
Rob Rix
78200a32de Map, not flatMap. 
This causes it to select the file URL overload. Kinda silly.
 2015-10-29 15:44:26 -04:00
Rob Rix
68aba834e3 Guard clauses for parsing the URLs. 2015-10-29 15:40:36 -04:00
Rob Rix
e10312ef53 Spacing. 2015-10-29 15:39:32 -04:00
Rob Rix
9114c91d82 Dedent. 2015-10-29 15:39:26 -04:00
Rob Rix
e208e81e63 Guard clauses for the other paths. 2015-10-29 15:39:12 -04:00
Rob Rix
59da5ac57c Rename the other files. 2015-10-29 15:38:35 -04:00
Rob Rix
d2439b85f4 Read the files directly. 2015-10-29 15:38:06 -04:00
Rob Rix
a16e0ede56 Pull the URLs into guard clauses. 2015-10-29 15:36:42 -04:00
Rob Rix
7f0d18934c Use the language we got. 2015-10-29 15:34:00 -04:00
Rob Rix
1d077f60d5 Get the language out of the table. 2015-10-29 15:33:52 -04:00
Rob Rix
aa78a266dd Capture the extensions. 2015-10-29 15:33:28 -04:00
Rob Rix
10a38fcff0 Guard against comparisons we can’t make. 2015-10-29 15:31:50 -04:00
Rob Rix
8c354ef30e Get the paths as URLs. 2015-10-29 15:28:26 -04:00
Rob Rix
e51729aae6 termWithInput takes a language. 2015-10-29 15:20:59 -04:00
Rob Rix
c2fa2ff621 Capture a temporary holding the parser. 2015-10-29 15:20:31 -04:00
Rob Rix
c5dcd9dbd9 Capture the originating paths. 2015-10-29 15:19:35 -04:00
Rob Rix
bcb6cb5dc2 Merge branch 'master' into parse-c-sources 2015-10-29 15:17:30 -04:00
Rob Rix
2e76f541eb Match against the predicate. 2015-10-29 15:12:16 -04:00
Rob Rix
2930932479 Add a set of productions to treat as Fixed. 2015-10-29 15:11:52 -04:00
joshvera
c8e12176e3 Merge branch 'master' into show-empty-space 2015-10-29 15:11:20 -04:00
joshvera
c091289cf4 Construct both diffs at the same time 2015-10-29 15:11:18 -04:00
Rob Rix
0fe57c4ccf Match against the predicate. 2015-10-29 15:10:37 -04:00
Rob Rix
49efa1e952 Add a set of productions to treat as Keyed. 2015-10-29 15:10:30 -04:00
Rob Rix
c48a141418 Document the operator. 2015-10-29 15:09:57 -04:00
Rob Rix
7dc2c9e1a2 Add a ~= overload allowing predicates to appear in case clauses. 2015-10-29 15:09:52 -04:00
Rob Rix
a68de637c0 Add the C language to the table. 2015-10-29 15:00:07 -04:00
Rob Rix
e3042f5930 Bridge the C language to Swift. 2015-10-29 14:59:51 -04:00
Rob Rix
e89a745c31 Add a table of languages by file extension. 2015-10-29 14:59:18 -04:00
Rob Rix
4534dd4028 Add a TSLanguage typealias. 2015-10-29 14:58:07 -04:00
Josh Vera
f662d36721 Merge pull request #188 from github/several-dozen-fewer-klocs-of-c 
Several dozen fewer klocs of C
 2015-10-29 14:45:31 -04:00
Rob Rix
d67471524c Extract Info into its own file. 2015-10-29 13:52:21 -04:00
Rob Rix
0307508daa Group the parsers together logically. 2015-10-29 13:48:32 -04:00
Rob Rix
2d422ee92b Add groups for the parsers. 
This insulates us from accidentally selecting them and causing Xcode to
throw a fit.
 2015-10-29 13:48:18 -04:00
Rob Rix
8117173ec8 Compile in the C parser. 2015-10-29 13:47:23 -04:00
Rob Rix
fc37264af2 Add the C parser as a submodule. 2015-10-29 13:45:09 -04:00
Rob Rix
7b1ece59fd Replace the JS parser with the one from the submodule. 2015-10-29 13:32:48 -04:00
Rob Rix
62d589c27f Add the JS grammar as a submodule. 2015-10-29 13:30:20 -04:00
Josh Vera
7acb9aaec4 Merge pull request #186 from github/optimize-ses-for-equal-terms 
Short-circuit cost computations for equal terms.
 2015-10-29 13:29:48 -04:00
Rob Rix
73f094cc29 Document the early return. 2015-10-29 13:16:16 -04:00
Rob Rix
17d0582331 Short-circuit cost computations for equal terms. 
This is an optimization for SES allowing it to short-circuit cost
computations when it encounters equal terms.
 2015-10-29 11:23:25 -04:00
Rob Rix
6b86defdf8 Only compute the substring when we’re going to use it. 2015-10-29 10:10:13 -04:00
Rob Rix
69cb807c98 Comments in objects use their substrings as their keys. 2015-10-29 10:09:46 -04:00
Rob Rix
68ca3f8e36 Patch.sum gives better results than Patch.difference. 2015-10-29 10:05:30 -04:00
Rob Rix
364a79a8fb Construct leaves with their corresponding substring. 2015-10-29 10:04:38 -04:00
Rob Rix
cea790eeb1 Use the substring convenience. 2015-10-29 10:03:53 -04:00
Rob Rix
54a577abc4 Add a convenience method to get the substring. 2015-10-29 10:03:11 -04:00
Rob Rix
297be40c2d Key, not name. 2015-10-29 10:03:02 -04:00
Rob Rix
8aa18d8263 Use the UTF16 integer range subscript. 2015-10-29 10:01:31 -04:00
Rob Rix
0b2f363c29 Subscript UTF16 views with integer ranges. 2015-10-29 10:00:56 -04:00
Rob Rix
5dfd596b72 Remove the anonymous error type. 2015-10-28 18:51:10 -04:00
Rob Rix
a3d72521d8 Delete the custom range function. 2015-10-28 18:49:28 -04:00
Rob Rix
1ed4b68378 Restrict comparisons by category. 2015-10-28 18:45:50 -04:00
Rob Rix
b0f6854460 Lots of other things can be fixed. 2015-10-28 18:42:10 -04:00
Rob Rix
2b4f665ae0 Describe why there’s a default case. 2015-10-28 18:33:04 -04:00
Rob Rix
746723963c Deal with comments inside object literals. 2015-10-28 18:32:34 -04:00
Rob Rix
dc148e31cb Don’t bother erasing the children collection. 2015-10-28 18:23:58 -04:00
Rob Rix
e2e37a011d Compute the count eagerly. 2015-10-28 18:22:53 -04:00
Rob Rix
8d4bc19dc1 Throw a string when we can’t make a String for a node name. 2015-10-28 18:17:16 -04:00
Rob Rix
b933d3ce0d String is an adequate ErrorType. 2015-10-28 18:17:01 -04:00
Rob Rix
b004a800b9 Terms’ annotations are Infos. 2015-10-28 18:12:16 -04:00
Rob Rix
08120cb79f Use the range’s JSON property. 2015-10-28 18:11:22 -04:00
Rob Rix
ba33e1c4a3 Ranges have a JSON property. 2015-10-28 18:11:01 -04:00
Rob Rix
ae6ecef9c2 Try constructing explicitly. 
Maybe Xcode 7.0 will like this one better.
 2015-10-28 18:07:04 -04:00
Rob Rix
04eaeffb1b Info has a set of string categories. 2015-10-28 17:51:54 -04:00
Rob Rix
ef7ce734d7 Arrays of CustomJSONConvertible elements have a JSON property. 2015-10-28 17:51:27 -04:00
Rob Rix
6688f223fe Use strings for the categories. 2015-10-28 17:48:51 -04:00
Rob Rix
f7f45444e0 Try to compute the name from the contents of the string. 2015-10-28 17:41:02 -04:00
Rob Rix
28ddedb967 Use the range property. 2015-10-28 17:36:29 -04:00
Rob Rix
06de75a3be Add a range property. 2015-10-28 17:36:23 -04:00
Rob Rix
6135553861 Find the correct keys within objects. 2015-10-28 17:32:11 -04:00
Rob Rix
691030332a Correct how names and categories are found. 2015-10-28 17:28:58 -04:00
Rob Rix
b13d3f7d59 Use the category method. 2015-10-28 17:24:41 -04:00
Rob Rix
90caa11870 Factor the private error type out. 2015-10-28 17:23:31 -04:00
Rob Rix
fac848e452 Compute nodes’ categories. 2015-10-28 17:23:06 -04:00
Rob Rix
fa137b30d8 Use the name accessor. 2015-10-28 16:56:00 -04:00
Rob Rix
56a87154de Add a method returning the node’s name as a Swift string. 2015-10-28 16:55:42 -04:00
Rob Rix
3b757bd1e7 Add a TSDocument typealias. 2015-10-28 16:55:28 -04:00
Rob Rix
a87434c683 Move the collection to the bottom. 2015-10-28 16:28:37 -04:00
Rob Rix
bd900197bc Note that the object map is incorrect. 2015-10-28 16:21:17 -04:00
Rob Rix
cdca67f8eb Handle pairs as Fixed. 2015-10-28 16:20:39 -04:00
Rob Rix
9d52d02214 Object literals are keyed. 2015-10-28 16:18:38 -04:00
Rob Rix
2a42c9554d Use the namedChildren collection’s count. 2015-10-28 15:38:20 -04:00
Rob Rix
156fb463f9 Map over the named child collection. 2015-10-28 15:31:08 -04:00
Rob Rix
5532001d94 Add a collection of named children. 2015-10-28 15:27:20 -04:00
Rob Rix
a674548395 Add a collection of children. 2015-10-28 15:22:29 -04:00
Rob Rix
1f9be9ecac Add a private collection type for node children. 2015-10-28 15:22:21 -04:00
Rob Rix
5f121471b5 Switch on the category. 2015-10-28 15:05:25 -04:00
Rob Rix
a40edc906d Revert "Terms are annotated with Info." 
This reverts commit d5f4e70140a5ca808ed23ca4e4e2f4204c84e537.
 2015-10-28 14:55:45 -04:00
Rob Rix
ab7c0d172c Terms are annotated with Info. 2015-10-28 14:41:13 -04:00
Rob Rix
9d0805c228 Revert "Revert "Don’t constrain the type to the protocol, pass it in directly."" 
This reverts commit c813e703e4ee963d94c1d45e7c935731a4eb0c7e.
 2015-10-28 14:38:56 -04:00
Rob Rix
a4da6cd33c Revert "Revert "Add a constructor to JSON which takes a CustomJSONConvertible."" 
This reverts commit 6ea523a327bed0ce54e8d56373604f1a64c83200.
 2015-10-28 14:38:51 -04:00
Rob Rix
502696a992 Info is Categorizable. 2015-10-28 14:38:17 -04:00
Rob Rix
0371c51340 Revert "Add a constructor to JSON which takes a CustomJSONConvertible." 
This reverts commit 9e0d4208bed25824275ccc34092b8659fa316a2b.
 2015-10-28 14:37:12 -04:00
Rob Rix
cdf4848357 Revert "Don’t constrain the type to the protocol, pass it in directly." 
This reverts commit fb68f0c0ba30c0691c72170efa5c5204a027c8aa.
 2015-10-28 14:37:08 -04:00
Rob Rix
4b47650de6 Revert "Can construct JSON from array literals of CustomJSONConvertible." 
This reverts commit cabc221180851e236d39c717db2eefa9edc9f312.
 2015-10-28 14:37:04 -04:00
Rob Rix
4f2e61054e Can construct JSON from array literals of CustomJSONConvertible. 2015-10-28 14:34:44 -04:00
Rob Rix
51dc49f3e0 Don’t constrain the type to the protocol, pass it in directly. 2015-10-28 14:34:16 -04:00
Rob Rix
04a782b5d0 Clean up the range function. 2015-10-28 14:32:59 -04:00
Rob Rix
5d6e10e25a Add a constructor to JSON which takes a CustomJSONConvertible. 2015-10-28 14:31:20 -04:00
Rob Rix
53217d03e5 Info is CustomJSONConvertible. 2015-10-28 14:27:52 -04:00
Rob Rix
039ada73bf Info is Equatable. 2015-10-28 14:23:58 -04:00
Rob Rix
a0e8d918dc Move Category into Info. 2015-10-28 14:22:55 -04:00
Rob Rix
2ea54805f1 Add an Info structure. 2015-10-28 14:22:07 -04:00
Rob Rix
83328cc0d0 Compute the categories for each node. 2015-10-28 14:20:46 -04:00
Rob Rix
c5685aa586 Add a Category type for the syntactic categories in a grammar under TSNode. 2015-10-28 14:13:41 -04:00
Rob Rix
173eb068a1 Compute histograms for both terms. 2015-10-28 14:03:53 -04:00
Rob Rix
a89657250b Throw an error and return nil if we can’t make a Swift string from some node’s name. 2015-10-28 12:33:03 -04:00
Rob Rix
f2c1cf871b Extract the name into a temporary. 2015-10-28 12:21:34 -04:00
Rob Rix
4d1d7d62e8 Patch.difference rethrows errors. 2015-10-28 12:15:36 -04:00
Rob Rix
89cd067c8f Patch.sum rethrows errors. 2015-10-28 12:15:18 -04:00
Rob Rix
c36b1df02b Patch.difference’s argument does not escape. 2015-10-28 12:14:58 -04:00
Rob Rix
5c44771b02 Patch.sum’s argument does not escape. 2015-10-28 12:14:43 -04:00
Rob Rix
0f7d7b2770 Patch.map rethrows errors. 2015-10-28 12:14:15 -04:00
Rob Rix
c03871468e CofreeType.ana rethrows errors. 2015-10-28 12:11:41 -04:00
Rob Rix
b28038cb63 CofreeType.ana’s argument does not escape. 2015-10-28 12:11:02 -04:00
Rob Rix
79dce9ba64 Implement CofreeType.ana without composition or application operators. 
Once again, Swift doesn’t understand its own transitivity.
 2015-10-28 12:10:37 -04:00
Rob Rix
010f45c15e Cofree.map rethrows errors. 2015-10-28 12:09:04 -04:00
Rob Rix
29e8a7598b Cofree.map’s argument does not escape. 2015-10-28 12:08:27 -04:00
Rob Rix
17987eff80 Free.ana rethrows errors. 2015-10-28 12:07:23 -04:00
Rob Rix
33bd0c5644 Free.ana’s argument does not escape. 2015-10-28 12:06:30 -04:00
Rob Rix
f469b4f691 Implement Free.ana without application or composition operators. 
Swift can’t trace `noescape` or `rethrows` transitively through them.
 2015-10-28 12:05:40 -04:00
Rob Rix
8ca7cf7599 Free.merge’s argument does not escape. 2015-10-28 12:04:56 -04:00
Rob Rix
d7eb23d291 Free.cata rethrows errors. 2015-10-28 11:58:13 -04:00
Rob Rix
9228031f5d Free.flatMap rethrows errors. 2015-10-28 11:57:29 -04:00
Rob Rix
feabaa01a7 Free.map rethrows errors. 2015-10-28 11:56:49 -04:00
Rob Rix
abab6f3c7b Free.sum’s cost function does not escape. 2015-10-28 11:55:38 -04:00
Rob Rix
9f60616f8b Free.reduce’s combining function does not escape. 2015-10-28 11:55:06 -04:00
Rob Rix
2252f8dbe6 Free.analysis rethrows errors. 2015-10-28 11:54:40 -04:00
Rob Rix
11a2d2700a Free.cata’s argument does not escape. 2015-10-28 11:53:47 -04:00
Rob Rix
d4aaf2eb55 Syntax.map rethrows errors. 2015-10-28 11:51:43 -04:00
Rob Rix
602522dd21 A few MB less whitespace. 2015-10-27 19:31:33 -04:00
Rob Rix
3bb61d1cc1 Ignore all JSON files in the UI folder. 2015-10-27 18:59:03 -04:00
Rob Rix
4f1c52ac24 Use a different JSON output for doubt-difftool. 2015-10-27 18:58:35 -04:00
Rob Rix
c129fbcdcd Load the JSON from the queried path or diff.json. 2015-10-27 18:57:08 -04:00
Rob Rix
74b2099a02 Add a query with the path to the JSON. 2015-10-27 18:56:53 -04:00
Rob Rix
8fbc71270e Open the URL of the UI. 2015-10-27 18:53:48 -04:00
Rob Rix
bf5b5616d5 Pass the UI page to the difftool. 2015-10-27 18:53:40 -04:00
Rob Rix
e64f01bf03 Load the fixtures and write out the diff to a given path. 2015-10-27 18:46:16 -04:00
Rob Rix
19eb676e8e Add before/after fixtures. 2015-10-27 18:45:26 -04:00
Rob Rix
c3c391f2cf Write the output to the third path. 2015-10-27 18:39:11 -04:00
Rob Rix
d120a5dac5 Serialize the diff to JSON. 2015-10-27 18:38:31 -04:00
Rob Rix
33de066844 Diff two terms. 2015-10-27 18:38:25 -04:00
Rob Rix
abfe582247 Use the Term typealias. 2015-10-27 18:37:59 -04:00
Rob Rix
1df957877e Add a typealias for Terms. 2015-10-27 18:37:34 -04:00
Rob Rix
db01456d8d Remove the POSIX file reading stuff. 2015-10-27 18:30:02 -04:00
Rob Rix
dfbbabd898 Load files into strings. 2015-10-27 18:29:44 -04:00
Rob Rix
9af1cb41a8 Add a readFile function. 2015-10-27 18:29:27 -04:00
Rob Rix
0eb13e39c0 Extract a function to parse a term. 2015-10-27 18:26:39 -04:00
Rob Rix
c14d82d737 Check that we have a valid file in the TSInput constructor. 2015-10-27 18:23:26 -04:00
Rob Rix
8615eec2c6 Only collect the named children. 2015-10-27 18:20:21 -04:00
Rob Rix
06185b9b4f Merge branch 'master' into parse-with-tree-sitter 
Conflicts:
	prototype/Doubt.xcodeproj/project.pbxproj
 2015-10-27 18:15:53 -04:00
Rob Rix
97a7a105d2 Map to source ranges. 2015-10-27 18:13:49 -04:00
Rob Rix
76a67a7d8e Reformat. 2015-10-27 18:10:17 -04:00
Rob Rix
3f61255915 Capture node names, not strings. 2015-10-27 18:09:30 -04:00
Rob Rix
52a63856a8 Produce indexed nodes. 2015-10-27 18:09:23 -04:00
Rob Rix
1374cf8052 Phrase this as a guard. 2015-10-27 18:07:23 -04:00
Rob Rix
ac2a12a03f Construct a leaf term. 2015-10-27 18:07:00 -04:00
Rob Rix
5883a4bc8a Remove copy bundle resources phases. 2015-10-27 18:06:46 -04:00
Rob Rix
3cdcf08707 Share the difftool scheme. 2015-10-27 17:52:56 -04:00
Rob Rix
8f51aa55a6 Remove another temporary. 2015-10-27 16:28:04 -04:00
Rob Rix
0902bf0508 Remove an obsolete typealias. 2015-10-27 16:26:34 -04:00
Rob Rix
fc4098129f Inline a definition. 2015-10-27 16:26:24 -04:00
Rob Rix
2ef9eaa798 Remove an obsolete comment. 2015-10-27 16:25:25 -04:00
Rob Rix
db6bfbb85c Drop a couple of bindings. 2015-10-27 16:22:12 -04:00
Rob Rix
3b21c087a0 Remove a couple of redundant typealiases. 2015-10-27 16:18:54 -04:00
Rob Rix
3b3ee835ba Remove an unnecessary type annotation. 2015-10-27 16:18:48 -04:00
Rob Rix
a51eb87d92 🔥 String : CollectionType. 2015-10-27 16:15:42 -04:00
Rob Rix
3c7eae25b5 🔥 String.lift. 2015-10-27 16:15:28 -04:00
Rob Rix
82284e422a Always parse over String.CharacterView. 2015-10-27 16:15:11 -04:00
Rob Rix
25467794f9 More leaning on satisfy parsers. 2015-10-27 16:12:23 -04:00
Rob Rix
8a86a0a741 Lean on oneOf. 2015-10-27 16:12:14 -04:00
Rob Rix
3c203e8f43 Extract the key/term parser. 2015-10-27 16:11:45 -04:00
Rob Rix
c366e379a0 Inline charP. 2015-10-27 16:11:38 -04:00
Rob Rix
72abc9f9e2 Wipe out some indentation. 2015-10-27 16:11:31 -04:00
Rob Rix
176300b141 No need to import Either. 2015-10-27 16:11:26 -04:00
joshvera
0718e49343 Capture the quoted range in members' keys 2015-10-27 13:28:35 -04:00
joshvera
96bcc25b23 Calculate the key range from the previous range 2015-10-27 13:15:56 -04:00
joshvera
81f4112aca Merge branch 'master' into fix-dictionary-ranges 2015-10-27 12:58:24 -04:00
Rob Rix
9fd162fb1b Spacing. 2015-10-27 11:53:44 -04:00
Rob Rix
533f8753b9 Attempt to print the string. 2015-10-27 11:45:54 -04:00
Rob Rix
d29c6b5cdd Deal with EOF. 2015-10-27 11:45:42 -04:00
Rob Rix
ae111582d9 Pass in a capacity. 2015-10-27 11:40:03 -04:00
Rob Rix
687f9aab4a Die if we don’t get an extant file. 2015-10-27 11:39:51 -04:00
Rob Rix
c23f62d9cf Try to use the correct return value when seeking. 2015-10-27 11:33:18 -04:00
Rob Rix
f2b52a0620 Read data with getline. 2015-10-27 11:27:17 -04:00
joshvera
007a984c02 fix test 2015-10-27 11:23:12 -04:00
joshvera
57f15afc08 Change dict to be a .Keyed(.Keyed) node 2015-10-27 11:18:52 -04:00
Rob Rix
ef121e4bb1 We want the first passed argument, not the process name. 2015-10-27 11:18:05 -04:00
Rob Rix
5db484e815 Merge branch 'extract-js-from-html' into parse-with-tree-sitter 2015-10-27 11:16:43 -04:00
Rob Rix
db1a28a8ce We don’t need to build the to-C compiler. 2015-10-27 11:15:09 -04:00
Rob Rix
c107d9c0e2 DOM stuff is in its own file. 2015-10-27 11:12:27 -04:00
Rob Rix
f0ccfe0799 Diff is in its own file. 2015-10-27 11:11:45 -04:00
Rob Rix
9b22c3cbda Syntax is in its own file. 2015-10-27 11:10:38 -04:00
Rob Rix
2ef643cb40 Dictionary is in its own file. 2015-10-27 11:09:48 -04:00
Rob Rix
e0fda81376 Patch is in its own file. 2015-10-27 11:09:16 -04:00
Rob Rix
3270ec91c1 Term is in its own file. 2015-10-27 11:08:28 -04:00
Rob Rix
97da51dd2d Spacing. 2015-10-27 11:04:39 -04:00
Rob Rix
27d9aa9efe Attempt to parse the passed file. 2015-10-27 11:04:18 -04:00
Rob Rix
ce79e07cf8 Attempt to open and read a file with TSInput. 2015-10-27 11:04:00 -04:00
Rob Rix
a1a3a120ef Set the document’s language. 2015-10-27 10:02:22 -04:00
Rob Rix
0810a37a17 Make a document. 2015-10-27 10:02:12 -04:00
Rob Rix
8460e42d95 Bridge the JS language. 2015-10-27 10:01:57 -04:00
Rob Rix
0b2dbb05f6 Add the JS parser. 2015-10-27 10:00:52 -04:00
Rob Rix
1331cc2c02 Don’t import parser.h. 
🎩 @maxbrunsfeld.
 2015-10-27 09:50:26 -04:00
joshvera
3a1c4a3b0d parse whitespace around separators 2015-10-26 16:52:30 -04:00
joshvera
3d8b7c1832 Remove JSONLeaf from doubt-swift target 2015-10-26 16:45:09 -04:00
joshvera
b9be03e540 Add Fixed case to Syntax.equals 2015-10-26 16:38:07 -04:00
joshvera
3d84c3be73 Improve escape character parsing 2015-10-26 16:37:50 -04:00
joshvera
14fac1df3c don't parse whitespace ranges along with syntax 2015-10-26 16:37:34 -04:00
joshvera
98d8d52048 sepBy 2015-10-26 16:36:22 -04:00
Rob Rix
d09a151486 Add a bridging header importing tree-sitter. 2015-10-26 16:04:22 -04:00
Rob Rix
b5a0d950b3 Search for tree-sitter’s headers. 2015-10-26 16:02:31 -04:00
Rob Rix
c5f39d0997 Add a doubt-difftool target linking runtime and compiler. 2015-10-26 16:00:52 -04:00
Rob Rix
7d27a8405b More stupid metadata that Xcode needs to bump every so often. 2015-10-26 16:00:33 -04:00
Rob Rix
caae1694e3 Add a target for the tree-sitter compiler. 2015-10-26 15:52:21 -04:00
Rob Rix
3baa3e4e61 Build with the empty string. 2015-10-26 15:49:44 -04:00
Rob Rix
0e7639f0d6 Build and clean. 2015-10-26 15:45:51 -04:00
Rob Rix
64f7e9d30a Correct the directory. 2015-10-26 15:42:06 -04:00
Rob Rix
83337a55cc Build using the tree-sitter script. 2015-10-26 15:40:56 -04:00
Rob Rix
0c8ae2a286 Pass the action to the external build tool. 2015-10-26 15:40:50 -04:00
Rob Rix
39e372819b Add a script to build tree-sitter. 2015-10-26 15:40:22 -04:00
Rob Rix
13f91b80a3 Add a target for tree-sitter’s runtime library. 2015-10-26 15:36:07 -04:00
Rob Rix
98d4e1dd8f Okay, Xcode whatever you say. 2015-10-26 15:34:41 -04:00
joshvera
e59946aa0a Return Members as Fixed 2015-10-26 15:06:45 -04:00
joshvera
92539dec54 Make JSONLeaf and JSONParser public 2015-10-26 15:06:33 -04:00
joshvera
3802854f4e Add failing test 2015-10-26 15:05:58 -04:00
Rob Rix
7b6f185884 Add tree-sitter as a submodule. 2015-10-26 15:03:47 -04:00
joshvera
d40ec59f61 WIP .Fixed dictionaries 2015-10-26 13:31:25 -04:00
joshvera
29250af579 stub JSONParserTests 2015-10-26 13:31:09 -04:00
Rob Rix
ec06db7c08 Display Fixed nodes. 2015-10-26 09:35:54 -04:00
Rob Rix
53cea24ddc Map Fixed nodes. 2015-10-26 09:35:46 -04:00
Rob Rix
9bef60f2dd Construct Fixed nodes. 2015-10-26 09:35:42 -04:00
Rob Rix
9041ebafa1 Merge branch 'master' into diff-ui-shows-original-sources-for-unchanged-ranges-as-well 
Conflicts:
	prototype/Doubt/Syntax.swift
 2015-10-26 09:31:44 -04:00
Rob Rix
c0f9120d1b Classify replacements. 2015-10-23 21:29:21 -04:00
Rob Rix
72b97d1b3a Replacements are yellow. 2015-10-23 21:29:02 -04:00
Rob Rix
6a76b1d97e Assign classes to insertions. 2015-10-23 21:27:11 -04:00
Rob Rix
ee1d00a74c Assign classes to deletions. 2015-10-23 21:25:55 -04:00
Rob Rix
dc4fd6f659 Columns have no background colour. 2015-10-23 21:25:50 -04:00
Rob Rix
15813f38ef Allow the things to be side by side. 2015-10-23 21:22:58 -04:00
Rob Rix
4775d8e925 Apparently we pass this parameter, so let’s use it. 2015-10-23 21:22:28 -04:00
Rob Rix
28d7325647 Skip empty things. 2015-10-23 21:19:43 -04:00
Rob Rix
c01624abe9 Map ranges and stuff correctly. 2015-10-23 21:19:37 -04:00
Rob Rix
865dbe2eed Mapping into null is a bad idea. 2015-10-23 21:19:25 -04:00
Rob Rix
770e826340 Use classes to signal diffs. 2015-10-23 21:19:19 -04:00
Rob Rix
5939f3a865 Map the before and after terms separately I guess. 2015-10-23 21:05:51 -04:00
Rob Rix
fc60c75b14 Assign the range of patches. 2015-10-23 21:05:30 -04:00
Rob Rix
b7ac783e19 Get ranges for children. 2015-10-23 21:05:20 -04:00
Rob Rix
b3dfee8fc0 Terminate. 2015-10-23 20:51:31 -04:00
Rob Rix
8b1ae5f5b5 Separate Term decoding and construction. 2015-10-23 20:37:58 -04:00
Rob Rix
95cc7e7768 Diff catamorphisms. 2015-10-23 20:27:12 -04:00
Rob Rix
e152b0084c Use a term-to-DOM wrapper function. 2015-10-23 20:23:53 -04:00
Rob Rix
38ec0850c2 Default recur parameter. 2015-10-23 20:23:35 -04:00
Rob Rix
c51d66fe8d Correct how the diff is unpacked. 2015-10-23 19:25:21 -04:00
Rob Rix
fe2915a427 Try to map terms into DOM. 2015-10-23 19:24:13 -04:00
Rob Rix
7bff777b07 Attempt to correct Diff/DOM mapping. 2015-10-23 19:23:58 -04:00
Rob Rix
27853e30b1 Correct mapping diffs into DOM. 2015-10-23 19:23:38 -04:00
Rob Rix
b42d5238d1 Correct Syntax.Leaf construction. 2015-10-23 19:22:22 -04:00
Rob Rix
96675b4de6 Correct Syntax.Indexed construction. 2015-10-23 19:22:14 -04:00
Rob Rix
4a9ff5118a Correct Syntax.Keyed construction. 2015-10-23 19:20:06 -04:00
Rob Rix
62000715e8 Correct Syntax.Keyed mapping. 2015-10-23 19:19:22 -04:00
Rob Rix
be6b72cf00 Correct Syntax mapping. 2015-10-23 19:17:02 -04:00
Rob Rix
05a376f8ae Use the correct references. 2015-10-23 19:09:52 -04:00
Rob Rix
b3fa50bf64 Map the original diff. 2015-10-23 19:08:10 -04:00
Rob Rix
57fb7dda4c Diff.map. 2015-10-23 18:59:24 -04:00
Rob Rix
eb598effa5 Simplify Syntax.map. 2015-10-23 18:58:10 -04:00
Rob Rix
00234c1365 Simplify the Diff constructor. 2015-10-23 18:56:07 -04:00
Rob Rix
ccc57c6411 Correct the hash passed to Diff. 2015-10-23 18:55:30 -04:00
Rob Rix
20057acaff Add a function to construct diffs from JSON. 2015-10-23 18:54:24 -04:00
Rob Rix
692ae3be29 Remove Indexed toDOM handling. 2015-10-23 18:41:29 -04:00
Rob Rix
eabb27c5af Remove the Keyed toDOM handling. 2015-10-23 18:41:04 -04:00
Rob Rix
b3f0d16fc8 Remove Term catamorphism/paramorphism 😢 2015-10-23 18:27:16 -04:00
Rob Rix
aaa1a9d25a Term paramorphism. 2015-10-23 18:26:57 -04:00
Rob Rix
ec9cbf4dbf Remove leaf handling from toDOM. 2015-10-23 18:26:42 -04:00
Rob Rix
f00b9cca5b Construct Patches with Terms directly. 2015-10-23 18:26:24 -04:00
Rob Rix
16876343a4 Map Syntax by construction. 2015-10-23 18:24:19 -04:00
Rob Rix
08927d06b5 Construct Syntax values correctly. 2015-10-23 18:23:25 -04:00
Rob Rix
155b0a16ef Syntax nodes’ JSON is unambiguous. 2015-10-23 18:22:24 -04:00
Rob Rix
48a8217c41 Dictionary mapping passes a key to the transformation function. 2015-10-23 18:21:09 -04:00
Rob Rix
ebc8e96396 Remove Term processing from toDOM. 2015-10-23 18:19:25 -04:00
Rob Rix
59861a9a34 Terms construct a Syntax. 2015-10-23 18:19:11 -04:00
Rob Rix
7fb3aeb452 catamorphism over Term. 2015-10-23 17:19:24 -04:00
Rob Rix
d75322e37e Remove Indexed. 2015-10-23 17:19:18 -04:00
Rob Rix
aef4e18518 Map over Syntax. 2015-10-23 17:19:07 -04:00
Rob Rix
c5c9e8838b Map over dictionaries. 2015-10-23 17:19:00 -04:00
Rob Rix
ff21b7d299 Construct Syntax as a sum type. 2015-10-23 17:18:54 -04:00
Rob Rix
87cdba8e4b Replaced Keyed with Dictionary. 2015-10-23 17:16:19 -04:00
joshvera
f2aeae9e4b Interpret Fixed cases recursively 2015-10-23 17:03:12 -04:00
Rob Rix
056e79f261 Rename the syntax field to unwrap. 2015-10-23 16:56:39 -04:00
Rob Rix
3206f13be0 Syntax is a type. 2015-10-23 16:54:49 -04:00
Rob Rix
235d70239a Rename a/b to before/after. 2015-10-23 16:53:51 -04:00
Rob Rix
32ed77d9bc Rename left/right to before/after. 2015-10-23 16:53:02 -04:00
joshvera
20e2a520e6 add .Fixed to Syntax 2015-10-23 14:47:44 -04:00
Rob Rix
7d721acec5 Re-add the left/right column divs. 2015-10-23 14:00:25 -04:00
Rob Rix
7adfd32d9d Patch is an object. 2015-10-23 13:48:44 -04:00
Rob Rix
0667e3b30e Move the patch function up. 2015-10-23 13:47:33 -04:00
Rob Rix
968980e17b Don’t be gross. 2015-10-23 13:32:54 -04:00
Rob Rix
b03bacbcf2 Pass the source strings to toDOM. 2015-10-23 13:32:19 -04:00
Rob Rix
93a8f75da9 Don’t thread the original strings through model construction. 2015-10-23 13:31:14 -04:00
Rob Rix
107c8969e8 Arbitrarily select the before string/range. 2015-10-23 12:22:21 -04:00
Rob Rix
2213606727 Merge branch 'master' into diff-ui-shows-original-sources-for-unchanged-ranges-as-well 2015-10-23 12:02:51 -04:00
Rob Rix
d5bf556cac Test that recursively-copied diffs do not contain patches. 2015-10-23 11:49:03 -04:00
Rob Rix
11ed1a855d Test that equal terms zip to non-nil. 2015-10-23 11:46:47 -04:00
Rob Rix
0c1905b6f5 Avoid a bang. 2015-10-23 11:44:17 -04:00
Rob Rix
f4a9053977 Use the convenience constructor. 2015-10-23 11:44:00 -04:00
Rob Rix
aca676dd04 Reintroduce the CofreeType → Free convenience constructor. 2015-10-23 11:43:05 -04:00
Rob Rix
383b20bb31 Document mapping a term into a diff. 2015-10-23 11:40:03 -04:00
Rob Rix
180cc41f6c reiterate → hylo 2015-10-23 11:36:42 -04:00
Rob Rix
2b216398b7 iterate → cata 2015-10-23 11:36:05 -04:00
Rob Rix
9b310b8c78 coiterate → ana 2015-10-23 11:34:53 -04:00
Rob Rix
f1d60da274 Assign patch ranges to Diff.Pures. 2015-10-23 11:14:45 -04:00
Rob Rix
c3e740ab8e Assign term ranges to patches. 2015-10-23 11:14:39 -04:00
Rob Rix
1153cd95e9 Assign a canonical source/range for diffs. 2015-10-23 11:11:05 -04:00
Rob Rix
7d09a9ab0f Store the sources in a hash so we can get them out correctly. 2015-10-23 11:09:10 -04:00
Rob Rix
63267cdb1c Attach the range and source to the syntax. 2015-10-23 11:04:21 -04:00
Rob Rix
8d344381e7 Keep the correct ranges. 2015-10-23 11:04:03 -04:00
Rob Rix
7b8d3747de Keep the sources. 2015-10-23 11:02:37 -04:00
Rob Rix
00970c03ee Keep the ranges. 2015-10-23 11:02:32 -04:00
Rob Rix
56f2f6f0c0 Unwrap the syntax. 2015-10-23 11:01:21 -04:00
Rob Rix
353ff8d4b2 Formatting. 2015-10-23 11:01:14 -04:00
Rob Rix
c187b796f3 Merge branch 'master' into annotate-diffs 
Conflicts:
	prototype/Doubt/Free.swift
 2015-10-23 10:48:17 -04:00
Rob Rix
2a50752f24 Don’t decode back into an unused string, that’s dumb. 2015-10-22 19:04:38 -04:00
Rob Rix
6c99f37e7a Encode ranges in Diff.Roll. 2015-10-22 19:04:21 -04:00
Rob Rix
bfb9095d21 Don’t output Diff.Roll annotations. 2015-10-22 18:57:07 -04:00
Rob Rix
5f5a4739bf Use the Introduce shorthand. 2015-10-22 18:56:03 -04:00
Rob Rix
b194dede9a Add annotations to Free 😭 
This is heartbreaking, but it was always going to end this way.
 2015-10-22 18:55:28 -04:00
Rob Rix
3682aca8a0 Rename the convenience to avoid the method of the same name. 2015-10-22 18:54:10 -04:00
Rob Rix
6cca28582d Add a convenience to copy terms into diffs. 2015-10-22 18:51:14 -04:00
Rob Rix
1ee9663e6e Unwrap with the static eliminator. 2015-10-22 18:43:49 -04:00
Rob Rix
3a1ced9786 Add an elimination form for Cofree. 2015-10-22 18:43:17 -04:00
Rob Rix
6423d5817f Rename the introduction form for Cofree. 2015-10-22 18:43:08 -04:00
Rob Rix
f8739e90b0 zip the terms. 2015-10-22 18:42:04 -04:00
Rob Rix
b210cf8586 Rephrase copying terms into diffs as a hylomorphism. 2015-10-22 18:32:41 -04:00
Rob Rix
95adbdf042 Documentation for reiterate. 2015-10-22 18:31:11 -04:00
Rob Rix
397af0d02d Documentation for hylo. 2015-10-22 18:31:06 -04:00
Rob Rix
b425d69c36 Define hylo and reiterate through Syntax. 2015-10-22 18:18:05 -04:00
Rob Rix
c84578402c Document CofreeType.zip. 2015-10-22 18:09:18 -04:00
Rob Rix
7b57a9ce17 CofreeType values can be zipped. 2015-10-22 18:06:35 -04:00
Rob Rix
6bc8fe4285 Define coiterate over CofreeType. 2015-10-22 18:04:51 -04:00
Rob Rix
9ff1840e4a CofreeTypes have a static curried Wrap constructor function. 2015-10-22 18:04:19 -04:00
Rob Rix
c6962c798d CofreeType requires a constructor. 2015-10-22 18:02:44 -04:00
Rob Rix
4195edc469 Define a reiterate function. 2015-10-22 17:25:58 -04:00
Rob Rix
d0aeedeb52 Define iterate so as to clarify its relationship with cata. 2015-10-22 17:15:49 -04:00
Rob Rix
521e253240 Define hylomorphism through Syntax. 2015-10-22 17:11:35 -04:00
Rob Rix
f4966684a5 Rename the functions to unfold. 2015-10-22 17:09:40 -04:00
Rob Rix
090406aafe Define coiterate so as to reflect its symmetry with ana. 2015-10-22 17:09:00 -04:00
Rob Rix
f0379f421b Define ana using the backwards application operator to clarify dataflow. 2015-10-22 17:08:17 -04:00
Rob Rix
d6a9be0794 Double down on annotations. 2015-10-22 16:02:03 -04:00
Rob Rix
49fb14f6a8 Define Free equality over Patch<Term: CofreeType> without reference to annotation equality. 2015-10-22 16:01:48 -04:00
Rob Rix
39ae63d426 It doesn’t matter if annotations are equatable. 2015-10-22 15:52:08 -04:00
Rob Rix
5e0fbd8d8c Revert "Constrain Free equality over CofreeType to terms whose annotations are equatable." 
This reverts commit a79f354992cbca36fa3e55de648e6bc6c55f956b.
 2015-10-22 15:51:52 -04:00
Rob Rix
651a3c2f91 Don’t constrain recursive Free construction from TermType to the same annotation type. 2015-10-22 15:50:16 -04:00
Rob Rix
657d7edbba Merge branch 'unfold-diffs' into annotate-diffs 
Conflicts:
	prototype/Doubt/Free.swift
	prototype/Doubt/TermType.swift
 2015-10-22 13:40:19 -04:00
Rob Rix
f00f3f485f Copy diffs recursively using ana. 2015-10-22 13:15:13 -04:00
Rob Rix
f36651660b ana is static. 2015-10-22 13:11:00 -04:00
Rob Rix
4cc87bc0cf Tacit unwrapping. 2015-10-22 13:05:16 -04:00
Rob Rix
89adf2cc86 Add a static unwrap function over TermType. 2015-10-22 13:05:08 -04:00
Rob Rix
6bcbccfe08 Document coiterate as an anamorphism. 2015-10-22 12:55:06 -04:00
Rob Rix
f145bb4293 Document ana. 2015-10-22 12:53:18 -04:00
Rob Rix
d4744200ae Rename the parameter to transform. 2015-10-22 12:51:26 -04:00
Rob Rix
e7a525910f Implement anamorphism over Free. 2015-10-22 12:49:41 -04:00
Rob Rix
453fd80318 Section header for CustomDebugStringConvertible. 2015-10-22 11:35:25 -04:00
Rob Rix
6d665ff391 Remove an unused conversion of Free to JSON. 2015-10-22 10:57:31 -04:00
Rob Rix
76b7df9d68 Constrain Free equality over CofreeType to terms whose annotations are equatable. 2015-10-22 10:54:49 -04:00
Rob Rix
8cbb69fa97 Rename the Syntax piecewise JSON functions after the type parameters (mostly). 2015-10-22 10:47:48 -04:00
Rob Rix
40fe88b4a4 Rename the Syntax piecewise equality functions after the type parameters (mostly). 2015-10-22 10:46:51 -04:00
Rob Rix
831f8dcbae Name Free’s piecewise JSON functions after the type parameters. 2015-10-22 10:43:42 -04:00
Rob Rix
b7a341b8b1 Correct omissions in the tests. 2015-10-22 10:43:20 -04:00
Rob Rix
d678946fda Name the piecewise equality functions after the type parameters. 2015-10-22 10:41:42 -04:00
Rob Rix
0a28a390b7 Remove SyntaxConvertible. 2015-10-22 10:40:08 -04:00
Rob Rix
5cfe2b33b9 Free is no longer SyntaxConvertible. 2015-10-22 10:39:33 -04:00
Rob Rix
750def8107 Fix up some comments. 2015-10-22 10:37:00 -04:00
Rob Rix
ad05308ab6 Define the recursive TermType → Free constructor over CofreeType instead. 2015-10-22 10:33:25 -04:00
Rob Rix
c9b33f826c Add an annotation parameter to Free. 2015-10-22 10:30:38 -04:00
Rob Rix
c5e01c41db Rename SES’ A type parameter to Leaf. 2015-10-22 10:28:22 -04:00
Rob Rix
695b69b086 Algorithm’s parameter must be a CofreeType. 2015-10-22 10:26:45 -04:00