Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
forked fromTokTok/apidsl

Commit51c20d3

Browse files
committed
Add back coveralls support.
1 parent6370c8e commit51c20d3

File tree

128 files changed

+235
-255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+235
-255
lines changed

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
/_build
2-
/src/.merlin
2+
/_coverage
3+
/coverage.json
34
/setup.data
45
/setup.log
6+
/test/*/dune
7+
.merlin
58
*.byte
9+
*.exe
610
*.native
711
*.swp
12+
bisect*.out

‎.merlin‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,22 @@
22
language:generic
33
os:linux
44

5-
jobs:
6-
include:
7-
-env:BUILD=host
8-
addons:
9-
apt:
10-
sources:
11-
-avsm
12-
packages:
13-
-aspcud
14-
-opam
5+
addons:
6+
apt:
7+
sources:
8+
-avsm
9+
packages:
10+
-aspcud
11+
-opam
1512

16-
cache:
17-
directories:
18-
-$HOME/.opam
13+
cache:
14+
directories:
15+
-$HOME/.opam
1916

20-
install:
21-
-opam init -y
22-
-eval `opam env`
23-
-opam install -y menhir ppx_deriving dune
17+
install:
18+
-opam init -y
19+
-eval `opam env`
20+
-opam install -y menhir ppx_deriving bisect_ppx dune
2421

25-
script:
26-
-make
27-
# - make coverage
28-
29-
-env:BUILD=docker
30-
services:
31-
-docker
32-
script:
33-
-docker build -t apidsl .
34-
-docker run --rm -v $PWD:/apidsl apidsl
35-
# - make tests
22+
script:
23+
-make coveralls

‎Makefile‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,26 @@
1-
tests:\
2-
$(patsubst%.api.h,%.out.h,$(wildcard src/tests/*.api.h))\
3-
$(patsubst%.api.h,%.out.hs,$(wildcard src/tests/*.api.h))\
4-
$(patsubst%.api.h,%.out.api,$(wildcard src/tests/*.api.h))\
5-
$(patsubst%.api.h,%.out.ast,$(wildcard src/tests/*.api.h))
6-
./apigen.exe
7-
8-
src/tests/%.out.h: src/tests/%.api.h apigen.exe
9-
-cd src&& ../apigen.exe$(patsubst src/%,%,$<)>$(patsubst src/%,%,$@)2>&1
10-
diff -u src/tests/$*.exp.h$@
11-
rm -f$@
12-
13-
src/tests/%.out.hs: src/tests/%.api.h apigen.exe
14-
-cd src&& ../apigen.exe -hs Main$(patsubst src/%,%,$<)>$(patsubst src/%,%,$@)2>&1
15-
diff -u src/tests/$*.exp.hs$@
16-
rm -f$@
1+
apigen.native:$(wildcard*.ml* src/*.ml*)
2+
dune clean
3+
dune build --profile release
4+
cp _build/default/apigen.exe$@
175

18-
src/tests/%.out.api: src/tests/%.api.h apigen.exe
19-
-cd src&& ../apigen.exe -api$(patsubst src/%,%,$<)>$(patsubst src/%,%,$@)2>&1
20-
diff -u src/tests/$*.exp.api$@
21-
rm -f$@
6+
test/%/dune: test/dune-template Makefile
7+
sed -e's/%NAME%/$*/g'$<>$@
228

