Merge 0.2.0 into develop (#82)

* Add version tag to dockerhub

* Add major, minor, patch version to dockerhub

* Bump version 0.2.0

* remove grammar as it is outdated

* complete merge

Cargo.lock

@@ -565,7 +565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "zokrates"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "assert_cli 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "zokrates"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Jacob Eberhardt <jacob.eberhardt@tu-berlin.de>", "Dennis Kuhnert <mail@kyroy.com>"]
-repository = "https://github.com/Kyroy/VerifiableStatementCompiler.git"
+repository = "https://github.com/JacobEberhardt/ZoKrates"
 readme = "README.md"
 build = "build.rs"
 

src/parser.rs

@@ -4,73 +4,6 @@
 //! @author Jacob Eberhardt <jacob.eberhardt@tu-berlin.de>
 //! @date 2017
 
-// import syntax draft
-// <imports> ::= <import> <imports>
-//
-// <import> ::= `import' 
-
-// Grammar:
-//
-// <prog> ::= <functions>
-//
-// <functions> ::= <function> <functions>
-//
-// <function> ::= `def' <ide> `(' <arguments> `):\\n' <stat-list>
-//
-// <arguments> ::= <ide> <more-args> | $\varepsilon$
-//
-// <more-args> ::= `,' <ide> <more-args>  | $\varepsilon$
-//
-// <stat-list> ::= <statement> <stat-list> | <return>
-//
-// <expressions> ::= <expr> <more-expr> | $\varepsilon$
-//
-// <more-exprs> ::= `,' <ide> <more-args>  | $\varepsilon$
-//
-// <statement> ::= <ide> <statement'>
-//         | `if' <expr> <comparator> <expr> `then' <expr> `else' <expr> `fi' <expr'> `==' <expr> `\\n'
-//         | `(' <expr> `)' <term'> <expr'> `==' <expr> `\\n'
-//         | <num> <term'> <expr'> `==' <expr> `\\n'
-//         | `#' <ide> `=' <expr> `\\n'
-//
-// <statement'> ::= `=' <expr> `\\n'
-//         | <term'> <expr'> `==' <expr> `\\n'
-//
-// <expr> ::= `if' <expr> <comparator> <expr> `then' <expr> `else' <expr> `fi' <expr'>
-//         | `(' <expr> `)' <term'> <expr'>
-//         | <ide> <term'> <expr'>
-//         | <num> <term'> <expr'>
-//         | <ide> `(' <expressions> `)' <term'> <expr'>
-//
-// <expr'> ::= `+' <term> <expr'>
-//         | `-' <term> <expr'>
-//         | `**' <num> <term'> <expr'>
-//         | $\varepsilon$
-//
-// <term> ::= <factor> <term'>
-//
-// <term'> ::= `*' <term>
-//         | `/' <term>
-//         | $\varepsilon$
-//
-// <factor> ::= `if' <expr> <comparator> <expr> `then' <expr> `else' <expr> `fi' <expr'> `**' <num>
-//         | `(' <expr> `)' <factor'>
-//         | <ide> <factor'>
-//         | <num> <factor'>
-//         | <ide> `(' <expressions> `)' <factor'>
-//
-// <factor'> ::= <term'> <expr'> `**' <num>
-//         | $\varepsilon$
-//
-// <comparator> ::= `<' | `<=' | `==' | `>=' | `>'
-//
-// <num> ::= `d' <num> | `d'
-//
-// <ide> ::= `l' <trail> | `l'
-//
-// <trail> ::= `d' <trail> | `l' <trail> | `d' | `l'
-//
-
 use std::fmt;
 use std::io::{BufReader, Lines};
 use std::io::prelude::*;