Merge pull request #574 from Zokrates/052-typos

typos
Zokrates · Feb 25, 2020 · d8cde9e · d8cde9e
2 parents 20ced30 + d7302d8
commit d8cde9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/zokrates_book/src/reference/abi.md b/zokrates_book/src/reference/abi.md
@@ -20,9 +20,9 @@ def main(private Foo foo, bool[2] bar, field num) -> (field):
 
 ## ABI specification
 
-When compiling a program, an ABI specification `abi.json` file is created and describes the interface of the program.
+When compiling a program, an ABI specification is generated and describes the interface of the program.
 
-In this example, the generate ABI specification is:
+In this example, the ABI specification is:
 
 ```json
 {
@@ -69,7 +69,7 @@ In this example, the generate ABI specification is:
         }
     ]
 }
-``
+```
 
 
 ## ABI input format

diff --git a/zokrates_parser/src/zokrates.pest b/zokrates_parser/src/zokrates.pest
@@ -119,6 +119,6 @@ WHITESPACE = _{ " " | "\t" | "\\" ~ NEWLINE}
 COMMENT = _{ ("/*" ~ (!"*/" ~ ANY)* ~ "*/") | ("//" ~ (!NEWLINE ~ ANY)*) }
 
 // TODO: Order by alphabet
-keyword = @{"as"|"bool"|"byte"|"def"|"do"|"else"|"endfor"|"export"|"false"|"field"|"for"|"if"|"then"|"fi"|"import"|
+keyword = @{"as"|"bool"|"byte"|"def"|"do"|"else"|"endfor"|"export"|"false"|"field"|"for"|"if"|"then"|"fi"|"import"|"from"|
             "in"|"private"|"public"|"return"|"struct"|"true"|"uint"
             }