23-
src/tests/%.out.ast: src/tests/%.api.h apigen.exe
24-
-cd src&& ../apigen.exe -ast$(patsubst src/%,%,$<)>$(patsubst src/%,%,$@)2>&1
25-
diff -u src/tests/$*.exp.ast$@
9+
check:$(patsubst%,%dune,$(dir$(wildcard test/*/*.api.h)))
10+
dune clean
11+
BISECT_ENABLE=yes dune runtest
2612

27-
apigen.exe:
28-
dune build --profile release
29-
cp _build/default/src/apigen.exe$@
13+
coverage: check
14+
bisect-ppx-report -html _coverage/ -I _build/default _build/default/test/*/bisect*.out
3015

31-
coverage: travis-coveralls.sh
32-
bash$<
16+
coveralls: check
17+
bisect-ppx-report\
18+
-coveralls coverage.json\
19+
-service-name travis-ci\
20+
-service-job-id"${TRAVIS_JOB_ID}"\
21+
-I _build/default _build/default/test/*/bisect*.out
22+
curl -L -F json_file=@coverage.json https://coveralls.io/api/v1/jobs
3323

3424
clean:
3525
dune clean
26+
rm -f apigen.native
Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
1+
openApidsl
2+
13
typeoutlang=
24
|Api
35
|Ast
46
|C
57
|Haskellofstring
68

7-
letparse_filefile=
8-
let fh= open_in filein
9-
let lexbuf=Lexing.from_channel fhin
10-
lexbuf.Lexing.lex_curr_p<-Lexing.({
11-
lexbuf.lex_curr_pwith
12-
pos_fname= file;
13-
});
14-
15-
let api=ApiPasses.parse_lexbuf lexbufin
16-
17-
close_in fh;
18-
19-
api
20-
21-
229
letdump_apipreapipost=
2310
Option.may (Format.pp_print_stringFormat.str_formatter) pre;
2411
Format.fprintfFormat.str_formatter"%a\n"
@@ -29,7 +16,7 @@ let dump_api pre api post =
2916

3017

3118
letmaininput=
32-
let api= parse_file inputin
19+
let api=ApiPasses.parse_file inputin
3320
letApiAst.Api (pre, ast, post)= apiin
3421
function
3522
|C -> print_string (ApiPasses.all pre ast post)
@@ -40,10 +27,13 @@ let main input =
4027

4128
let()=
4229
(*Printexc.record_backtrace true;*)
43-
matchSys.argvwith
44-
| [|_ ; input|]
45-
| [|_;"-c" ; input|] -> main inputC
46-
| [|_;"-hs"; modname; input|] -> main input (Haskell modname)
47-
| [|_;"-ast" ; input|] -> main inputAst
48-
| [|_;"-api" ; input|] -> main inputApi
49-
|_ -> print_endline"Usage: apigen <file>"
30+
try
31+
matchSys.argvwith
32+
| [|_ ; input|]
33+
| [|_;"-c" ; input|] -> main inputC
34+
| [|_;"-hs"; modname; input|] -> main input (Haskell modname)
35+
| [|_;"-ast" ; input|] -> main inputAst
36+
| [|_;"-api" ; input|] -> main inputApi
37+
|_ -> print_endline"Usage: apigen <file>"
38+
withFailure (msg) ->
39+
print_endline ("Failure:"^ msg)

‎dune‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
(executable
2+
(name apigen)
3+
(libraries apidsl))

‎dune-fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(file .git ignore)

‎src/apiCodegen.ml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ module Codegen(P : Params) = struct
8787
;;
8888

8989

90-
letreccg_size_specfmt=function
90+
letcg_size_specfmt=function
9191
|Ss_UNameuname ->
9292
Format.fprintf fmt"%a"
9393
cg_uname uname
@@ -110,7 +110,7 @@ module Codegen(P : Params) = struct
110110
cg_uname uname
111111
|Ty_LNamelname ->
112112
ifString.contains lname'_'&&
113-
Char.uppercase lname.[0]= lname.[0]then
113+
Char.uppercase_ascii lname.[0]= lname.[0]then
114114
Format.fprintf fmt"struct";
115115
Format.fprintf fmt"%a"
116116
cg_lname lname
@@ -277,7 +277,7 @@ module Codegen(P : Params) = struct
277277
(cg_braced cg_enumerators) enumerators
278278
|Decl_Struct (lname,attrs,[]) ->
279279
assert (qualifier="");
280-
let uname=String.uppercase lnamein
280+
let uname=String.uppercase_ascii lnamein
281281
if c_modethen (
282282
Format.fprintf fmt"@,#ifndef %a_DEFINED"
283283
cg_uname uname;
@@ -333,13 +333,13 @@ module Codegen(P : Params) = struct
333333
(cg_decl_qualified"static") decl
334334
|Decl_Sectionfrags ->
335335
Format.fprintf fmt"@,@,/*";
336-
fori=0to77do
336+
for_=0to77do
337337
Format.pp_print_char fmt'*'
338338
done;
339339
Format.fprintf fmt"%a"
340340
(cg_list cg_comment_fragment) frags;
341341
Format.fprintf fmt"@,";
342-
fori=0to77do
342+
for_=0to77do
343343
Format.pp_print_char fmt'*'
344344
done;
345345
Format.fprintf fmt"/@,@,";

‎src/apiFold.ml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ let visit_list f v state l =
2222
List.fold_left (f v) state l
2323

2424

25-
letvisit_unamevstate=function
26-
|name -> state
25+
letvisit_uname_state=function
26+
|_ -> state
2727

28-
letvisit_lnamevstate=function
29-
|name -> state
28+
letvisit_lname_state=function
29+
|_ -> state
3030

31-
letvisit_macrovstate=function
32-
|Macromacro -> state
31+
letvisit_macro_state=function
32+
|Macro_ -> state
3333

3434

3535
letvisit_varvstate=function
@@ -44,7 +44,7 @@ let visit_var v state = function
4444

4545

4646
letvisit_comment_fragmentvstate=function
47-
|Cmtf_Docdoc ->
47+
|Cmtf_Doc_ ->
4848
state
4949
|Cmtf_UNameuname ->
5050
let state= v.fold_uname v state unamein
@@ -105,7 +105,7 @@ let visit_type_name v state = function
105105

106106

107107
letvisit_enumeratorvstate=function
108-
|Enum_Name (comment,uname,value) ->
108+
|Enum_Name (comment,uname,_) ->
109109
let state= v.fold_comment v state commentin
110110
let state= v.fold_uname v state unamein
111111
state
@@ -134,7 +134,7 @@ let visit_parameter v state = function
134134

135135

136136
letvisit_exprvstate=function
137-
|E_Numbernum ->
137+
|E_Number_ ->
138138
state
139139
|E_UNameuname ->
140140
let state= v.fold_uname v state unamein
@@ -180,7 +180,7 @@ let visit_decl v state = function
180180
let state= v.fold_uname v state unamein
181181
let state= v.fold_expr v state exprin
182182
state
183-
|Decl_Enum (is_class,uname,enumerators) ->
183+
|Decl_Enum (_,uname,enumerators) ->
184184
let state= v.fold_uname v state unamein
185185
let state= visit_list v.fold_enumerator v state enumeratorsin
186186
state
@@ -207,7 +207,7 @@ let visit_decl v state = function
207207
let state= v.fold_lname v state lnamein
208208
let state= visit_list v.fold_parameter v state parametersin
209209
state
210-
|Decl_Event (lname,is_const,decl) ->
210+
|Decl_Event (lname,_,decl) ->
211211
let state= v.fold_lname v state lnamein
212212
let state= visit_list v.fold_decl v state declin
213213
state

‎src/apiFoldMap.ml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ let visit_list f v state l =
2929
state,List.rev l
3030

3131

32-
letvisit_unamevstate=function
32+
letvisit_uname_state=function
3333
|name -> state, name
3434

35-
letvisit_lnamevstate=function
35+
letvisit_lname_state=function
3636
|name -> state, name
3737

38-
letvisit_macrovstate=function
38+
letvisit_macro_state=function
3939
|Macromacro -> state,Macro macro
4040

4141

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp