aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2017-09-25 12:51:26 -0400
committerAndrew Kelley <superjoe30@gmail.com>2017-09-25 15:04:52 -0400
commit79400bfdfd1e90cf3a4d09f32de965b13796a44d (patch)
tree352f583af59ecc7b38431554ddc6d665e9e44222
parent6c3a56a7ffd5a2ec5119447aa81dce9bf6ec1319 (diff)
downloadzig-79400bfdfd1e90cf3a4d09f32de965b13796a44d.tar.gz
zig-79400bfdfd1e90cf3a4d09f32de965b13796a44d.zip
fix docs
-rw-r--r--README.md9
-rw-r--r--doc/semantic_analysis.md4
2 files changed, 10 insertions, 3 deletions
diff --git a/README.md b/README.md
index 19a276d7a8..3bf646bf54 100644
--- a/README.md
+++ b/README.md
@@ -106,13 +106,20 @@ libc. Create demo games using Zig.
These compile tools must be available on your system and are used to build
the Zig compiler itself:
+##### POSIX
+
* gcc >= 5.0.0 or clang >= 3.6.0
* cmake >= 2.8.5
+##### Windows
+
+ * Microsoft Visual Studio 2015
+
#### Library Dependencies
These libraries must be installed on your system, with the development files
-available. The Zig compiler links against them.
+available. The Zig compiler links against them. You have to use the same
+compiler for these libraries as you do to compile Zig.
* LLVM, Clang, and LLD libraries == 5.x
diff --git a/doc/semantic_analysis.md b/doc/semantic_analysis.md
index 770b0f93b3..6e860aac42 100644
--- a/doc/semantic_analysis.md
+++ b/doc/semantic_analysis.md
@@ -6,8 +6,8 @@ choose to add more files to the compilation, for example bootstrap.zig which
contains the code that calls main.
Our goal now is to treat everything that is marked with the `export` keyword
-as a root node, and then then parse and semantically analyze as little as
-possible in order to fulfill these exports.
+as a root node, and then parse and semantically analyze as little as possible
+in order to fulfill these exports.
So, some parts of the code very well may have uncaught semantic errors, but as
long as the code is not referenced in any way, the compiler will not complain