balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint

Browse Source
This commit is contained in:
Christian Rinderknecht 2020-05-18 11:01:54 +02:00
commit 281477bbaf
9 changed files with 14068 additions and 5007 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.gitlab-ci.yml
View File

@ -17,6 +17,7 @@ stages:
- ide-deploy
- nix
- nix-push
- versioning
# TODO provide sensible CI for master
dont-merge-to-master:
@ -99,6 +100,13 @@ dont-merge-to-master:
- eval $(opam config env)
- scripts/setup_repos.sh
version_scheduled_job:
stage: versioning
script:
- scripts/versioning.sh
only:
- schedules
local-dune-job:
<<: *before_script
stage: test
@ -113,6 +121,8 @@ local-dune-job:
only:
- merge_requests
- dev
- tags
- triggers
- /^.*-run-dev$/
# Run a docker build without publishing to the registry
@ -158,6 +168,7 @@ build-and-package-debian-9:
<<: *build_binary
only:
- dev
- tags
- /^.*-run-dev$/
build-and-package-debian-10:
@ -175,6 +186,7 @@ build-and-package-debian-10:
only:
- merge_requests
- dev
- tags
- /^.*-run-dev$/
build-and-package-ubuntu-18-04:
@ -188,6 +200,7 @@ build-and-package-ubuntu-18-04:
<<: *build_binary
only:
- dev
- tags
- /^.*-run-dev$/
build-and-package-ubuntu-19-10:
@ -201,6 +214,7 @@ build-and-package-ubuntu-19-10:
<<: *build_binary
only:
- dev
- tags
- /^.*-run-dev$/
# Pages are deployed from dev, be careful not to override 'next'
@ -232,7 +246,8 @@ run-webide-unit-tests:
- npm ci
- export LIGO_CMD=/bin/ligo && npm run test
rules:
- changes:
- if: '$TAG_JOB != "true"'
changes:
- tools/webide/**
when: always
@ -256,10 +271,11 @@ build-publish-ide-image:
.
- docker push "${WEBIDE_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}"
rules:
- changes:
- if: '$TAG_JOB != "true"'
changes:
- tools/webide/**
when: always
- if: '$CI_COMMIT_REF_NAME == "dev"'
if: '$CI_COMMIT_REF_NAME == "dev"'
when: always
run-webide-e2e-tests:
@ -271,10 +287,11 @@ run-webide-e2e-tests:
- export WEBIDE_IMAGE="${WEBIDE_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}"
- docker-compose run e2e
rules:
- changes:
- if: '$TAG_JOB != "true"'
changes:
- tools/webide/**
when: always
- if: '$CI_COMMIT_REF_NAME == "dev"'
if: '$CI_COMMIT_REF_NAME == "dev"'
when: always
deploy-handoff:

6
gitlab-pages/docs/language-basics/boolean-if-else.md
View File

@ -549,7 +549,7 @@ You can run the `compare` function defined above using the LIGO compiler
like this:
```shell
ligo run-function
gitlab-pages/docs/language-basics/boolean-if-else/cond.ligo compare 21n'
gitlab-pages/docs/language-basics/src/boolean-if-else/cond.ligo compare '21n'
# Outputs: Large(Unit)
```
@ -590,7 +590,7 @@ You can run the `compare` function defined above using the LIGO compiler
like this:
```shell
ligo run-function
gitlab-pages/docs/language-basics/boolean-if-else/cond.mligo compare 21n'
gitlab-pages/docs/language-basics/src/boolean-if-else/cond.mligo compare '21n'
# Outputs: Large
```
@ -613,7 +613,7 @@ You can run the `compare` function defined above using the LIGO compiler
like this:
```shell
ligo run-function
gitlab-pages/docs/language-basics/boolean-if-else/cond.religo compare 21n'
gitlab-pages/docs/language-basics/src/boolean-if-else/cond.religo compare '21n'
# Outputs: Large
```

18878
gitlab-pages/website/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
nix/sources.json
View File

@ -17,10 +17,10 @@
"homepage": "",
"owner": "serokell",
"repo": "nix-npm-buildpackage",
"rev": "14d03b37cd421b281835ae245b6cbf5b84c26e80",
"sha256": "13lz138rcy2vfd13sa4l2r4y5nx7v5pslxfy1vdq2phpmnn9j9yb",
"rev": "0450c7d88dc3d0a26461b05cfa36f45d551f4d63",
"sha256": "1w0k4jxw141win67rk66nvg323j5i3s4m1w3icf1g1f0p2zyf531",
"type": "tarball",
"url": "https://github.com/serokell/nix-npm-buildpackage/archive/14d03b37cd421b281835ae245b6cbf5b84c26e80.tar.gz",
"url": "https://github.com/serokell/nix-npm-buildpackage/archive/0450c7d88dc3d0a26461b05cfa36f45d551f4d63.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {

45
scripts/versioning.sh Executable file
View File

@ -0,0 +1,45 @@
#!/bin/sh
apt-get update -qq
apt-get -y -qq install jq
fetch_version () {
local LAST_VERSION=`curl --silent "https://gitlab.com/api/v4/projects/12294987/repository/tags?search=^V&order_by=name" | jq "map(.name)[0]"`
MAJOR=`echo $LAST_VERSION | sed -E "s/\.|\"|\V/\n/g" | grep -e . | sed -n 1p`
MINOR=`echo $LAST_VERSION | sed -E "s/\.|\"|\V/\n/g" | grep -e . | sed -n 2p`
PATCH=`echo $LAST_VERSION | sed -E "s/\.|\"|\V/\n/g" | grep -e . | sed -n 3p`
}
increment_patch () {
fetch_version
local NEW_PATCH=$((PATCH+1))
NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
}
increment_minor () {
fetch_version
local NEW_MINOR=$((MINOR+1))
NEW_VERSION="${MAJOR}.${NEW_MINOR}.0"
}
increment_major () {
fetch_version
local NEW_MAJOR=$((MAJOR+1))
NEW_VERSION="${NEW_MAJOR}.0.0"
}
tag_dev () {
curl --request POST --header "PRIVATE-TOKEN: ${AUTH}" https://gitlab.com/api/v4/projects/12294987/repository/tags -d "tag_name=V.${1}&ref=dev"
}
increment_minor
echo $NEW_VERSION
# increment_major
# echo $NEW_VERSION
# increment_patch
# echo $NEW_VERSION
tag_dev $NEW_VERSION
# curl --header "PRIVATE-TOKEN: W-7UVDzeofRmejE17_Gn" https://gitlab.com/api/v4/version
# curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/projects/5/repository/branches?branch=newbranch&ref=master

1
vendors/Preprocessor/Preproc.mli vendored
View File

@ -33,6 +33,7 @@ type error =
| File_not_found of string
| Invalid_character of char
| Unterminated_comment of string
| Unterminated_inclusion
val format :
?offsets:bool -> error Region.reg -> file:bool -> string Region.reg

108
vendors/Preprocessor/Preproc.mll vendored
View File

@ -119,6 +119,7 @@ type error =
| File_not_found of string
| Invalid_character of char
| Unterminated_comment of string
| Unterminated_inclusion
let error_to_string = function
Directive_inside_line ->
@ -178,8 +179,11 @@ let error_to_string = function
| Invalid_character c ->
E_Lexer.error_to_string (E_Lexer.Invalid_character c)
| Unterminated_comment ending ->
sprintf "Unterminated comment.\n\
Hint: Close with \"%s\"." ending
sprintf "Unterminated comment.\n\
Hint: Close with \"%s\"." ending
| Unterminated_inclusion ->
sprintf "Unterminated #include directive.\n\
Hint: Add as a string the name of the file to be included."
let format ?(offsets=true) Region.{region; value} ~file =
let msg = error_to_string value
@ -492,26 +496,28 @@ rule scan state = parse
and file = Lexing.(lexbuf.lex_curr_p.pos_fname) in
let base = Filename.basename file
and reg, incl_file = scan_inclusion state lexbuf in
let incl_dir = Filename.dirname incl_file in
let path = mk_path state in
let incl_path, incl_chan =
match find path incl_file state.opt#libs with
Some p -> p
| None -> stop (File_not_found incl_file) state reg in
let () = print state (sprintf "\n# 1 \"%s\" 1\n" incl_path) in
let incl_buf = Lexing.from_channel incl_chan in
let () =
let open Lexing in
incl_buf.lex_curr_p <-
{incl_buf.lex_curr_p with pos_fname = incl_file} in
let state = {state with incl = incl_chan::state.incl} in
let state' = {state with mode=Copy; trace=[]} in
let state' = scan (push_dir incl_dir state') incl_buf in
let state = {state with env=state'.env; incl=state'.incl} in
let path = if path = "" then base
else path ^ Filename.dir_sep ^ base in
print state (sprintf "\n# %i \"%s\" 2" (line+1) path);
scan state lexbuf
if state.mode = Copy then
let incl_dir = Filename.dirname incl_file in
let path = mk_path state in
let incl_path, incl_chan =
match find path incl_file state.opt#libs with
Some p -> p
| None -> stop (File_not_found incl_file) state reg in
let () = print state (sprintf "\n# 1 \"%s\" 1\n" incl_path) in
let incl_buf = Lexing.from_channel incl_chan in
let () =
let open Lexing in
incl_buf.lex_curr_p <-
{incl_buf.lex_curr_p with pos_fname = incl_file} in
let state = {state with incl = incl_chan::state.incl} in
let state' = {state with mode=Copy; trace=[]} in
let state' = scan (push_dir incl_dir state') incl_buf in
let state = {state with env=state'.env; incl=state'.incl} in
let path = if path = "" then base
else path ^ Filename.dir_sep ^ base in
let () = print state (sprintf "\n# %i \"%s\" 2" (line+1) path)
in scan state lexbuf
else scan state lexbuf
| "if" ->
let mode = expr state lexbuf in
let mode = if state.mode = Copy then mode else Skip in
@ -539,16 +545,22 @@ rule scan state = parse
scan (reduce_cond state region) lexbuf
| "define" ->
let id, region = variable state lexbuf in
if id="true" || id="false"
then stop (Reserved_symbol id) state region;
if Env.mem id state.env
then stop (Multiply_defined_symbol id) state region;
let state = {state with env = Env.add id state.env}
in scan state lexbuf
if state.mode = Copy then
if id="true" || id="false"
then stop (Reserved_symbol id) state region
else
if Env.mem id state.env
then stop (Multiply_defined_symbol id) state region
else
let state = {state with env = Env.add id state.env}
in scan state lexbuf
else scan state lexbuf
| "undef" ->
let id, _ = variable state lexbuf in
let state = {state with env = Env.remove id state.env}
in scan state lexbuf
if state.mode = Copy then
let state = {state with env = Env.remove id state.env}
in scan state lexbuf
else scan state lexbuf
| "error" ->
stop (Error_directive (message [] lexbuf)) state region
| "region" ->
@ -563,15 +575,15 @@ rule scan state = parse
| _ -> assert false
}
| eof { if state.trace = [] then state
else fail Missing_endif state lexbuf }
| eof { if state.trace = [] then state
else fail Missing_endif state lexbuf }
| '"' { if state.mode = Copy then
begin
copy state lexbuf;
scan (in_string (mk_reg lexbuf) state lexbuf) lexbuf
end
else scan state lexbuf }
| '"' { if state.mode = Copy then
begin
copy state lexbuf;
scan (in_string (mk_reg lexbuf) state lexbuf) lexbuf
end
else scan state lexbuf }
| block_comment_openings {
let lexeme = Lexing.lexeme lexbuf in
@ -633,20 +645,22 @@ and symbol state = parse
and skip_line state = parse
nl { proc_nl state lexbuf }
| blank+ { skip_line state lexbuf }
| _ { () }
| eof { rollback lexbuf }
| blank+
| _ { skip_line state lexbuf }
and message acc = parse
nl { Lexing.new_line lexbuf;
mk_str (List.length acc) acc }
| eof { mk_str (List.length acc) acc }
| eof { rollback lexbuf;
mk_str (List.length acc) acc }
| _ as c { message (c::acc) lexbuf }
(* Comments *)
and in_line_com state = parse
nl { proc_nl state lexbuf; state }
| eof { state }
| eof { rollback lexbuf; state }
| _ { if state.mode = Copy then copy state lexbuf;
in_line_com state lexbuf }
@ -684,13 +698,13 @@ and in_block block opening state = parse
(* Included filename *)
and scan_inclusion state = parse
blank+ { scan_inclusion state lexbuf }
| '"' { in_inclusion (mk_reg lexbuf) [] 0 state lexbuf }
blank+ { scan_inclusion state lexbuf }
| '"' { in_inclusion (mk_reg lexbuf) [] 0 state lexbuf }
| nl | eof { fail Unterminated_inclusion state lexbuf }
and in_inclusion opening acc len state = parse
'"' { let closing = mk_reg lexbuf
in Region.cover opening closing,
mk_str len acc }
in Region.cover opening closing, mk_str len acc }
| nl { fail Newline_in_string state lexbuf }
| eof { stop Unterminated_string state opening }
| _ as c { in_inclusion opening (c::acc) (len+1) state lexbuf }
@ -700,7 +714,7 @@ and in_inclusion opening acc len state = parse
and in_string opening state = parse
"\\\"" { copy state lexbuf; in_string opening state lexbuf }
| '"' { copy state lexbuf; state }
| eof { state }
| eof { rollback lexbuf; state }
| _ { copy state lexbuf; in_string opening state lexbuf }
and preproc state = parse

2
vendors/Preprocessor/PreprocMain.ml vendored
View File

@ -4,7 +4,7 @@ module Region = Simple_utils.Region
module Preproc = Preprocessor.Preproc
module EvalOpt = Preprocessor.EvalOpt
let highlight msg = Printf.eprintf "\027[31m%s\027[0m%!" msg
let highlight msg = Printf.eprintf "\027[31m%s\027[0m\n%!" msg
let options =
let open EvalOpt in