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 |
|