Added tests to build, fixed some unused variables.

This commit is contained in:
Georges Dupéron 2019-05-15 15:17:04 +02:00
parent 3c6af09b21
commit 22b331dbed
6 changed files with 19 additions and 8 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/_build/
/dune-project

View File

@ -34,12 +34,22 @@ before_script:
# paths: # paths:
# - src/ligo/bin/cli.ml # - src/ligo/bin/cli.ml
local-dune-job:
script:
- vendors/ligo-opam-repository/rewrite-local-opam-repository.sh
- opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository/"
- opam install -y --build-test --deps-only ./src/
- (dune build -p ligo)
# TODO: also try instead from time to time:
#- (cd ./src/; dune build -p ligo)
dune build -p ligo
local-repo-job: local-repo-job:
script: script:
- vendors/ligo-opam-repository/rewrite-local-opam-repository.sh - vendors/ligo-opam-repository/rewrite-local-opam-repository.sh
- opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository/" - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository/"
#--build-test #--build-test
- opam install -y -v ligo - opam install -y ligo
remote-repo-job: remote-repo-job:
script: script:

3
src/.gitignore vendored
View File

@ -1,5 +1,4 @@
_build/* _build/
*/_build
.merlin .merlin
*/.merlin */.merlin
*.install *.install

View File

@ -22,7 +22,7 @@ let parse_file (source: string) : AST_Raw.t result =
(fun () -> open_in pp_input) in (fun () -> open_in pp_input) in
let lexbuf = Lexing.from_channel channel in let lexbuf = Lexing.from_channel channel in
let module Lexer = Lexer.Make(LexToken) in let module Lexer = Lexer.Make(LexToken) in
let Lexer.{read ; close} = let Lexer.{read ; close ; _} =
Lexer.open_token_stream None in Lexer.open_token_stream None in
specific_try (fun () -> function specific_try (fun () -> function
| Parser.Error -> ( | Parser.Error -> (
@ -59,7 +59,7 @@ let parse_file (source: string) : AST_Raw.t result =
let parse_string (s:string) : AST_Raw.t result = let parse_string (s:string) : AST_Raw.t result =
let lexbuf = Lexing.from_string s in let lexbuf = Lexing.from_string s in
let module Lexer = Lexer.Make(LexToken) in let module Lexer = Lexer.Make(LexToken) in
let Lexer.{read ; close} = let Lexer.{read ; close ; _} =
Lexer.open_token_stream None in Lexer.open_token_stream None in
specific_try (fun () -> function specific_try (fun () -> function
| Parser.Error -> ( | Parser.Error -> (
@ -83,7 +83,7 @@ let parse_string (s:string) : AST_Raw.t result =
let parse_expression (s:string) : AST_Raw.expr result = let parse_expression (s:string) : AST_Raw.expr result =
let lexbuf = Lexing.from_string s in let lexbuf = Lexing.from_string s in
let module Lexer = Lexer.Make(LexToken) in let module Lexer = Lexer.Make(LexToken) in
let Lexer.{read ; close} = let Lexer.{read ; close; _} =
Lexer.open_token_stream None in Lexer.open_token_stream None in
specific_try (fun () -> function specific_try (fun () -> function
| Parser.Error -> ( | Parser.Error -> (

@ -1 +1 @@
Subproject commit fbfa642ebd4d55ec1a33cbdc75093c0681ddd3ce Subproject commit c794c6169960fd6d625ec2eb292f4136ec276f99

2
vendors/ligo-utils vendored

@ -1 +1 @@
Subproject commit 6ccdf0bf9e69585197d97b2f023590aeb03076de Subproject commit 3a7d2a85f1792105a375e35aa03afa137b29a9af