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.

Sign up for GitHub

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

Jump to bottom

Jared json rebase (DO NOT MERGE) #755

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Jared json rebase (DO NOT MERGE) #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1df280b
astjson on the way
jaredly Aug 28, 2016
881ce63
json input & output works!!
jaredly Aug 28, 2016
3714292
formatting
jaredly Aug 28, 2016
7ea0cb3
better error message
jaredly Aug 28, 2016
8a4649a
get -use-stdin working
jaredly Aug 28, 2016
b1f863f
update opam deps
jaredly Aug 28, 2016
9e09605
Add ppx_deriving to package.json
jordwalke Sep 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .merlin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PKG utop merlin_extend compiler-libs easy-format re.str
PKG utop merlin_extend compiler-libs easy-format re.str yojson result
B _build/src
S src
2 changes: 1 addition & 1 deletion _tags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ true: warn(@5@8@10@11@12@14@23-24@26@29@40), bin_annot, safe_string, debug
<node_modules/**>: -traverse
"formatTest": -traverse
"src": include
<src/*>: package(menhirLib unix compiler-libs.common ocamlbuild findlib easy-format BetterErrors merlin_extend re.str)
<src/*>: package(menhirLib unix compiler-libs.common ocamlbuild findlib easy-format BetterErrors merlin_extend re.str ppx_deriving.std yojson ppx_deriving_yojson)
<src/reason_utop.*>: package(menhirLib utop)

<src_gen/*>: package(sedlex)
Expand Down
3 changes: 3 additions & 0 deletions opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ depends: [
"BetterErrors" {>= "0.0.1"}
"menhir" {>= "20160303"}
"re" {>= "1.5.0"}
"ppx_deriving" {>= "4.0"}
"ppx_deriving_yojson" {>= "3.0"}
"yojson" {>= "1.3.2"}
]
depopts: [
]
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
},
"name": "reason",
"dependencies": {
"ppx_deriving": "https://github.com/npm-opam/ppx_deriving.git",
"merlin": "https://github.com/npm-opam/merlin",
"re": "https://github.com/npm-opam/re",
"ocamlfind": "https://github.com/npm-opam/ocamlfind",
Expand Down
Loading