merge changes

diff --cc example.src
index aff6ba373b418b468d6de3d36ff7912f77196768,1b023c88e6f15bca66502661a5cd1b53e897a088..f63b04c2b5f2b58c9cdb7070da1c772b17b9ad3f
--- 1/example.src
--- 2/example.src
+++ b/example.src
@@@ -1,18 -1,17 +1,17 @@@
- package main
- requires ("fmt")
- provides (main)
+ require ("fmt")
+ provide (main)
  
- let const_true bool = true
- let const_false bool = false
- let const_uint int = 123
- let const_string string = ""
+ let const_true bool = true;
+ let const_false bool = false;
+ let const_uint int = 123;
+ let const_string string = "";
  
 -var const_true bool = true;
 -var const_false bool = false;
 -var const_uint int = 123;
 -var const_string string = "";
 +var var_true bool = true
 +var var_false bool = false
 +var var_uint int = 123
 +var var_string string = ""
  
- # type type_int int
+ type type_int = int;
  # type type_intary int[]
  # type type_intary42 int[42]
  # type type_intaryary int[][]